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

package/dest/shared/cross_chain_test_harness.js

@@ -1,11 +1,14 @@
-// docs:start:cross_chain_test_harness
-import { EthAddress, Fr, L1TokenPortalManager, deployL1Contract, retryUntil } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { L1TokenPortalManager } from '@aztec/aztec.js/ethereum';
+import { Fr } from '@aztec/aztec.js/fields';
+import { OutboxContract } from '@aztec/ethereum/contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { getContract } from 'viem';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-// docs:start:deployAndInitializeTokenAndBridgeContracts
+import { waitForL1ToL2MessageSeen } from './wait_for_l1_to_l2_message.js';
 /**
  * Deploy L1 token and portal, initialize portal, deploy a non native l2 token contract, its L2 bridge contract and attach is to the portal.
  * @param wallet - the wallet instance
@@ -15,27 +18,39 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
  * @param owner - owner of the L2 contract
  * @param underlyingERC20Address - address of the underlying ERC20 contract to use (if none supplied, it deploys one)
  * @returns l2 contract instance, bridge contract instance, token portal instance, token portal address and the underlying ERC20 instance
- */ export async function deployAndInitializeTokenAndBridgeContracts(wallet, walletClient, publicClient, rollupRegistryAddress, owner, underlyingERC20Address) {
+ */ export async function deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, rollupRegistryAddress, owner, underlyingERC20Address) {
     // deploy the token portal
-    const { address: tokenPortalAddress } = await deployL1Contract(walletClient, publicClient, TokenPortalAbi, TokenPortalBytecode);
+    const { address: tokenPortalAddress } = await deployL1Contract(l1Client, TokenPortalAbi, TokenPortalBytecode);
     const tokenPortal = getContract({
         address: tokenPortalAddress.toString(),
         abi: TokenPortalAbi,
-        client: walletClient
+        client: l1Client
     });
     // deploy l2 token
-    const token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send().deployed();
+    const { contract: token } = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send({
+        from: owner
+    });
     // deploy l2 token bridge and attach to the portal
-    const bridge = await TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send().deployed();
-    if (await token.methods.get_admin().simulate() !== owner.toBigInt()) {
+    const { contract: bridge } = await TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send({
+        from: owner
+    });
+    if ((await token.methods.get_admin().simulate({
+        from: owner
+    })).result !== owner.toBigInt()) {
         throw new Error(`Token admin is not ${owner}`);
     }
-    if (!(await bridge.methods.get_config().simulate()).token.equals(token.address)) {
+    if (!(await bridge.methods.get_config().simulate({
+        from: owner
+    })).result.token.equals(token.address)) {
         throw new Error(`Bridge token is not ${token.address}`);
     }
     // make the bridge a minter on the token:
-    await token.methods.set_minter(bridge.address, true).send().wait();
-    if (await token.methods.is_minter(bridge.address).simulate() === 1n) {
+    await token.methods.set_minter(bridge.address, true).send({
+        from: owner
+    });
+    if ((await token.methods.is_minter(bridge.address).simulate({
+        from: owner
+    })).result === 1n) {
         throw new Error(`Bridge is not a minter`);
     }
     // initialize portal
@@ -47,7 +62,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     const underlyingERC20 = getContract({
         address: underlyingERC20Address.toString(),
         abi: TestERC20Abi,
-        client: walletClient
+        client: l1Client
     });
     return {
         token,
@@ -57,55 +72,64 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         underlyingERC20
     };
 }
-// docs:end:deployAndInitializeTokenAndBridgeContracts
 /**
  * A Class for testing cross chain interactions, contains common interactions
  * shared between cross chain tests.
  */ export class CrossChainTestHarness {
     aztecNode;
-    pxeService;
     logger;
     l2Token;
     l2Bridge;
     ethAccount;
     tokenPortalAddress;
     underlyingERC20Address;
-    publicClient;
-    walletClient;
+    l1Client;
     l1ContractAddresses;
-    ownerWallet;
-    static async new(aztecNode, pxeService, publicClient, walletClient, wallet, logger, underlyingERC20Address) {
-        const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
-        const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
+    wallet;
+    ownerAddress;
+    static async new(aztecNode, l1Client, wallet, ownerAddress, logger, underlyingERC20Address) {
+        const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
+        const l1ContractAddresses = (await aztecNode.getNodeInfo()).l1ContractAddresses;
         // Deploy and initialize all required contracts
         logger.info('Deploying and initializing token, portal and its bridge...');
-        const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, walletClient, publicClient, l1ContractAddresses.registryAddress, wallet.getAddress(), underlyingERC20Address);
+        const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, l1ContractAddresses.registryAddress, ownerAddress, underlyingERC20Address);
         logger.info('Deployed and initialized token, portal and its bridge.');
-        return new CrossChainTestHarness(aztecNode, pxeService, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, publicClient, walletClient, l1ContractAddresses, wallet);
+        return new CrossChainTestHarness(aztecNode, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, l1Client, l1ContractAddresses, wallet, ownerAddress);
     }
     l1TokenManager;
     l1TokenPortalManager;
-    ownerAddress;
-    constructor(/** Aztec node instance. */ aztecNode, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Public client instance. */ publicClient, /** Viem Wallet Client instance. */ walletClient, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet of the owner. */ ownerWallet){
+    outboxContract;
+    constructor(/** Aztec node instance. */ aztecNode, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Extended client instance. */ l1Client, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet to simulate and send txs from. */ wallet, /** Owner of the l2 token and bridge */ ownerAddress){
         this.aztecNode = aztecNode;
-        this.pxeService = pxeService;
         this.logger = logger;
         this.l2Token = l2Token;
         this.l2Bridge = l2Bridge;
         this.ethAccount = ethAccount;
         this.tokenPortalAddress = tokenPortalAddress;
         this.underlyingERC20Address = underlyingERC20Address;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+        this.l1Client = l1Client;
         this.l1ContractAddresses = l1ContractAddresses;
-        this.ownerWallet = ownerWallet;
-        this.l1TokenPortalManager = new L1TokenPortalManager(this.tokenPortalAddress, this.underlyingERC20Address, this.l1ContractAddresses.outboxAddress, this.publicClient, this.walletClient, this.logger);
+        this.wallet = wallet;
+        this.ownerAddress = ownerAddress;
+        this.l1TokenPortalManager = new L1TokenPortalManager(this.tokenPortalAddress, this.underlyingERC20Address, this.l1ContractAddresses.feeAssetHandlerAddress, this.l1ContractAddresses.outboxAddress, this.l1Client, this.logger);
         this.l1TokenManager = this.l1TokenPortalManager.getTokenManager();
-        this.ownerAddress = this.ownerWallet.getAddress();
+        this.outboxContract = new OutboxContract(this.l1Client, this.l1ContractAddresses.outboxAddress);
     }
     async mintTokensOnL1(amount) {
-        await this.l1TokenManager.mint(amount, this.ethAccount.toString());
-        expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(amount);
+        const contract = getContract({
+            abi: TestERC20Abi,
+            address: this.l1TokenManager.tokenAddress.toString(),
+            client: this.l1Client
+        });
+        const balanceBefore = await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString());
+        const hash = await contract.write.mint([
+            this.ethAccount.toString(),
+            amount
+        ]);
+        await this.l1Client.waitForTransactionReceipt({
+            hash
+        });
+        expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);
     }
     getL1BalanceOf(address) {
         return this.l1TokenManager.getL1TokenBalance(address.toString());
@@ -118,37 +142,52 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     }
     async mintTokensPublicOnL2(amount) {
         this.logger.info('Minting tokens on L2 publicly');
-        await this.l2Token.methods.mint_to_public(this.ownerAddress, amount).send().wait();
+        await this.l2Token.methods.mint_to_public(this.ownerAddress, amount).send({
+            from: this.ownerAddress
+        });
     }
     async mintTokensPrivateOnL2(amount) {
-        await mintTokensToPrivate(this.l2Token, this.ownerWallet, this.ownerAddress, amount);
+        await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerAddress, amount);
     }
     async sendL2PublicTransfer(transferAmount, receiverAddress) {
         // send a transfer tx to force through rollup with the message included
-        await this.l2Token.methods.transfer_in_public(this.ownerAddress, receiverAddress, transferAmount, 0).send().wait();
+        await this.l2Token.methods.transfer_in_public(this.ownerAddress, receiverAddress, transferAmount, 0).send({
+            from: this.ownerAddress
+        });
     }
     async consumeMessageOnAztecAndMintPrivately(claim) {
         this.logger.info('Consuming messages on L2 privately');
         const { recipient, claimAmount, claimSecret: secretForL2MessageConsumption, messageLeafIndex } = claim;
-        await this.l2Bridge.methods.claim_private(recipient, claimAmount, secretForL2MessageConsumption, messageLeafIndex).send().wait();
+        await this.l2Bridge.methods.claim_private(recipient, claimAmount, secretForL2MessageConsumption, messageLeafIndex).send({
+            from: this.ownerAddress
+        });
     }
     async consumeMessageOnAztecAndMintPublicly(claim) {
         this.logger.info('Consuming messages on L2 Publicly');
         const { claimAmount, claimSecret, messageLeafIndex } = claim;
-        await this.l2Bridge.methods.claim_public(this.ownerAddress, claimAmount, claimSecret, messageLeafIndex).send().wait();
+        await this.l2Bridge.methods.claim_public(this.ownerAddress, claimAmount, claimSecret, messageLeafIndex).send({
+            from: this.ownerAddress
+        });
     }
-    async withdrawPrivateFromAztecToL1(withdrawAmount, nonce = Fr.ZERO) {
-        const withdrawReceipt = await this.l2Bridge.methods.exit_to_l1_private(this.l2Token.address, this.ethAccount, withdrawAmount, EthAddress.ZERO, nonce).send().wait();
+    async withdrawPrivateFromAztecToL1(withdrawAmount, authwitNonce = Fr.ZERO, authWitness) {
+        const { receipt: withdrawReceipt } = await this.l2Bridge.methods.exit_to_l1_private(this.l2Token.address, this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce).send({
+            authWitnesses: [
+                authWitness
+            ],
+            from: this.ownerAddress
+        });
         return withdrawReceipt;
     }
-    async withdrawPublicFromAztecToL1(withdrawAmount, nonce = Fr.ZERO) {
-        const withdrawReceipt = await this.l2Bridge.methods.exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, nonce).send().wait();
+    async withdrawPublicFromAztecToL1(withdrawAmount, authwitNonce = Fr.ZERO) {
+        const { receipt: withdrawReceipt } = await this.l2Bridge.methods.exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce).send({
+            from: this.ownerAddress
+        });
         return withdrawReceipt;
     }
     async getL2PrivateBalanceOf(owner) {
-        return await this.l2Token.methods.balance_of_private(owner).simulate({
+        return (await this.l2Token.methods.balance_of_private(owner).simulate({
             from: owner
-        });
+        })).result;
     }
     async expectPrivateBalanceOnL2(owner, expectedBalance) {
         const balance = await this.getL2PrivateBalanceOf(owner);
@@ -156,25 +195,31 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         expect(balance).toBe(expectedBalance);
     }
     async getL2PublicBalanceOf(owner) {
-        return await this.l2Token.methods.balance_of_public(owner).simulate();
+        return (await this.l2Token.methods.balance_of_public(owner).simulate({
+            from: this.ownerAddress
+        })).result;
     }
     async expectPublicBalanceOnL2(owner, expectedBalance) {
         const balance = await this.getL2PublicBalanceOf(owner);
         expect(balance).toBe(expectedBalance);
     }
-    getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
-        return this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
+    async getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
+        return await this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
     }
