@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/shared/cross_chain_test_harness.js

@@ -1,13 +1,15 @@
 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 { 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 { testSpan } from '../fixtures/timing.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
+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
@@ -17,39 +19,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, l1Client, rollupRegistryAddress, owner, underlyingERC20Address) {
-    // deploy the token portal
-    const { address: tokenPortalAddress } = await deployL1Contract(l1Client, TokenPortalAbi, TokenPortalBytecode);
+ */ export async function deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, rollupRegistryAddress, owner, underlyingERC20Address, predeployedTokenPortalAddress) {
+    // Deploy the token portal, unless it was already deployed before the node started (under automine).
+    const tokenPortalAddress = predeployedTokenPortalAddress ?? (await deployL1Contract(l1Client, TokenPortalAbi, TokenPortalBytecode)).address;
     const tokenPortal = getContract({
         address: tokenPortalAddress.toString(),
         abi: TokenPortalAbi,
         client: l1Client
     });
     // deploy l2 token
-    const token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send({
-        from: owner
-    }).deployed();
+    const { contract: token } = await testSpan('deploy:token', ()=>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({
-        from: owner
-    }).deployed();
-    if (await token.methods.get_admin().simulate({
+    const { contract: bridge } = await testSpan('deploy:bridge', ()=>TokenBridgeContract.deploy(wallet, token.address, tokenPortalAddress).send({
+            from: owner
+        }));
+    if ((await token.methods.get_admin().simulate({
         from: owner
-    }) !== owner.toBigInt()) {
+    })).result !== owner.toBigInt()) {
         throw new Error(`Token admin is not ${owner}`);
     }
     if (!(await bridge.methods.get_config().simulate({
         from: owner
-    })).token.equals(token.address)) {
+    })).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({
         from: owner
-    }).wait();
-    if (await token.methods.is_minter(bridge.address).simulate({
+    });
+    if ((await token.methods.is_minter(bridge.address).simulate({
         from: owner
-    }) === 1n) {
+    })).result === 1n) {
         throw new Error(`Bridge is not a minter`);
     }
     // initialize portal
@@ -86,17 +88,18 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     l1ContractAddresses;
     wallet;
     ownerAddress;
-    static async new(aztecNode, l1Client, wallet, ownerAddress, logger, underlyingERC20Address) {
+    static async new(aztecNode, l1Client, wallet, ownerAddress, logger, underlyingERC20Address, predeployedTokenPortalAddress) {
         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, l1Client, l1ContractAddresses.registryAddress, ownerAddress, underlyingERC20Address);
+        const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, l1ContractAddresses.registryAddress, ownerAddress, underlyingERC20Address, predeployedTokenPortalAddress);
         logger.info('Deployed and initialized token, portal and its bridge.');
         return new CrossChainTestHarness(aztecNode, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, l1Client, l1ContractAddresses, wallet, ownerAddress);
     }
     l1TokenManager;
     l1TokenPortalManager;
