chore: update private token box

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

@@ -17,9 +17,8 @@ export async function callContractFunction(
   // TODO: switch to the generated typescript class?
   const contract = await Contract.at(address, abi, selectedWallet);
 
-  const returnVal = contract.methods[functionName](...typedArgs)
+  return contract.methods[functionName](...typedArgs)
     .send()
     .wait();
 
-  return await returnVal;
 }

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

@@ -15,8 +15,7 @@ export function convertArgs(functionAbi: FunctionAbi, args: any): Fr[] {
     }
   });
 
-  const typedArgs = encodeArguments(functionAbi, untypedArgs);
-  return typedArgs;
+  return encodeArguments(functionAbi, untypedArgs);
 }
 
 /**

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

@@ -1,6 +1,6 @@
+import { getWallet } from './util.js';
 import { AztecAddress, AztecRPC, CompleteAddress, Contract } from '@aztec/aztec.js';
 import { ContractAbi } from '@aztec/foundation/abi';
-import { getWallet } from './util.js';
 
 export async function viewContractFunction(
   address: AztecAddress,
@@ -14,7 +14,5 @@ export async function viewContractFunction(
   const selectedWallet = await getWallet(wallet, rpc);
   const contract = await Contract.at(address, abi, selectedWallet);
 
-  // TODO: see if we can remove the {from: wallet.address}?
-  const viewResult = await contract.methods[functionName](...typedArgs).view({ from: wallet.address });
-  return viewResult;
+  return await contract.methods[functionName](...typedArgs).view({ from: wallet.address });
 }

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

@@ -22,6 +22,7 @@ const setupSandbox = async () => {
   const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
   const aztecRpc = createAztecRpcClient(SANDBOX_URL);
   await waitForSandbox(aztecRpc);
+
   return aztecRpc;
 };
 
@@ -30,8 +31,7 @@ async function deployZKContract(owner: CompleteAddress, wallet: Wallet, rpcClien
   const contractAddress = await deployContract(owner, BlankContract.abi, [], Fr.random(), rpcClient);
 
   logger(`L2 contract deployed at ${contractAddress}`);
-  const contract = await BlankContract.at(contractAddress, wallet);
-  return contract;
+  return BlankContract.at(contractAddress, wallet);
 }
 
 describe('ZK Contract Tests', () => {

yarn-project/boxes/blank/src/index.ts

@@ -21,9 +21,9 @@ export const FILTERED_FUNCTION_NAMES = [];
 
 export const DEFAULT_PUBLIC_ADDRESS: string = '0x25048e8c1b7dea68053d597ac2d920637c99523651edfb123d0632da785970d0';
 
-// interaction with the button
-
 let contractAddress: string = '';
+
+// interaction with the buttons
 document.getElementById('deploy')?.addEventListener('click', async () => {
   console.log('Deploying Contract');
   const [wallet, ..._rest] = await getSandboxAccountsWallets(rpcClient);
@@ -55,7 +55,7 @@ document.getElementById('interact')?.addEventListener('click', async () => {
     wallet.getCompleteAddress(),
   );
 
-  console.log('Interaction transaction succeeded', call);
+  console.log('transaction outcome:', call);
 });
 
 export const getFunctionAbi = (contractAbi: any, functionName: string) => {
@@ -132,6 +132,5 @@ export function convertArgs(functionAbi: FunctionAbi, args: any): Fr[] {
     }
   });
 
-  const typedArgs = encodeArguments(functionAbi, untypedArgs);
-  return typedArgs;
+  return encodeArguments(functionAbi, untypedArgs);
 }

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

@@ -29,8 +29,7 @@ async function deployZKContract(owner: CompleteAddress, wallet: Wallet, rpcClien
   const contractAddress = await deployContract(owner, BlankContract.abi, [], Fr.random(), rpcClient);
 
   logger(`L2 contract deployed at ${contractAddress}`);
-  const contract = await BlankContract.at(contractAddress, wallet);
-  return contract;
+  return BlankContract.at(contractAddress, wallet);
 }
 
 describe('ZK Contract Tests', () => {

yarn-project/boxes/private-token/README.md

@@ -12,7 +12,6 @@ Dependencies can be installed from the root of the package:
 yarn
 yarn install:noir
 yarn install:sandbox
-yarn build
 ```
 
 In addition to the usual javascript dependencies, this project requires `nargo` (package manager) and `noir` (a Domain Specific Language for SNARK proving systems) in addition to `@aztec/aztec-cli`.
@@ -33,7 +32,7 @@ docker pull aztecprotocol/aztec-sandbox:latest
 
 ## Getting started
 
-After `yarn build` has run,`yarn start:sandbox` in one terminal will launch a local instance of the Aztec sandbox via Docker Compose and `yarn start:dev` will launch a frontend app for deploying and interacting with the PrivateToken contract.
+After `yarn` has run,`yarn start:sandbox` in one terminal will launch a local instance of the Aztec sandbox via Docker Compose and `yarn start:dev` will launch a frontend app for deploying and interacting with the PrivateToken contract.
 
 At this point, [http://localhost:5173](http://localhost:5173) should provide a minimal smart contract frontend.
 

yarn-project/boxes/private-token/src/app/components/contract_function_form.tsx

@@ -48,7 +48,7 @@ function generateYupSchema(functionAbi: FunctionAbi, defaultAddress: string) {
             return value;
           });
         initialValues[param.name] = Array(arrayLength).fill(
-          CONTRACT_ADDRESS_PARAM_NAMES.includes(param.name) ? DEFAULT_PUBLIC_ADDRESS : 200,
+          CONTRACT_ADDRESS_PARAM_NAMES.includes(param.name) ? defaultAddress : 200,
         );
         break;
       case 'boolean':

yarn-project/boxes/private-token/src/app/contract.tsx

@@ -1,11 +1,11 @@
+import { Button, ButtonSize, ButtonTheme, Card, CardTheme, ImageButton, ImageButtonIcon } from '@aztec/aztec-ui';
 import { AztecAddress, CompleteAddress } from '@aztec/aztec.js';
 import { FunctionAbi } from '@aztec/foundation/abi';
 import { ReactNode, useState } from 'react';
 import { FILTERED_FUNCTION_NAMES, contractAbi } from '../config.js';
+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 { Copy } from './components/copy.js';
 
 const functionTypeSortOrder = {
   secret: 0,
@@ -98,6 +98,7 @@ export function Contract({ wallet }: Props) {
               contractAddress={contractAddress}
               contractAbi={contractAbi}
               functionAbi={selectedFunctionAbi}
+              defaultAddress={wallet.address.toString()}
               isLoading={processingFunction === selectedFunctionAbi.name && !hasResult}
               disabled={processingFunction === selectedFunctionAbi.name && hasResult}
               onSubmit={() => handleSubmitForm(selectedFunctionAbi.name)}
@@ -116,6 +117,7 @@ export function Contract({ wallet }: Props) {
           wallet={wallet}
           contractAbi={contractAbi}
           functionAbi={constructorAbi}
+          defaultAddress={wallet.address.toString()}
           buttonText="Deploy"
           isLoading={!!processingFunction && !hasResult}
           disabled={!!processingFunction && hasResult}