@matterlabs/zksync-js 0.0.2 → 0.0.5

package/dist/{chunk-OC6ZVLSP.js → chunk-JXUFGIJG.js}

@@ -1,21 +1,39 @@
-import { buildFeeBreakdown, quoteL2Gas, quoteL1Gas, quoteL2Gas2 } from './chunk-QJS6ETEE.js';
-import { findL1MessageSentLog, messengerLogIndex, isAddressEq, isHash66, pickDepositRoute, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-HLUANWGN.js';
+import { createNTVCodec, buildFeeBreakdown, quoteL2Gas, quoteL1Gas, quoteL2Gas2 } from './chunk-LL3WKCFJ.js';
+import { findL1MessageSentLog, messengerLogIndex, normalizeL1Token, isAddressEq, hexEq, isHash66, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-NEC2ZKHI.js';
 import { REVERT_TO_READINESS } from './chunk-NCAIVYBR.js';
 import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, isZKsyncError, createError, shapeCause, OP_WITHDRAWALS, OP_DEPOSITS, isReceiptNotFound, IBridgehub_default, IL2AssetRouter_default, IBaseToken_default } from './chunk-M5J2MM2U.js';
-import { ETH_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_MESSENGER_ADDRESS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS, L2_BASE_TOKEN_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, SAFE_L1_BRIDGE_GAS } from './chunk-F2ENUV3A.js';
-import { encodeAbiParameters, keccak256, concat, decodeErrorResult, decodeAbiParameters, decodeEventLog, encodeFunctionData, zeroAddress } from 'viem';
+import { ETH_ADDRESS, L1_MESSENGER_ADDRESS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, SAFE_L1_BRIDGE_GAS } from './chunk-F2ENUV3A.js';
+import { keccak256, encodeAbiParameters, concat, decodeErrorResult, decodeAbiParameters, decodeEventLog, encodeFunctionData, zeroAddress } from 'viem';
 
 // src/adapters/viem/resources/deposits/context.ts
-async function commonCtx(p, client) {
-  const { bridgehub, l1AssetRouter } = await client.ensureAddresses();
+async function commonCtx(p, client, tokens, contracts) {
+  const { bridgehub, l1AssetRouter } = await contracts.addresses();
   const chainId = await client.l2.getChainId();
   const sender = client.account.address;
   const gasPerPubdata = p.gasPerPubdata ?? 800n;
   const operatorTip = p.operatorTip ?? 0n;
   const refundRecipient = p.refundRecipient ?? sender;
-  const route = await pickDepositRoute(client, BigInt(chainId), p.token);
+  const resolvedToken = await tokens.resolve(p.token, { chain: "l1" });
+  const baseTokenAssetId = resolvedToken.baseTokenAssetId;
+  const baseTokenL1 = await tokens.l1TokenFromAssetId(baseTokenAssetId);
+  const baseIsEth = resolvedToken.isChainEthBased;
+  const route = (() => {
+    if (resolvedToken.kind === "eth") {
+      return baseIsEth ? "eth-base" : "eth-nonbase";
+    }
+    if (resolvedToken.kind === "base") {
+      return baseIsEth ? "eth-base" : "erc20-base";
+    }
+    return "erc20-nonbase";
+  })();
   return {
     client,
+    tokens,
+    contracts,
+    resolvedToken,
+    baseTokenAssetId,
+    baseTokenL1,
+    baseIsEth,
     l1AssetRouter,
     route,
     bridgehub,
@@ -28,17 +46,6 @@ async function commonCtx(p, client) {
     refundRecipient
   };
 }
-function encodeNativeTokenVaultAssetId(chainId, address) {
-  const encoded = encodeAbiParameters(
-    [
-      { type: "uint256", name: "originChainId" },
-      { type: "address", name: "ntv" },
-      { type: "address", name: "token" }
-    ],
-    [chainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, address]
-  );
-  return keccak256(encoded);
-}
 function encodeNativeTokenVaultTransferData(amount, receiver, token) {
   return encodeAbiParameters(
     [
@@ -59,8 +66,6 @@ function encodeSecondBridgeDataV1(assetId, transferData) {
   );
   return concat(["0x01", data]);
 }
-var encodeNTVAssetId = encodeNativeTokenVaultAssetId;
-var encodeNTVTransferData = encodeNativeTokenVaultTransferData;
 function encodeSecondBridgeArgs(token, amount, l2Receiver) {
   return encodeAbiParameters(
     [
@@ -218,7 +223,7 @@ function createErrorHandlers(resource) {
   function wrap2(operation, fn, opts) {
     return run("INTERNAL", operation, fn, opts);
   }
-  function wrapAs9(kind, operation, fn, opts) {
+  function wrapAs10(kind, operation, fn, opts) {
     return run(kind, operation, fn, opts);
   }
   async function toResult2(operation, fn, opts) {
@@ -239,7 +244,7 @@ function createErrorHandlers(resource) {
       return { ok: false, error: shaped };
     }
   }
-  return { wrap: wrap2, wrapAs: wrapAs9, toResult: toResult2 };
+  return { wrap: wrap2, wrapAs: wrapAs10, toResult: toResult2 };
 }
 
 // src/adapters/viem/estimator.ts
@@ -360,13 +365,7 @@ async function determineErc20L2Gas(input) {
     });
   }
   try {
-    const l2NativeTokenVault = (await ctx.client.contracts()).l2NativeTokenVault;
-    const l2TokenAddress = await ctx.client.l2.readContract({
-      address: l2NativeTokenVault.address,
-      abi: l2NativeTokenVault.abi,
-      functionName: "l2TokenAddress",
-      args: [l1Token]
-    });
+    const l2TokenAddress = ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).read.l2TokenAddress([l1Token]);
     if (l2TokenAddress === zeroAddress) {
       return quoteL2Gas3({
         ctx,
@@ -529,18 +528,18 @@ function routeErc20NonBase() {
         "VALIDATION",
         OP_DEPOSITS.nonbase.assertNotEthAsset,
         () => {
-          if (isETH(p.token)) {
+          if (ctx.resolvedToken?.kind === "eth" || isETH(p.token)) {
             throw new Error("erc20-nonbase route requires an ERC-20 token (not ETH).");
           }
         },
         { ctx: { token: p.token } }
       );
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
       await wrapAs3(
         "VALIDATION",
         OP_DEPOSITS.nonbase.assertNonBaseToken,
         () => {
-          if (normalizeAddrEq(baseToken, p.token)) {
+          if (ctx.resolvedToken?.kind === "base" || normalizeAddrEq(baseToken, p.token)) {
             throw new Error("erc20-nonbase route requires a non-base ERC-20 deposit token.");
           }
         },
@@ -548,8 +547,8 @@ function routeErc20NonBase() {
       );
     },
     async build(p, ctx) {
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
-      const baseIsEth = isETH(baseToken);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
+      const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
       const assetRouter = ctx.l1AssetRouter;
       const l2Gas = await determineErc20L2Gas({
         ctx,
@@ -756,22 +755,21 @@ function routeEthNonBase() {
         "VALIDATION",
         OP_DEPOSITS.ethNonBase.assertEthAsset,
         () => {
-          if (!isETH(p.token)) {
+          if (ctx.resolvedToken?.kind !== "eth" && !isETH(p.token)) {
             throw new Error("eth-nonbase route requires ETH as the deposit asset.");
           }
         },
         { ctx: { token: p.token } }
       );
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
       await wrapAs4(
         "VALIDATION",
         OP_DEPOSITS.ethNonBase.assertNonEthBase,
         () => {
-          if (isETH(baseToken)) {
+          if (ctx.baseIsEth) {
             throw new Error("eth-nonbase route requires target chain base token \u2260 ETH.");
           }
         },
-        { ctx: { baseToken, chainIdL2: ctx.chainIdL2 } }
+        { ctx: { baseIsEth: ctx.baseIsEth, chainIdL2: ctx.chainIdL2 } }
       );
       const ethBal = await wrapAs4(
         "RPC",
@@ -794,7 +792,7 @@ function routeEthNonBase() {
       );
     },
     async build(p, ctx) {
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
       const l2TxModel = {
         to: p.to ?? ctx.sender,
         from: ctx.sender,
@@ -967,13 +965,13 @@ function routeErc20Base() {
         "VALIDATION",
         OP_DEPOSITS.base.assertErc20Asset,
         () => {
-          if (isETH(p.token)) {
+          if (ctx.resolvedToken?.kind === "eth" || isETH(p.token)) {
             throw new Error("erc20-base route requires an ERC-20 token (not ETH).");
           }
         },
         { ctx: { token: p.token } }
       );
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
       await wrapAs5(
         "VALIDATION",
         OP_DEPOSITS.base.assertMatchesBase,
@@ -986,7 +984,7 @@ function routeErc20Base() {
       );
     },
     async build(p, ctx) {
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
       const l2TxModel = {
         to: p.to ?? ctx.sender,
         from: ctx.sender,
@@ -1211,6 +1209,260 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   }
   return { l2Receipt, l2TxHash };
 }
+var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => encodeAbiParameters(
+    types.map((t, i) => ({ type: t, name: `arg${i}` })),
+    values
+  ),
+  keccak256: (data) => keccak256(data)
+});
+function createTokensResource(client) {
+  let l2NtvL1ChainIdPromise = null;
+  let baseTokenAssetIdPromise = null;
+  let wethL1Promise = null;
+  let wethL2Promise = null;
+  async function getL1ChainId() {
+    if (!l2NtvL1ChainIdPromise) {
+      l2NtvL1ChainIdPromise = wrapAs6("INTERNAL", "getL1ChainId", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        return await l2NativeTokenVault.read.L1_CHAIN_ID();
+      });
+    }
+    return l2NtvL1ChainIdPromise;
+  }
+  async function getBaseTokenAssetId() {
+    if (!baseTokenAssetIdPromise) {
+      baseTokenAssetIdPromise = wrapAs6("INTERNAL", "baseTokenAssetId", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        const assetId = await l2NativeTokenVault.read.BASE_TOKEN_ASSET_ID();
+        return assetId;
+      });
+    }
+    return baseTokenAssetIdPromise;
+  }
+  async function getWethL1() {
+    if (!wethL1Promise) {
+      wethL1Promise = wrapAs6("INTERNAL", "wethL1", async () => {
+        const { l1NativeTokenVault } = await client.contracts();
+        const weth = await l1NativeTokenVault.read.WETH_TOKEN();
+        return weth;
+      });
+    }
+    return wethL1Promise;
+  }
+  async function getWethL2() {
+    if (!wethL2Promise) {
+      wethL2Promise = wrapAs6("INTERNAL", "wethL2", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        const weth = await l2NativeTokenVault.read.WETH_TOKEN();
+        return weth;
+      });
+    }
+    return wethL2Promise;
+  }
+  async function toL2Address(l1Token) {
+    return wrapAs6("CONTRACT", "tokens.toL2Address", async () => {
+      const normalized = normalizeL1Token(l1Token);
+      const chainId = BigInt(await client.l2.getChainId());
+      const baseToken = await client.baseToken(chainId);
+      if (isAddressEq(normalized, baseToken)) {
+        return L2_BASE_TOKEN_ADDRESS;
+      }
+      const { l2NativeTokenVault } = await client.contracts();
+      const l2Token = await l2NativeTokenVault.read.l2TokenAddress([normalized]);
+      return l2Token;
+    });
+  }
+  async function toL1Address(l2Token) {
+    return wrapAs6("CONTRACT", "tokens.toL1Address", async () => {
+      if (isAddressEq(l2Token, ETH_ADDRESS)) return ETH_ADDRESS;
+      if (isAddressEq(l2Token, L2_BASE_TOKEN_ADDRESS)) {
+        const chainId = BigInt(await client.l2.getChainId());
+        return await client.baseToken(chainId);
+      }
+      const { l2AssetRouter } = await client.contracts();
+      const l1Token = await l2AssetRouter.read.l1TokenAddress([l2Token]);
+      return l1Token;
+    });
+  }
+  async function assetIdOfL1(l1Token) {
+    return wrapAs6("CONTRACT", "tokens.assetIdOfL1", async () => {
+      const normalized = normalizeL1Token(l1Token);
+      const { l1NativeTokenVault } = await client.contracts();
+      return await l1NativeTokenVault.read.assetId([normalized]);
+    });
+  }
+  async function assetIdOfL2(l2Token) {
+    return wrapAs6("CONTRACT", "tokens.assetIdOfL2", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      return await l2NativeTokenVault.read.assetId([l2Token]);
+    });
+  }
+  async function l2TokenFromAssetId(assetId) {
+    return wrapAs6("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      return await l2NativeTokenVault.read.tokenAddress([assetId]);
+    });
+  }
+  async function l1TokenFromAssetId(assetId) {
+    return wrapAs6("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
+      const { l1NativeTokenVault } = await client.contracts();
+      return await l1NativeTokenVault.read.tokenAddress([assetId]);
+    });
+  }
+  async function originChainId(assetId) {
+    return wrapAs6("CONTRACT", "tokens.originChainId", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      return await l2NativeTokenVault.read.originChainId([assetId]);
+    });
+  }
+  async function baseTokenAssetId() {
+    return getBaseTokenAssetId();
+  }
+  async function isChainEthBased() {
+    return wrapAs6("CONTRACT", "tokens.isChainEthBased", async () => {
+      const baseAssetId = await getBaseTokenAssetId();
+      const l1ChainId = await getL1ChainId();
+      const ethAssetId = ntvCodec.encodeAssetId(
+        l1ChainId,
+        L2_NATIVE_TOKEN_VAULT_ADDRESS,
+        ETH_ADDRESS
+      );
+      return hexEq(baseAssetId, ethAssetId);
+    });
+  }
+  async function wethL1() {
+    return getWethL1();
+  }
+  async function wethL2() {
+    return getWethL2();
+  }
+  async function computeL2BridgedAddress(args) {
+    return wrapAs6("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
+      const normalized = normalizeL1Token(args.l1Token);
+      const { l2NativeTokenVault } = await client.contracts();
+      const predicted = await l2NativeTokenVault.read.calculateCreate2TokenAddress([
+        args.originChainId,
+        normalized
+      ]);
+      return predicted;
+    });
+  }
+  async function resolve(ref, opts) {
+    return wrapAs6("CONTRACT", "tokens.resolve", async () => {
+      let chain;
+      let address;
+      if (typeof ref === "string") {
+        chain = opts?.chain ?? "l1";
+        address = ref;
+      } else {
+        chain = ref.chain;
+        address = ref.address;
+      }
+      let l1;
+      let l2;
+      if (chain === "l1") {
+        l1 = normalizeL1Token(address);
+        l2 = await toL2Address(address);
+      } else {
+        l2 = address;
+        l1 = await toL1Address(address);
+      }
+      const assetId = await assetIdOfL1(l1);
+      const originChainIdVal = await originChainId(assetId);
+      const [baseAssetId, wethL1Addr, wethL2Addr, ethBased] = await Promise.all([
+        baseTokenAssetId(),
+        wethL1(),
+        wethL2(),
+        isChainEthBased()
+      ]);
+      let kind;
+      if (isAddressEq(l1, ETH_ADDRESS)) {
+        kind = "eth";
+      } else if (hexEq(assetId, baseAssetId)) {
+        kind = "base";
+      } else {
+        kind = "erc20";
+      }
+      return {
+        kind,
+        l1,
+        l2,
+        assetId,
+        originChainId: originChainIdVal,
+        isChainEthBased: ethBased,
+        baseTokenAssetId: baseAssetId,
+        wethL1: wethL1Addr,
+        wethL2: wethL2Addr
+      };
+    });
+  }
+  return {
+    resolve,
+    toL2Address,
+    toL1Address,
+    assetIdOfL1,
+    assetIdOfL2,
+    l2TokenFromAssetId,
+    l1TokenFromAssetId,
+    originChainId,
+    baseTokenAssetId,
+    isChainEthBased,
+    wethL1,
+    wethL2,
+    computeL2BridgedAddress
+  };
+}
+
+// src/adapters/viem/resources/contracts/contracts.ts
+function createContractsResource(client) {
+  async function addresses() {
+    return client.ensureAddresses();
+  }
+  async function instances() {
+    return client.contracts();
+  }
+  async function bridgehub() {
+    const { bridgehub: bridgehub2 } = await instances();
+    return bridgehub2;
+  }
+  async function l1AssetRouter() {
+    const { l1AssetRouter: l1AssetRouter2 } = await instances();
+    return l1AssetRouter2;
+  }
+  async function l1NativeTokenVault() {
+    const { l1NativeTokenVault: l1NativeTokenVault2 } = await instances();
+    return l1NativeTokenVault2;
+  }
+  async function l1Nullifier() {
+    const { l1Nullifier: l1Nullifier2 } = await instances();
+    return l1Nullifier2;
+  }
+  async function l2AssetRouter() {
+    const { l2AssetRouter: l2AssetRouter2 } = await instances();
+    return l2AssetRouter2;
+  }
+  async function l2NativeTokenVault() {
+    const { l2NativeTokenVault: l2NativeTokenVault2 } = await instances();
+    return l2NativeTokenVault2;
+  }
+  async function l2BaseTokenSystem() {
+    const { l2BaseTokenSystem: l2BaseTokenSystem2 } = await instances();
+    return l2BaseTokenSystem2;
+  }
+  return {
+    addresses,
+    instances,
+    bridgehub,
+    l1AssetRouter,
+    l1NativeTokenVault,
+    l1Nullifier,
+    l2AssetRouter,
+    l2NativeTokenVault,
+    l2BaseTokenSystem
+  };
+}
 
 // src/adapters/viem/resources/deposits/index.ts
 var { wrap, toResult } = createErrorHandlers("deposits");
@@ -1220,9 +1472,11 @@ var ROUTES = {
   "erc20-nonbase": routeErc20NonBase(),
   "erc20-base": routeErc20Base()
 };
-function createDepositsResource(client) {
+function createDepositsResource(client, tokens, contracts) {
+  const tokensResource = tokens ?? createTokensResource(client);
+  const contractsResource = contracts ?? createContractsResource(client);
   async function buildPlan(p) {
-    const ctx = await commonCtx(p, client);
+    const ctx = await commonCtx(p, client, tokensResource, contractsResource);
     const route = ctx.route;
     await ROUTES[route].preflight?.(p, ctx);
     const { steps, approvals, fees } = await ROUTES[route].build(p, ctx);
@@ -1526,32 +1780,8 @@ function createDepositsResource(client) {
   return { quote, tryQuote, prepare, tryPrepare, create, tryCreate, status, wait, tryWait };
 }
 
-// src/adapters/viem/resources/token-info.ts
-async function ntvBaseAssetId(l2, ntv) {
-  return l2.readContract({
-    address: ntv,
-    abi: L2NativeTokenVault_default,
-    functionName: "BASE_TOKEN_ASSET_ID"
-  });
-}
-async function ntvL1ChainId(l2, ntv) {
-  return l2.readContract({
-    address: ntv,
-    abi: L2NativeTokenVault_default,
-    functionName: "L1_CHAIN_ID"
-  });
-}
-async function isEthBasedChain(l2, ntv) {
-  const [baseAssetId, l1ChainId] = await Promise.all([
-    ntvBaseAssetId(l2, ntv),
-    ntvL1ChainId(l2, ntv)
-  ]);
-  const ethAssetId = encodeNativeTokenVaultAssetId(l1ChainId, ETH_ADDRESS);
-  return baseAssetId.toLowerCase() === ethAssetId.toLowerCase();
-}
-
 // src/adapters/viem/resources/withdrawals/context.ts
-async function commonCtx2(p, client) {
+async function commonCtx2(p, client, tokens, contracts) {
   const sender = client.account.address;
   const {
     bridgehub,
@@ -1560,12 +1790,20 @@ async function commonCtx2(p, client) {
     l2AssetRouter,
     l2NativeTokenVault,
     l2BaseTokenSystem
-  } = await client.ensureAddresses();
+  } = await contracts.addresses();
   const chainIdL2 = BigInt(await client.l2.getChainId());
-  const baseIsEth = await isEthBasedChain(client.l2, l2NativeTokenVault);
+  const resolvedToken = await tokens.resolve(p.token, { chain: "l2" });
+  const baseTokenAssetId = resolvedToken.baseTokenAssetId;
+  const baseTokenL1 = await tokens.l1TokenFromAssetId(baseTokenAssetId);
+  const baseIsEth = resolvedToken.isChainEthBased;
   const route = pickWithdrawRoute({ token: p.token, baseIsEth });
   return {
     client,
+    tokens,
+    contracts,
+    resolvedToken,
+    baseTokenAssetId,
+    baseTokenL1,
     bridgehub,
     chainIdL2,
     sender,
@@ -1608,12 +1846,12 @@ function buildFeeBreakdown2(p) {
 }
 
 // src/adapters/viem/resources/withdrawals/routes/eth.ts
-var { wrapAs: wrapAs6 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
 function routeEthBase() {
   return {
     async build(p, ctx) {
       const steps = [];
-      const data = await wrapAs6(
+      const data = await wrapAs7(
         "INTERNAL",
         OP_WITHDRAWALS.eth.encodeWithdraw,
         () => Promise.resolve(
@@ -1663,14 +1901,14 @@ function routeEthBase() {
     }
   };
 }
-var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
 function routeErc20NonBase2() {
   return {
     // TODO: add preflight validations here
     async build(p, ctx) {
       const steps = [];
       const approvals = [];
-      const current = await wrapAs7(
+      const current = await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.allowance,
         () => ctx.client.l2.readContract({
@@ -1709,7 +1947,7 @@ function routeErc20NonBase2() {
           approveTxCandidate.maxFeePerGas = approveGas.maxFeePerGas;
           approveTxCandidate.maxPriorityFeePerGas = approveGas.maxPriorityFeePerGas;
         }
-        const approveSim = await wrapAs7(
+        const approveSim = await wrapAs8(
           "CONTRACT",
           OP_WITHDRAWALS.erc20.estGas,
           () => ctx.client.l2.simulateContract({
@@ -1736,7 +1974,8 @@ function routeErc20NonBase2() {
           tx: approveTx
         });
       }
-      const ensure = await wrapAs7(
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l2" }) : void 0);
+      const assetId = resolved?.assetId ?? (await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.ensureRegistered,
         () => ctx.client.l2.simulateContract({
@@ -1750,8 +1989,7 @@ function routeErc20NonBase2() {
           ctx: { where: "L2NativeTokenVault.ensureTokenIsRegistered", token: p.token },
           message: "Failed to ensure token is registered in L2NativeTokenVault."
         }
-      );
-      const assetId = ensure.result;
+      )).result;
       const assetData = encodeAbiParameters(
         [
           { type: "uint256", name: "amount" },
@@ -1788,7 +2026,7 @@ function routeErc20NonBase2() {
           ...withdrawGas
         };
       } else {
-        const sim = await wrapAs7(
+        const sim = await wrapAs8(
           "CONTRACT",
           OP_WITHDRAWALS.erc20.estGas,
           () => ctx.client.l2.simulateContract({
@@ -1817,14 +2055,14 @@ function routeErc20NonBase2() {
         tx: withdrawTx
       });
       const fees = buildFeeBreakdown2({
-        feeToken: await ctx.client.baseToken(ctx.chainIdL2),
+        feeToken: ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2),
         l2Gas: withdrawGas
       });
       return { steps, approvals, fees };
     }
   };
 }
-var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
 var IL1NullifierMini = [
   {
     type: "function",
@@ -1841,7 +2079,7 @@ var IL1NullifierMini = [
 function createFinalizationServices(client) {
   return {
     async fetchFinalizeDepositParams(l2TxHash) {
-      const parsed = await wrapAs8(
+      const parsed = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.receipt,
         () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -1858,7 +2096,7 @@ function createFinalizationServices(client) {
           context: { l2TxHash }
         });
       }
-      const ev = await wrapAs8(
+      const ev = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.findMessage,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
@@ -1868,7 +2106,7 @@ function createFinalizationServices(client) {
           message: "Failed to locate L1MessageSent event in L2 receipt."
         }
       );
-      const message = await wrapAs8(
+      const message = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
         () => {
@@ -1880,7 +2118,7 @@ function createFinalizationServices(client) {
           message: "Failed to decode withdrawal message."
         }
       );
-      const raw = await wrapAs8(
+      const raw = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.rawReceipt,
         () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -1897,7 +2135,7 @@ function createFinalizationServices(client) {
           context: { l2TxHash }
         });
       }
-      const idx = await wrapAs8(
+      const idx = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.messengerIndex,
         () => Promise.resolve(messengerLogIndex(raw, { index: 0, messenger: L1_MESSENGER_ADDRESS })),
@@ -1906,7 +2144,7 @@ function createFinalizationServices(client) {
           message: "Failed to derive messenger log index."
         }
       );
-      const proof = await wrapAs8(
+      const proof = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.proof,
         () => client.zks.getL2ToL1LogProof(l2TxHash, idx),
@@ -1915,7 +2153,7 @@ function createFinalizationServices(client) {
           message: "Failed to fetch L2\u2192L1 log proof."
         }
       );
-      const chainId = await wrapAs8(
+      const chainId = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.network,
         () => client.l2.getChainId(),
@@ -1931,7 +2169,7 @@ function createFinalizationServices(client) {
         message,
         merkleProof: proof.proof
       };
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1943,7 +2181,7 @@ function createFinalizationServices(client) {
       return { params, nullifier: l1Nullifier };
     },
     async simulateFinalizeReadiness(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.readiness.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1954,7 +2192,7 @@ function createFinalizationServices(client) {
       );
       const done = await (async () => {
         try {
-          const result = await wrapAs8(
+          const result = await wrapAs9(
             "RPC",
             OP_WITHDRAWALS.finalize.readiness.isFinalized,
             () => client.l1.readContract({
@@ -1988,7 +2226,7 @@ function createFinalizationServices(client) {
       }
     },
     async isWithdrawalFinalized(key) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1997,7 +2235,7 @@ function createFinalizationServices(client) {
           message: "Failed to ensure L1 Nullifier address."
         }
       );
-      return await wrapAs8(
+      return await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.isFinalized,
         () => client.l1.readContract({
@@ -2013,7 +2251,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.estimate,
         () => client.ensureAddresses(),
@@ -2022,7 +2260,7 @@ function createFinalizationServices(client) {
           message: "Failed to ensure L1 Nullifier address."
         }
       );
-      const gasLimit = await wrapAs8(
+      const gasLimit = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.estimate,
         () => client.l1.estimateContractGas({
@@ -2046,7 +2284,7 @@ function createFinalizationServices(client) {
       let maxFeePerGas;
       let maxPriorityFeePerGas;
       try {
-        const fee = await wrapAs8(
+        const fee = await wrapAs9(
           "RPC",
           OP_WITHDRAWALS.finalize.estimate,
           () => client.l1.estimateFeesPerGas(),
@@ -2065,7 +2303,7 @@ function createFinalizationServices(client) {
         })();
         maxPriorityFeePerGas = fee.maxPriorityFeePerGas ?? 0n;
       } catch {
-        const gasPrice = await wrapAs8(
+        const gasPrice = await wrapAs9(
           "RPC",
           OP_WITHDRAWALS.finalize.estimate,
           () => client.l1.getGasPrice(),
@@ -2084,7 +2322,7 @@ function createFinalizationServices(client) {
       };
     },
     async finalizeDeposit(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -2148,11 +2386,13 @@ var ROUTES2 = {
   "erc20-nonbase": routeErc20NonBase2()
   // AssetRouter.withdraw for non-base ERC-20s
 };
-function createWithdrawalsResource(client) {
+function createWithdrawalsResource(client, tokens, contracts) {
   const svc = createFinalizationServices(client);
   const { wrap: wrap2, toResult: toResult2 } = createErrorHandlers("withdrawals");
+  const tokensResource = tokens ?? createTokensResource(client);
+  const contractsResource = contracts ?? createContractsResource(client);
   async function buildPlan(p) {
-    const ctx = await commonCtx2(p, client);
+    const ctx = await commonCtx2(p, client, tokensResource, contractsResource);
     await ROUTES2[ctx.route].preflight?.(p, ctx);
     const { steps, approvals, fees } = await ROUTES2[ctx.route].build(p, ctx);
     return {
@@ -2499,56 +2739,14 @@ function createWithdrawalsResource(client) {
 
 // src/adapters/viem/sdk.ts
 function createViemSdk(client) {
+  const tokens = createTokensResource(client);
+  const contracts = createContractsResource(client);
   return {
-    deposits: createDepositsResource(client),
-    withdrawals: createWithdrawalsResource(client),
-    helpers: {
-      addresses: () => client.ensureAddresses(),
-      contracts: () => client.contracts(),
-      async l1AssetRouter() {
-        const { l1AssetRouter } = await client.contracts();
-        return l1AssetRouter;
-      },
-      async l1NativeTokenVault() {
-        const { l1NativeTokenVault } = await client.contracts();
-        return l1NativeTokenVault;
-      },
-      async l1Nullifier() {
-        const { l1Nullifier } = await client.contracts();
-        return l1Nullifier;
-      },
-      async baseToken(chainId) {
-        const id = chainId ?? BigInt(await client.l2.getChainId());
-        return client.baseToken(id);
-      },
-      async l2TokenAddress(l1Token) {
-        if (isAddressEq(l1Token, FORMAL_ETH_ADDRESS)) {
-          return ETH_ADDRESS;
-        }
-        const base = await client.baseToken(BigInt(await client.l2.getChainId()));
-        if (isAddressEq(l1Token, base)) {
-          return L2_BASE_TOKEN_ADDRESS;
-        }
-        const { l2NativeTokenVault } = await client.contracts();
-        const addr = await l2NativeTokenVault.read.l2TokenAddress([l1Token]);
-        return addr;
-      },
-      async l1TokenAddress(l2Token) {
-        if (isAddressEq(l2Token, FORMAL_ETH_ADDRESS)) {
-          return FORMAL_ETH_ADDRESS;
-        }
-        const { l2AssetRouter } = await client.contracts();
-        const addr = await l2AssetRouter.read.l1TokenAddress([l2Token]);
-        return addr;
-      },
-      async assetId(l1Token) {
-        const norm = isAddressEq(l1Token, FORMAL_ETH_ADDRESS) ? ETH_ADDRESS : l1Token;
-        const { l1NativeTokenVault } = await client.contracts();
-        const id = await l1NativeTokenVault.read.assetId([norm]);
-        return id;
-      }
-    }
+    deposits: createDepositsResource(client, tokens, contracts),
+    withdrawals: createWithdrawalsResource(client, tokens, contracts),
+    tokens,
+    contracts
   };
 }
 
-export { buildDirectRequestStruct, classifyReadinessFromRevert, createDepositsResource, createErrorHandlers, createFinalizationServices, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNTVAssetId, encodeNTVTransferData, encodeNativeTokenVaultAssetId, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError };
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError };