Merge remote-tracking branch 'origin/master' into ad/feat/goblin-bench

.circleci/config.yml

@@ -432,7 +432,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/run_tests blank-react
+          command: ./boxes/run_tests blank-react
 
   boxes-blank:
     machine:
@@ -443,7 +443,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/run_tests blank
+          command: ./boxes/run_tests blank
 
   boxes-token:
     machine:
@@ -454,7 +454,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test via adhoc script"
-          command: ./yarn-project/boxes/run_tests token
+          command: ./boxes/run_tests token
 
   end-to-end:
     machine:
@@ -1190,4 +1190,4 @@ workflows:
           <<: *defaults
 
       # Production releases.
-      - deploy-and-release: *defaults_deploy
+      - deploy-and-release: *defaults_deploy

.gitignore

@@ -8,6 +8,7 @@ build/
 cmake-build-debug
 .terraform*
 .bootstrapped
+.tsbuildinfo
 
 # Local Netlify folder
 .netlify

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.16.8",
-  "barretenberg": "0.16.8",
-  "barretenberg/ts": "0.16.8"
+  ".": "0.16.9",
+  "barretenberg": "0.16.9",
+  "barretenberg/ts": "0.16.9"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.16.9](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.8...aztec-packages-v0.16.9) (2023-12-13)
+
+
+### Bug Fixes
+
+* **ci:** Deploy_npm script ([#3678](https://github.com/AztecProtocol/aztec-packages/issues/3678)) ([9d7c58d](https://github.com/AztecProtocol/aztec-packages/commit/9d7c58d4fe0f91c453c47d6be813325cff08907b))
+
 ## [0.16.8](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.7...aztec-packages-v0.16.8) (2023-12-13)
 
 

barretenberg/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.16.9](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.8...barretenberg-v0.16.9) (2023-12-13)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.16.8](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.7...barretenberg-v0.16.8) (2023-12-13)
 
 

barretenberg/cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.16.8 # x-release-please-version
+    VERSION 0.16.9 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file

barretenberg/ts/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.16.9](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.16.8...barretenberg.js-v0.16.9) (2023-12-13)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
 ## [0.16.8](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.16.7...barretenberg.js-v0.16.8) (2023-12-13)
 
 

barretenberg/ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.16.8",
+  "version": "0.16.9",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",

yarn-project/boxes/README.md → boxes/README.md

@@ -5,6 +5,19 @@ A minimal framework for building full stack applications for Aztec (using React)
 
 This folder contains the "boxes" that are meant for quickstarts for Aztec smart contract developers, including simple Noir smart contracts and frontends.
 
+Note because this depends on packages in the parallel workspace `yarn-project`, it uses "portal" dependencies which requires yarn version 2+.
+
+This was installed with 
+```
+$yarn set version berry
+```
+
+which also required a node version of 18.12 or higher, via
+
+```
+nvm use 18.12.0
+```
+
 ## Debugging
 
 If CI is failing, it may be due to incompatibility with previous build artifacts - running the following command inside this boxes folder should regenerate the artifacts.

yarn-project/boxes/blank-react/package.json → boxes/blank-react/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@aztec/aztec-ui": "^0.1.14",
-    "@aztec/aztec.js": "workspace:^",
+    "@aztec/aztec.js": "portal:../../yarn-project/aztec.js",
     "classnames": "^2.3.2",
     "formik": "^2.4.3",
     "node-sass": "^9.0.0",
@@ -46,6 +46,12 @@
     "serve": "^14.2.1",
     "yup": "^1.2.0"
   },
+  "resolutions": {
+    "@aztec/circuits.js": "portal:../../yarn-project/circuits.js",
+    "@aztec/foundation": "portal:../../yarn-project/foundation",
+    "@aztec/types": "portal:../../yarn-project/types",
+    "@aztec/ethereum": "portal:../../yarn-project/ethereum"
+  },
   "devDependencies": {
     "@types/jest": "^29.5.0",
     "@types/mocha": "^10.0.3",
@@ -58,8 +64,10 @@
     "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",
     "jest": "^29.6.4",
@@ -96,5 +104,6 @@
     "src",
     "!*.test.*"
   ],
-  "types": "./dest/index.d.ts"
+  "types": "./dest/index.d.ts",
+  "packageManager": "[email protected]"
 }

yarn-project/boxes/blank-react/src/config.ts → boxes/blank-react/src/config.ts

@@ -1,5 +1,5 @@
-import { BlankContractArtifact } from './artifacts/Blank.js';
 import { ContractArtifact, PXE, createPXEClient } from '@aztec/aztec.js';
+import { BlankContractArtifact } from './artifacts/Blank.js';
 
 // update this if using a different contract
 

yarn-project/boxes/blank/tsconfig.json → boxes/blank-react/tsconfig.json

@@ -24,7 +24,7 @@
   "include": ["src", "src/**/*.json"],
   "references": [
     {
-      "path": "../../aztec.js"
+      "path": "../../yarn-project/aztec.js"
     },
   ]
 }