@aztec/end-to-end 1.2.1 → 2.0.0-nightly.20250813

package/dest/fixtures/utils.js

@@ -3,12 +3,12 @@ import { deployFundedSchnorrAccounts, generateSchnorrAccounts, getDeployedTestAc
 import { createArchiver } from '@aztec/archiver';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import { BatchCall, createAztecNodeClient, createLogger, createPXEClient, makeFetch, sleep, waitForPXE } from '@aztec/aztec.js';
-import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
-import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
+import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
 import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
-import { NULL_KEY, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain, l1Artifacts } from '@aztec/ethereum';
+import { FeeAssetArtifact, NULL_KEY, RollupContract, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
 import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -26,7 +26,7 @@ import { createProverNode } from '@aztec/prover-node';
 import { createPXEServiceWithSimulator, getPXEServiceConfig } from '@aztec/pxe/server';
 import { MemoryCircuitRecorder, SimulatorRecorderWrapper, WASMSimulator } from '@aztec/simulator/client';
 import { FileCircuitRecorder } from '@aztec/simulator/testing';
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
@@ -161,8 +161,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         deployL1ContractsValues,
         config,
         initialFundedAccounts,
+        wallets,
         wallet: wallets[0],
-        wallets: wallets.slice(0, numberOfAccounts),
+        accounts: wallets.slice(0, numberOfAccounts).map((w)=>w.getAddress()),
         logger,
         cheatCodes,
         prefilledPublicData: undefined,
@@ -214,7 +215,8 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             }
             const res = await startAnvil({
                 l1BlockTime: opts.ethereumSlotDuration,
-                accounts: opts.anvilAccounts
+                accounts: opts.anvilAccounts,
+                port: opts.anvilPort
             });
             anvil = res.anvil;
             config.l1RpcUrls = [
@@ -232,7 +234,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             await ethCheatCodes.loadChainState(opts.stateLoad);
         }
         if (opts.l1StartTime) {
-            await ethCheatCodes.warp(opts.l1StartTime);
+            await ethCheatCodes.warp(opts.l1StartTime, {
+                resetBlockInterval: true
+            });
         }
         let publisherPrivKey = undefined;
         let publisherHdAccount = undefined;
@@ -271,20 +275,16 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         config.rollupVersion = deployL1ContractsValues.rollupVersion;
         if (opts.fundRewardDistributor) {
             // Mints block rewards for 10000 blocks to the rewardDistributor contract
-            const rewardDistributor = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
-                abi: l1Artifacts.rewardDistributor.contractAbi,
-                client: deployL1ContractsValues.l1Client
-            });
-            const blockReward = await rewardDistributor.read.BLOCK_REWARD();
+            const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+            const blockReward = await rollup.getBlockReward();
             const mintAmount = 10_000n * blockReward;
             const feeJuice = getContract({
                 address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
-                abi: l1Artifacts.feeAsset.contractAbi,
+                abi: FeeAssetArtifact.contractAbi,
                 client: deployL1ContractsValues.l1Client
             });
             const rewardDistributorMintTxHash = await feeJuice.write.mint([
-                rewardDistributor.address,
+                deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
                 mintAmount
             ], {});
             await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
@@ -299,7 +299,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         if (opts.l2StartTime) {
             // This should only be used in synching test or when you need to have a stable
             // timestamp for the first l2 block.
-            await ethCheatCodes.warp(opts.l2StartTime);
+            await ethCheatCodes.warp(opts.l2StartTime, {
+                resetBlockInterval: true
+            });
         }
         const dateProvider = new TestDateProvider();
         dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
@@ -343,6 +345,24 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
                 p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
             };
         }
+        // Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
+        // To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
+        // For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
+        // If no accounts need deployment, we await an empty block to confirm network progression. After either path
+        // completes, we restore the original minTxsPerBlock setting. The deployment and waiting for empty block is
+        // handled by the if-else branches on line 632.
+        // For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
+        // `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
+        //
+        // Note: If the following seems too convoluted or if it starts making problems, we could drop the "progressing
+        // past genesis via an account contract deployment" optimization and just call flush() on the sequencer and wait
+        // for an empty block to be mined. This would simplify it all quite a bit but the setup would be slower for tests
+        // deploying accounts.
+        const originalMinTxsPerBlock = config.minTxsPerBlock;
+        if (originalMinTxsPerBlock === undefined) {
+            throw new Error('minTxsPerBlock is undefined in e2e test setup');
+        }
+        config.minTxsPerBlock = numberOfAccounts === 0 ? 0 : 1;
         config.p2pEnabled = opts.mockGossipSubNetwork || config.p2pEnabled;
         config.p2pIp = opts.p2pIp ?? config.p2pIp ?? '127.0.0.1';
         const aztecNode = await AztecNodeService.createAndSync(config, {
@@ -383,35 +403,20 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             await cheatCodes.rollup.setupEpoch();
             await cheatCodes.rollup.debugRollup();
         }
-        const sequencer = sequencerClient.getSequencer();
-        const minTxsPerBlock = config.minTxsPerBlock;
-        if (minTxsPerBlock === undefined) {
-            throw new Error('minTxsPerBlock is undefined in e2e test setup');
-        }
-        // Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
-        // To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
-        // For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
-        // If no accounts need deployment, we await an empty block to confirm network progression. After either path
-        // completes, we restore the original minTxsPerBlock setting.
-        // For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
-        // `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
+        // Below we continue with what we described in the long comment on line 571.
         let accountManagers = [];
         if (numberOfAccounts === 0) {
-            // We wait until block 1 is mined to ensure that the network has progressed past genesis.
-            sequencer.updateConfig({
-                minTxsPerBlock: 0
-            });
+            logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
             while(await pxe.getBlockNumber() === 0){
                 await sleep(2000);
             }
         } else {
-            sequencer.updateConfig({
-                minTxsPerBlock: 1
-            });
+            logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
             accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
         }
-        sequencer.updateConfig({
-            minTxsPerBlock
+        // Now we restore the original minTxsPerBlock setting.
+        sequencerClient.getSequencer().updateConfig({
+            minTxsPerBlock: originalMinTxsPerBlock
         });
         const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
         if (initialFundedAccounts.length < numberOfAccounts) {
@@ -454,8 +459,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             sequencer: sequencerClient,
             teardown,
             telemetryClient: telemetry,
-            wallet: wallets[0],
             wallets,
+            wallet: wallets[0],
+            accounts: wallets.map((w)=>w.getAddress()),
             watcher
         };
     } catch (err) {
@@ -470,24 +476,28 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  */ // docs:start:public_deploy_accounts
-export async function ensureAccountsPubliclyDeployed(sender, accountsToDeploy) {
+export async function ensureAccountContractsPublished(sender, accountsToDeploy) {
     // We have to check whether the accounts are already deployed. This can happen if the test runs against
     // the sandbox and the test accounts exist
     const accountsAndAddresses = await Promise.all(accountsToDeploy.map(async (account)=>{
         const address = account.getAddress();
         return {
             address,
-            deployed: (await sender.getContractMetadata(address)).isContractPubliclyDeployed
+            deployed: (await sender.getContractMetadata(address)).isContractPublished
         };
     }));
     const instances = (await Promise.all(accountsAndAddresses.filter(({ deployed })=>!deployed).map(({ address })=>sender.getContractMetadata(address)))).map((contractMetadata)=>contractMetadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
     if (!(await sender.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
-        await (await registerContractClass(sender, SchnorrAccountContractArtifact)).send().wait();
+        await (await publishContractClass(sender, SchnorrAccountContractArtifact)).send({
+            from: accountsToDeploy[0].getAddress()
+        }).wait();
     }
-    const requests = await Promise.all(instances.map(async (instance)=>await deployInstance(sender, instance)));
+    const requests = await Promise.all(instances.map(async (instance)=>await publishInstance(sender, instance)));
     const batch = new BatchCall(sender, requests);
-    await batch.send().wait();
+    await batch.send({
+        from: accountsToDeploy[0].getAddress()
+    }).wait();
 }
 // docs:end:public_deploy_accounts
 /**
@@ -518,10 +528,12 @@ export async function ensureAccountsPubliclyDeployed(sender, accountsToDeploy) {
     }
     return createLogger('e2e:' + describeBlockName);
 }
-export function getBalancesFn(symbol, method, logger) {
+export function getBalancesFn(symbol, method, from, logger) {
     const balances = async (...addressLikes)=>{
         const addresses = addressLikes.map((addressLike)=>'address' in addressLike ? addressLike.address : addressLike);
-        const b = await Promise.all(addresses.map((address)=>method(address).simulate()));
+        const b = await Promise.all(addresses.map((address)=>method(address).simulate({
+                from
+            })));
         const debugString = `${symbol} balances: ${addresses.map((address, i)=>`${address}: ${b[i]}`).join(', ')}`;
         logger.verbose(debugString);
         return b;
@@ -543,16 +555,23 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
  * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
  * but by conventions its address is computed with a salt of 0.
  * @returns The address of the sponsored FPC contract
- */ export async function getSponsoredFPCAddress() {
-    const sponsoredFPCInstance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+ */ export function getSponsoredFPCInstance() {
+    return Promise.resolve(getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
         salt: new Fr(SPONSORED_FPC_SALT)
-    });
+    }));
+}
+/**
+ * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
+ * but by conventions its address is computed with a salt of 0.
+ * @returns The address of the sponsored FPC contract
+ */ export async function getSponsoredFPCAddress() {
+    const sponsoredFPCInstance = await getSponsoredFPCInstance();
     return sponsoredFPCInstance.address;
 }
 /**
  * Deploy a sponsored FPC contract to a running instance.
  */ export async function setupSponsoredFPC(pxe) {
-    const instance = await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+    const instance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
         salt: new Fr(SPONSORED_FPC_SALT)
     });
     await pxe.registerContract({
@@ -562,15 +581,24 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     getLogger().info(`SponsoredFPC: ${instance.address}`);
     return instance;
 }
+/**
+ * Registers the SponsoredFPC in this PXE instance
+ * @param pxe - The pxe client
+ */ export async function registerSponsoredFPC(pxe) {
+    await pxe.registerContract({
+        instance: await getSponsoredFPCInstance(),
+        artifact: SponsoredFPCContract.artifact
+    });
+}
 export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, intervalSec = 1) {
     targetBlock ??= await node.getBlockNumber();
     await retryUntil(async ()=>await node.getProvenBlockNumber() >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
 }
-export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = []) {
+export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = [], proverNodeDeps = {}) {
     return withLogNameSuffix('prover-node', async ()=>{
         // Disable stopping the aztec node as the prover coordination test will kill it otherwise
         // This is only required when stopping the prover node for testing
-        const aztecNodeTxProvider = {
+        const aztecNodeTxProvider = aztecNode && {
             getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
             getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
             stop: ()=>Promise.resolve()
@@ -581,13 +609,15 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
             ...aztecNodeConfig,
             dataDirectory: proverNodeConfig.dataDirectory
         };
-        const archiver = await createArchiver(archiverConfig, blobSinkClient, {
+        const archiver = await createArchiver(archiverConfig, {
+            blobSinkClient
+        }, {
             blockUntilSync: true
         });
         // Prover node config is for simulated proofs
         const proverConfig = {
             ...aztecNodeConfig,
-            proverCoordinationNodeUrls: [],
+            txCollectionNodeRpcUrls: [],
             realProofs: false,
             proverAgentCount: 2,
             publisherPrivateKey: new SecretValue(proverNodePrivateKey),
@@ -597,11 +627,13 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
             txGatheringIntervalMs: 1000,
             txGatheringBatchSize: 10,
             txGatheringMaxParallelRequestsPerNode: 10,
+            txGatheringTimeoutMs: 24_000,
             proverNodeFailedEpochStore: undefined,
             ...proverNodeConfig
         };
-        const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
+        const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node', proverNodeDeps.dateProvider);
         const proverNode = await createProverNode(proverConfig, {
+            ...proverNodeDeps,
             aztecNodeTxProvider,
             archiver: archiver,
             l1TxUtils
@@ -615,10 +647,10 @@ export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, p
         return proverNode;
     });
 }
-function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName) {
+function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName, dateProvider) {
     const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
     const log = createLogger(logName);
-    const l1TxUtils = new DelayedTxUtils(l1Client, log, aztecNodeConfig);
+    const l1TxUtils = new DelayedTxUtils(l1Client, log, dateProvider, aztecNodeConfig);
     l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
     return l1TxUtils;
 }

package/dest/integration_l1_publisher/write_json.d.ts

@@ -0,0 +1,8 @@
+import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
+import { BatchedBlob, Blob } from '@aztec/blob-lib';
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */
+export declare function writeJson(fileName: string, block: L2Block, l1ToL2Content: Fr[], blobs: Blob[], batchedBlob: BatchedBlob, recipientAddress: AztecAddress, deployerAddress: `0x${string}`): Promise<void>;
+//# sourceMappingURL=write_json.d.ts.map

package/dest/integration_l1_publisher/write_json.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"write_json.d.ts","sourceRoot":"","sources":["../../src/integration_l1_publisher/write_json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAOpD;;;GAGG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,EAAE,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,YAAY,EAC9B,eAAe,EAAE,KAAK,MAAM,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC,CAqDf"}

package/dest/integration_l1_publisher/write_json.js

@@ -0,0 +1,57 @@
+import { Blob } from '@aztec/blob-lib';
+import { writeFile } from 'fs/promises';
+const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
+/**
+ * Creates a json object that can be used to test the solidity contract.
+ * The json object must be put into
+ */ export async function writeJson(fileName, block, l1ToL2Content, blobs, batchedBlob, recipientAddress, deployerAddress) {
+    if (!AZTEC_GENERATE_TEST_DATA) {
+        return;
+    }
+    // Path relative to the package.json in the end-to-end folder
+    const path = `../../l1-contracts/test/fixtures/${fileName}.json`;
+    const asHex = (value, size = 64)=>{
+        const buffer = Buffer.isBuffer(value) ? value : value.toBuffer();
+        return `0x${buffer.toString('hex').padStart(size, '0')}`;
+    };
+    const jsonObject = {
+        populate: {
+            l1ToL2Content: l1ToL2Content.map(asHex),
+            recipient: asHex(recipientAddress.toField()),
+            sender: deployerAddress
+        },
+        messages: {
+            l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map(asHex)
+        },
+        block: {
+            // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
+            // This should not be a problem for testing as long as the values are not larger than u32.
+            archive: asHex(block.archive.root),
+            blobCommitments: Blob.getPrefixedEthBlobCommitments(blobs),
+            batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
+            blockNumber: block.number,
+            body: `0x${block.body.toBuffer().toString('hex')}`,
+            header: {
+                lastArchiveRoot: asHex(block.header.lastArchive.root),
+                contentCommitment: {
+                    blobsHash: asHex(block.header.contentCommitment.blobsHash),
+                    inHash: asHex(block.header.contentCommitment.inHash),
+                    outHash: asHex(block.header.contentCommitment.outHash)
+                },
+                slotNumber: Number(block.header.globalVariables.slotNumber),
+                timestamp: Number(block.header.globalVariables.timestamp),
+                coinbase: asHex(block.header.globalVariables.coinbase, 40),
+                feeRecipient: asHex(block.header.globalVariables.feeRecipient),
+                gasFees: {
+                    feePerDaGas: Number(block.header.globalVariables.gasFees.feePerDaGas),
+                    feePerL2Gas: Number(block.header.globalVariables.gasFees.feePerL2Gas)
+                },
+                totalManaUsed: block.header.totalManaUsed.toNumber()
+            },
+            headerHash: asHex(block.header.toPropose().hash()),
+            numTxs: block.body.txEffects.length
+        }
+    };
+    const output = JSON.stringify(jsonObject, null, 2);
+    await writeFile(path, output, 'utf8');
+}

package/dest/sample-dapp/connect.d.mts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=connect.d.mts.map

package/dest/sample-dapp/connect.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connect.d.mts","sourceRoot":"","sources":["../../src/sample-dapp/connect.mjs"],"names":[],"mappings":""}

package/dest/sample-dapp/connect.js

@@ -2,7 +2,7 @@
 import { createPXEClient } from '@aztec/aztec.js';
 const { PXE_URL = 'http://localhost:8080' } = process.env;
 async function main() {
-    const pxe = await createPXEClient(PXE_URL);
+    const pxe = createPXEClient(PXE_URL);
     const { l1ChainId } = await pxe.getNodeInfo();
     console.log(`Connected to chain ${l1ChainId}`);
 }

package/dest/sample-dapp/contracts.d.mts

@@ -0,0 +1,3 @@
+export function getToken(wallet: any): Promise<Contract>;
+import { Contract } from '@aztec/aztec.js';
+//# sourceMappingURL=contracts.d.mts.map

package/dest/sample-dapp/contracts.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contracts.d.mts","sourceRoot":"","sources":["../../src/sample-dapp/contracts.mjs"],"names":[],"mappings":"AASA,yDAGC;yBAZsC,iBAAiB"}

package/dest/sample-dapp/contracts.js

@@ -4,7 +4,7 @@ import { readFileSync } from 'fs';
 // This syntax is helpful for the referencing tutorial
 const TokenContractArtifact = TokenContract.artifact;
 // docs:start:get-tokens
-export async function getToken(wallet) {
+export function getToken(wallet) {
     const addresses = JSON.parse(readFileSync('addresses.json'));
     return Contract.at(AztecAddress.fromString(addresses.token), TokenContractArtifact, wallet);
 } // docs:end:get-tokens

package/dest/sample-dapp/deploy.d.mts

@@ -0,0 +1,3 @@
+export { main as deploy };
+declare function main(): Promise<void>;
+//# sourceMappingURL=deploy.d.mts.map

package/dest/sample-dapp/deploy.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deploy.d.mts","sourceRoot":"","sources":["../../src/sample-dapp/deploy.mjs"],"names":[],"mappings":";AAeA,uCAeC"}

package/dest/sample-dapp/deploy.js

@@ -4,6 +4,7 @@ import { Contract, createPXEClient, waitForPXE } from '@aztec/aztec.js';
 // docs:end:deploy-imports
 // docs:start:import_artifact
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+// docs:end:import_artifact
 import { writeFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 // docs:start:dapp-deploy
@@ -18,7 +19,9 @@ async function main() {
         'TokenName',
         'TKN',
         18
-    ]).send().deployed();
+    ]).send({
+        from: ownerAddress
+    }).deployed();
     console.log(`Token deployed at ${token.address.toString()}`);
     const addresses = {
         token: token.address.toString()

package/dest/sample-dapp/index.d.mts

@@ -0,0 +1,2 @@
+export function main(): Promise<void>;
+//# sourceMappingURL=index.d.mts.map

package/dest/sample-dapp/index.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/sample-dapp/index.mjs"],"names":[],"mappings":"AAwGA,sCAcC"}

package/dest/sample-dapp/index.js

@@ -18,7 +18,9 @@ async function showPrivateBalances(pxe) {
     const accounts = await pxe.getRegisteredAccounts();
     for (const account of accounts){
         // highlight-next-line:showPrivateBalances
-        const balance = await token.methods.balance_of_private(account.address).simulate();
+        const balance = await token.methods.balance_of_private(account.address).simulate({
+            from: account.address
+        });
         console.log(`Balance of ${account.address}: ${balance}`);
     }
 }
@@ -30,8 +32,9 @@ async function mintPrivateFunds(pxe) {
     await showPrivateBalances(pxe);
     // We mint tokens to the owner
     const mintAmount = 20n;
-    const from = ownerWallet.getAddress(); // we are setting from to owner here because we need a sender to calculate the tag
-    await token.methods.mint_to_private(from, ownerWallet.getAddress(), mintAmount).send().wait();
+    await token.methods.mint_to_private(ownerWallet.getAddress(), mintAmount).send({
+        from: ownerWallet.getAddress()
+    }).wait();
     await showPrivateBalances(pxe);
 }
 // docs:end:mintPrivateFunds
@@ -41,7 +44,9 @@ async function transferPrivateFunds(pxe) {
     const token = await getToken(owner);
     await showPrivateBalances(pxe);
     console.log(`Sending transaction, awaiting transaction to be mined`);
-    const receipt = await token.methods.transfer(recipient.getAddress(), 1).send().wait();
+    const receipt = await token.methods.transfer(recipient.getAddress(), 1).send({
+        from: owner.getAddress()
+    }).wait();
     console.log(`Transaction ${receipt.txHash} has been mined on block ${receipt.blockNumber}`);
     await showPrivateBalances(pxe);
 }
@@ -53,7 +58,9 @@ async function showPublicBalances(pxe) {
     const accounts = await pxe.getRegisteredAccounts();
     for (const account of accounts){
         // highlight-next-line:showPublicBalances
-        const balance = await token.methods.balance_of_public(account.address).simulate();
+        const balance = await token.methods.balance_of_public(account.address).simulate({
+            from: account.address
+        });
         console.log(`Balance of ${account.address}: ${balance}`);
     }
 }
@@ -64,7 +71,9 @@ async function mintPublicFunds(pxe) {
     const token = await getToken(owner);
     await showPublicBalances(pxe);
     console.log(`Sending transaction, awaiting transaction to be mined`);
-    const receipt = await token.methods.mint_to_public(owner.getAddress(), 100).send().wait();
+    const receipt = await token.methods.mint_to_public(owner.getAddress(), 100).send({
+        from: owner.getAddress()
+    }).wait();
     console.log(`Transaction ${receipt.txHash} has been mined on block ${receipt.blockNumber}`);
     await showPublicBalances(pxe);
     // docs:start:showLogs
@@ -73,7 +82,9 @@ async function mintPublicFunds(pxe) {
         fromBlock: blockNumber - 1
     })).logs;
     const textLogs = logs.map((extendedLog)=>extendedLog.toHumanReadable().slice(0, 200));
-    for (const log of textLogs)console.log(`Log emitted: ${log}`);
+    for (const log of textLogs){
+        console.log(`Log emitted: ${log}`);
+    }
 // docs:end:showLogs
 }
 // docs:end:mintPublicFunds
@@ -89,7 +100,6 @@ async function main() {
 }
 // Execute main only if run directly
 if (process.argv[1].replace(/\/index\.m?js$/, '') === fileURLToPath(import.meta.url).replace(/\/index\.m?js$/, '')) {
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     main().then(()=>process.exit(0)).catch((err)=>{
         console.error(`Error in app: ${err}`);
         process.exit(1);

package/dest/shared/cross_chain_test_harness.d.ts

@@ -72,10 +72,11 @@ export declare class CrossChainTestHarness {
     readonly l1ContractAddresses: L1ContractAddresses;
     /** Wallet of the owner. */
     readonly ownerWallet: AccountWallet;
-    static new(aztecNode: AztecNode, pxeService: PXE, l1Client: ExtendedViemWalletClient, wallet: AccountWallet, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
+    /** Owner of the l2 token and bridge */
+    readonly ownerAddress: AztecAddress;
+    static new(aztecNode: AztecNode, pxeService: PXE, l1Client: ExtendedViemWalletClient, wallet: AccountWallet, ownerAddress: AztecAddress, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
     private readonly l1TokenManager;
     private readonly l1TokenPortalManager;
-    readonly ownerAddress: AztecAddress;
     constructor(
     /** Aztec node instance. */
     aztecNode: AztecNode, 
@@ -98,7 +99,9 @@ export declare class CrossChainTestHarness {
     /** Deployment addresses for all L1 contracts */
     l1ContractAddresses: L1ContractAddresses, 
     /** Wallet of the owner. */
-    ownerWallet: AccountWallet);
+    ownerWallet: AccountWallet, 
+    /** Owner of the l2 token and bridge */
+    ownerAddress: AztecAddress);
     mintTokensOnL1(amount: bigint): Promise<void>;
     getL1BalanceOf(address: EthAddress): Promise<bigint>;
     sendTokensToPortalPublic(bridgeAmount: bigint, mint?: boolean): Promise<L2AmountClaim>;

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

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