chore: move boxes out of yarn-project

.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:

.gitignore

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

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,10 +36,7 @@
   },
   "dependencies": {
     "@aztec/aztec-ui": "^0.1.14",
-    "@aztec/aztec.js": "workspace:^",
-    "@aztec/circuits.js": "workspace:^",
-    "@aztec/foundation": "workspace:^",
-    "@aztec/types": "workspace:^",
+    "@aztec/aztec.js": "portal:../../yarn-project/aztec.js",
     "classnames": "^2.3.2",
     "formik": "^2.4.3",
     "node-sass": "^9.0.0",
@@ -49,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",
@@ -61,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",
@@ -99,5 +104,6 @@
     "src",
     "!*.test.*"
   ],
-  "types": "./dest/index.d.ts"
+  "types": "./dest/index.d.ts",
+  "packageManager": "yarn@4.0.2"
 }

yarn-project/boxes/blank-react/src/app/components/contract_function_form.tsx → boxes/blank-react/src/app/components/contract_function_form.tsx

@@ -3,8 +3,7 @@ import { callContractFunction, deployContract, viewContractFunction } from '../.
 import { convertArgs } from '../../scripts/util.js';
 import styles from './contract_function_form.module.scss';
 import { Button, Loader } from '@aztec/aztec-ui';
-import { AztecAddress, CompleteAddress, Fr } from '@aztec/aztec.js';
-import { ContractArtifact, FunctionArtifact } from '@aztec/foundation/abi';
+import { AztecAddress, CompleteAddress, ContractArtifact, Fr, FunctionArtifact } from '@aztec/aztec.js';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 

yarn-project/boxes/blank-react/src/app/contract.tsx → boxes/blank-react/src/app/contract.tsx

@@ -3,8 +3,7 @@ import { Copy } from './components/copy.js';
 import { ContractFunctionForm, Popup } from './components/index.js';
 import styles from './contract.module.scss';
 import { Button, ButtonSize, ButtonTheme, Card, CardTheme, ImageButton, ImageButtonIcon } from '@aztec/aztec-ui';
-import { AztecAddress, CompleteAddress } from '@aztec/aztec.js';
-import { FunctionArtifact } from '@aztec/foundation/abi';
+import { AztecAddress, CompleteAddress, FunctionArtifact } from '@aztec/aztec.js';
 import { ReactNode, useState } from 'react';
 
 const functionTypeSortOrder = {

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

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

yarn-project/boxes/blank-react/src/scripts/call_contract_function.ts → boxes/blank-react/src/scripts/call_contract_function.ts

@@ -1,7 +1,5 @@
 import { getWallet } from './util.js';
-import { AztecAddress, PXE, CompleteAddress, Contract, TxReceipt } from '@aztec/aztec.js';
-import { ContractArtifact } from '@aztec/foundation/abi';
-import { FieldsOf } from '@aztec/foundation/types';
+import { AztecAddress, CompleteAddress, Contract, ContractArtifact, FieldsOf, PXE, TxReceipt } from '@aztec/aztec.js';
 
 export async function callContractFunction(
   address: AztecAddress,

yarn-project/boxes/blank-react/src/scripts/deploy_contract.ts → boxes/blank-react/src/scripts/deploy_contract.ts

@@ -1,6 +1,4 @@
-import { AztecAddress, CompleteAddress, DeployMethod, Fr } from '@aztec/aztec.js';
-import { ContractArtifact } from '@aztec/foundation/abi';
-import { PXE } from '@aztec/types';
+import { AztecAddress, CompleteAddress, ContractArtifact, DeployMethod, Fr, PXE } from '@aztec/aztec.js';
 
 export async function deployContract(
   activeWallet: CompleteAddress,

yarn-project/boxes/blank-react/src/scripts/util.ts → boxes/blank-react/src/scripts/util.ts

@@ -1,6 +1,12 @@
-import { AccountWallet, Fr, getSandboxAccountsWallets } from '@aztec/aztec.js';
-import { FunctionArtifact, encodeArguments } from '@aztec/foundation/abi';
-import { PXE, CompleteAddress } from '@aztec/types';
+import {
+  AccountWallet,
+  CompleteAddress,
+  Fr,
+  FunctionArtifact,
+  PXE,
+  encodeArguments,
+  getSandboxAccountsWallets,
+} from '@aztec/aztec.js';
 
 export function convertArgs(functionAbi: FunctionArtifact, args: any): Fr[] {
   const untypedArgs = functionAbi.parameters.map(param => {

yarn-project/boxes/blank-react/src/scripts/view_contract_function.ts → boxes/blank-react/src/scripts/view_contract_function.ts

@@ -1,6 +1,5 @@
 import { getWallet } from './util.js';
-import { AztecAddress, PXE, CompleteAddress, Contract } from '@aztec/aztec.js';
-import { ContractArtifact } from '@aztec/foundation/abi';
+import { AztecAddress, CompleteAddress, Contract, ContractArtifact, PXE } from '@aztec/aztec.js';
 
 export async function viewContractFunction(
   address: AztecAddress,

yarn-project/boxes/blank-react/src/tests/blank.contract.test.ts → boxes/blank-react/src/tests/blank.contract.test.ts

@@ -9,10 +9,10 @@ import {
   PXE,
   TxStatus,
   Wallet,
+  createDebugLogger,
   createPXEClient,
   waitForSandbox,
 } from '@aztec/aztec.js';
-import { createDebugLogger } from '@aztec/foundation/log';
 
 const logger = createDebugLogger('aztec:http-pxe-client');
 

boxes/blank-react/tsconfig.dest.json

@@ -0,0 +1,5 @@
+{
+  "extends": ".",
+  "references": [{ "path": "../../aztec.js" }],
+  "exclude": ["src/**/*.test.ts"]
+}

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

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