Merge remote-tracking branch 'origin/master' into alexg/fix/bad-contr…

…acts-deploy

.circleci/config.yml

@@ -131,6 +131,17 @@ jobs:
           name: "Build"
           command: cond_spot_run_build barretenberg-x86_64-linux-clang-assert 128
 
+  barretenberg-x86_64-linux-clang-sol:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build barretenberg-x86_64-linux-clang-sol 32
+
   barretenberg-stdlib-tests:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -465,6 +476,39 @@ jobs:
           name: "Build and test"
           command: build aztec-node | add_timestamps
 
+  mainnet-fork:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: build mainnet-fork | add_timestamps
+
+  deploy-mainnet-fork:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Deploy mainnet fork"
+          command: deploy_ecr mainnet-fork
+
+  aztec-faucet:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build aztec-faucet | add_timestamps
+
   pxe-x86_64:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -513,7 +557,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/blank-react/run_tests
+          command: ./yarn-project/boxes/run_tests blank-react
 
   boxes-blank:
     machine:
@@ -524,7 +568,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/blank/run_tests
+          command: ./yarn-project/boxes/run_tests blank
 
   boxes-token:
     machine:
@@ -535,7 +579,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/token/run_tests
+          command: ./yarn-project/boxes/run_tests token
 
   canary:
     machine:
@@ -619,18 +663,6 @@ jobs:
           command: cond_run_script end-to-end ./scripts/run_tests_local e2e_token_contract.test.ts
           environment: { DEBUG: "aztec:*" }
 
-  e2e-private-airdrop:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_private_airdrop.test.ts
-          environment: { DEBUG: "aztec:*" }
-
   e2e-sandbox-example:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -640,19 +672,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_sandbox_example.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          environment: { DEBUG: "aztec:*" }
-
-  e2e-multi-transfer-contract:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_multi_transfer.test.ts
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_sandbox_example.test.ts
           environment: { DEBUG: "aztec:*" }
 
   e2e-block-building:
@@ -811,18 +831,6 @@ jobs:
           command: cond_run_script end-to-end ./scripts/run_tests_local integration_l1_publisher.test.ts
           environment: { DEBUG: "aztec:*" }
 
-  e2e-public-token-contract:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_public_token_contract.test.ts
-          environment: { DEBUG: "aztec:*" }
-
   e2e-cli:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -844,7 +852,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_p2p_network.test.ts
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_p2p_network.test.ts ./scripts/docker-compose-no-sandbox.yml
           environment: { DEBUG: "aztec:*" }
 
   e2e-browser-sandbox:
@@ -856,7 +864,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox-browser.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-browser.yml
           environment: { DEBUG: "aztec:*" }
 
   e2e-card-game:
@@ -880,7 +888,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local pxe_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local pxe_sandbox.test.ts
           environment: { DEBUG: "aztec:*" }
 
   cli-docs-sandbox:
@@ -892,7 +900,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local cli_docs_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local cli_docs_sandbox.test.ts
           environment: { DEBUG: "aztec:*" }
 
   guides-writing-an-account-contract:
@@ -916,7 +924,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local guides/dapp_testing.test.ts
           environment: { DEBUG: "aztec:*" }
 
   guides-sample-dapp:
@@ -928,7 +936,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local sample-dapp
           environment: { DEBUG: "aztec:*" }
 
   guides-up-quick-start:
@@ -940,20 +948,9 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_run_script end-to-end ./scripts/run_tests_local guides/up_quick_start.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+          command: cond_run_script end-to-end ./scripts/run_tests_local guides/up_quick_start.test.ts
           environment: { DEBUG: "aztec:*" }
 
-  e2e-canary-test:
-    machine:
-      image: ubuntu-2204:2023.07.2
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: cond_run_script canary-build ./scripts/run_tests uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
-
   bench-publish-rollup:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -963,7 +960,7 @@ jobs:
       - *setup_env
       - run:
           name: "Benchmark"
-          command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_publish_rollup.test.ts
+          command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_publish_rollup.test.ts ./scripts/docker-compose-no-sandbox.yml
           environment:
             DEBUG: "aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees"
 
@@ -976,7 +973,7 @@ jobs:
       - *setup_env
       - run:
           name: "Benchmark"
-          command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_process_history.test.ts
+          command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_process_history.test.ts ./scripts/docker-compose-no-sandbox.yml
           environment:
             DEBUG: "aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees"
 
@@ -1179,6 +1176,7 @@ workflows:
       - barretenberg-x86_64-linux-clang-assert: *defaults
       - barretenberg-x86_64-linux-clang-fuzzing: *defaults
       - barretenberg-wasm-linux-clang: *defaults
+      - barretenberg-x86_64-linux-clang-sol: *defaults
       - barretenberg-proof-system-tests: *bb_test
       - barretenberg-honk-tests: *bb_test
       - barretenberg-dsl-tests: *bb_test
@@ -1247,6 +1245,12 @@ workflows:
       - l1-contracts: *defaults
       - noir-contracts-build: *defaults
 
+      - mainnet-fork: *defaults
+      - deploy-mainnet-fork:
+          requires:
+            - mainnet-fork
+          <<: *deploy_defaults
+
       # Yarn Project
       - yarn-project-base:
           requires:
@@ -1299,6 +1303,11 @@ workflows:
             - yarn-project
           <<: *defaults
 
+      - aztec-faucet:
+          requires:
+            - yarn-project
+          <<: *defaults
+
       - pxe-x86_64:
           requires:
             - yarn-project
@@ -1342,14 +1351,11 @@ workflows:
       - e2e-deploy-contract: *e2e_test
       - e2e-lending-contract: *e2e_test
       - e2e-token-contract: *e2e_test
-      - e2e-private-airdrop: *e2e_test
       - e2e-sandbox-example: *e2e_test
-      - e2e-multi-transfer-contract: *e2e_test
       - e2e-block-building: *e2e_test
       - e2e-nested-contract: *e2e_test
       - e2e-non-contract-account: *e2e_test
       - e2e-multiple-accounts-1-enc-key: *e2e_test
-      - e2e-public-token-contract: *e2e_test
       - e2e-cli: *e2e_test
       - e2e-cross-chain-messaging: *e2e_test
       - e2e-public-cross-chain-messaging: *e2e_test
@@ -1362,7 +1368,6 @@ workflows:
       - integration-l1-publisher: *e2e_test
       - integration-archiver-l1-to-l2: *e2e_test
       - e2e-p2p: *e2e_test
-      - e2e-canary-test: *e2e_test
       - e2e-browser-sandbox: *e2e_test
       - e2e-card-game: *e2e_test
       - pxe-sandbox: *e2e_test
@@ -1380,14 +1385,11 @@ workflows:
             - e2e-deploy-contract
             - e2e-lending-contract
             - e2e-token-contract
-            - e2e-private-airdrop
             - e2e-sandbox-example
-            - e2e-multi-transfer-contract
             - e2e-block-building
             - e2e-nested-contract
             - e2e-non-contract-account
             - e2e-multiple-accounts-1-enc-key
-            - e2e-public-token-contract
             - e2e-cli
             - e2e-cross-chain-messaging
             - e2e-public-cross-chain-messaging
@@ -1401,7 +1403,6 @@ workflows:
             - integration-archiver-l1-to-l2
             - e2e-p2p
             - e2e-browser-sandbox
-            - e2e-canary-test
             - e2e-card-game
             - pxe-sandbox
             - cli-docs-sandbox

.github/workflows/publish-bb.yml

@@ -51,7 +51,7 @@ jobs:
         run: |
           cd barretenberg/cpp
 
-          cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere
+          cmake --preset default -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere
           cmake --build --preset default --target bb
 
       - name: Tar and GZip bb Binary (Ubuntu)

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.8.14",
-  "barretenberg": "0.8.14",
-  "barretenberg/ts": "0.8.14"
+  ".": "0.12.0",
+  "barretenberg": "0.12.0",
+  "barretenberg/ts": "0.12.0"
 }