@aztec/end-to-end 0.0.0-test.1 → 0.0.1-fake-c83136db25

package/dest/fixtures/web3signer.d.ts

@@ -0,0 +1,5 @@
+export declare function createWeb3SignerKeystore(dir: string, ...privateKeys: string[]): Promise<void>;
+export declare function refreshWeb3Signer(url: string, ...expectedAddresses: string[]): Promise<void>;
+export declare function getWeb3SignerTestKeystoreDir(): string;
+export declare function getWeb3SignerUrl(): string;
+//# sourceMappingURL=web3signer.d.ts.map

package/dest/fixtures/web3signer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"web3signer.d.ts","sourceRoot":"","sources":["../../src/fixtures/web3signer.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,iBAcnF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,iBAoBlF;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAOrD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAMzC"}

package/dest/fixtures/web3signer.js

@@ -0,0 +1,53 @@
+import { randomBytes } from '@aztec/foundation/crypto';
+import { retryUntil } from '@aztec/foundation/retry';
+import { sleep } from '@aztec/foundation/sleep';
+import { RemoteSigner } from '@aztec/node-keystore';
+import { mkdirSync } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+export async function createWeb3SignerKeystore(dir, ...privateKeys) {
+    const yaml = privateKeys.map((pk)=>`\
+type: file-raw
+keyType: SECP256K1
+privateKey: ${pk}`).join('\n---\n');
+    // NOTE: nodejs stdlib can only create temp directories, not temp files!
+    // this write uses wx (write-exclusive) so it'll throw if the file already exists
+    const path = join(dir, `keystore-${randomBytes(4).toString('hex')}.yaml`);
+    await writeFile(path, yaml, {
+        flag: 'wx'
+    });
+}
+export async function refreshWeb3Signer(url, ...expectedAddresses) {
+    await fetch(new URL('reload', url), {
+        method: 'POST'
+    });
+    if (expectedAddresses.length > 0) {
+        await retryUntil(async ()=>{
+            try {
+                await RemoteSigner.validateAccess(url, expectedAddresses);
+                return true;
+            } catch  {
+                return false;
+            }
+        }, 'web3signer refresh', 10, 0.5);
+    } else {
+        await sleep(1000);
+    }
+}
+export function getWeb3SignerTestKeystoreDir() {
+    if (process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR) {
+        mkdirSync(process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR, {
+            recursive: true
+        });
+        return process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR;
+    } else {
+        throw new Error('Web3signer not running');
+    }
+}
+export function getWeb3SignerUrl() {
+    if (process.env.WEB3_SIGNER_URL) {
+        return process.env.WEB3_SIGNER_URL;
+    } else {
+        throw new Error('Web3signer not running');
+    }
+}

package/dest/quality_of_service/alert_checker.d.ts

