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

package/dest/shared/uniswap_l1_l2.js

@@ -1,11 +1,16 @@
-import { AztecAddress, EthAddress, Fr, computeAuthWitMessageHash, generateClaimSecret } from '@aztec/aztec.js';
-import { deployL1Contract, extractEvent } from '@aztec/ethereum';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { computeAuthWitMessageHash } from '@aztec/aztec.js/authorization';
+import { generateClaimSecret } from '@aztec/aztec.js/ethereum';
+import { Fr } from '@aztec/aztec.js/fields';
+import { RollupContract, deployL1Contract, extractEvent } from '@aztec/ethereum';
 import { sha256ToField } from '@aztec/foundation/crypto';
-import { InboxAbi, RollupAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
+import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
+import { computeL2ToL1MessageHash } from '@aztec/stdlib/hash';
+import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
 import { jest } from '@jest/globals';
 import { getContract, parseEther, toFunctionSelector } from 'viem';
-import { ensureAccountsPubliclyDeployed } from '../fixtures/utils.js';
+import { ensureAccountContractsPublished } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from './cross_chain_test_harness.js';
 // PSA: This tests works on forked mainnet. There is a dump of the data in `dumpedState` such that we
 // don't need to burn through RPC requests.
@@ -13,26 +18,20 @@ import { CrossChainTestHarness } from './cross_chain_test_harness.js';
 // To start an actual fork, use the command:
 // anvil --fork-url https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c --fork-block-number 17514288 --chain-id 31337
 // For CI, this is configured in `run_tests.sh` and `docker-compose-images.yml`
-// docs:start:uniswap_l1_l2_test_setup_const
 const TIMEOUT = 360_000;
-// docs:end:uniswap_l1_l2_test_setup_const
 export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 17514288)=>{
-    // docs:start:uniswap_l1_l2_test_beforeAll
     describe('uniswap_trade_on_l1_from_l2', ()=>{
         jest.setTimeout(TIMEOUT);
         const WETH9_ADDRESS = EthAddress.fromString('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
         const DAI_ADDRESS = EthAddress.fromString('0x6B175474E89094C44Da98b954EedeAC495271d0F');
         let aztecNode;
-        let pxe;
         let logger;
-        let walletClient;
-        let publicClient;
-        let ownerWallet;
+        let l1Client;
+        let wallet;
         let ownerAddress;
         let ownerEthAddress;
         // does transactions on behalf of owner on Aztec:
-        let sponsorWallet;
-        // let sponsorAddress: AztecAddress;
+        let sponsorAddress;
         let daiCrossChainHarness;
         let wethCrossChainHarness;
         let deployL1ContractsValues;
@@ -44,54 +43,51 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         const uniswapFeeTier = 3000n;
         const minimumOutputAmount = 0n;
         let cheatCodes;
+        let version;
         beforeAll(async ()=>{
-            ({ aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } = await setup());
-            if (Number(await publicClient.getBlockNumber()) < expectedForkBlockNumber) {
+            ({ aztecNode, logger, l1Client, wallet, ownerAddress, sponsorAddress, deployL1ContractsValues, cheatCodes } = await setup());
+            if (Number(await l1Client.getBlockNumber()) < expectedForkBlockNumber) {
                 throw new Error('This test must be run on a fork of mainnet with the expected fork block');
             }
-            rollup = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-                abi: RollupAbi,
-                client: deployL1ContractsValues.walletClient
-            });
-            ownerAddress = ownerWallet.getAddress();
-            // sponsorAddress = sponsorWallet.getAddress();
-            ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
-            await ensureAccountsPubliclyDeployed(ownerWallet, [
-                ownerWallet,
-                sponsorWallet
+            rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+            version = Number(await rollup.getVersion());
+            ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
+            await ensureAccountContractsPublished(wallet, [
+                ownerAddress,
+                sponsorAddress
             ]);
             logger.info('Deploying DAI Portal, initializing and deploying l2 contract...');
-            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, publicClient, walletClient, ownerWallet, logger, DAI_ADDRESS);
+            daiCrossChainHarness = await CrossChainTestHarness.new(aztecNode, deployL1ContractsValues.l1Client, wallet, ownerAddress, logger, DAI_ADDRESS);
             logger.info('Deploying WETH Portal, initializing and deploying l2 contract...');
-            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, pxe, publicClient, walletClient, ownerWallet, logger, WETH9_ADDRESS);
+            wethCrossChainHarness = await CrossChainTestHarness.new(aztecNode, l1Client, wallet, ownerAddress, logger, WETH9_ADDRESS);
             logger.info('Deploy Uniswap portal on L1 and L2...');
-            uniswapPortalAddress = await deployL1Contract(walletClient, publicClient, UniswapPortalAbi, UniswapPortalBytecode).then(({ address })=>address);
+            uniswapPortalAddress = await deployL1Contract(l1Client, UniswapPortalAbi, UniswapPortalBytecode).then(({ address })=>address);
             uniswapPortal = getContract({
                 address: uniswapPortalAddress.toString(),
                 abi: UniswapPortalAbi,
-                client: walletClient
+                client: l1Client
             });
             // deploy l2 uniswap contract and attach to portal
-            uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress).send().deployed();
-            const registryAddress = (await pxe.getNodeInfo()).l1ContractAddresses.registryAddress;
+            uniswapL2Contract = await UniswapContract.deploy(wallet, uniswapPortalAddress).send({
+                from: ownerAddress
+            }).deployed();
+            const registryAddress = (await aztecNode.getNodeInfo()).l1ContractAddresses.registryAddress;
             await uniswapPortal.write.initialize([
                 registryAddress.toString(),
                 uniswapL2Contract.address.toString()
             ], {});
             // Give me some WETH so I can deposit to L2 and do the swap...
             logger.info('Getting some weth');
-            const hash = await walletClient.sendTransaction({
+            const hash = await l1Client.sendTransaction({
                 to: WETH9_ADDRESS.toString(),
                 value: parseEther('1000')
             });
-            await publicClient.waitForTransactionReceipt({
+            await l1Client.waitForTransactionReceipt({
                 hash
             });
             const wethBalance = await wethCrossChainHarness.getL1BalanceOf(ownerEthAddress);
             expect(wethBalance).toBe(parseEther('1000'));
         });
-        // docs:end:uniswap_l1_l2_test_beforeAll
         afterAll(async ()=>{
             await cleanup();
         });
@@ -114,14 +110,19 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // 3. Owner gives uniswap approval to transfer the funds to public to self on its behalf
             logger.info('Approving uniswap to transfer funds to public to self on my behalf');
             const nonceForWETHTransferToPublicApproval = new Fr(1n);
-            await ownerWallet.createAuthWit({
+            const transferToPublicAuhtwit = await wallet.createAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval)
             });
             // 4. Swap on L1 - sends L2 to L1 message to withdraw WETH to L1 and another message to swap assets.
             logger.info('Withdrawing weth to L1 and sending message to swap to dai');
             const [secretForDepositingSwappedDai, secretHashForDepositingSwappedDai] = await generateClaimSecret();
-            const l2UniswapInteractionReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send().wait();
+            const l2UniswapInteractionReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send({
+                from: ownerAddress,
+                authWitnesses: [
+                    transferToPublicAuhtwit
+                ]
+            }).wait();
             const swapPrivateFunction = 'swap_private(address,uint256,uint24,address,uint256,bytes32,address)';
             const swapPrivateContent = sha256ToField([
                 Buffer.from(toFunctionSelector(swapPrivateFunction).substring(2), 'hex'),
@@ -133,37 +134,41 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPrivateLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(1),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
-                swapPrivateContent
-            ]);
+            const swapPrivateLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPrivateContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
-                withdrawContent
-            ]);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             // ensure that user's funds were burnt
             await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
             // ensure that uniswap contract didn't eat the funds.
             await wethCrossChainHarness.expectPublicBalanceOnL2(uniswapL2Contract.address, 0n);
             // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-            await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+            await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
             // 5. Consume L2 to L1 message by calling uniswapPortal.swap_private()
             logger.info('Execute withdraw and swap on the uniswapPortal!');
             const daiL1BalanceOfPortalBeforeSwap = await daiCrossChainHarness.getL1BalanceOf(daiCrossChainHarness.tokenPortalAddress);
-            const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(l2UniswapInteractionReceipt.blockNumber, swapPrivateLeaf);
-            const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(l2UniswapInteractionReceipt.blockNumber, withdrawLeaf);
+            const swapResult = await computeL2ToL1MembershipWitness(aztecNode, l2UniswapInteractionReceipt.blockNumber, swapPrivateLeaf);
+            const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, l2UniswapInteractionReceipt.blockNumber, withdrawLeaf);
+            const swapPrivateL2MessageIndex = swapResult.leafIndex;
+            const swapPrivateSiblingPath = swapResult.siblingPath;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
+            const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
                 _leafIndex: BigInt(withdrawL2MessageIndex),
@@ -188,7 +193,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 ]
             ];
             // this should also insert a message into the inbox.
