@aztec/aztec.js 0.85.0 → 0.86.0

package/dest/ethereum/portal_manager.d.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient, ViemContract } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
@@ -6,7 +6,7 @@ import type { SiblingPath } from '@aztec/foundation/trees';
 import { TokenPortalAbi } from '@aztec/l1-artifacts/TokenPortalAbi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { type GetContractReturnType, type Hex } from 'viem';
+import { type Hex } from 'viem';
 import type { Wallet } from '../index.js';
 /** L1 to L2 message info to claim it on L2. */
 export type L2Claim = {
@@ -35,8 +35,7 @@ export declare class L1TokenManager {
     readonly tokenAddress: EthAddress;
     /** Address of the handler/faucet contract. */
     readonly handlerAddress: EthAddress | undefined;
-    private publicClient;
-    private walletClient;
+    private readonly extendedClient;
     private logger;
     private contract;
     private handler;
@@ -44,7 +43,7 @@ export declare class L1TokenManager {
     /** Address of the ERC20 contract. */
     tokenAddress: EthAddress, 
     /** Address of the handler/faucet contract. */
-    handlerAddress: EthAddress | undefined, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    handlerAddress: EthAddress | undefined, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /** Returns the amount of tokens available to mint via the handler.
      * @throws if the handler is not provided.
      */
@@ -70,12 +69,11 @@ export declare class L1TokenManager {
 }
 /** Helper for interacting with the FeeJuicePortal on L1. */
 export declare class L1FeeJuicePortalManager {
-    private readonly publicClient;
-    private readonly walletClient;
+    private readonly extendedClient;
     private readonly logger;
     private readonly tokenManager;
     private readonly contract;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /** Returns the associated token manager for the L1 ERC20. */
     getTokenManager(): L1TokenManager;
     /**
@@ -88,20 +86,18 @@ export declare class L1FeeJuicePortalManager {
     /**
      * Creates a new instance
      * @param walletOrPxe - Wallet or PXE client used for retrieving the L1 contract addresses.
-     * @param publicClient - L1 public client.
-     * @param walletClient - L1 wallet client.
+     * @param extendedClient - Wallet client, extended with public actions.
      * @param logger - Logger.
      */
-    static new(walletOrPxe: Wallet | PXE, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger): Promise<L1FeeJuicePortalManager>;
+    static new(walletOrPxe: Wallet | PXE, extendedClient: ExtendedViemWalletClient, logger: Logger): Promise<L1FeeJuicePortalManager>;
 }
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
 export declare class L1ToL2TokenPortalManager {
-    protected publicClient: ViemPublicClient;
-    protected walletClient: ViemWalletClient;
+    protected extendedClient: ExtendedViemWalletClient;
     protected logger: Logger;
-    protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, ViemWalletClient>;
+    protected readonly portal: ViemContract<typeof TokenPortalAbi>;
     protected readonly tokenManager: L1TokenManager;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /** Returns the token manager for the underlying L1 token. */
     getTokenManager(): L1TokenManager;
     /**
@@ -123,7 +119,7 @@ export declare class L1ToL2TokenPortalManager {
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
 export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
     private readonly outbox;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, outboxAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, outboxAddress: EthAddress, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /**
      * Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
      * @param amount - Amount to withdraw.

package/dest/ethereum/portal_manager.d.ts.map

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

package/dest/ethereum/portal_manager.js

@@ -24,27 +24,25 @@ import { getContract, toFunctionSelector } from 'viem';
 /** Helper for managing an ERC20 on L1. */ export class L1TokenManager {
     tokenAddress;
     handlerAddress;
-    publicClient;
-    walletClient;
+    extendedClient;
     logger;
     contract;
     handler;
-    constructor(/** Address of the ERC20 contract. */ tokenAddress, /** Address of the handler/faucet contract. */ handlerAddress, publicClient, walletClient, logger){
+    constructor(/** Address of the ERC20 contract. */ tokenAddress, /** Address of the handler/faucet contract. */ handlerAddress, extendedClient, logger){
         this.tokenAddress = tokenAddress;
         this.handlerAddress = handlerAddress;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+        this.extendedClient = extendedClient;
         this.logger = logger;
         this.contract = getContract({
             address: this.tokenAddress.toString(),
             abi: TestERC20Abi,
-            client: this.walletClient
+            client: this.extendedClient
         });
         if (this.handlerAddress) {
             this.handler = getContract({
                 address: this.handlerAddress.toString(),
                 abi: FeeAssetHandlerAbi,
-                client: this.walletClient
+                client: this.extendedClient
             });
         }
     }
@@ -86,7 +84,7 @@ import { getContract, toFunctionSelector } from 'viem';
    * @param addressName - Optional name of the address for logging.
    */ async approve(amount, address, addressName = '') {
         this.logger.info(`Approving ${amount} tokens for ${stringifyEthAddress(address, addressName)}`);
-        await this.publicClient.waitForTransactionReceipt({
+        await this.extendedClient.waitForTransactionReceipt({
             hash: await this.contract.write.approve([
                 address,
                 amount
@@ -95,20 +93,18 @@ import { getContract, toFunctionSelector } from 'viem';
     }
 }
 /** Helper for interacting with the FeeJuicePortal on L1. */ export class L1FeeJuicePortalManager {
-    publicClient;
-    walletClient;
+    extendedClient;
     logger;
     tokenManager;
     contract;
-    constructor(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
         this.contract = getContract({
             address: portalAddress.toString(),
             abi: FeeJuicePortalAbi,
-            client: this.walletClient
+            client: extendedClient
         });
     }
     /** Returns the associated token manager for the L1 ERC20. */ getTokenManager() {
@@ -127,7 +123,7 @@ import { getContract, toFunctionSelector } from 'viem';
             if (amountToBridge !== mintableAmount) {
                 throw new Error(`Minting amount must be ${mintableAmount}`);
             }
-            await this.tokenManager.mint(this.walletClient.account.address);
+            await this.tokenManager.mint(this.extendedClient.account.address);
         }
         await this.tokenManager.approve(amountToBridge, this.contract.address, 'FeeJuice Portal');
         this.logger.info('Sending L1 Fee Juice to L2 to be claimed publicly');
@@ -137,7 +133,7 @@ import { getContract, toFunctionSelector } from 'viem';
             claimSecretHash.toString()
         ];
         await this.contract.simulate.depositToAztecPublic(args);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
             hash: await this.contract.write.depositToAztecPublic(args)
         });
         this.logger.info('Deposited to Aztec public successfully');
@@ -153,10 +149,9 @@ import { getContract, toFunctionSelector } from 'viem';
     /**
    * Creates a new instance
    * @param walletOrPxe - Wallet or PXE client used for retrieving the L1 contract addresses.
-   * @param publicClient - L1 public client.
-   * @param walletClient - L1 wallet client.
+   * @param extendedClient - Wallet client, extended with public actions.
    * @param logger - Logger.
-   */ static async new(walletOrPxe, publicClient, walletClient, logger) {
+   */ static async new(walletOrPxe, extendedClient, logger) {
         const { l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress, feeAssetHandlerAddress } } = await walletOrPxe.getNodeInfo();
         if (feeJuiceAddress.isZero() || feeJuicePortalAddress.isZero()) {
             throw new Error('Portal or token not deployed on L1');
@@ -164,24 +159,22 @@ import { getContract, toFunctionSelector } from 'viem';
         if (!feeAssetHandlerAddress || feeAssetHandlerAddress.isZero()) {
             throw new Error('Handler not deployed on L1, or handler address is zero');
         }
-        return new L1FeeJuicePortalManager(feeJuicePortalAddress, feeJuiceAddress, feeAssetHandlerAddress, publicClient, walletClient, logger);
+        return new L1FeeJuicePortalManager(feeJuicePortalAddress, feeJuiceAddress, feeAssetHandlerAddress, extendedClient, logger);
     }
 }
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */ export class L1ToL2TokenPortalManager {
-    publicClient;
-    walletClient;
+    extendedClient;
     logger;
     portal;
     tokenManager;
-    constructor(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
         this.portal = getContract({
             address: portalAddress.toString(),
             abi: TokenPortalAbi,
-            client: this.walletClient
+            client: extendedClient
         });
     }
     /** Returns the token manager for the underlying L1 token. */ getTokenManager() {
@@ -200,8 +193,8 @@ import { getContract, toFunctionSelector } from 'viem';
             amount,
             claimSecretHash.toString()
         ]);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(request)
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(request)
         });
         const log = extractEvent(txReceipt.logs, this.portal.address, this.portal.abi, 'DepositToAztecPublic', (log)=>log.args.secretHash === claimSecretHash.toString() && log.args.amount === amount && log.args.to === to.toString(), this.logger);
         return {
@@ -226,8 +219,8 @@ import { getContract, toFunctionSelector } from 'viem';
             amount,
             claimSecretHash.toString()
         ]);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(request)
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(request)
         });
         const log = extractEvent(txReceipt.logs, this.portal.address, this.portal.abi, 'DepositToAztecPrivate', (log)=>log.args.amount === amount && log.args.secretHashForL2MessageConsumption === claimSecretHash.toString(), this.logger);
         this.logger.info(`Claim message secret: ${claimSecret.toString()}, claim message secret hash: ${claimSecretHash.toString()}`);
@@ -246,7 +239,7 @@ import { getContract, toFunctionSelector } from 'viem';
             if (amount !== mintableAmount) {
                 throw new Error(`Minting amount must be ${mintableAmount} for testing`);
             }
-            await this.tokenManager.mint(this.walletClient.account.address);
+            await this.tokenManager.mint(this.extendedClient.account.address);
         }
         await this.tokenManager.approve(amount, this.portal.address, 'TokenPortal');
         return generateClaimSecret();
@@ -254,12 +247,12 @@ import { getContract, toFunctionSelector } from 'viem';
 }
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
     outbox;
-    constructor(portalAddress, tokenAddress, handlerAddress, outboxAddress, publicClient, walletClient, logger){
-        super(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger);
+    constructor(portalAddress, tokenAddress, handlerAddress, outboxAddress, extendedClient, logger){
+        super(portalAddress, tokenAddress, handlerAddress, extendedClient, logger);
         this.outbox = getContract({
             address: outboxAddress.toString(),
             abi: OutboxAbi,
-            client: walletClient
+            client: extendedClient
         });
     }
     /**
@@ -287,8 +280,8 @@ import { getContract, toFunctionSelector } from 'viem';
             messageIndex,
             siblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
         ]);
-        await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(withdrawRequest)
+        await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(withdrawRequest)
         });
         const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([
             blockNumber,
@@ -316,7 +309,7 @@ import { getContract, toFunctionSelector } from 'viem';
             l2Bridge.toBuffer(),
             new Fr(version).toBuffer(),
             EthAddress.fromString(this.portal.address).toBuffer32() ?? Buffer.alloc(32, 0),
-            new Fr(this.publicClient.chain.id).toBuffer(),
+            new Fr(this.extendedClient.chain.id).toBuffer(),
             content.toBuffer()
         ]);
         return leaf;

package/dest/test/anvil_test_watcher.d.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient } from '@aztec/ethereum';
+import type { ViemClient } from '@aztec/ethereum';
 import type { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { TestDateProvider } from '@aztec/foundation/timer';
@@ -20,7 +20,7 @@ export declare class AnvilTestWatcher {
     private markingAsProvenRunningPromise?;
     private logger;
     private isMarkingAsProven;
-    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, publicClient: ViemPublicClient, dateProvider?: TestDateProvider | undefined);
+    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
     setIsMarkingAsProven(isMarkingAsProven: boolean): void;
     setIsSandbox(isSandbox: boolean): void;
     start(): Promise<void>;

package/dest/test/anvil_test_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAezB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAjBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAA4D;IAC1E,OAAO,CAAC,gBAAgB,CAAmB;IAE3C,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAC/C,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,YAAY,EAAE,gBAAgB,EACtB,YAAY,CAAC,8BAAkB;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/test/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAezB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAjBvB,OAAO,CAAC,SAAS,CAAkB;IAEnC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAE3C,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,qBAAqB,CAAC,CAAiB;IAC/C,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;gBAGvB,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB;IAezC,oBAAoB,CAAC,iBAAiB,EAAE,OAAO;IAI/C,YAAY,CAAC,SAAS,EAAE,OAAO;IAIzB,KAAK;IAwBL,IAAI;IAMJ,OAAO;IAMP,YAAY;IAOZ,cAAc;IAoBd,gBAAgB;CAwCvB"}

package/dest/test/anvil_test_watcher.js

@@ -20,7 +20,7 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
     markingAsProvenRunningPromise;
     logger;
     isMarkingAsProven;
-    constructor(cheatcodes, rollupAddress, publicClient, dateProvider){
+    constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
         this.isSandbox = false;
@@ -29,7 +29,7 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
         this.rollup = getContract({
             address: getAddress(rollupAddress.toString()),
             abi: RollupAbi,
-            client: publicClient
+            client: l1Client
         });
         this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
             rollupAddress

package/dest/test/rollup_cheat_codes.d.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient } from '@aztec/ethereum';
+import { type ViemPublicClient } from '@aztec/ethereum';
 import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -22,6 +22,10 @@ export declare class RollupCheatCodes {
         /** The pending chain tip */ pending: bigint;
         /** The proven chain tip */ proven: bigint;
     }>;
+    /**
+     * Logs the current state of the rollup contract.
+     */
+    debugRollup(): Promise<void>;
     /** Fetches the epoch and slot duration config from the rollup contract */
     getConfig(): Promise<{
         /** Epoch duration */ epochDuration: bigint;

package/dest/test/rollup_cheat_codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAA8D,MAAM,MAAM,CAAC;AAGxH,8CAA8C;AAC9C,qBAAa,gBAAgB;IAMf,OAAO,CAAC,aAAa;IALjC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAA4D;IAE1E,OAAO,CAAC,MAAM,CAAuC;gBAEjC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAYvG,+BAA+B;IAClB,OAAO;IAKpB,gCAAgC;IACnB,QAAQ;IAKrB;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC;QAC9B,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7C,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5C,CAAC;IAQF,0EAA0E;IAC7D,SAAS,IAAI,OAAO,CAAC;QAChC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC;QAC5C,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;KAC3C,CAAC;IAQF,4CAA4C;IAC/B,kBAAkB;IAU/B,6DAA6D;IAChD,iBAAiB;IAQ9B;;;OAGG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM;IASzC;;;OAGG;IACU,YAAY,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAiC5D;;;OAGG;IACU,OAAO,CAClB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAQ1G,4CAA4C;IAC/B,oBAAoB;IAQjC;;;OAGG;IACU,sBAAsB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM;IAMtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM;CAOpD"}
+{"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,GAAG,EAA8D,MAAM,MAAM,CAAC;AAGxH,8CAA8C;AAC9C,qBAAa,gBAAgB;IAMf,OAAO,CAAC,aAAa;IALjC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAA4D;IAE1E,OAAO,CAAC,MAAM,CAAuC;gBAEjC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAYvG,+BAA+B;IAClB,OAAO;IAKpB,gCAAgC;IACnB,QAAQ;IAKrB;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC;QAC9B,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7C,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5C,CAAC;IAQF;;OAEG;IACU,WAAW;IAmBxB,0EAA0E;IAC7D,SAAS,IAAI,OAAO,CAAC;QAChC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC;QAC5C,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;KAC3C,CAAC;IAQF,4CAA4C;IAC/B,kBAAkB;IAU/B,6DAA6D;IAChD,iBAAiB;IAQ9B;;;OAGG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM;IASzC;;;OAGG;IACU,YAAY,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAiC5D;;;OAGG;IACU,OAAO,CAClB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAQ1G,4CAA4C;IAC/B,oBAAoB;IAQjC;;;OAGG;IACU,sBAAsB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM;IAMtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM;CAOpD"}

package/dest/test/rollup_cheat_codes.js

@@ -1,3 +1,4 @@
+import { RollupContract } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
@@ -43,6 +44,25 @@ import { foundry } from 'viem/chains';
             proven: res.provenBlockNumber
         };
     }
+    /**
+   * Logs the current state of the rollup contract.
+   */ async debugRollup() {
+        const rollup = new RollupContract(this.client, this.rollup.address);
+        const pendingNum = await rollup.getBlockNumber();
+        const provenNum = await rollup.getProvenBlockNumber();
+        const validators = await rollup.getAttesters();
+        const committee = await rollup.getCurrentEpochCommittee();
+        const archive = await rollup.archive();
+        const epochNum = await rollup.getEpochNumber();
+        const slot = await this.getSlot();
+        this.logger.info(`Pending block num: ${pendingNum}`);
+        this.logger.info(`Proven block num: ${provenNum}`);
+        this.logger.info(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
+        this.logger.info(`Committee: ${committee.map((v)=>v.toString()).join(', ')}`);
+        this.logger.info(`Archive: ${archive}`);
+        this.logger.info(`Epoch num: ${epochNum}`);
+        this.logger.info(`Slot: ${slot}`);
+    }
     /** Fetches the epoch and slot duration config from the rollup contract */ async getConfig() {
         const [epochDuration, slotDuration] = await Promise.all([
             this.rollup.read.getEpochDuration(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/aztec.js",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -38,8 +38,6 @@
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
     "clean": "rm -rf ./dest .tsbuildinfo ./src/account_contract/artifacts",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -80,14 +78,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.85.0",
-    "@aztec/entrypoints": "0.85.0",
-    "@aztec/ethereum": "0.85.0",
-    "@aztec/foundation": "0.85.0",
-    "@aztec/l1-artifacts": "0.85.0",
-    "@aztec/protocol-contracts": "0.85.0",
-    "@aztec/stdlib": "0.85.0",
-    "axios": "^1.7.2",
+    "@aztec/constants": "0.86.0",
+    "@aztec/entrypoints": "0.86.0",
+    "@aztec/ethereum": "0.86.0",
+    "@aztec/foundation": "0.86.0",
+    "@aztec/l1-artifacts": "0.86.0",
+    "@aztec/protocol-contracts": "0.86.0",
+    "@aztec/stdlib": "0.86.0",
+    "axios": "^1.8.2",
     "tslib": "^2.4.0",
     "viem": "2.23.7"
   },

package/src/ethereum/portal_manager.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient, ViemContract } from '@aztec/ethereum';
 import { extractEvent } from '@aztec/ethereum/utils';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -14,7 +14,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computeSecretHash } from '@aztec/stdlib/hash';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 
-import { type GetContractReturnType, type Hex, getContract, toFunctionSelector } from 'viem';
+import { type Hex, getContract, toFunctionSelector } from 'viem';
 
 import type { Wallet } from '../index.js';
 
@@ -57,28 +57,27 @@ export async function generateClaimSecret(logger?: Logger): Promise<[Fr, Fr]> {
 
 /** Helper for managing an ERC20 on L1. */
 export class L1TokenManager {
-  private contract: GetContractReturnType<typeof TestERC20Abi, ViemWalletClient>;
-  private handler: GetContractReturnType<typeof FeeAssetHandlerAbi, ViemWalletClient> | undefined;
+  private contract: ViemContract<typeof TestERC20Abi>;
+  private handler: ViemContract<typeof FeeAssetHandlerAbi> | undefined;
 
   public constructor(
     /** Address of the ERC20 contract. */
     public readonly tokenAddress: EthAddress,
     /** Address of the handler/faucet contract. */
     public readonly handlerAddress: EthAddress | undefined,
-    private publicClient: ViemPublicClient,
-    private walletClient: ViemWalletClient,
+    private readonly extendedClient: ExtendedViemWalletClient,
     private logger: Logger,
   ) {
     this.contract = getContract({
       address: this.tokenAddress.toString(),
       abi: TestERC20Abi,
-      client: this.walletClient,
+      client: this.extendedClient,
     });
     if (this.handlerAddress) {
       this.handler = getContract({
         address: this.handlerAddress.toString(),
         abi: FeeAssetHandlerAbi,
-        client: this.walletClient,
+        client: this.extendedClient,
       });
     }
   }
@@ -124,7 +123,7 @@ export class L1TokenManager {
    */
   public async approve(amount: bigint, address: Hex, addressName = '') {
     this.logger.info(`Approving ${amount} tokens for ${stringifyEthAddress(address, addressName)}`);
-    await this.publicClient.waitForTransactionReceipt({
+    await this.extendedClient.waitForTransactionReceipt({
       hash: await this.contract.write.approve([address, amount]),
     });
   }
@@ -133,21 +132,20 @@ export class L1TokenManager {
 /** Helper for interacting with the FeeJuicePortal on L1. */
 export class L1FeeJuicePortalManager {
   private readonly tokenManager: L1TokenManager;
-  private readonly contract: GetContractReturnType<typeof FeeJuicePortalAbi, ViemWalletClient>;
+  private readonly contract: ViemContract<typeof FeeJuicePortalAbi>;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
     handlerAddress: EthAddress,
-    private readonly publicClient: ViemPublicClient,
-    private readonly walletClient: ViemWalletClient,
+    private readonly extendedClient: ExtendedViemWalletClient,
     private readonly logger: Logger,
   ) {
-    this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
+    this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
     this.contract = getContract({
       address: portalAddress.toString(),
       abi: FeeJuicePortalAbi,
-      client: this.walletClient,
+      client: extendedClient,
     });
   }
 
@@ -170,7 +168,7 @@ export class L1FeeJuicePortalManager {
       if (amountToBridge !== mintableAmount) {
         throw new Error(`Minting amount must be ${mintableAmount}`);
       }
-      await this.tokenManager.mint(this.walletClient.account.address);
+      await this.tokenManager.mint(this.extendedClient.account.address);
     }
 
     await this.tokenManager.approve(amountToBridge, this.contract.address, 'FeeJuice Portal');
@@ -180,7 +178,7 @@ export class L1FeeJuicePortalManager {
 
     await this.contract.simulate.depositToAztecPublic(args);
 
-    const txReceipt = await this.publicClient.waitForTransactionReceipt({
+    const txReceipt = await this.extendedClient.waitForTransactionReceipt({
       hash: await this.contract.write.depositToAztecPublic(args),
     });
 
@@ -210,14 +208,12 @@ export class L1FeeJuicePortalManager {
   /**
    * Creates a new instance
    * @param walletOrPxe - Wallet or PXE client used for retrieving the L1 contract addresses.
-   * @param publicClient - L1 public client.
-   * @param walletClient - L1 wallet client.
+   * @param extendedClient - Wallet client, extended with public actions.
    * @param logger - Logger.
    */
   public static async new(
     walletOrPxe: Wallet | PXE,
-    publicClient: ViemPublicClient,
-    walletClient: ViemWalletClient,
+    extendedClient: ExtendedViemWalletClient,
     logger: Logger,
   ): Promise<L1FeeJuicePortalManager> {
     const {
@@ -235,8 +231,7 @@ export class L1FeeJuicePortalManager {
       feeJuicePortalAddress,
       feeJuiceAddress,
       feeAssetHandlerAddress,
-      publicClient,
-      walletClient,
+      extendedClient,
       logger,
     );
   }
@@ -244,22 +239,21 @@ export class L1FeeJuicePortalManager {
 
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
 export class L1ToL2TokenPortalManager {
-  protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, ViemWalletClient>;
+  protected readonly portal: ViemContract<typeof TokenPortalAbi>;
   protected readonly tokenManager: L1TokenManager;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
     handlerAddress: EthAddress | undefined,
-    protected publicClient: ViemPublicClient,
-    protected walletClient: ViemWalletClient,
+    protected extendedClient: ExtendedViemWalletClient,
     protected logger: Logger,
   ) {
-    this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
+    this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
     this.portal = getContract({
       address: portalAddress.toString(),
       abi: TokenPortalAbi,
-      client: this.walletClient,
+      client: extendedClient,
     });
   }
 
@@ -284,8 +278,8 @@ export class L1ToL2TokenPortalManager {
       claimSecretHash.toString(),
     ]);
 
-    const txReceipt = await this.publicClient.waitForTransactionReceipt({
-      hash: await this.walletClient.writeContract(request),
+    const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+      hash: await this.extendedClient.writeContract(request),
     });
 
     const log = extractEvent(
@@ -327,8 +321,8 @@ export class L1ToL2TokenPortalManager {
     this.logger.info('Sending L1 tokens to L2 to be claimed privately');
     const { request } = await this.portal.simulate.depositToAztecPrivate([amount, claimSecretHash.toString()]);
 
-    const txReceipt = await this.publicClient.waitForTransactionReceipt({
-      hash: await this.walletClient.writeContract(request),
+    const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+      hash: await this.extendedClient.writeContract(request),
     });
 
     const log = extractEvent(
@@ -360,7 +354,7 @@ export class L1ToL2TokenPortalManager {
       if (amount !== mintableAmount) {
         throw new Error(`Minting amount must be ${mintableAmount} for testing`);
       }
-      await this.tokenManager.mint(this.walletClient.account.address);
+      await this.tokenManager.mint(this.extendedClient.account.address);
     }
     await this.tokenManager.approve(amount, this.portal.address, 'TokenPortal');
     return generateClaimSecret();
@@ -369,22 +363,21 @@ export class L1ToL2TokenPortalManager {
 
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
 export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
-  private readonly outbox: GetContractReturnType<typeof OutboxAbi, ViemWalletClient>;
+  private readonly outbox: ViemContract<typeof OutboxAbi>;
 
   constructor(
     portalAddress: EthAddress,
     tokenAddress: EthAddress,
     handlerAddress: EthAddress | undefined,
     outboxAddress: EthAddress,
-    publicClient: ViemPublicClient,
-    walletClient: ViemWalletClient,
+    extendedClient: ExtendedViemWalletClient,
     logger: Logger,
   ) {
-    super(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger);
+    super(portalAddress, tokenAddress, handlerAddress, extendedClient, logger);
     this.outbox = getContract({
       address: outboxAddress.toString(),
       abi: OutboxAbi,
-      client: walletClient,
+      client: extendedClient,
     });
   }
 
@@ -422,7 +415,9 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
       siblingPath.toBufferArray().map((buf: Buffer): Hex => `0x${buf.toString('hex')}`),
     ]);
 
-    await this.publicClient.waitForTransactionReceipt({ hash: await this.walletClient.writeContract(withdrawRequest) });
+    await this.extendedClient.waitForTransactionReceipt({
+      hash: await this.extendedClient.writeContract(withdrawRequest),
+    });
 
     const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([blockNumber, messageIndex]);
     if (!isConsumedAfter) {
@@ -455,7 +450,7 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
       l2Bridge.toBuffer(),
       new Fr(version).toBuffer(), // aztec version
       EthAddress.fromString(this.portal.address).toBuffer32() ?? Buffer.alloc(32, 0),
-      new Fr(this.publicClient.chain.id).toBuffer(), // chain id
+      new Fr(this.extendedClient.chain.id).toBuffer(), // chain id
       content.toBuffer(),
     ]);
 

package/src/test/anvil_test_watcher.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient } from '@aztec/ethereum';
+import type { ViemClient } from '@aztec/ethereum';
 import type { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -20,7 +20,7 @@ import { RollupCheatCodes } from './rollup_cheat_codes.js';
 export class AnvilTestWatcher {
   private isSandbox: boolean = false;
 
-  private rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
+  private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
   private rollupCheatCodes: RollupCheatCodes;
 
   private filledRunningPromise?: RunningPromise;
@@ -34,13 +34,13 @@ export class AnvilTestWatcher {
   constructor(
     private cheatcodes: EthCheatCodes,
     rollupAddress: EthAddress,
-    publicClient: ViemPublicClient,
+    l1Client: ViemClient,
     private dateProvider?: TestDateProvider,
   ) {
     this.rollup = getContract({
       address: getAddress(rollupAddress.toString()),
       abi: RollupAbi,
-      client: publicClient,
+      client: l1Client,
     });
 
     this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {

package/src/test/rollup_cheat_codes.ts

@@ -1,4 +1,4 @@
-import type { ViemPublicClient } from '@aztec/ethereum';
+import { RollupContract, type ViemPublicClient } from '@aztec/ethereum';
 import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -54,6 +54,28 @@ export class RollupCheatCodes {
     };
   }
 
+  /**
+   * Logs the current state of the rollup contract.
+   */
+  public async debugRollup() {
+    const rollup = new RollupContract(this.client, this.rollup.address);
+    const pendingNum = await rollup.getBlockNumber();
+    const provenNum = await rollup.getProvenBlockNumber();
+    const validators = await rollup.getAttesters();
+    const committee = await rollup.getCurrentEpochCommittee();
+    const archive = await rollup.archive();
+    const epochNum = await rollup.getEpochNumber();
+    const slot = await this.getSlot();
+
+    this.logger.info(`Pending block num: ${pendingNum}`);
+    this.logger.info(`Proven block num: ${provenNum}`);
+    this.logger.info(`Validators: ${validators.map(v => v.toString()).join(', ')}`);
+    this.logger.info(`Committee: ${committee.map(v => v.toString()).join(', ')}`);
+    this.logger.info(`Archive: ${archive}`);
+    this.logger.info(`Epoch num: ${epochNum}`);
+    this.logger.info(`Slot: ${slot}`);
+  }
+
   /** Fetches the epoch and slot duration config from the rollup contract */
   public async getConfig(): Promise<{
     /** Epoch duration */ epochDuration: bigint;