Merge branch 'main' into jc/87.2

Author: critesjosh

scripts/deploy_contract.ts

@@ -1,6 +1,5 @@
 import { EasyPrivateVotingContract } from "../src/artifacts/EasyPrivateVoting.js"
 import { createLogger, PXE, Logger, SponsoredFeePaymentMethod, Fr } from "@aztec/aztec.js";
-import { TokenContract } from "@aztec/noir-contracts.js/Token"
 import { setupPXE } from "../src/utils/setup_pxe.js";
 import { getSponsoredFPCInstance } from "../src/utils/sponsored_fpc.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
@@ -21,7 +20,7 @@ async function main() {
 
     let accountManager = await deploySchnorrAccount(pxe);
     const wallet = await accountManager.getWallet();
-    const address = await accountManager.getAddress();
+    const address = accountManager.getAddress();
 
     const votingContract = await EasyPrivateVotingContract.deploy(wallet, address).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).deployed();
     logger.info(`Voting Contract deployed at: ${votingContract.address}`);

scripts/fees.ts

@@ -23,9 +23,6 @@ import { deriveSigningKey } from '@aztec/stdlib/keys';
 const MNEMONIC = 'test test test test test test test test test test test junk';
 const FEE_FUNDING_FOR_TESTER_ACCOUNT = 1000000000000000000n;
 
-let walletClient = getL1WalletClient(foundry.rpcUrls.default.http[0], 0);
-const ownerEthAddress = walletClient.account.address;
-
 async function main() {
 
     let pxe: PXE;
@@ -69,7 +66,7 @@ async function main() {
     await pxe.registerContract({ instance: sponseredFPC, artifact: SponsoredFPCContract.artifact });
     const paymentMethod = new SponsoredFeePaymentMethod(sponseredFPC.address);
 
-    // Two arbitraty txs to make the L1 message available on L2
+    // Two arbitrary txs to make the L1 message available on L2
     const votingContract = await EasyPrivateVotingContract.deploy(wallet1, wallet1.getAddress()).send({ fee: { paymentMethod } }).deployed();
     const bananaCoin = await TokenContract.deploy(wallet1, wallet1.getAddress(), "bananaCoin", "BNC", 18).send({ fee: { paymentMethod } }).deployed()
 

scripts/multiple_pxe.ts

@@ -69,7 +69,7 @@ async function main() {
     let schnorrAccount = await getSchnorrAccount(pxe1, secretKey, deriveSigningKey(secretKey), salt);
     let tx = await schnorrAccount.deploy({ fee: { paymentMethod } }).wait();
     let ownerWallet = await schnorrAccount.getWallet();
-    let ownerAddress = await ownerWallet.getAddress();
+    let ownerAddress = ownerWallet.getAddress();
     const token = await TokenContract.deploy(ownerWallet, ownerAddress, 'Clean USDC', 'USDC', 6).send({ contractAddressSalt: L2_TOKEN_CONTRACT_SALT, fee: { paymentMethod } }).wait()
 
     // setup account on 2nd pxe
@@ -114,7 +114,7 @@ async function main() {
     const balance = await l2TokenContract.methods.balance_of_private(wallet2.getAddress()).simulate()
     console.log("private balance should be 100", balance)
     // errors
-    const public_balance = await l2TokenContract.methods.balance_of_public(wallet2.getAddress()).simulate()
+    await l2TokenContract.methods.balance_of_public(wallet2.getAddress()).simulate()
 
 }
 

src/utils/deploy_account.ts

@@ -1,9 +1,9 @@
-import { createLogger, Fr, PXE,  Logger, AccountManager } from "@aztec/aztec.js";
+import { createLogger, Fr, AccountManager } from "@aztec/aztec.js";
+import type { PXE, Logger } from "@aztec/aztec.js";
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { SponsoredFeePaymentMethod } from "@aztec/aztec.js/fee/testing";
 import { getSponsoredFPCInstance } from "./sponsored_fpc.js";
-import { setupPXE } from "./setup_pxe.js";
 import { SponsoredFPCContract } from "@aztec/noir-contracts.js/SponsoredFPC";
 
 export async function deploySchnorrAccount(pxe: PXE): Promise<AccountManager> {
@@ -19,7 +19,7 @@ export async function deploySchnorrAccount(pxe: PXE): Promise<AccountManager> {
     let salt = Fr.random();
 
     let schnorrAccount = await getSchnorrAccount(pxe, secretKey, deriveSigningKey(secretKey), salt);
-    let tx = await schnorrAccount.deploy({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait();
+    await schnorrAccount.deploy({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait();
     let wallet = await schnorrAccount.getWallet();
 
     logger.info(`Schnorr account deployed at: ${wallet.getAddress()}`);