-            const txReceipt = await daiCrossChainHarness.publicClient.waitForTransactionReceipt({
+            const txReceipt = await daiCrossChainHarness.l1Client.waitForTransactionReceipt({
                 hash: await uniswapPortal.write.swapPrivate(swapArgs)
             });
             // We get the msg leaf from event so that we can later wait for it to be available for consumption
@@ -432,12 +437,11 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             const nonceForWETHTransferToPublicApproval = new Fr(2n);
             const expectedMessageHash = await computeAuthWitMessageHash({
                 caller: uniswapL2Contract.address,
-                action: wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval)
-            }, {
-                chainId: ownerWallet.getChainId(),
-                version: ownerWallet.getVersion()
-            });
-            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).prove()).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
+                call: await wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval).getFunctionCall()
+            }, await wallet.getChainInfo());
+            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).simulate({
+                from: ownerAddress
+            })).rejects.toThrow(`Unknown auth witness for message hash ${expectedMessageHash.toString()}`);
         });
         it("can't swap if user passes a token different to what the bridge tracks", async ()=>{
             // 1. give user private funds on L2:
@@ -446,13 +450,18 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // 2. owner gives uniswap approval to transfer the funds to public:
             logger.info('Approving uniswap to transfer funds to public to self on my behalf');
             const nonceForWETHTransferToPublicApproval = new Fr(3n);
-            await ownerWallet.createAuthWit({
+            const transferToPublicAuthwith = await wallet.createAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval)
             });
             // 3. Swap but send the wrong token address
             logger.info('Swap but send the wrong token address');
-            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, daiCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).prove()).rejects.toThrow('Assertion failed: input_asset address is not the same as seen in the bridge contract');
+            await expect(uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, daiCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, Fr.random(), ownerEthAddress).send({
+                from: ownerAddress,
+                authWitnesses: [
+                    transferToPublicAuthwith
+                ]
+            }).wait()).rejects.toThrow('Assertion failed: input_asset address is not the same as seen in the bridge contract');
         });
         // edge cases for public flow:
         it("I don't need approval to call swap_public if I'm swapping on my own behalf", async ()=>{
@@ -460,14 +469,16 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             await wethCrossChainHarness.mintTokensPublicOnL2(wethAmountToBridge);
             // 2. Give approval to uniswap to transfer funds to itself
             const nonceForWETHTransferApproval = new Fr(2n);
-            const validateActionInteraction = await ownerWallet.setPublicAuthWit({
+            const validateActionInteraction = await wallet.setPublicAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
             await validateActionInteraction.send().wait();
             // No approval to call `swap` but should work even without it:
             const [_, secretHashForDepositingSwappedDai] = await generateClaimSecret();
-            await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send().wait();
+            await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send({
+                from: ownerAddress
+            }).wait();
             // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
             await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
         });
@@ -477,23 +488,27 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             const nonceForWETHTransferApproval = new Fr(3n);
             const nonceForSwap = new Fr(3n);
             const secretHashForDepositingSwappedDai = new Fr(4n);
-            const action = uniswapL2Contract.withWallet(sponsorWallet).methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, nonceForSwap);
-            const validateActionInteraction = await ownerWallet.setPublicAuthWit({
+            const action = uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, nonceForSwap);
+            const validateActionInteraction = await wallet.setPublicAuthWit(ownerAddress, {
                 caller: approvedUser,
                 action
             }, true);
             await validateActionInteraction.send().wait();
-            await expect(action.simulate()).rejects.toThrow(/unauthorized/);
+            await expect(action.simulate({
+                from: sponsorAddress
+            })).rejects.toThrow(/unauthorized/);
         });
         it("uniswap can't pull funds without transfer approval", async ()=>{
             // swap should fail since no transfer approval to uniswap:
             const nonceForWETHTransferApproval = new Fr(4n);
-            const validateActionInteraction = await ownerWallet.setPublicAuthWit({
+            const validateActionInteraction = await wallet.setPublicAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
             await validateActionInteraction.send().wait();
-            await expect(uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, new Fr(420), uniswapFeeTier, minimumOutputAmount, ownerAddress, Fr.random(), ownerEthAddress, Fr.ZERO).simulate()).rejects.toThrow(/unauthorized/);
+            await expect(uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, new Fr(420), uniswapFeeTier, minimumOutputAmount, ownerAddress, Fr.random(), ownerEthAddress, Fr.ZERO).simulate({
+                from: ownerAddress
+            })).rejects.toThrow(/unauthorized/);
         });
         // tests when trying to mix private and public flows:
         it("can't call swap_public on L1 if called swap_private on L2", async ()=>{
@@ -503,7 +518,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // Owner gives uniswap approval to transfer the funds to public to self on its behalf
             logger.info('Approving uniswap to transfer the funds to public to self on my behalf');
             const nonceForWETHTransferToPublicApproval = new Fr(4n);
-            await ownerWallet.createAuthWit({
+            const transferToPublicAuhtwit = await wallet.createAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_to_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferToPublicApproval)
             });
@@ -511,7 +526,12 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // Swap
             logger.info('Withdrawing weth to L1 and sending message to swap to dai');
             const [, secretHashForDepositingSwappedDai] = await generateClaimSecret();
-            const withdrawReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send().wait();
+            const withdrawReceipt = await uniswapL2Contract.methods.swap_private(wethCrossChainHarness.l2Token.address, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferToPublicApproval, uniswapFeeTier, minimumOutputAmount, secretHashForDepositingSwappedDai, ownerEthAddress).send({
+                from: ownerAddress,
+                authWitnesses: [
+                    transferToPublicAuhtwit
+                ]
+            }).wait();
             const swapPrivateContent = sha256ToField([
                 Buffer.from(toFunctionSelector('swap_private(address,uint256,uint24,address,uint256,bytes32,address)').substring(2), 'hex'),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
@@ -522,28 +542,32 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPrivateLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(1),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
-                swapPrivateContent
-            ]);
+            const swapPrivateLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPrivateContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
-                withdrawContent
-            ]);
-            const [swapPrivateL2MessageIndex, swapPrivateSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, swapPrivateLeaf);
-            const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, withdrawLeaf);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
+            const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPrivateLeaf);
+            const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
+            const swapPrivateL2MessageIndex = swapResult.leafIndex;
+            const swapPrivateSiblingPath = swapResult.siblingPath;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
+            const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
                 _leafIndex: BigInt(withdrawL2MessageIndex),
