@matterlabs/zksync-js 0.0.2 → 0.0.5

package/dist/{chunk-BCCKWWOX.js → chunk-NBJEQAOE.js}

@@ -1,8 +1,8 @@
 import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-XRE7H466.js';
-import { buildFeeBreakdown, quoteL2Gas, quoteL2BaseCost, quoteL1Gas, quoteL2Gas2 } from './chunk-QJS6ETEE.js';
-import { findL1MessageSentLog, messengerLogIndex, isAddressEq, isHash66, pickDepositRoute, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-HLUANWGN.js';
-import { OP_WITHDRAWALS, IL1Nullifier_default, createError, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IBridgehub_default, L2NativeTokenVault_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 { createNTVCodec, buildFeeBreakdown, quoteL2Gas, quoteL2BaseCost, quoteL1Gas, quoteL2Gas2 } from './chunk-LL3WKCFJ.js';
+import { findL1MessageSentLog, messengerLogIndex, normalizeL1Token, isAddressEq, hexEq, isHash66, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-NEC2ZKHI.js';
+import { OP_WITHDRAWALS, IL1Nullifier_default, createError, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound } from './chunk-M5J2MM2U.js';
+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 { Interface, AbiCoder, ethers, Contract, NonceManager } from 'ethers';
 
 var I_BRIDGEHUB = new Interface([
@@ -70,16 +70,34 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
 }
 
 // src/adapters/ethers/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.getNetwork();
   const sender = await client.signer.getAddress();
   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,
@@ -92,31 +110,14 @@ async function commonCtx(p, client) {
     refundRecipient
   };
 }
-function encodeNativeTokenVaultAssetId(chainId, address) {
-  const abi = new AbiCoder();
-  const hex = abi.encode(
-    ["uint256", "address", "address"],
-    [chainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, address]
-  );
-  return ethers.keccak256(hex);
-}
 function encodeNativeTokenVaultTransferData(amount, receiver, token) {
   return new AbiCoder().encode(["uint256", "address", "address"], [amount, receiver, token]);
 }
 function encodeSecondBridgeDataV1(assetId, transferData) {
-  const abi = new AbiCoder();
-  const data = abi.encode(["bytes32", "bytes"], [assetId, transferData]);
+  const abi2 = new AbiCoder();
+  const data = abi2.encode(["bytes32", "bytes"], [assetId, transferData]);
   return ethers.concat(["0x01", data]);
 }
-function encodeNTVAssetId(chainId, address) {
-  const abi = new AbiCoder();
-  const hex = abi.encode(
-    ["uint256", "address", "address"],
-    [chainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, address]
-  );
-  return ethers.keccak256(hex);
-}
-var encodeNTVTransferData = encodeNativeTokenVaultTransferData;
 function encodeSecondBridgeArgs(token, amount, l2Receiver) {
   return AbiCoder.defaultAbiCoder().encode(
     ["address", "uint256", "address"],
@@ -214,8 +215,8 @@ function ethersToGasEstimator(provider) {
 
 // src/adapters/ethers/resources/deposits/services/fee.ts
 var { wrapAs } = createErrorHandlers("deposits");
-var encode = (abi, fn, args) => {
-  return new Interface(abi).encodeFunctionData(fn, args);
+var encode = (abi2, fn, args) => {
+  return new Interface(abi2).encodeFunctionData(fn, args);
 };
 async function quoteL2BaseCost2(input) {
   const { ctx, l2GasLimit } = input;
@@ -270,8 +271,7 @@ async function determineErc20L2Gas(input) {
     });
   }
   try {
-    const { l2NativeTokenVault } = await ctx.client.contracts();
-    const l2TokenAddress = await l2NativeTokenVault.l2TokenAddress(l1Token);
+    const l2TokenAddress = ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).l2TokenAddress(l1Token);
     if (l2TokenAddress === "0x0000000000000000000000000000000000000000") {
       return quoteL2Gas3({
         ctx,
@@ -312,7 +312,7 @@ async function determineErc20L2Gas(input) {
 function routeEthDirect() {
   return {
     async build(p, ctx) {
-      const bh = new Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
+      const bh = await ctx.contracts.bridgehub();
       const l2TxModel = {
         to: p.to ?? ctx.sender,
         from: ctx.sender,
@@ -389,14 +389,14 @@ function routeEthDirect() {
 var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
-    // TODO: do we even need these validations?
     async preflight(p, ctx) {
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
       await wrapAs2(
         "VALIDATION",
         OP_DEPOSITS.nonbase.assertNonBaseToken,
         () => {
-          if (normalizeAddrEq(baseToken, p.token)) {
+          if (resolved?.kind === "base" || resolved?.kind === "eth") {
             throw new Error("erc20-nonbase route requires a non-base ERC-20 deposit token.");
           }
         },
@@ -405,8 +405,8 @@ function routeErc20NonBase() {
     },
     async build(p, ctx) {
       const l1Signer = ctx.client.getL1Signer();
-      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 l2GasParams = await determineErc20L2Gas({
         ctx,
         l1Token: p.token,
@@ -493,7 +493,7 @@ function routeErc20NonBase() {
         secondBridgeValue: 0n,
         secondBridgeCalldata
       };
-      const bh = (await ctx.client.contracts()).bridgehub;
+      const bh = await ctx.contracts.bridgehub();
       const data = bh.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
         requestStruct
       ]);
@@ -542,26 +542,26 @@ var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeEthNonBase() {
   return {
     async preflight(p, ctx) {
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
       await wrapAs3(
         "VALIDATION",
         OP_DEPOSITS.ethNonBase.assertEthAsset,
         () => {
-          if (!isETH(p.token)) {
+          if (resolved?.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 wrapAs3(
         "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 wrapAs3(
         "RPC",
@@ -586,7 +586,7 @@ function routeEthNonBase() {
     },
     async build(p, ctx) {
       const l1Signer = ctx.client.getL1Signer();
-      const baseToken = await ctx.client.baseToken(ctx.chainIdL2);
+      const baseToken = ctx.baseTokenL1;
       const l2TxModel = {
         to: p.to ?? ctx.sender,
         from: ctx.sender,
@@ -651,11 +651,10 @@ function routeEthNonBase() {
         secondBridgeValue: p.amount,
         secondBridgeCalldata
       };
-      const data = new Contract(
-        ctx.bridgehub,
-        IBridgehub_default,
-        ctx.client.l1
-      ).interface.encodeFunctionData("requestL2TransactionTwoBridges", [requestStruct]);
+      const bridgehub = await ctx.contracts.bridgehub();
+      const data = bridgehub.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
+        requestStruct
+      ]);
       const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
@@ -701,17 +700,18 @@ var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 function routeErc20Base() {
   return {
     async preflight(p, ctx) {
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
       await wrapAs4(
         "VALIDATION",
         OP_DEPOSITS.base.assertErc20Asset,
         () => {
-          if (isETH(p.token)) {
+          if (resolved?.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 wrapAs4(
         "VALIDATION",
         OP_DEPOSITS.base.assertMatchesBase,
@@ -726,7 +726,7 @@ function routeErc20Base() {
     },
     async build(p, ctx) {
       const l1Signer = ctx.client.getL1Signer();
-      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,
@@ -779,11 +779,10 @@ function routeErc20Base() {
         l2Contract: p.to ?? ctx.sender,
         l2Value: p.amount
       });
-      const data = new Contract(
-        ctx.bridgehub,
-        IBridgehub_default,
-        ctx.client.l1
-      ).interface.encodeFunctionData("requestL2TransactionDirect", [requestStruct]);
+      const bridgehub = await ctx.contracts.bridgehub();
+      const data = bridgehub.interface.encodeFunctionData("requestL2TransactionDirect", [
+        requestStruct
+      ]);
       const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
@@ -825,6 +824,266 @@ function routeErc20Base() {
     }
   };
 }
+var { wrapAs: wrapAs5 } = createErrorHandlers("tokens");
+var abi = AbiCoder.defaultAbiCoder();
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => abi.encode(types, values),
+  keccak256: (data) => ethers.keccak256(data)
+});
+function createTokensResource(client) {
+  let l2NtvL1ChainIdPromise = null;
+  let baseTokenAssetIdPromise = null;
+  let wethL1Promise = null;
+  let wethL2Promise = null;
+  async function getL1ChainId() {
+    if (!l2NtvL1ChainIdPromise) {
+      l2NtvL1ChainIdPromise = wrapAs5("INTERNAL", "getL1ChainId", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        const chainId = await l2NativeTokenVault.L1_CHAIN_ID();
+        return chainId;
+      });
+    }
+    return l2NtvL1ChainIdPromise;
+  }
+  async function getBaseTokenAssetId() {
+    if (!baseTokenAssetIdPromise) {
+      baseTokenAssetIdPromise = wrapAs5("INTERNAL", "baseTokenAssetId", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        const assetId = await l2NativeTokenVault.BASE_TOKEN_ASSET_ID();
+        return assetId;
+      });
+    }
+    return baseTokenAssetIdPromise;
+  }
+  async function getWethL1() {
+    if (!wethL1Promise) {
+      wethL1Promise = wrapAs5("INTERNAL", "wethL1", async () => {
+        const { l1NativeTokenVault } = await client.contracts();
+        const weth = await l1NativeTokenVault.WETH_TOKEN();
+        return weth;
+      });
+    }
+    return wethL1Promise;
+  }
+  async function getWethL2() {
+    if (!wethL2Promise) {
+      wethL2Promise = wrapAs5("INTERNAL", "wethL2", async () => {
+        const { l2NativeTokenVault } = await client.contracts();
+        const weth = await l2NativeTokenVault.WETH_TOKEN();
+        return weth;
+      });
+    }
+    return wethL2Promise;
+  }
+  async function toL2Address(l1Token) {
+    return wrapAs5("CONTRACT", "tokens.toL2Address", async () => {
+      const normalized = normalizeL1Token(l1Token);
+      const { chainId } = await client.l2.getNetwork();
+      const baseToken = await client.baseToken(BigInt(chainId));
+      if (isAddressEq(normalized, baseToken)) {
+        return L2_BASE_TOKEN_ADDRESS;
+      }
+      const { l2NativeTokenVault } = await client.contracts();
+      const l2Token = await l2NativeTokenVault.l2TokenAddress(normalized);
+      return l2Token;
+    });
+  }
+  async function toL1Address(l2Token) {
+    return wrapAs5("CONTRACT", "tokens.toL1Address", async () => {
+      if (isAddressEq(l2Token, ETH_ADDRESS)) {
+        return ETH_ADDRESS;
+      }
+      if (isAddressEq(l2Token, L2_BASE_TOKEN_ADDRESS)) {
+        const { chainId } = await client.l2.getNetwork();
+        return await client.baseToken(BigInt(chainId));
+      }
+      const { l2AssetRouter } = await client.contracts();
+      const l1Token = await l2AssetRouter.l1TokenAddress(l2Token);
+      return l1Token;
+    });
+  }
+  async function assetIdOfL1(l1Token) {
+    return wrapAs5("CONTRACT", "tokens.assetIdOfL1", async () => {
+      const normalized = normalizeL1Token(l1Token);
+      const { l1NativeTokenVault } = await client.contracts();
+      const assetId = await l1NativeTokenVault.assetId(normalized);
+      return assetId;
+    });
+  }
+  async function assetIdOfL2(l2Token) {
+    return wrapAs5("CONTRACT", "tokens.assetIdOfL2", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      const assetId = await l2NativeTokenVault.assetId(l2Token);
+      return assetId;
+    });
+  }
+  async function l2TokenFromAssetId(assetId) {
+    return wrapAs5("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      const tokenAddr = await l2NativeTokenVault.tokenAddress(assetId);
+      return tokenAddr;
+    });
+  }
+  async function l1TokenFromAssetId(assetId) {
+    return wrapAs5("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
+      const { l1NativeTokenVault } = await client.contracts();
+      const tokenAddr = await l1NativeTokenVault.tokenAddress(assetId);
+      return tokenAddr;
+    });
+  }
+  async function originChainId(assetId) {
+    return wrapAs5("CONTRACT", "tokens.originChainId", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      const chainId = await l2NativeTokenVault.originChainId(assetId);
+      return chainId;
+    });
+  }
+  async function baseTokenAssetId() {
+    return getBaseTokenAssetId();
+  }
+  async function isChainEthBased() {
+    return wrapAs5("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 wrapAs5("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
+      const normalized = normalizeL1Token(args.l1Token);
+      const { l2NativeTokenVault } = await client.contracts();
+      const predicted = await l2NativeTokenVault.calculateCreate2TokenAddress(
+        args.originChainId,
+        normalized
+      );
+      return predicted;
+    });
+  }
+  async function resolve(ref, opts) {
+    return wrapAs5("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/ethers/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/ethers/resources/deposits/index.ts
 var { wrap, toResult } = createErrorHandlers("deposits");
@@ -834,9 +1093,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);
@@ -1101,25 +1362,9 @@ function createDepositsResource(client) {
   );
   return { quote, tryQuote, prepare, tryPrepare, create, tryCreate, status, wait, tryWait };
 }
-async function ntvBaseAssetId(l2, ntv) {
-  const c = new Contract(ntv, L2NativeTokenVault_default, l2);
-  return await c.BASE_TOKEN_ASSET_ID();
-}
-async function ntvL1ChainId(l2, ntv) {
-  const c = new Contract(ntv, L2NativeTokenVault_default, l2);
-  return await c.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/ethers/resources/withdrawals/context.ts
-async function commonCtx2(p, client) {
+async function commonCtx2(p, client, tokens, contracts) {
   const sender = await client.signer.getAddress();
   const {
     bridgehub,
@@ -1128,13 +1373,21 @@ async function commonCtx2(p, client) {
     l2AssetRouter,
     l2NativeTokenVault,
     l2BaseTokenSystem
-  } = await client.ensureAddresses();
+  } = await contracts.addresses();
   const { chainId } = await client.l2.getNetwork();
   const chainIdL2 = BigInt(chainId);
-  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,
@@ -1177,13 +1430,13 @@ function buildFeeBreakdown2(p) {
 }
 
 // src/adapters/ethers/resources/withdrawals/routes/eth.ts
-var { wrapAs: wrapAs5 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs6 } = createErrorHandlers("withdrawals");
 function routeEthBase() {
   return {
     async build(p, ctx) {
       const steps = [];
-      const base = (await ctx.client.contracts()).l2BaseTokenSystem;
-      const data = await wrapAs5(
+      const base = await ctx.contracts.l2BaseTokenSystem();
+      const data = await wrapAs6(
         "INTERNAL",
         OP_WITHDRAWALS.eth.encodeWithdraw,
         () => Promise.resolve(base.interface.encodeFunctionData("withdraw", [p.to ?? ctx.sender])),
@@ -1218,7 +1471,7 @@ function routeEthBase() {
     }
   };
 }
-var { wrapAs: wrapAs6 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
 var SIG = {
   withdraw: "withdraw(bytes32,bytes)"
 };
@@ -1228,7 +1481,7 @@ function routeErc20NonBase2() {
       const steps = [];
       const approvals = [];
       const erc20 = new Contract(p.token, IERC20_default, ctx.client.getL2Signer());
-      const current = await wrapAs6(
+      const current = await wrapAs7(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.allowance,
         () => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
@@ -1266,17 +1519,21 @@ function routeErc20NonBase2() {
           tx: approveTx
         });
       }
-      const ntv = (await ctx.client.contracts()).l2NativeTokenVault;
-      const assetId = await wrapAs6(
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l2" }) : void 0);
+      const assetId = resolved?.assetId ?? await wrapAs7(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.ensureRegistered,
-        () => ntv.getFunction("ensureTokenIsRegistered").staticCall(p.token),
+        async () => {
+          const ntv = await ctx.contracts.l2NativeTokenVault();
+          const ensured = await ntv.getFunction("ensureTokenIsRegistered").staticCall(p.token);
+          return ensured;
+        },
         {
           ctx: { where: "L2NativeTokenVault.ensureTokenIsRegistered", token: p.token },
           message: "Failed to ensure token is registered in L2NativeTokenVault."
         }
       );
-      const assetData = await wrapAs6(
+      const assetData = await wrapAs7(
         "INTERNAL",
         OP_WITHDRAWALS.erc20.encodeAssetData,
         () => Promise.resolve(
@@ -1287,8 +1544,8 @@ function routeErc20NonBase2() {
           message: "Failed to encode burn/withdraw asset data."
         }
       );
-      const l2ar = (await ctx.client.contracts()).l2AssetRouter;
-      const dataWithdraw = await wrapAs6(
+      const l2ar = await ctx.contracts.l2AssetRouter();
+      const dataWithdraw = await wrapAs7(
         "INTERNAL",
         OP_WITHDRAWALS.erc20.encodeWithdraw,
         () => Promise.resolve(l2ar.interface.encodeFunctionData(SIG.withdraw, [assetId, assetData])),
@@ -1315,14 +1572,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: wrapAs7 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
 var IL1NullifierMini = [
   "function isWithdrawalFinalized(uint256,uint256,uint256) view returns (bool)"
 ];
@@ -1330,7 +1587,7 @@ function createFinalizationServices(client) {
   const { l1, l2, signer } = client;
   return {
     async fetchFinalizeDepositParams(l2TxHash) {
-      const parsed = await wrapAs7(
+      const parsed = await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.receipt,
         () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -1347,7 +1604,7 @@ function createFinalizationServices(client) {
           context: { l2TxHash }
         });
       }
-      const ev = await wrapAs7(
+      const ev = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.findMessage,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
@@ -1357,7 +1614,7 @@ function createFinalizationServices(client) {
           message: "Failed to locate L1MessageSent event in L2 receipt."
         }
       );
-      const message = await wrapAs7(
+      const message = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
         () => Promise.resolve(AbiCoder.defaultAbiCoder().decode(["bytes"], ev.data)[0]),
@@ -1366,7 +1623,7 @@ function createFinalizationServices(client) {
           message: "Failed to decode withdrawal message."
         }
       );
-      const raw = await wrapAs7(
+      const raw = await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.rawReceipt,
         () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -1383,7 +1640,7 @@ function createFinalizationServices(client) {
           context: { l2TxHash }
         });
       }
-      const idx = await wrapAs7(
+      const idx = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.messengerIndex,
         () => Promise.resolve(messengerLogIndex(raw, { index: 0, messenger: L1_MESSENGER_ADDRESS })),
@@ -1392,7 +1649,7 @@ function createFinalizationServices(client) {
           message: "Failed to derive messenger log index."
         }
       );
-      const proof = await wrapAs7(
+      const proof = await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.proof,
         () => client.zks.getL2ToL1LogProof(l2TxHash, idx),
@@ -1401,7 +1658,7 @@ function createFinalizationServices(client) {
           message: "Failed to fetch L2\u2192L1 log proof."
         }
       );
-      const { chainId } = await wrapAs7(
+      const { chainId } = await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.network,
         () => l2.getNetwork(),
@@ -1420,7 +1677,7 @@ function createFinalizationServices(client) {
         message,
         merkleProof: proof.proof
       };
-      const { l1Nullifier } = await wrapAs7(
+      const { l1Nullifier } = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1432,7 +1689,7 @@ function createFinalizationServices(client) {
       return { params, nullifier: l1Nullifier };
     },
     async simulateFinalizeReadiness(params) {
-      const { l1Nullifier } = await wrapAs7(
+      const { l1Nullifier } = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.readiness.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1444,7 +1701,7 @@ function createFinalizationServices(client) {
       const done = await (async () => {
         try {
           const cMini = new Contract(l1Nullifier, IL1NullifierMini, l1);
-          const isFinalized = await wrapAs7(
+          const isFinalized = await wrapAs8(
             "RPC",
             OP_WITHDRAWALS.finalize.readiness.isFinalized,
             () => cMini.isWithdrawalFinalized(
@@ -1472,7 +1729,7 @@ function createFinalizationServices(client) {
       }
     },
     async isWithdrawalFinalized(key) {
-      const { l1Nullifier } = await wrapAs7(
+      const { l1Nullifier } = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1482,7 +1739,7 @@ function createFinalizationServices(client) {
         }
       );
       const c = new Contract(l1Nullifier, IL1NullifierMini, l1);
-      return await wrapAs7(
+      return await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.isFinalized,
         () => c.isWithdrawalFinalized(key.chainIdL2, key.l2BatchNumber, key.l2MessageIndex),
@@ -1493,7 +1750,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs7(
+      const { l1Nullifier } = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.estimate,
         () => client.ensureAddresses(),
@@ -1504,7 +1761,7 @@ function createFinalizationServices(client) {
       );
       const signer2 = client.getL1Signer();
       const c = new Contract(l1Nullifier, IL1Nullifier_default, signer2);
-      const gasLimit = await wrapAs7(
+      const gasLimit = await wrapAs8(
         "RPC",
         OP_WITHDRAWALS.finalize.estimate,
         () => c.finalizeDeposit.estimateGas(params),
@@ -1519,7 +1776,7 @@ function createFinalizationServices(client) {
           message: "Failed to estimate gas for finalizeDeposit."
         }
       );
-      const feeData = await wrapAs7("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
+      const feeData = await wrapAs8("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
         ctx: { where: "l1.getFeeData" },
         message: "Failed to estimate fee data for finalizeDeposit."
       });
@@ -1540,7 +1797,7 @@ function createFinalizationServices(client) {
       };
     },
     async finalizeDeposit(params) {
-      const { l1Nullifier } = await wrapAs7(
+      const { l1Nullifier } = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -1601,11 +1858,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 {
@@ -1929,58 +2188,14 @@ function createWithdrawalsResource(client) {
 
 // src/adapters/ethers/sdk.ts
 function createEthersSdk(client) {
+  const tokens = createTokensResource(client);
+  const contracts = createContractsResource(client);
   return {
-    deposits: createDepositsResource(client),
-    withdrawals: createWithdrawalsResource(client),
-    // TODO: might update to create dedicated resources for these
-    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.getNetwork()).chainId);
-        return client.baseToken(id);
-      },
-      async l2TokenAddress(l1Token) {
-        if (isAddressEq(l1Token, FORMAL_ETH_ADDRESS)) {
-          return ETH_ADDRESS;
-        }
-        const { chainId } = await client.l2.getNetwork();
-        const base = await client.baseToken(BigInt(chainId));
-        if (isAddressEq(l1Token, base)) {
-          return L2_BASE_TOKEN_ADDRESS;
-        }
-        const { l2NativeTokenVault } = await client.contracts();
-        const addr = await l2NativeTokenVault.l2TokenAddress(l1Token);
-        return addr;
-      },
-      async l1TokenAddress(l2Token) {
-        if (isAddressEq(l2Token, ETH_ADDRESS)) {
-          return ETH_ADDRESS;
-        }
-        const { l2AssetRouter } = await client.contracts();
-        const addr = await l2AssetRouter.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.assetId(norm);
-        return id;
-      }
-    }
+    deposits: createDepositsResource(client, tokens, contracts),
+    withdrawals: createWithdrawalsResource(client, tokens, contracts),
+    tokens,
+    contracts
   };
 }
 
-export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createWithdrawalsResource, encodeNTVAssetId, encodeNTVTransferData, encodeNativeTokenVaultAssetId, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs };
+export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs };