fix

fix

fix

abc

abc

abc

abc

abc

fix

Author: Esau

docs/examples/solidity/foundry.toml

@@ -6,10 +6,8 @@ solc_version = '0.8.27'
 evm_version = 'prague'
 optimizer = true
 
-# Match l1-contracts remappings exactly
 remappings = [
   "@oz/=../../../l1-contracts/lib/openzeppelin-contracts/contracts/",
   "@aztec/=../../../l1-contracts/src/",
-  "@openzeppelin/contracts/=../../../l1-contracts/lib/openzeppelin-contracts/contracts/",
-  "@aztec-blob-lib/=../../../l1-contracts/src/mock/libraries/"
+  "@aztec-blob-lib/=../../../l1-contracts/src/core/libraries/rollup/"
 ]

docs/examples/solidity/nft_bridge/NFTPortal.sol

@@ -9,6 +9,7 @@ import {IOutbox} from "@aztec/core/interfaces/messagebridge/IOutbox.sol";
 import {IRollup} from "@aztec/core/interfaces/IRollup.sol";
 import {DataStructures} from "@aztec/core/libraries/DataStructures.sol";
 import {Hash} from "@aztec/core/libraries/crypto/Hash.sol";
+import {Epoch} from "@aztec/core/libraries/TimeLib.sol";
 
 contract NFTPortal {
     IRegistry public registry;
@@ -50,7 +51,7 @@ contract NFTPortal {
     // Unlock NFT after L2 burn
     function withdraw(
         uint256 tokenId,
-        uint256 l2BlockNumber,
+        Epoch epoch,
         uint256 leafIndex,
         bytes32[] calldata path
     ) external {
@@ -61,7 +62,7 @@ contract NFTPortal {
             content: Hash.sha256ToField(abi.encodePacked(tokenId, msg.sender))
         });
 
-        outbox.consume(message, l2BlockNumber, leafIndex, path);
+        outbox.consume(message, epoch, leafIndex, path);
 
         // Unlock NFT
         nftContract.transferFrom(address(this), msg.sender, tokenId);

docs/examples/ts/token_bridge/config.yaml

@@ -16,4 +16,4 @@ dependencies:
   - "@aztec/stdlib"
   - "@aztec/foundation"
   - "@aztec/ethereum"
-  - "npm:viem@npm:@aztec/viem@2.38.2"
+  - "npm:@aztec/viem@2.38.2"

docs/examples/ts/token_bridge/index.ts

@@ -1,7 +1,6 @@
 // docs:start:setup
-import { privateKeyToAccount } from "viem/accounts";
-import { decodeEventLog, getContract, pad } from "viem";
-import { foundry } from "viem/chains";
+import { decodeEventLog, pad } from "@aztec/viem";
+import { foundry } from "@aztec/viem/chains";
 import { AztecAddress, EthAddress } from "@aztec/aztec.js/addresses";
 import { Fr } from "@aztec/aztec.js/fields";
 import { createAztecNodeClient } from "@aztec/aztec.js/node";
@@ -13,40 +12,41 @@ import { TestWallet } from "@aztec/test-wallet/server";
 import { getInitialTestAccountsData } from "@aztec/accounts/testing";
 import { createExtendedL1Client } from "@aztec/ethereum/client";
 import { deployL1Contract } from "@aztec/ethereum/deploy-l1-contract";
+import { CheckpointNumber } from "@aztec/foundation/branded-types";
+import { RollupContract } from "@aztec/ethereum/contracts";
 import SimpleNFT from "../../../target/solidity/nft_bridge/SimpleNFT.sol/SimpleNFT.json" with { type: "json" };
 import NFTPortal from "../../../target/solidity/nft_bridge/NFTPortal.sol/NFTPortal.json" with { type: "json" };
 import { NFTPunkContract } from "./artifacts/NFTPunk.js";
 import { NFTBridgeContract } from "./artifacts/NFTBridge.js";
 
-// Setup L1 client using anvil's 1st account which should have a ton of ETH already
-const l1Account = privateKeyToAccount(
-  "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
-);
-const l1Client = createExtendedL1Client(
-  ["http://localhost:8545"],
-  l1Account,
-  foundry
-);
+// Setup L1 client using anvil's default mnemonic (same as e2e tests)
+const MNEMONIC = "test test test test test test test test test test test junk";
+const l1Client = createExtendedL1Client(["http://localhost:8545"], MNEMONIC);
+const ownerEthAddress = l1Client.account.address;
 
 // Setup L2 using Aztec's local network and one of its initial accounts
-console.log("🔮 Setting up L2...\n");
+console.log("Setting up L2...\n");
 const node = createAztecNodeClient("http://localhost:8080");
 const aztecWallet = await TestWallet.create(node);
 const [accData] = await getInitialTestAccountsData();
 const account = await aztecWallet.createSchnorrAccount(
   accData.secret,
   accData.salt
 );
-console.log(`✅ Account: ${account.address.toString()}\n`);
+console.log(`Account: ${account.address.toString()}\n`);
 
 // Get node info
 const nodeInfo = await node.getNodeInfo();
 const registryAddress = nodeInfo.l1ContractAddresses.registryAddress.toString();
 const inboxAddress = nodeInfo.l1ContractAddresses.inboxAddress.toString();
+const rollupAddress = nodeInfo.l1ContractAddresses.rollupAddress.toString();
+
+// Create rollup contract instance for querying epoch information
+const rollup = new RollupContract(l1Client, rollupAddress);
 // docs:end:setup
 
 // docs:start:deploy_l1_contracts
-console.log("📦 Deploying L1 contracts...\n");
+console.log("Deploying L1 contracts...\n");
 
 const { address: nftAddress } = await deployL1Contract(
   l1Client,
@@ -60,12 +60,12 @@ const { address: portalAddress } = await deployL1Contract(
   NFTPortal.bytecode.object as `0x${string}`
 );
 
-console.log(`✅ SimpleNFT: ${nftAddress}`);
-console.log(`✅ NFTPortal: ${portalAddress}\n`);
+console.log(`SimpleNFT: ${nftAddress}`);
+console.log(`NFTPortal: ${portalAddress}\n`);
 // docs:end:deploy_l1_contracts
 
 // docs:start:deploy_l2_contracts
-console.log("📦 Deploying L2 contracts...\n");
+console.log("Deploying L2 contracts...\n");
 
 const l2Nft = await NFTPunkContract.deploy(aztecWallet, account.address)
   .send({ from: account.address })
@@ -75,36 +75,28 @@ const l2Bridge = await NFTBridgeContract.deploy(aztecWallet, l2Nft.address)
   .send({ from: account.address })
   .deployed();
 
-console.log(`✅ L2 NFT: ${l2Nft.address.toString()}`);
-console.log(`✅ L2 Bridge: ${l2Bridge.address.toString()}\n`);
+console.log(`L2 NFT: ${l2Nft.address.toString()}`);
+console.log(`L2 Bridge: ${l2Bridge.address.toString()}\n`);
 // docs:end:deploy_l2_contracts
 
 // docs:start:initialize_portal
-console.log("🔧 Initializing portal...");
+console.log("Initializing portal...");
 
-const nftContract = getContract({
-  address: nftAddress.toString() as `0x${string}`,
-  abi: SimpleNFT.abi,
-  client: l1Client,
-});
-const portalContract = getContract({
+// Initialize the portal contract
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const initHash = await l1Client.writeContract({
   address: portalAddress.toString() as `0x${string}`,
   abi: NFTPortal.abi,
-  client: l1Client,
+  functionName: "initialize",
+  args: [registryAddress, nftAddress.toString(), l2Bridge.address.toString()],
 });
+await l1Client.waitForTransactionReceipt({ hash: initHash });
 
-const hash = await portalContract.write.initialize([
-  registryAddress as `0x${string}`,
-  nftAddress.toString() as `0x${string}`,
-  l2Bridge.address.toString() as `0x${string}`,
-]);
-await l1Client.waitForTransactionReceipt({ hash });
-
-console.log("✅ Portal initialized\n");
+console.log("Portal initialized\n");
 // docs:end:initialize_portal
 
 // docs:start:initialize_l2_bridge
-console.log("🔧 Setting up L2 bridge...");
+console.log("Setting up L2 bridge...");
 
 await l2Bridge.methods
   .set_portal(EthAddress.fromString(portalAddress.toString()))
@@ -116,37 +108,51 @@ await l2Nft.methods
   .send({ from: account.address })
   .wait();
 
-console.log("✅ Bridge configured\n");
+console.log("Bridge configured\n");
 // docs:end:initialize_l2_bridge
 
 // docs:start:mint_nft_l1
-console.log("🎨 Minting NFT on L1...");
+console.log("Minting NFT on L1...");
 
-const mintHash = await nftContract.write.mint([l1Account.address]);
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const mintHash = await l1Client.writeContract({
+  address: nftAddress.toString() as `0x${string}`,
+  abi: SimpleNFT.abi,
+  functionName: "mint",
+  args: [ownerEthAddress],
+});
 await l1Client.waitForTransactionReceipt({ hash: mintHash });
 
 // no need to parse logs, this will be tokenId 0 since it's a fresh contract
 const tokenId = 0n;
 
-console.log(`✅ Minted tokenId: ${tokenId}\n`);
+console.log(`Minted tokenId: ${tokenId}\n`);
 // docs:end:mint_nft_l1
 
 // docs:start:deposit_to_aztec
-console.log("🌉 Depositing NFT to Aztec...");
+console.log("Depositing NFT to Aztec...");
 
 const secret = Fr.random();
 const secretHash = await computeSecretHash(secret);
 
-const approveHash = await nftContract.write.approve([
-  portalAddress.toString() as `0x${string}`,
-  tokenId,
-]);
+// Approve portal to transfer the NFT
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const approveHash = await l1Client.writeContract({
+  address: nftAddress.toString() as `0x${string}`,
+  abi: SimpleNFT.abi,
+  functionName: "approve",
+  args: [portalAddress.toString(), tokenId],
+});
 await l1Client.waitForTransactionReceipt({ hash: approveHash });
 
-const depositHash = await portalContract.write.depositToAztec([
-  tokenId,
-  pad(secretHash.toString() as `0x${string}`, { dir: "left", size: 32 }),
-]);
+// Deposit to Aztec
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const depositHash = await l1Client.writeContract({
+  address: portalAddress.toString() as `0x${string}`,
+  abi: NFTPortal.abi,
+  functionName: "depositToAztec",
+  args: [tokenId, pad(secretHash.toString() as `0x${string}`, { dir: "left", size: 32 })],
+});
 const depositReceipt = await l1Client.waitForTransactionReceipt({
   hash: depositHash,
 });
@@ -167,22 +173,23 @@ const INBOX_ABI = [
 ] as const;
 
 // Find and decode the MessageSent event from the Inbox contract
-const messageSentLog = depositReceipt.logs
+const messageSentLogs = depositReceipt.logs
   .filter((log) => log.address.toLowerCase() === inboxAddress.toLowerCase())
-  .map((log) => {
+  .map((log: any) => {
     try {
-      return decodeEventLog({
+      const decoded = decodeEventLog({
         abi: INBOX_ABI,
         data: log.data,
         topics: log.topics,
       });
+      return { log, decoded };
     } catch {
       return null;
     }
   })
-  .find((decoded) => decoded?.eventName === "MessageSent");
+  .filter((item): item is { log: any; decoded: any } => item !== null && item.decoded.eventName === "MessageSent");
 
-const messageLeafIndex = new Fr(messageSentLog!.args.index);
+const messageLeafIndex = new Fr(messageSentLogs[0].decoded.args.index);
 // docs:end:get_message_leaf_index
 
 // docs:start:mine_blocks
@@ -201,44 +208,44 @@ async function mine2Blocks(aztecWallet: TestWallet, accountAddress: AztecAddress
 await mine2Blocks(aztecWallet, account.address);
 
 // Check notes before claiming (should be 0)
-console.log("📝 Checking notes before claim...");
+console.log("Checking notes before claim...");
 const notesBefore = await l2Nft.methods
   .notes_of(account.address)
   .simulate({ from: account.address });
 console.log(`   Notes count: ${notesBefore}`);
 
-console.log("🎯 Claiming NFT on L2...");
+console.log("Claiming NFT on L2...");
 await l2Bridge.methods
   .claim(account.address, new Fr(Number(tokenId)), secret, messageLeafIndex)
   .send({ from: account.address })
   .wait();
-console.log("✅ NFT claimed on L2\n");
+console.log("NFT claimed on L2\n");
 
 // Check notes after claiming (should be 1)
-console.log("📝 Checking notes after claim...");
+console.log("Checking notes after claim...");
 const notesAfterClaim = await l2Nft.methods
   .notes_of(account.address)
   .simulate({ from: account.address });
 console.log(`   Notes count: ${notesAfterClaim}\n`);
 // docs:end:claim_on_l2
 
 // docs:start:exit_from_l2
-// L2 → L1 flow
-console.log("🚪 Exiting NFT from L2...");
+// L2 -> L1 flow
+console.log("Exiting NFT from L2...");
 // Mine blocks, not necessary on devnet, but must wait for 2 blocks
 await mine2Blocks(aztecWallet, account.address);
 
-const recipientEthAddress = EthAddress.fromString(l1Account.address);
+const recipientEthAddress = EthAddress.fromString(ownerEthAddress);
 
 const exitReceipt = await l2Bridge.methods
   .exit(new Fr(Number(tokenId)), recipientEthAddress)
   .send({ from: account.address })
   .wait();
 
-console.log(`✅ Exit message sent (block: ${exitReceipt.blockNumber})\n`);
+console.log(`Exit message sent (block: ${exitReceipt.blockNumber})\n`);
 
 // Check notes after burning (should be 0 again)
-console.log("📝 Checking notes after burn...");
+console.log("Checking notes after burn...");
 const notesAfterBurn = await l2Nft.methods
   .notes_of(account.address)
   .simulate({ from: account.address });
@@ -258,9 +265,14 @@ const content = sha256ToField([
 ]);
 
 // Get rollup version from the portal contract (it stores it during initialize)
-const version = await portalContract.read.rollupVersion();
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const version = (await l1Client.readContract({
+  address: portalAddress.toString() as `0x${string}`,
+  abi: NFTPortal.abi,
+  functionName: "rollupVersion",
+})) as bigint;
 
-// Compute the L2→L1 message hash
+// Compute the L2->L1 message hash
 const msgLeaf = computeL2ToL1MessageHash({
   l2Sender: l2Bridge.address,
   l1Recipient: EthAddress.fromString(portalAddress.toString()),
@@ -271,7 +283,7 @@ const msgLeaf = computeL2ToL1MessageHash({
 
 // Wait for the block to be proven before withdrawing
 // Waiting for the block to be proven is not necessary on the local network, but it is necessary on devnet
-console.log("⏳ Waiting for block to be proven...");
+console.log("Waiting for block to be proven...");
 console.log(`   Exit block number: ${exitReceipt.blockNumber}`);
 
 let provenBlockNumber = await node.getProvenBlockNumber();
@@ -285,12 +297,19 @@ while (provenBlockNumber < exitReceipt.blockNumber!) {
   provenBlockNumber = await node.getProvenBlockNumber();
 }
 
-console.log("✅ Block proven!\n");
+console.log("Block proven!\n");
 
-// Compute the membership witness using the message hash
+// Get the epoch for the exit block's checkpoint
+// In Aztec, checkpoint number equals block number (1:1 mapping)
+const epoch = await rollup.getEpochNumberForCheckpoint(
+  CheckpointNumber.fromBlockNumber(exitReceipt.blockNumber!)
+);
+console.log(`   Epoch for block ${exitReceipt.blockNumber}: ${epoch}`);
+
+// Compute the membership witness using the message hash and epoch
 const witness = await computeL2ToL1MembershipWitness(
   node,
-  exitReceipt.blockNumber!,
+  epoch,
   msgLeaf
 );
 const siblingPathHex = witness!.siblingPath
@@ -299,13 +318,14 @@ const siblingPathHex = witness!.siblingPath
 // docs:end:get_withdrawal_witness
 
 // docs:start:withdraw_on_l1
-console.log("💰 Withdrawing NFT on L1...");
-const withdrawHash = await portalContract.write.withdraw([
-  tokenId,
-  BigInt(exitReceipt.blockNumber!),
-  BigInt(witness!.leafIndex),
-  siblingPathHex,
-]);
+console.log("Withdrawing NFT on L1...");
+// @ts-expect-error - viem type inference doesn't work with JSON-imported ABIs
+const withdrawHash = await l1Client.writeContract({
+  address: portalAddress.toString() as `0x${string}`,
+  abi: NFTPortal.abi,
+  functionName: "withdraw",
+  args: [tokenId, BigInt(epoch), BigInt(witness!.leafIndex), siblingPathHex],
+});
 await l1Client.waitForTransactionReceipt({ hash: withdrawHash });
-console.log("✅ NFT withdrawn to L1\n");
+console.log("NFT withdrawn to L1\n");
 // docs:end:withdraw_on_l1