@@ -557,7 +581,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // ensure that user's funds were burnt
             await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
             // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-            await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+            await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
             // On L1 call swap_public!
             logger.info('call swap_public on L1');
             const swapArgs = [
@@ -583,14 +607,16 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             await wethCrossChainHarness.mintTokensPublicOnL2(wethAmountToBridge);
             // Owner gives uniswap approval to transfer funds on its behalf
             const nonceForWETHTransferApproval = new Fr(5n);
-            const validateActionInteraction = await ownerWallet.setPublicAuthWit({
+            const validateActionInteraction = await wallet.setPublicAuthWit(ownerAddress, {
                 caller: uniswapL2Contract.address,
                 action: wethCrossChainHarness.l2Token.methods.transfer_in_public(ownerAddress, uniswapL2Contract.address, wethAmountToBridge, nonceForWETHTransferApproval)
             }, true);
             await validateActionInteraction.send().wait();
             // Call swap_public on L2
             const secretHashForDepositingSwappedDai = Fr.random();
-            const withdrawReceipt = await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send().wait();
+            const withdrawReceipt = await uniswapL2Contract.methods.swap_public(ownerAddress, wethCrossChainHarness.l2Bridge.address, wethAmountToBridge, daiCrossChainHarness.l2Bridge.address, nonceForWETHTransferApproval, uniswapFeeTier, minimumOutputAmount, ownerAddress, secretHashForDepositingSwappedDai, ownerEthAddress, Fr.ZERO).send({
+                from: ownerAddress
+            }).wait();
             const swapPublicContent = sha256ToField([
                 Buffer.from(toFunctionSelector('swap_public(address,uint256,uint24,address,uint256,bytes32,bytes32,address)').substring(2), 'hex'),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
@@ -602,28 +628,32 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPublicLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(1),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(publicClient.chain.id),
-                swapPublicContent
-            ]);
+            const swapPublicLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPublicContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(publicClient.chain.id),
-                withdrawContent
-            ]);
-            const [swapPublicL2MessageIndex, swapPublicSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, swapPublicLeaf);
-            const [withdrawL2MessageIndex, withdrawSiblingPath] = await aztecNode.getL2ToL1MessageMembershipWitness(withdrawReceipt.blockNumber, withdrawLeaf);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
+            const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPublicLeaf);
+            const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
+            const swapPublicL2MessageIndex = swapResult.leafIndex;
+            const swapPublicSiblingPath = swapResult.siblingPath;
+            const withdrawL2MessageIndex = withdrawResult.leafIndex;
+            const withdrawSiblingPath = withdrawResult.siblingPath;
             const withdrawMessageMetadata = {
                 _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
                 _leafIndex: BigInt(withdrawL2MessageIndex),
@@ -637,7 +667,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
             await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
             // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
-            await cheatCodes.rollup.markAsProven(await rollup.read.getPendingBlockNumber());
+            await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
             // Call swap_private on L1
             logger.info('Execute withdraw and swap on the uniswapPortal!');
             const swapArgs = [

package/dest/simulators/lending_simulator.d.ts

@@ -1,9 +1,9 @@
-import { AztecAddress, type CheatCodes, Fr } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { CheatCodes } from '@aztec/aztec/testing';
+import type { RollupContract } from '@aztec/ethereum';
 import type { TestDateProvider } from '@aztec/foundation/timer';
-import type { RollupAbi } from '@aztec/l1-artifacts';
 import type { LendingContract } from '@aztec/noir-contracts.js/Lending';
-import type { Account, GetContractReturnType, HttpTransport, WalletClient } from 'viem';
-import type * as chains from 'viem/chains';
 import type { TokenSimulator } from './token_simulator.js';
 /**
  * Contains utilities to compute the "key" for private holdings in the public state.
@@ -29,7 +29,7 @@ export declare class LendingSimulator {
     private rate;
     private ethereumSlotDuration;
     /** the rollup contract */
-    rollup: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, chains.Chain, Account>>;
+    rollup: RollupContract;
     /** the lending contract */
     lendingContract: LendingContract;
     /** the collateral asset used in the lending contract */
@@ -46,7 +46,7 @@ export declare class LendingSimulator {
     private mintedOutside;
     constructor(cc: CheatCodes, account: LendingAccount, rate: bigint, ethereumSlotDuration: number, 
     /** the rollup contract */
-    rollup: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, chains.Chain, Account>>, 
+    rollup: RollupContract, 
     /** the lending contract */
     lendingContract: LendingContract, 
     /** the collateral asset used in the lending contract */

package/dest/simulators/lending_simulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lending_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/lending_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,KAAK,UAAU,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAEpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACxF,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;GAEG;AACH,qBAAa,cAAc;IACzB,yCAAyC;IACzC,SAAgB,OAAO,EAAE,YAAY,CAAC;IACtC,2CAA2C;IAC3C,SAAgB,MAAM,EAAE,EAAE,CAAC;gBAEf,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;IAK7C;;;OAGG;IACI,GAAG;CAGX;AAgCD;;GAEG;AACH,qBAAa,gBAAgB;IAYzB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,oBAAoB;IAC5B,0BAA0B;IACnB,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1G,2BAA2B;IACpB,eAAe,EAAE,eAAe;IACvC,wDAAwD;IACjD,eAAe,EAAE,cAAc;IACtC,uDAAuD;IAChD,UAAU,EAAE,cAAc;IAtBnC,gCAAgC;IACzB,WAAW,EAAE,MAAM,CAAM;IAChC,oCAAoC;IAC7B,IAAI,EAAE,MAAM,CAAK;IAExB,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,aAAa,CAAc;gBAGzB,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM;IACpC,0BAA0B;IACnB,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1G,2BAA2B;IACpB,eAAe,EAAE,eAAe;IACvC,wDAAwD;IACjD,eAAe,EAAE,cAAc;IACtC,uDAAuD;IAChD,UAAU,EAAE,cAAc;IAG7B,OAAO;IAQP,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,gBAAgB;IAmBjE,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAKjE,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAKhE,OAAO,CAAC,OAAO;IAKf,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3D,MAAM,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASzD,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAK/D,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAK9D,OAAO,CAAC,KAAK;IAQb,yBAAyB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ;IASzE,KAAK;CA0BZ"}
+{"version":3,"file":"lending_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/lending_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;GAEG;AACH,qBAAa,cAAc;IACzB,yCAAyC;IACzC,SAAgB,OAAO,EAAE,YAAY,CAAC;IACtC,2CAA2C;IAC3C,SAAgB,MAAM,EAAE,EAAE,CAAC;gBAEf,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE;IAK7C;;;OAGG;IACI,GAAG;CAGX;AAgCD;;GAEG;AACH,qBAAa,gBAAgB;IAYzB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,oBAAoB;IAC5B,0BAA0B;IACnB,MAAM,EAAE,cAAc;IAC7B,2BAA2B;IACpB,eAAe,EAAE,eAAe;IACvC,wDAAwD;IACjD,eAAe,EAAE,cAAc;IACtC,uDAAuD;IAChD,UAAU,EAAE,cAAc;IAtBnC,gCAAgC;IACzB,WAAW,EAAE,MAAM,CAAM;IAChC,oCAAoC;IAC7B,IAAI,EAAE,MAAM,CAAK;IAExB,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,aAAa,CAAc;gBAGzB,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM;IACpC,0BAA0B;IACnB,MAAM,EAAE,cAAc;IAC7B,2BAA2B;IACpB,eAAe,EAAE,eAAe;IACvC,wDAAwD;IACjD,eAAe,EAAE,cAAc;IACtC,uDAAuD;IAChD,UAAU,EAAE,cAAc;IAG7B,OAAO;IAMP,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,gBAAgB;IAmBjE,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAKjE,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAKhE,OAAO,CAAC,OAAO;IAKf,QAAQ,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3D,MAAM,CAAC,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASzD,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAK/D,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM;IAK9D,OAAO,CAAC,KAAK;IAQb,yBAAyB,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ;IASzE,KAAK;CA0BZ"}

package/dest/simulators/lending_simulator.js

@@ -1,5 +1,6 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
-import { AztecAddress, Fr } from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
 import { pedersenHash } from '@aztec/foundation/crypto';
 /**
  * Contains utilities to compute the "key" for private holdings in the public state.
@@ -76,23 +77,15 @@ const computeMultiplier = (rate, dt)=>{
     }
     async prepare() {
         this.accumulator = BASE;
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration)
-        ]);
-        this.time = Number(await this.rollup.read.getTimestampForSlot([
-            slot
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration));
+        this.time = Number(await this.rollup.getTimestampForSlot(slot));
     }
     async progressSlots(diff, dateProvider) {
         if (diff <= 1) {
             return;
         }
-        const slot = await this.rollup.read.getSlotAt([
-            BigInt(await this.cc.eth.timestamp())
-        ]);
-        const ts = Number(await this.rollup.read.getTimestampForSlot([
-            slot + BigInt(diff)
-        ]));
+        const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()));
+        const ts = Number(await this.rollup.getTimestampForSlot(slot + BigInt(diff)));
         const timeDiff = ts - this.time;
         this.time = ts;
         // Mine ethereum blocks such that the next block will be in a new slot
@@ -100,7 +93,7 @@ const computeMultiplier = (rate, dt)=>{
         if (dateProvider) {
             dateProvider.setTime(this.time * 1000);
         }
-        await this.cc.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+        await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
         this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
     }
     depositPrivate(from, onBehalfOf, amount) {
@@ -157,7 +150,9 @@ const computeMultiplier = (rate, dt)=>{
         const totalCollateral = Object.values(this.collateral).reduce((a, b)=>new Fr(a.value + b.value), Fr.ZERO);
         expect(totalCollateral).toEqual(new Fr(this.collateralAsset.balanceOfPublic(this.lendingContract.address)));
         expect(this.borrowed).toEqual(this.stableCoin.totalSupply - this.mintedOutside);
-        const asset = await this.lendingContract.methods.get_asset(0).simulate();
+        const asset = await this.lendingContract.methods.get_asset(0).simulate({
+            from: this.account.address
+        });
         const interestAccumulator = asset['interest_accumulator'];
         expect(interestAccumulator).toEqual(this.accumulator);
         expect(asset['last_updated_ts']).toEqual(BigInt(this.time));
@@ -165,7 +160,9 @@ const computeMultiplier = (rate, dt)=>{
             this.account.address,
             AztecAddress.fromField(await this.account.key())
         ]){
-            const privatePos = await this.lendingContract.methods.get_position(key).simulate();
+            const privatePos = await this.lendingContract.methods.get_position(key).simulate({
+                from: this.account.address
+            });
             expect(new Fr(privatePos['collateral'])).toEqual(this.collateral[key.toString()] ?? Fr.ZERO);
             expect(new Fr(privatePos['static_debt'])).toEqual(this.staticDebt[key.toString()] ?? Fr.ZERO);
             expect(privatePos['debt']).toEqual(muldivUp((this.staticDebt[key.toString()] ?? Fr.ZERO).value, this.accumulator, BASE));

package/dest/simulators/token_simulator.d.ts

@@ -1,15 +1,18 @@
-import { type AztecAddress, type Logger, type Wallet } from '@aztec/aztec.js';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 export declare class TokenSimulator {
     protected token: TokenContract;
     protected defaultWallet: Wallet;
+    protected defaultAddress: AztecAddress;
     protected logger: Logger;
     protected accounts: AztecAddress[];
     private balancesPrivate;
     private balancePublic;
     totalSupply: bigint;
     private lookupProvider;
-    constructor(token: TokenContract, defaultWallet: Wallet, logger: Logger, accounts: AztecAddress[]);
+    constructor(token: TokenContract, defaultWallet: Wallet, defaultAddress: AztecAddress, logger: Logger, accounts: AztecAddress[]);
     addAccount(account: AztecAddress): void;
     setLookupProvider(account: AztecAddress, wallet: Wallet): void;
     mintPrivate(to: AztecAddress, amount: bigint): void;

package/dest/simulators/token_simulator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAVpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;gBAG5C,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE;IAG7B,UAAU,CAAC,OAAO,EAAE,YAAY;IAIhC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIvD,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAK5C,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASnE,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASpE,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQtE,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQrE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ9C,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ7C,eAAe,CAAC,OAAO,EAAE,YAAY;IAIrC,gBAAgB,CAAC,OAAO,EAAE,YAAY;IAIvC,WAAW;IAkBX,YAAY;IAmCL,KAAK;CAInB"}
+{"version":3,"file":"token_simulator.d.ts","sourceRoot":"","sources":["../../src/simulators/token_simulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAIpE,qBAAa,cAAc;IAQvB,SAAS,CAAC,KAAK,EAAE,aAAa;IAC9B,SAAS,CAAC,aAAa,EAAE,MAAM;IAC/B,SAAS,CAAC,cAAc,EAAE,YAAY;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE;IAXpC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,aAAa,CAAkC;IAChD,WAAW,EAAE,MAAM,CAAM;IAEhC,OAAO,CAAC,cAAc,CAAkC;gBAG5C,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,YAAY,EAC5B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EAAE;IAG7B,UAAU,CAAC,OAAO,EAAE,YAAY;IAIhC,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAIvD,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAK5C,UAAU,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAM3C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASnE,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IASpE,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQtE,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQrE,WAAW,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ9C,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAQ7C,eAAe,CAAC,OAAO,EAAE,YAAY;IAIrC,gBAAgB,CAAC,OAAO,EAAE,YAAY;IAIvC,WAAW;IAoBX,YAAY;IAsCL,KAAK;CAInB"}