@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/shared/gas_portal_test_harness.js

@@ -1,4 +1,7 @@
-import { EthAddress, Fr, L1FeeJuicePortalManager, retryUntil } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
+import { Fr } from '@aztec/aztec.js/fields';
+import { retryUntil } from '@aztec/foundation/retry';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 export class FeeJuicePortalTestingHarnessFactory {
@@ -7,16 +10,16 @@ export class FeeJuicePortalTestingHarnessFactory {
         this.config = config;
     }
     async createReal() {
-        const { aztecNode, pxeService, publicClient, walletClient, wallet, logger } = this.config;
-        const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
-        const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+        const { aztecNode, aztecNodeAdmin, l1Client, wallet, logger } = this.config;
+        const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
+        const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
         const feeJuiceAddress = l1ContractAddresses.feeJuiceAddress;
         const feeJuicePortalAddress = l1ContractAddresses.feeJuicePortalAddress;
         if (feeJuiceAddress.isZero() || feeJuicePortalAddress.isZero()) {
             throw new Error('Fee Juice portal not deployed on L1');
         }
         const gasL2 = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
-        return new GasBridgingTestHarness(aztecNode, pxeService, logger, gasL2, ethAccount, feeJuicePortalAddress, feeJuiceAddress, publicClient, walletClient);
+        return new GasBridgingTestHarness(aztecNode, aztecNodeAdmin, wallet, logger, gasL2, ethAccount, feeJuicePortalAddress, feeJuiceAddress, l1ContractAddresses.feeAssetHandlerAddress, l1Client);
     }
     static create(config) {
         const factory = new FeeJuicePortalTestingHarnessFactory(config);
@@ -28,54 +31,62 @@ export class FeeJuicePortalTestingHarnessFactory {
  * shared between cross chain tests.
  */ export class GasBridgingTestHarness {
     aztecNode;
-    pxeService;
+    aztecNodeAdmin;
+    wallet;
     logger;
     feeJuice;
     ethAccount;
     feeJuicePortalAddress;
     l1FeeJuiceAddress;
-    publicClient;
-    walletClient;
+    feeAssetHandlerAddress;
+    l1Client;
     l1TokenManager;
     feeJuicePortalManager;
-    constructor(/** Aztec node */ aztecNode, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token/Bridge contract. */ feeJuice, /** Eth account to interact with. */ ethAccount, /** Portal address. */ feeJuicePortalAddress, /** Underlying token for portal tests. */ l1FeeJuiceAddress, /** Viem Public client instance. */ publicClient, /** Viem Wallet Client instance. */ walletClient){
+    constructor(/** Aztec node */ aztecNode, /** Aztec node admin interface */ aztecNodeAdmin, /** Wallet. */ wallet, /** Logger. */ logger, /** L2 Token/Bridge contract. */ feeJuice, /** Eth account to interact with. */ ethAccount, /** Portal address. */ feeJuicePortalAddress, /** Underlying token for portal tests. */ l1FeeJuiceAddress, /** Fee asset handler address. */ feeAssetHandlerAddress, /** Viem Extended client instance. */ l1Client){
         this.aztecNode = aztecNode;
-        this.pxeService = pxeService;
+        this.aztecNodeAdmin = aztecNodeAdmin;
+        this.wallet = wallet;
         this.logger = logger;
         this.feeJuice = feeJuice;
         this.ethAccount = ethAccount;
         this.feeJuicePortalAddress = feeJuicePortalAddress;
         this.l1FeeJuiceAddress = l1FeeJuiceAddress;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
-        this.feeJuicePortalManager = new L1FeeJuicePortalManager(this.feeJuicePortalAddress, this.l1FeeJuiceAddress, this.publicClient, this.walletClient, this.logger);
+        this.feeAssetHandlerAddress = feeAssetHandlerAddress;
+        this.l1Client = l1Client;
+        this.feeJuicePortalManager = new L1FeeJuicePortalManager(this.feeJuicePortalAddress, this.l1FeeJuiceAddress, this.feeAssetHandlerAddress, this.l1Client, this.logger);
         this.l1TokenManager = this.feeJuicePortalManager.getTokenManager();
     }
-    async mintTokensOnL1(amount, to = this.ethAccount) {
-        const balanceBefore = await this.l1TokenManager.getL1TokenBalance(to.toString());
-        await this.l1TokenManager.mint(amount, to.toString());
-        expect(await this.l1TokenManager.getL1TokenBalance(to.toString())).toEqual(balanceBefore + amount);
+    async mintTokensOnL1(to = this.ethAccount) {
+        // const balanceBefore = await this.l1TokenManager.getL1TokenBalance(to.toString());
+        await this.l1TokenManager.mint(to.toString());
+    // expect(await this.l1TokenManager.getL1TokenBalance(to.toString())).toEqual(balanceBefore + amount);
     }
     async getL1FeeJuiceBalance(address) {
         return await this.l1TokenManager.getL1TokenBalance(address.toString());
     }
-    sendTokensToPortalPublic(bridgeAmount, l2Address, mint = false) {
-        return this.feeJuicePortalManager.bridgeTokensPublic(l2Address, bridgeAmount, mint);
+    sendTokensToPortalPublic(bridgeAmount, l2Address) {
+        return this.feeJuicePortalManager.bridgeTokensPublic(l2Address, bridgeAmount, false);
     }
-    async consumeMessageOnAztecAndClaimPrivately(owner, claim) {
+    async consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim) {
         this.logger.info('Consuming messages on L2 Privately');
         const { claimAmount, claimSecret, messageLeafIndex } = claim;
-        await this.feeJuice.methods.claim(owner, claimAmount, claimSecret, messageLeafIndex).send().wait();
+        await this.feeJuice.methods.claim(owner, claimAmount, claimSecret, messageLeafIndex).send({
+            from: claimer
+        }).wait();
     }
     async getL2PublicBalanceOf(owner) {
-        return await this.feeJuice.methods.balance_of_public(owner).simulate();
+        return await this.feeJuice.methods.balance_of_public(owner).simulate({
+            from: owner
+        });
     }
     async expectPublicBalanceOnL2(owner, expectedBalance) {
         const balance = await this.getL2PublicBalanceOf(owner);
         expect(balance).toBe(expectedBalance);
     }
-    async prepareTokensOnL1(bridgeAmount, owner) {
-        const claim = await this.sendTokensToPortalPublic(bridgeAmount, owner, true);
+    async prepareTokensOnL1(owner) {
+        const bridgeAmount = await this.l1TokenManager.getMintAmount();
+        await this.mintTokensOnL1();
+        const claim = await this.sendTokensToPortalPublic(bridgeAmount, owner);
         const isSynced = async ()=>await this.aztecNode.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
         await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 1);
         // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
@@ -83,16 +94,26 @@ export class FeeJuicePortalTestingHarnessFactory {
         await this.advanceL2Block();
         return claim;
     }
-    async bridgeFromL1ToL2(bridgeAmount, owner) {
+    async bridgeFromL1ToL2(owner, claimer) {
         // Prepare the tokens on the L1 side
-        const claim = await this.prepareTokensOnL1(bridgeAmount, owner);
+        const claim = await this.prepareTokensOnL1(owner);
         // Consume L1 -> L2 message and claim tokens privately on L2
-        await this.consumeMessageOnAztecAndClaimPrivately(owner, claim);
-        await this.expectPublicBalanceOnL2(owner, bridgeAmount);
+        await this.consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim);
     }
     async advanceL2Block() {
         const initialBlockNumber = await this.aztecNode.getBlockNumber();
-        await this.aztecNode.flushTxs();
+        let minTxsPerBlock = undefined;
+        if (this.aztecNodeAdmin) {
+            ({ minTxsPerBlock } = await this.aztecNodeAdmin.getConfig());
+            await this.aztecNodeAdmin.setConfig({
+                minTxsPerBlock: 0
+            }); // Set to 0 to ensure we can advance the block
+        }
         await retryUntil(async ()=>await this.aztecNode.getBlockNumber() >= initialBlockNumber + 1);
+        if (this.aztecNodeAdmin && minTxsPerBlock !== undefined) {
+            await this.aztecNodeAdmin.setConfig({
+                minTxsPerBlock
+            });
+        }
     }
 } // docs:end:cross_chain_test_harness

package/dest/shared/jest_setup.js

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { beforeEach, expect } from '@jest/globals';
 import { basename } from 'path';
 beforeEach(()=>{

package/dest/shared/submit-transactions.d.ts

@@ -1,4 +1,6 @@
-import { type Logger, type SentTx, type Wallet } from '@aztec/aztec.js';
-import type { PXEService } from '@aztec/pxe/server';
-export declare const submitTxsTo: (pxe: PXEService, numTxs: number, wallet: Wallet, logger: Logger) => Promise<SentTx[]>;
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { SentTx } from '@aztec/aztec.js/contracts';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { TestWallet } from '@aztec/test-wallet/server';
+export declare const submitTxsTo: (wallet: TestWallet, submitter: AztecAddress, numTxs: number, logger: Logger) => Promise<SentTx[]>;
 //# sourceMappingURL=submit-transactions.d.ts.map

package/dest/shared/submit-transactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submit-transactions.d.ts","sourceRoot":"","sources":["../../src/shared/submit-transactions.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,eAAO,MAAM,WAAW,QACjB,UAAU,UACP,MAAM,UACN,MAAM,UACN,MAAM,KACb,QAAQ,MAAM,EAAE,CAqBlB,CAAC"}
+{"version":3,"file":"submit-transactions.d.ts","sourceRoot":"","sources":["../../src/shared/submit-transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAG5D,eAAO,MAAM,WAAW,GACtB,QAAQ,UAAU,EAClB,WAAW,YAAY,EACvB,QAAQ,MAAM,EACd,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAsBlB,CAAC"}

package/dest/shared/submit-transactions.js

@@ -1,13 +1,14 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, GrumpkinScalar, TxStatus } from '@aztec/aztec.js';
+import { Fr, GrumpkinScalar } from '@aztec/aztec.js/fields';
+import { TxStatus } from '@aztec/aztec.js/tx';
 import { times } from '@aztec/foundation/collection';
-// submits a set of transactions to the provided Private eXecution Environment (PXE)
-export const submitTxsTo = async (pxe, numTxs, wallet, logger)=>{
+// submits a set of transactions to the provided Wallet
+export const submitTxsTo = async (wallet, submitter, numTxs, logger)=>{
     const txs = [];
     await Promise.all(times(numTxs, async ()=>{
-        const accountManager = await getSchnorrAccount(pxe, Fr.random(), GrumpkinScalar.random(), Fr.random());
-        const tx = accountManager.deploy({
-            deployWallet: wallet
+        const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
+        const deployMethod = await accountManager.getDeployMethod();
+        const tx = deployMethod.send({
+            from: submitter
         });
         const txHash = await tx.getTxHash();
         logger.info(`Tx sent with hash ${txHash}`);

package/dest/shared/uniswap_l1_l2.d.ts

@@ -1,21 +1,23 @@
-import { type AccountWallet, type AztecNode, type CheatCodes, type Logger, type PXE } from '@aztec/aztec.js';
-import { type DeployL1ContractsReturnType, type ViemPublicClient, type ViemWalletClient } from '@aztec/ethereum';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { CheatCodes } from '@aztec/aztec/testing';
+import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
+import type { TestWallet } from '@aztec/test-wallet/server';
 /** Objects to be returned by the uniswap setup function */
 export type UniswapSetupContext = {
     /** Aztec Node instance */
     aztecNode: AztecNode;
-    /** The Private eXecution Environment (PXE). */
-    pxe: PXE;
     /** Logger instance named as the current test. */
     logger: Logger;
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient;
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient;
-    /** The owner wallet. */
-    ownerWallet: AccountWallet;
+    /** The L1 wallet client, extended with public actions. */
+    l1Client: ExtendedViemWalletClient;
+    /** The wallet. */
+    wallet: TestWallet;
+    /** The owner address. */
+    ownerAddress: AztecAddress;
     /** The sponsor wallet. */
-    sponsorWallet: AccountWallet;
+    sponsorAddress: AztecAddress;
     /**  */
     deployL1ContractsValues: DeployL1ContractsReturnType;
     /** Cheat codes instance. */

package/dest/shared/uniswap_l1_l2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,SAAS,EACd,KAAK,UAAU,EAGf,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAGtB,MAAM,iBAAiB,CAAC;AAqBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,mCAAmC;IACnC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,wBAAwB;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,0BAA0B;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,UACxB,MAAM,QAAQ,mBAAmB,CAAC,WAChC,MAAM,QAAQ,IAAI,CAAC,2CA89B7B,CAAC"}
+{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAc,MAAM,2BAA2B,CAAC;AAIrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAMzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAiB5D,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,kBAAkB;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,yBAAyB;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,0BAA0B;IAC1B,cAAc,EAAE,YAAY,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,gCAAkC,SAg+BnC,CAAC"}