+    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.logger = logger;
@@ -111,6 +114,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         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.outboxContract = new OutboxContract(this.l1Client, this.l1ContractAddresses.outboxAddress);
     }
     async mintTokensOnL1(amount) {
         const contract = getContract({
@@ -139,52 +143,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({
-            from: this.ownerAddress
-        }).wait();
+        await testSpan('tx:mint', ()=>this.l2Token.methods.mint_to_public(this.ownerAddress, amount).send({
+                from: this.ownerAddress
+            }));
     }
     async mintTokensPrivateOnL2(amount) {
-        await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerAddress, amount);
+        await testSpan('tx:mint', ()=>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({
             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({
             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({
             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({
+        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
-        }).wait();
+        });
         return withdrawReceipt;
     }
     async withdrawPublicFromAztecToL1(withdrawAmount, authwitNonce = Fr.ZERO) {
-        const withdrawReceipt = await this.l2Bridge.methods.exit_to_l1_public(this.ethAccount, withdrawAmount, EthAddress.ZERO, authwitNonce).send({
+        const { receipt: 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) {
-        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);
@@ -192,9 +196,9 @@ 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);
@@ -203,20 +207,20 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     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({
             from: this.ownerAddress
-        }).wait();
+        });
     }
     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, authwitNonce).send({
             from: this.ownerAddress
-        }).wait();
+        });
     }
     /**
    * Makes message available for consumption.
@@ -226,8 +230,9 @@ 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);
     }

package/dest/shared/gas_portal_test_harness.d.ts

@@ -3,9 +3,11 @@ import { L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim } from
 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 type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
-import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+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(owner: AztecAddress): Promise<L2AmountClaim>;
@@ -14,7 +16,7 @@ export interface IGasBridgingTestHarness {
     l1FeeJuiceAddress: EthAddress;
 }
 export interface FeeJuicePortalTestingHarnessFactoryConfig {
-    aztecNode: AztecNode;
+    aztecNode: MiningAztecNode;
     aztecNodeAdmin?: AztecNodeAdmin;
     l1Client: ExtendedViemWalletClient;
     wallet: Wallet;
@@ -32,21 +34,31 @@ export declare class FeeJuicePortalTestingHarnessFactory {
  * shared between cross chain tests.
  */
 export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
-    aztecNode: AztecNode;
+    /** Aztec node */
+    aztecNode: MiningAztecNode;
+    /** Aztec node admin interface */
     aztecNodeAdmin: AztecNodeAdmin | undefined;
+    /** Wallet. */
     wallet: Wallet;
+    /** Logger. */
     logger: Logger;
+    /** L2 Token/Bridge contract. */
     feeJuice: FeeJuiceContract;
+    /** Eth account to interact with. */
     ethAccount: EthAddress;
+    /** Portal address. */
     feeJuicePortalAddress: EthAddress;
+    /** Underlying token for portal tests. */
     l1FeeJuiceAddress: EthAddress;
+    /** Fee asset handler address. */
     feeAssetHandlerAddress: EthAddress;
+    /** Viem Extended client instance. */
     l1Client: ExtendedViemWalletClient;
     readonly l1TokenManager: L1TokenManager;
     readonly feeJuicePortalManager: L1FeeJuicePortalManager;
     constructor(
     /** Aztec node */
-    aztecNode: AztecNode, 
+    aztecNode: MiningAztecNode, 
     /** Aztec node admin interface */
     aztecNodeAdmin: AztecNodeAdmin | undefined, 
     /** Wallet. */
@@ -75,4 +87,5 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress): Promise<void>;
     private advanceL2Block;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU1RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFLE1BQU0sV0FBVyx1QkFBdUI7SUFDdEMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDM0QsaUJBQWlCLENBQUMsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDL0QsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM1RSxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0IsaUJBQWlCLEVBQUUsVUFBVSxDQUFDO0NBQy9CO0FBRUQsTUFBTSxXQUFXLHlDQUF5QztJQUN4RCxTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLGNBQWMsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUNoQyxRQUFRLEVBQUUsd0JBQXdCLENBQUM7SUFDbkMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDbEI7QUFFRCxxQkFBYSxtQ0FBbUM7SUFDMUIsT0FBTyxDQUFDLE1BQU07SUFBbEMsT0FBTyxlQUEwRTtZQUVuRSxVQUFVO0lBNkJ4QixNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx5Q0FBeUMsR0FBRyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FHaEc7Q0FDRjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHNCQUF1QixZQUFXLHVCQUF1QjtJQU0zRCxTQUFTLEVBQUUsU0FBUztJQUVwQixjQUFjLEVBQUUsY0FBYyxHQUFHLFNBQVM7SUFFMUMsTUFBTSxFQUFFLE1BQU07SUFFZCxNQUFNLEVBQUUsTUFBTTtJQUdkLFFBQVEsRUFBRSxnQkFBZ0I7SUFHMUIsVUFBVSxFQUFFLFVBQVU7SUFHdEIscUJBQXFCLEVBQUUsVUFBVTtJQUVqQyxpQkFBaUIsRUFBRSxVQUFVO0lBRTdCLHNCQUFzQixFQUFFLFVBQVU7SUFFbEMsUUFBUSxFQUFFLHdCQUF3QjtJQTFCM0MsU0FBZ0IsY0FBYyxFQUFFLGNBQWMsQ0FBQztJQUMvQyxTQUFnQixxQkFBcUIsRUFBRSx1QkFBdUIsQ0FBQztJQUUvRDtJQUNFLGlCQUFpQjtJQUNWLFNBQVMsRUFBRSxTQUFTO0lBQzNCLGlDQUFpQztJQUMxQixjQUFjLEVBQUUsY0FBYyxHQUFHLFNBQVM7SUFDakQsY0FBYztJQUNQLE1BQU0sRUFBRSxNQUFNO0lBQ3JCLGNBQWM7SUFDUCxNQUFNLEVBQUUsTUFBTTtJQUVyQixnQ0FBZ0M7SUFDekIsUUFBUSxFQUFFLGdCQUFnQjtJQUVqQyxvQ0FBb0M7SUFDN0IsVUFBVSxFQUFFLFVBQVU7SUFFN0Isc0JBQXNCO0lBQ2YscUJBQXFCLEVBQUUsVUFBVTtJQUN4Qyx5Q0FBeUM7SUFDbEMsaUJBQWlCLEVBQUUsVUFBVTtJQUNwQyxpQ0FBaUM7SUFDMUIsc0JBQXNCLEVBQUUsVUFBVTtJQUN6QyxxQ0FBcUM7SUFDOUIsUUFBUSxFQUFFLHdCQUF3QixFQVcxQztJQUVLLGNBQWMsQ0FBQyxFQUFFLEdBQUUsVUFBNEIsaUJBS3BEO0lBRUssb0JBQW9CLENBQUMsT0FBTyxFQUFFLFVBQVUsbUJBRTdDO0lBRUQsd0JBQXdCLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsWUFBWSwwQkFFckU7SUFFSyxzQ0FBc0MsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLGFBQWEsaUJBSTVHO0lBRUssb0JBQW9CLENBQUMsS0FBSyxFQUFFLFlBQVksZ0JBRTdDO0lBRUssdUJBQXVCLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxlQUFlLEVBQUUsTUFBTSxpQkFHekU7SUFFSyxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsWUFBWSwwQkFhMUM7SUFFSyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxZQUFZLGlCQU1oRTtZQUVhLGNBQWM7Q0FlN0IifQ==
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvZ2FzX3BvcnRhbF90ZXN0X2hhcm5lc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsS0FBSyxjQUFjLEVBQUUsS0FBSyxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU1RyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUt0RiwyRUFBMkU7QUFDM0UsS0FBSyxlQUFlLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUUzRCxNQUFNLFdBQVcsdUJBQXVCO0lBQ3RDLG9CQUFvQixDQUFDLE9BQU8sRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzNELGlCQUFpQixDQUFDLEtBQUssRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQy9ELGdCQUFnQixDQUFDLEtBQUssRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUUsUUFBUSxFQUFFLGdCQUFnQixDQUFD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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

@@ -4,6 +4,8 @@ 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 { testSpan } from '../fixtures/timing.js';
+import { waitForL1ToL2MessageSeen } from './wait_for_l1_to_l2_message.js';
 export class FeeJuicePortalTestingHarnessFactory {
     config;
     constructor(config){
@@ -72,12 +74,12 @@ export class FeeJuicePortalTestingHarnessFactory {
         const { claimAmount, claimSecret, messageLeafIndex } = claim;
         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
-        });
+        })).result;
     }
     async expectPublicBalanceOnL2(owner, expectedBalance) {
         const balance = await this.getL2PublicBalanceOf(owner);
@@ -87,20 +89,27 @@ export class FeeJuicePortalTestingHarnessFactory {
         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);
+        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(owner, claimer) {
-        // Prepare the tokens on the L1 side
-        const claim = await this.prepareTokensOnL1(owner);
-        // Consume L1 -> L2 message and claim tokens privately on L2
-        await this.consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim);
+        await testSpan('setup:bridge', async ()=>{
+            // Prepare the tokens on the L1 side
+            const claim = await this.prepareTokensOnL1(owner);
+            // Consume L1 -> L2 message and claim tokens privately on L2
+            await this.consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim);
+        });
     }
     async advanceL2Block() {
+        if (this.aztecNode.mineBlock) {
+            await this.aztecNode.mineBlock();
+            return;
+        }
         const initialBlockNumber = await this.aztecNode.getBlockNumber();
         let minTxsPerBlock = undefined;
         if (this.aztecNodeAdmin) {
@@ -109,11 +118,14 @@ export class FeeJuicePortalTestingHarnessFactory {
                 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
-            });
+        try {
+            await retryUntil(async ()=>await this.aztecNode.getBlockNumber() >= initialBlockNumber + 1, 'gas portal block advance', 0, 0.25);
+        } 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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zaGFyZWQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLG9CQUFvQixFQUFFLEtBQUssbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
+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.js

@@ -1,6 +1,12 @@
 import { createLogger } from '@aztec/aztec.js/log';
-import { beforeEach, expect } from '@jest/globals';
+import { afterAll, afterEach, beforeEach, expect } from '@jest/globals';
+import { readlinkSync } from 'fs';
 import { basename } from 'path';
+import { EluMonitor } from '../fixtures/elu_monitor.js';
+const eluMonitor = process.env.ELU_MONITOR_FILE ? new EluMonitor(process.env.ELU_MONITOR_FILE, Number(process.env.ELU_MONITOR_INTERVAL_MS) || undefined) : undefined;
+if (eluMonitor) {
+    process.on('exit', ()=>eluMonitor.stop());
+}
 beforeEach(()=>{
     const { testPath, currentTestName } = expect.getState();
     if (!testPath || !currentTestName) {
@@ -8,4 +14,38 @@ beforeEach(()=>{
     }
     const logger = createLogger(`e2e:${basename(testPath).replace('.test.ts', '')}`);
     logger.info(`Running test: ${currentTestName}`);
+    eluMonitor?.startTest(currentTestName);
+});
+afterEach(()=>{
+    eluMonitor?.stopTest();
+});
+// Log leaked handles after all tests complete. This runs after test-level afterAll hooks,
+// so any handles still alive at this point were not properly cleaned up during teardown.
+// This diagnostic helps identify the source of exit hangs without masking them.
+afterAll(()=>{
+    const handles = process._getActiveHandles();
+    if (handles.length > 0) {
+        const details = handles.map((h)=>{
+            const type = h?.constructor?.name ?? typeof h;
+            const fd = h?.fd ?? h?._handle?.fd ?? '?';
+            const destroyed = h?.destroyed ?? '?';
+            const hasRef = typeof h?.hasRef === 'function' ? h.hasRef() : '?';
+            const localAddr = h?.localAddress ?? '';
+            const remoteAddr = h?.remoteAddress ?? '';
+            const localPort = h?.localPort ?? '';
+            const remotePort = h?.remotePort ?? '';
+            const proto = Object.getPrototypeOf(h)?.constructor?.name ?? '?';
+            const keys = Object.keys(h).slice(0, 10).join(',');
+            let fdTarget = '';
+            if (typeof fd === 'number') {
+                try {
+                    fdTarget = ` -> ${readlinkSync(`/proc/self/fd/${fd}`)}`;
+                } catch  {
+                // ignore
+                }
+            }
+            return `  ${type}(fd=${fd}, destroyed=${destroyed}, hasRef=${hasRef}${fdTarget}) proto=${proto} addr=${localAddr}:${localPort}->${remoteAddr}:${remotePort} keys=[${keys}]`;
+        });
+        process.stderr.write(`\n[jest_setup] WARNING: ${handles.length} handle(s) still active after teardown:\n${details.join('\n')}\n` + `These may prevent Jest from exiting. Investigate and fix the leak.\n\n`);
+    }
 });

package/dest/shared/mock_state_view.d.ts

@@ -0,0 +1,86 @@
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import type { EthCheatCodes } from '@aztec/aztec/testing';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
+/**
+ * Mock StateView contract for testing the Uniswap price oracle.
+ *
+ * Wraps a compiled Solidity contract that mimics the Uniswap V4 StateView's getSlot0 function.
+ * The mock allows setting return values dynamically for testing different price scenarios.
+ *
+ * Solidity source:
+ * ```solidity
+ * // SPDX-License-Identifier: Apache-2.0
+ * pragma solidity >=0.8.27;
+ *
+ * contract MockStateView {
+ *     uint160 public sqrtPriceX96;
+ *     int24 public tick;
+ *     uint24 public protocolFee;
+ *     uint24 public lpFee;
+ *
+ *     function setReturnValues(
+ *         uint160 _sqrtPriceX96,
+ *         int24 _tick,
+ *         uint24 _protocolFee,
+ *         uint24 _lpFee
+ *     ) external {
+ *         sqrtPriceX96 = _sqrtPriceX96;
+ *         tick = _tick;
+ *         protocolFee = _protocolFee;
+ *         lpFee = _lpFee;
+ *     }
+ *
+ *     function getSlot0(bytes32 poolId) external view returns (uint160, int24, uint24, uint24) {
+ *         return (sqrtPriceX96, tick, protocolFee, lpFee);
+ *     }
+ * }
+ * ```
+ */
+export declare class MockStateView {
+    private readonly address;
+    private readonly walletClient;
+    private readonly log;
+    private static readonly BYTECODE;
+    private static readonly ABI;
+    private constructor();
+    /**
+     * Deploys the mock StateView contract at the specified address using etch.
+     * @param ethCheatCodes - Cheat codes for etching bytecode
+     * @param walletClient - Wallet client for sending transactions
+     * @param address - Address to deploy the mock at (typically the real StateView address)
+     */
+    static deploy(ethCheatCodes: EthCheatCodes, walletClient: ExtendedViemWalletClient, address: EthAddress): Promise<MockStateView>;
+    /**
+     * Sets the price using the ethPerFeeAssetE12 format (same as rollup contract).
+     * Computes the corresponding sqrtPriceX96 internally.
+     *
+     * Math (from fee_asset_price_oracle.ts):
+     *   ethPerFeeAssetE12 = 1e12 * 2^192 / sqrtPriceX96^2
+     *
+     * Inverted:
+     *   sqrtPriceX96^2 = 1e12 * 2^192 / ethPerFeeAssetE12
+     *   sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
+     *
+     * @param ethPerFeeAssetE12 - The price in ETH per fee asset, scaled by 1e12
+     */
+    setEthPerFeeAsset(ethPerFeeAssetE12: bigint): Promise<import("viem").TransactionReceipt>;
+    /**
+     * Sets the sqrtPriceX96 value directly (Uniswap's price encoding).
+     * @param sqrtPriceX96 - The sqrtPriceX96 value
+     * @param tick - The tick value (default 10)
+     * @param protocolFee - The protocol fee (default 0)
+     * @param lpFee - The LP fee (default 500)
+     */
+    setSqrtPriceX96(sqrtPriceX96: bigint, tick?: number, protocolFee?: number, lpFee?: number): Promise<import("viem").TransactionReceipt>;
+    /**
+     * Converts ethPerFeeAssetE12 to sqrtPriceX96 (inverse of sqrtPriceX96ToEthPerFeeAssetE12).
+     *
+     * Math:
+     *   sqrtPriceX96 = sqrt(1e12 * 2^192 / ethPerFeeAssetE12)
+     */
+    ethPerFeeAssetE12ToSqrtPriceX96(ethPerFeeAssetE12: bigint): bigint;
+    /** Integer square root using Newton's method */
+    bigintSqrt(n: bigint): bigint;
+}
+export declare function diffInBps(a: bigint, b: bigint): bigint;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19zdGF0ZV92aWV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2hhcmVkL21vY2tfc3RhdGVfdmlldy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFdkQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUl0RTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtDRztBQUNILHFCQUFhLGFBQWE7SUFxRHRCLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHO0lBdER0QixPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQ20rRTtJQUNuZ0YsT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQStDaEI7SUFFWCxPQUFPLGVBSUg7SUFFSjs7Ozs7T0FLRztJQUNILE9BQWEsTUFBTSxDQUNqQixhQUFhLEVBQUUsYUFBYSxFQUM1QixZQUFZLEVBQUUsd0JBQXdCLEVBQ3RDLE9BQU8sRUFBRSxVQUFVLEdBQ2xCLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FHeEI7SUFFRDs7Ozs7Ozs7Ozs7O09BWUc7SUFDRyxpQkFBaUIsQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLDhDQUdoRDtJQUVEOzs7Ozs7T0FNRztJQUNHLGVBQWUsQ0FBQyxZQUFZLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRSxNQUFXLEVBQUUsV0FBVyxHQUFFLE1BQVUsRUFBRSxLQUFLLEdBQUUsTUFBWSw4Q0FVMUc7SUFFRDs7Ozs7T0FLRztJQUNILCtCQUErQixDQUFDLGlCQUFpQixFQUFFLE1BQU0sR0FBRyxNQUFNLENBT2pFO0lBRUQsZ0RBQWdEO0lBQ2hELFVBQVUsQ0FBQyxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FjNUI7Q0FDRjtBQUVELHdCQUFnQixTQUFTLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FFdEQifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"mock_state_view.d.ts","sourceRoot":"","sources":["../../src/shared/mock_state_view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAItE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qBAAa,aAAa;IAqDtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IAtDtB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CACm+E;IACngF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CA+ChB;IAEX,OAAO,eAIH;IAEJ;;;;;OAKG;IACH,OAAa,MAAM,CACjB,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,wBAAwB,EACtC,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,aAAa,CAAC,CAGxB;IAED;;;;;;;;;;;;OAYG;IACG,iBAAiB,CAAC,iBAAiB,EAAE,MAAM,8CAGhD;IAED;;;;;;OAMG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,GAAE,MAAW,EAAE,WAAW,GAAE,MAAU,EAAE,KAAK,GAAE,MAAY,8CAU1G;IAED;;;;;OAKG;IACH,+BAA+B,CAAC,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAOjE;IAED,gDAAgD;IAChD,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc5B;CACF;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAEtD"}