Fix boxes (again)

AztecProtocol · Feb 26, 2024 · 36f00fc · 36f00fc
1 parent cacf063
commit 36f00fc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 37 deletions.
diff --git a/boxes/react/src/hooks/useContract.tsx b/boxes/react/src/hooks/useContract.tsx
@@ -14,17 +14,17 @@ export function useContract() {
     e.preventDefault();
 
     setWait(true);
-    const contractDeployer = new ContractDeployer(artifact, deployerEnv.pxe);
     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 { contractAddress } = await toast.promise(tx.wait(), {
+    const { address: contractAddress } = await toast.promise(tx.deployed(), {
       pending: 'Deploying contract...',
       success: {
-        render: ({ data }) => `Address: ${data.contractAddress}`,
+        render: ({ data }) => `Address: ${data.address}`,
       },
       error: 'Error deploying contract',
     });

diff --git a/boxes/react/src/index.tsx b/boxes/react/src/index.tsx
@@ -1,11 +1,9 @@
-import { Home } from "./pages/home";
-import "react-toastify/dist/ReactToastify.css";
-import * as ReactDOM from "react-dom/client";
-import { ToastContainer } from "react-toastify";
+import { Home } from './pages/home';
+import 'react-toastify/dist/ReactToastify.css';
+import * as ReactDOM from 'react-dom/client';
+import { ToastContainer } from 'react-toastify';
 
-const root = ReactDOM.createRoot(
-  document.getElementById("root") as HTMLElement,
-);
+const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
 root.render(
   <>
     <Home />

diff --git a/boxes/react/src/pages/contract.tsx b/boxes/react/src/pages/contract.tsx
@@ -1,7 +1,7 @@
-import { useState } from "react";
-import { Contract } from "@aztec/aztec.js";
-import { useNumber } from "../hooks/useNumber";
-import { filteredInterface } from "../config";
+import { useState } from 'react';
+import { Contract } from '@aztec/aztec.js';
+import { useNumber } from '../hooks/useNumber';
+import { filteredInterface } from '../config';
 
 export function ContractComponent({ contract }: { contract: Contract }) {
   const [showInput, setShowInput] = useState(true);
@@ -15,7 +15,7 @@ export function ContractComponent({ contract }: { contract: Contract }) {
         <select name="viewFunctions" id="viewFunctions">
           {filteredInterface.map(
             (fn, index) =>
-              fn.functionType === "unconstrained" && (
+              fn.functionType === 'unconstrained' && (
                 <option key={index} value={index}>
                   {fn.name}
                 </option>
@@ -29,26 +29,17 @@ export function ContractComponent({ contract }: { contract: Contract }) {
 
       <form onSubmit={setNumber}>
         <label htmlFor="functions">Functions:</label>
-        <select
-          name="functions"
-          id="functions"
-          onChange={() => setShowInput(true)}
-        >
+        <select name="functions" id="functions" onChange={() => setShowInput(true)}>
           {filteredInterface.map(
             (fn, index) =>
-              fn.functionType !== "unconstrained" && (
+              fn.functionType !== 'unconstrained' && (
                 <option key={index} value={index}>
                   {fn.name}
                 </option>
               ),
           )}
         </select>
-        <input
-          type="number"
-          name="numberToSet"
-          id="numberToSet"
-          hidden={!showInput}
-        />
+        <input type="number" name="numberToSet" id="numberToSet" hidden={!showInput} />
         <button type="submit" disabled={wait}>
           Write
         </button>

diff --git a/boxes/react/src/pages/home.tsx b/boxes/react/src/pages/home.tsx
@@ -1,5 +1,5 @@
-import { ContractComponent } from "./contract";
-import { useContract } from "../hooks/useContract";
+import { ContractComponent } from './contract';
+import { useContract } from '../hooks/useContract';
 
 export function Home() {
   const { contract, deploy, wait } = useContract();

diff --git a/boxes/react/tests/blank.contract.test.ts b/boxes/react/tests/blank.contract.test.ts
@@ -13,11 +13,9 @@ describe('BoxReact Contract Tests', () => {
   beforeAll(async () => {
     wallet = await deployerEnv.getWallet();
     const pxe = deployerEnv.pxe;
-    const deployer = new ContractDeployer(artifact, pxe);
+    const deployer = new ContractDeployer(artifact, wallet);
     const salt = Fr.random();
-    const tx = deployer.deploy(Fr.random(), wallet.getCompleteAddress().address).send({ contractAddressSalt: salt });
-    await tx.wait();
-    const { contractAddress } = await tx.getReceipt();
+    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}`);

diff --git a/boxes/vanilla-js/src/index.ts b/boxes/vanilla-js/src/index.ts
@@ -6,7 +6,6 @@ import {
   Fr,
   AccountWalletWithPrivateKey,
 } from '@aztec/aztec.js';
-import { BlankContractArtifact } from './artifacts/Blank.js';
 
 import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
 import { VanillaContract } from '../artifacts/Vanilla';
@@ -28,11 +27,11 @@ document.querySelector('#deploy').addEventListener('click', async ({ target }: a
   wallet = await account.register();
 
   const { artifact, at } = VanillaContract;
-  const contractDeployer = new ContractDeployer(artifact, pxe);
-  const { contractAddress } = await contractDeployer
+  const contractDeployer = new ContractDeployer(artifact, wallet);
+  const { address: contractAddress } = await contractDeployer
     .deploy(Fr.random(), wallet.getCompleteAddress().address)
     .send({ contractAddressSalt: Fr.random() })
-    .wait();
+    .deployed();
   contract = await at(contractAddress, wallet);
   alert(`Contract deployed at ${contractAddress}`);