-    withdrawFundsFromBridgeOnL1(amount, blockNumber, messageIndex, siblingPath) {
-        return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount, BigInt(blockNumber), messageIndex, siblingPath);
+    withdrawFundsFromBridgeOnL1(amount, epochNumber, numCheckpointsInEpoch, messageIndex, siblingPath) {
+        return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount, epochNumber, numCheckpointsInEpoch, messageIndex, siblingPath);
     }
     async transferToPrivateOnL2(shieldAmount) {
         this.logger.info('Transferring to private on L2');
-        await this.l2Token.methods.transfer_to_private(this.ownerAddress, shieldAmount).send().wait();
+        await this.l2Token.methods.transfer_to_private(this.ownerAddress, shieldAmount).send({
+            from: this.ownerAddress
+        });
     }
-    async transferToPublicOnL2(amount, nonce = Fr.ZERO) {
+    async transferToPublicOnL2(amount, authwitNonce = Fr.ZERO) {
         this.logger.info('Transferring tokens to public');
-        await this.l2Token.methods.transfer_to_public(this.ownerAddress, this.ownerAddress, amount, nonce).send().wait();
+        await this.l2Token.methods.transfer_to_public(this.ownerAddress, this.ownerAddress, amount, authwitNonce).send({
+            from: this.ownerAddress
+        });
     }
     /**
    * Makes message available for consumption.
@@ -184,9 +229,22 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
    * it's included it becomes available for consumption in the next block because the l1 to l2 message tree.
    */ async makeMessageConsumable(msgHash) {
         const frMsgHash = typeof msgHash === 'string' ? Fr.fromHexString(msgHash) : msgHash;
-        // We poll isL1ToL2MessageSynced endpoint until the message is available
-        await retryUntil(async ()=>await this.aztecNode.isL1ToL2MessageSynced(frMsgHash), 'message sync', 10);
+        await waitForL1ToL2MessageSeen(this.aztecNode, frMsgHash, {
+            timeoutSeconds: 10
+        });
         await this.mintTokensPublicOnL2(0n);
         await this.mintTokensPublicOnL2(0n);
     }
-} // docs:end:cross_chain_test_harness
+    toCrossChainContext() {
+        return {
+            l2Token: this.l2Token.address,
+            l2Bridge: this.l2Bridge.address,
+            tokenPortal: this.tokenPortalAddress,
+            underlying: this.underlyingERC20Address,
+            ethAccount: this.ethAccount,
+            ownerAddress: this.ownerAddress,
+            inbox: this.l1ContractAddresses.inboxAddress,
+            outbox: this.l1ContractAddresses.outboxAddress
+        };
+    }
+}

package/dest/shared/gas_portal_test_harness.d.ts

@@ -1,18 +1,24 @@
-import { type AztecAddress, type AztecNode, EthAddress, L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim } from '@aztec/aztec.js/ethereum';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import type { AztecNodeAdmin, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
+/** Aztec node that may expose the debug mining API in local e2e setups. */
+type MiningAztecNode = AztecNode & Partial<AztecNodeDebug>;
 export interface IGasBridgingTestHarness {
     getL1FeeJuiceBalance(address: EthAddress): Promise<bigint>;
-    prepareTokensOnL1(bridgeAmount: bigint, owner: AztecAddress): Promise<L2AmountClaim>;
-    bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress): Promise<void>;
+    prepareTokensOnL1(owner: AztecAddress): Promise<L2AmountClaim>;
+    bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress): Promise<void>;
     feeJuice: FeeJuiceContract;
     l1FeeJuiceAddress: EthAddress;
 }
 export interface FeeJuicePortalTestingHarnessFactoryConfig {
-    aztecNode: AztecNode;
-    pxeService: PXE;
-    publicClient: ViemPublicClient;
-    walletClient: ViemWalletClient;
+    aztecNode: MiningAztecNode;
+    aztecNodeAdmin?: AztecNodeAdmin;
+    l1Client: ExtendedViemWalletClient;
     wallet: Wallet;
     logger: Logger;
     mockL1?: boolean;
@@ -29,9 +35,11 @@ export declare class FeeJuicePortalTestingHarnessFactory {
  */
 export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     /** Aztec node */
-    aztecNode: AztecNode;
-    /** Private eXecution Environment (PXE). */
-    pxeService: PXE;
+    aztecNode: MiningAztecNode;
+    /** Aztec node admin interface */
+    aztecNodeAdmin: AztecNodeAdmin | undefined;
+    /** Wallet. */
+    wallet: Wallet;
     /** Logger. */
     logger: Logger;
     /** L2 Token/Bridge contract. */
@@ -42,17 +50,19 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     feeJuicePortalAddress: EthAddress;
     /** Underlying token for portal tests. */
     l1FeeJuiceAddress: EthAddress;
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient;
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient;
+    /** Fee asset handler address. */
+    feeAssetHandlerAddress: EthAddress;
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient;
     readonly l1TokenManager: L1TokenManager;
     readonly feeJuicePortalManager: L1FeeJuicePortalManager;
     constructor(
     /** Aztec node */
-    aztecNode: AztecNode, 
-    /** Private eXecution Environment (PXE). */
-    pxeService: PXE, 
+    aztecNode: MiningAztecNode, 
+    /** Aztec node admin interface */
+    aztecNodeAdmin: AztecNodeAdmin | undefined, 
+    /** Wallet. */
+    wallet: Wallet, 
     /** Logger. */
     logger: Logger, 
     /** L2 Token/Bridge contract. */
@@ -63,18 +73,19 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     feeJuicePortalAddress: EthAddress, 
     /** Underlying token for portal tests. */
     l1FeeJuiceAddress: EthAddress, 
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient, 
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient);
-    mintTokensOnL1(amount: bigint, to?: EthAddress): Promise<void>;
+    /** Fee asset handler address. */
+    feeAssetHandlerAddress: EthAddress, 
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient);
+    mintTokensOnL1(to?: EthAddress): Promise<void>;
     getL1FeeJuiceBalance(address: EthAddress): Promise<bigint>;
-    sendTokensToPortalPublic(bridgeAmount: bigint, l2Address: AztecAddress, mint?: boolean): Promise<L2AmountClaim>;
-    consumeMessageOnAztecAndClaimPrivately(owner: AztecAddress, claim: L2AmountClaim): Promise<void>;
+    sendTokensToPortalPublic(bridgeAmount: bigint, l2Address: AztecAddress): Promise<L2AmountClaim>;
+    consumeMessageOnAztecAndClaimPrivately(owner: AztecAddress, claimer: AztecAddress, claim: L2AmountClaim): Promise<void>;
     getL2PublicBalanceOf(owner: AztecAddress): Promise<any>;
     expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
-    prepareTokensOnL1(bridgeAmount: bigint, owner: AztecAddress): Promise<L2AmountClaim>;
-    bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress): Promise<void>;
+    prepareTokensOnL1(owner: AztecAddress): Promise<L2AmountClaim>;
+    bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress): Promise<void>;
     private advanceL2Block;
 }