@@ -1,4 +1,4 @@
-import type { Logger } from '@aztec/aztec.js';
+import type { Logger } from '@aztec/aztec.js/log';
 export interface AlertConfig {
     alert: string;
     expr: string;

package/dest/quality_of_service/alert_checker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alert_checker.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/alert_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAQD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAM;IAKpE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAqCZ,WAAW;IAqBzB;;;OAGG;IACU,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhE;;;OAGG;IACU,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxE;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IACnC,IAAI,SAAyB;CACvC"}
+{"version":3,"file":"alert_checker.d.ts","sourceRoot":"","sources":["../../src/quality_of_service/alert_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAQD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,kBAAkB,CAAM;IAKpE;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAMV,YAAY;YAqCZ,WAAW;IAqBzB;;;OAGG;IACU,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUhE;;;OAGG;IACU,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxE;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IACnC,IAAI,SAAyB;CACvC"}

package/dest/shared/cross_chain_test_harness.d.ts

@@ -1,5 +1,15 @@
-import { type AccountWallet, type AztecAddress, type AztecNode, EthAddress, type FieldsOf, Fr, type L2AmountClaim, type L2AmountClaimWithRecipient, type Logger, type PXE, type SiblingPath, type TxReceipt, type Wallet } from '@aztec/aztec.js';
-import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { AuthWitness } from '@aztec/aztec.js/authorization';
+import { type L2AmountClaim, type L2AmountClaimWithRecipient } from '@aztec/aztec.js/ethereum';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { SiblingPath } from '@aztec/aztec.js/trees';
+import type { TxReceipt } from '@aztec/aztec.js/tx';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { type ExtendedViemWalletClient, type L1ContractAddresses } from '@aztec/ethereum';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { type Hex } from 'viem';
@@ -13,7 +23,7 @@ import { type Hex } from 'viem';
  * @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 declare function deployAndInitializeTokenAndBridgeContracts(wallet: Wallet, walletClient: ViemWalletClient, publicClient: ViemPublicClient, rollupRegistryAddress: EthAddress, owner: AztecAddress, underlyingERC20Address: EthAddress): Promise<{
+export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Wallet, l1Client: ExtendedViemWalletClient, rollupRegistryAddress: EthAddress, owner: AztecAddress, underlyingERC20Address: EthAddress): Promise<{
     /**
      * The L2 token contract instance.
      */
@@ -35,6 +45,16 @@ export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Walle
      */
     underlyingERC20: any;
 }>;
+export type CrossChainContext = {
+    l2Token: AztecAddress;
+    l2Bridge: AztecAddress;
+    tokenPortal: EthAddress;
+    underlying: EthAddress;
+    ethAccount: EthAddress;
+    ownerAddress: AztecAddress;
+    inbox: EthAddress;
+    outbox: EthAddress;
+};
 /**
  * A Class for testing cross chain interactions, contains common interactions
  * shared between cross chain tests.
@@ -42,8 +62,6 @@ export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Walle
 export declare class CrossChainTestHarness {
     /** Aztec node instance. */
     aztecNode: AztecNode;
-    /** Private eXecution Environment (PXE). */
-    pxeService: PXE;
     /** Logger. */
     logger: Logger;
     /** L2 Token contract. */
@@ -56,23 +74,20 @@ export declare class CrossChainTestHarness {
     tokenPortalAddress: EthAddress;
     /** Underlying token for portal tests. */
     underlyingERC20Address: EthAddress;
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient;
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient;
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient;
     /** Deployment addresses for all L1 contracts */
     readonly l1ContractAddresses: L1ContractAddresses;
-    /** Wallet of the owner. */
-    readonly ownerWallet: AccountWallet;
-    static new(aztecNode: AztecNode, pxeService: PXE, publicClient: ViemPublicClient, walletClient: ViemWalletClient, wallet: AccountWallet, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
+    /** Wallet to simulate and send txs from. */
+    readonly wallet: Wallet;
+    /** Owner of the l2 token and bridge */
+    readonly ownerAddress: AztecAddress;
+    static new(aztecNode: AztecNode, l1Client: ExtendedViemWalletClient, wallet: Wallet, ownerAddress: AztecAddress, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
     private readonly l1TokenManager;
     private readonly l1TokenPortalManager;
-    readonly ownerAddress: AztecAddress;
     constructor(
     /** Aztec node instance. */
     aztecNode: AztecNode, 
-    /** Private eXecution Environment (PXE). */
-    pxeService: PXE, 
     /** Logger. */
     logger: Logger, 
     /** L2 Token contract. */
@@ -85,14 +100,14 @@ export declare class CrossChainTestHarness {
     tokenPortalAddress: EthAddress, 
     /** Underlying token for portal tests. */
     underlyingERC20Address: EthAddress, 
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient, 
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient, 
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient, 
     /** Deployment addresses for all L1 contracts */
     l1ContractAddresses: L1ContractAddresses, 
-    /** Wallet of the owner. */
-    ownerWallet: AccountWallet);
+    /** Wallet to simulate and send txs from. */
+    wallet: Wallet, 
+    /** Owner of the l2 token and bridge */
+    ownerAddress: AztecAddress);
     mintTokensOnL1(amount: bigint): Promise<void>;
     getL1BalanceOf(address: EthAddress): Promise<bigint>;
     sendTokensToPortalPublic(bridgeAmount: bigint, mint?: boolean): Promise<L2AmountClaim>;
@@ -102,16 +117,16 @@ export declare class CrossChainTestHarness {
     sendL2PublicTransfer(transferAmount: bigint, receiverAddress: AztecAddress): Promise<void>;
     consumeMessageOnAztecAndMintPrivately(claim: Pick<L2AmountClaimWithRecipient, 'claimAmount' | 'claimSecret' | 'messageLeafIndex' | 'recipient'>): Promise<void>;
     consumeMessageOnAztecAndMintPublicly(claim: Pick<L2AmountClaim, 'claimAmount' | 'claimSecret' | 'messageLeafIndex'>): Promise<void>;
-    withdrawPrivateFromAztecToL1(withdrawAmount: bigint, nonce?: Fr): Promise<FieldsOf<TxReceipt>>;
-    withdrawPublicFromAztecToL1(withdrawAmount: bigint, nonce?: Fr): Promise<FieldsOf<TxReceipt>>;
+    withdrawPrivateFromAztecToL1(withdrawAmount: bigint, authwitNonce: Fr | undefined, authWitness: AuthWitness): Promise<FieldsOf<TxReceipt>>;
+    withdrawPublicFromAztecToL1(withdrawAmount: bigint, authwitNonce?: Fr): Promise<FieldsOf<TxReceipt>>;
     getL2PrivateBalanceOf(owner: AztecAddress): Promise<any>;
     expectPrivateBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
     getL2PublicBalanceOf(owner: AztecAddress): Promise<any>;
     expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
-    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Fr;
+    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Promise<Fr>;
     withdrawFundsFromBridgeOnL1(amount: bigint, blockNumber: number | bigint, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
     transferToPrivateOnL2(shieldAmount: bigint): Promise<void>;
-    transferToPublicOnL2(amount: bigint, nonce?: Fr): Promise<void>;
+    transferToPublicOnL2(amount: bigint, authwitNonce?: Fr): Promise<void>;
     /**
      * Makes message available for consumption.
      * @dev Does that by performing 2 unrelated transactions on L2 to progress the rollup by 2 blocks and then waits for
@@ -120,5 +135,6 @@ export declare class CrossChainTestHarness {
      * it's included it becomes available for consumption in the next block because the l1 to l2 message tree.
      */
     makeMessageConsumable(msgHash: Fr | Hex): Promise<void>;
+    toCrossChainContext(): CrossChainContext;
 }
 //# sourceMappingURL=cross_chain_test_harness.d.ts.map

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

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

package/dest/shared/cross_chain_test_harness.js

@@ -1,11 +1,13 @@
-// 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 { deployL1Contract } from '@aztec/ethereum';
+import { retryUntil } from '@aztec/foundation/retry';
 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
 /**
  * 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 +17,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 token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send({
+        from: owner
+    }).deployed();
     // 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 bridge = await TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send({
+        from: owner
+    }).deployed();
+    if (await token.methods.get_admin().simulate({
+        from: owner
+    }) !== 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
+    })).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
+    }).wait();
+    if (await token.methods.is_minter(bridge.address).simulate({
+        from: owner
+    }) === 1n) {
         throw new Error(`Bridge is not a minter`);
     }
     // initialize portal
@@ -47,7 +61,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     const underlyingERC20 = getContract({
         address: underlyingERC20Address.toString(),
         abi: TestERC20Abi,
-        client: walletClient
+        client: l1Client
     });
     return {
         token,
@@ -57,55 +71,62 @@ 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){
+    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();
     }
     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,31 +139,46 @@ 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
+        }).wait();
     }
     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
+        }).wait();
     }
     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
+        }).wait();
     }
     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();
-    }
-    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();
+        await this.l2Bridge.methods.claim_public(this.ownerAddress, claimAmount, claimSecret, messageLeafIndex).send({
+            from: this.ownerAddress
+        }).wait();
+    }
+    async withdrawPrivateFromAztecToL1(withdrawAmount, authwitNonce = Fr.ZERO, authWitness) {
+        const withdrawReceipt = await this.l2Bridge.methods.exit_to_l1_private(this.l2Token.address, this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce).send({
+            authWitnesses: [
+                authWitness
+            ],
+            from: this.ownerAddress
+        }).wait();
         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 withdrawReceipt = await this.l2Bridge.methods.exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce).send({
+            from: this.ownerAddress
+        }).wait();
         return withdrawReceipt;
     }
     async getL2PrivateBalanceOf(owner) {
@@ -156,25 +192,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
+        });
     }
     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);
     }
     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
+        }).wait();
     }
-    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
+        }).wait();
     }
     /**
    * Makes message available for consumption.
@@ -189,4 +231,16 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         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,22 @@
-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';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 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;
+    aztecNodeAdmin?: AztecNodeAdmin;
+    l1Client: ExtendedViemWalletClient;
     wallet: Wallet;
     logger: Logger;
     mockL1?: boolean;
@@ -30,8 +34,10 @@ export declare class FeeJuicePortalTestingHarnessFactory {
 export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     /** Aztec node */
     aztecNode: AztecNode;
-    /** Private eXecution Environment (PXE). */
-    pxeService: PXE;
+    /** Aztec node admin interface */
+    aztecNodeAdmin: AztecNodeAdmin | undefined;
+    /** Wallet. */
+    wallet: Wallet;
     /** Logger. */
     logger: Logger;
     /** L2 Token/Bridge contract. */
@@ -42,17 +48,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, 
+    /** Aztec node admin interface */
+    aztecNodeAdmin: AztecNodeAdmin | undefined, 
+    /** Wallet. */
+    wallet: Wallet, 
     /** Logger. */
     logger: Logger, 
     /** L2 Token/Bridge contract. */
@@ -63,18 +71,18 @@ 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

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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"}