-//# sourceMappingURL=gas_portal_test_harness.d.ts.map
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU1RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUl0RiwyRUFBMkU7QUFDM0UsS0FBSyxlQUFlLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUUzRCxNQUFNLFdBQVcsdUJBQXVCO0lBQ3RDLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzNELGlCQUFpQixDQUFDLEtBQUssRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQy9ELGdCQUFnQixDQUFDLEtBQUssRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUUsUUFBUSxFQUFFLGdCQUFnQixDQUFD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

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

@@ -1 +1 @@
-{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"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"}

package/dest/shared/gas_portal_test_harness.js

@@ -1,22 +1,26 @@
-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';
+import { waitForL1ToL2MessageSeen } from './wait_for_l1_to_l2_message.js';
 export class FeeJuicePortalTestingHarnessFactory {
     config;
     constructor(config){
         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);
+        const gasL2 = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
+        return new GasBridgingTestHarness(aztecNode, aztecNodeAdmin, wallet, logger, gasL2, ethAccount, feeJuicePortalAddress, feeJuiceAddress, l1ContractAddresses.feeAssetHandlerAddress, l1Client);
     }
     static create(config) {
         const factory = new FeeJuicePortalTestingHarnessFactory(config);
@@ -28,71 +32,97 @@ 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
+        });
     }
     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
+        })).result;
     }
     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);
-        const isSynced = async ()=>await this.aztecNode.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
-        await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 1);
+    async prepareTokensOnL1(owner) {
+        const bridgeAmount = await this.l1TokenManager.getMintAmount();
+        await this.mintTokensOnL1();
+        const claim = await this.sendTokensToPortalPublic(bridgeAmount, owner);
+        await waitForL1ToL2MessageSeen(this.aztecNode, Fr.fromHexString(claim.messageHash), {
+            timeoutSeconds: 24
+        });
         // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
         await this.advanceL2Block();
         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() {
+        if (this.aztecNode.mineBlock) {
+            await this.aztecNode.mineBlock();
+            return;
+        }
         const initialBlockNumber = await this.aztecNode.getBlockNumber();
-        await this.aztecNode.flushTxs();
-        await retryUntil(async ()=>await this.aztecNode.getBlockNumber() >= initialBlockNumber + 1);
+        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
+        }
+        try {
+            await retryUntil(async ()=>await this.aztecNode.getBlockNumber() >= initialBlockNumber + 1);
+        } finally{
+            if (this.aztecNodeAdmin && minTxsPerBlock !== undefined) {
+                await this.aztecNodeAdmin.setConfig({
+                    minTxsPerBlock
+                });
+            }
+        }
     }
-} // docs:end:cross_chain_test_harness
+}

package/dest/shared/index.d.ts

@@ -1,2 +1,3 @@
-export { uniswapL1L2TestSuite, type UniswapSetupContext } from './uniswap_l1_l2.js';
-//# sourceMappingURL=index.d.ts.map
+export { uniswapL1L2TestSuite } from './uniswap_l1_l2.js';
+export { MockStateView, diffInBps } from './mock_state_view.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDMUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shared/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC"}

package/dest/shared/index.js

@@ -1 +1,2 @@
 export { uniswapL1L2TestSuite } from './uniswap_l1_l2.js';
+export { MockStateView, diffInBps } from './mock_state_view.js';

package/dest/shared/jest_setup.d.ts

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=jest_setup.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiamVzdF9zZXR1cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC9qZXN0X3NldHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==