@matterlabs/zksync-js 0.0.1 → 0.0.3

package/dist/{chunk-7M4V3FMT.js → chunk-JXUFGIJG.js}

@@ -1,20 +1,50 @@
-import { assertNoLegacyGas, assertPriorityFeeBounds, REVERT_TO_READINESS } from './chunk-263G6636.js';
-import { findL1MessageSentLog, messengerLogIndex, isAddressEq, isHash66, pickDepositRoute, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-DI2CJDPZ.js';
-import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IBridgehub_default, IL2AssetRouter_default, IBaseToken_default } from './chunk-Y75OMFK6.js';
-import { isZKsyncError, createError, shapeCause, OP_WITHDRAWALS, OP_DEPOSITS, isReceiptNotFound } from './chunk-B77GWPO5.js';
-import { ETH_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_FEE_ESTIMATION_COEF_NUMERATOR, L1_FEE_ESTIMATION_COEF_DENOMINATOR, L1_MESSENGER_ADDRESS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS, L2_BASE_TOKEN_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS } from './chunk-6GCT6TLS.js';
-import { encodeAbiParameters, keccak256, concat, decodeErrorResult, decodeAbiParameters, decodeEventLog } from 'viem';
+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, 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';
 
-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);
+// src/adapters/viem/resources/deposits/context.ts
+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 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,
+    chainIdL2: BigInt(chainId),
+    sender,
+    gasOverrides: p.l1TxOverrides,
+    l2GasLimit: p.l2GasLimit,
+    gasPerPubdata,
+    operatorTip,
+    refundRecipient
+  };
 }
 function encodeNativeTokenVaultTransferData(amount, receiver, token) {
   return encodeAbiParameters(
@@ -36,123 +66,6 @@ function encodeSecondBridgeDataV1(assetId, transferData) {
   );
   return concat(["0x01", data]);
 }
-var encodeNTVAssetId = encodeNativeTokenVaultAssetId;
-var encodeNTVTransferData = encodeNativeTokenVaultTransferData;
-function scaleGasLimit(gasLimit) {
-  return gasLimit * BigInt(L1_FEE_ESTIMATION_COEF_NUMERATOR) / BigInt(L1_FEE_ESTIMATION_COEF_DENOMINATOR);
-}
-async function checkBaseCost(baseCost, value) {
-  const resolved = await value;
-  if (baseCost > resolved) {
-    throw new Error(
-      `The base cost of performing the priority operation is higher than the provided value parameter for the transaction: baseCost: ${String(baseCost)}, provided value: ${String(resolved)}!`
-    );
-  }
-}
-async function getFeeOverrides(client, overrides) {
-  assertNoLegacyGas(overrides);
-  let maxFeePerGasFromProvider;
-  let maxPriorityFromProvider;
-  let gasPriceFromProvider;
-  try {
-    const fees = await client.l1.estimateFeesPerGas();
-    const { maxFeePerGas: maxFeePerGas2, maxPriorityFeePerGas: maxPriorityFeePerGas2 } = fees;
-    if (maxFeePerGas2 != null && maxPriorityFeePerGas2 != null) {
-      maxFeePerGasFromProvider = maxFeePerGas2;
-      maxPriorityFromProvider = maxPriorityFeePerGas2;
-      gasPriceFromProvider = fees.gasPrice ?? maxFeePerGas2;
-    } else if (fees.gasPrice != null) {
-      gasPriceFromProvider = fees.gasPrice;
-    }
-  } catch {
-  }
-  if (gasPriceFromProvider == null) {
-    try {
-      gasPriceFromProvider = await client.l1.getGasPrice();
-    } catch {
-    }
-  }
-  const maxFeePerGas = overrides?.maxFeePerGas ?? maxFeePerGasFromProvider ?? gasPriceFromProvider;
-  if (maxFeePerGas == null) {
-    throw new Error("L1 provider returned no gas price data");
-  }
-  const maxPriorityFeePerGas = overrides?.maxPriorityFeePerGas ?? maxPriorityFromProvider ?? maxFeePerGas;
-  assertPriorityFeeBounds({ maxFeePerGas, maxPriorityFeePerGas });
-  const gasPriceForBaseCost = overrides?.maxFeePerGas ?? maxFeePerGasFromProvider ?? gasPriceFromProvider ?? maxFeePerGas;
-  return {
-    gasLimit: overrides?.gasLimit,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    gasPriceForBaseCost
-  };
-}
-async function getL2FeeOverrides(client, overrides) {
-  assertNoLegacyGas(overrides);
-  let maxFeePerGasFromProvider;
-  let maxPriorityFromProvider;
-  let gasPriceFromProvider;
-  try {
-    const fees = await client.l2.estimateFeesPerGas();
-    if (fees?.maxFeePerGas != null && fees.maxPriorityFeePerGas != null) {
-      maxFeePerGasFromProvider = fees.maxFeePerGas;
-      maxPriorityFromProvider = fees.maxPriorityFeePerGas;
-      gasPriceFromProvider = fees.gasPrice ?? fees.maxFeePerGas;
-    } else if (fees?.gasPrice != null) {
-      gasPriceFromProvider = fees.gasPrice;
-    }
-  } catch {
-  }
-  if (gasPriceFromProvider == null) {
-    try {
-      gasPriceFromProvider = await client.l2.getGasPrice();
-    } catch {
-    }
-  }
-  const maxFeePerGas = overrides?.maxFeePerGas ?? maxFeePerGasFromProvider ?? gasPriceFromProvider;
-  if (maxFeePerGas == null) {
-    throw new Error("provider returned no gas price data");
-  }
-  const maxPriorityFeePerGas = overrides?.maxPriorityFeePerGas ?? maxPriorityFromProvider ?? maxFeePerGas;
-  assertPriorityFeeBounds({ maxFeePerGas, maxPriorityFeePerGas });
-  return {
-    gasLimit: overrides?.gasLimit,
-    maxFeePerGas,
-    maxPriorityFeePerGas
-  };
-}
-function buildViemFeeOverrides(fees) {
-  return {
-    maxFeePerGas: fees.maxFeePerGas,
-    maxPriorityFeePerGas: fees.maxPriorityFeePerGas,
-    gas: fees.gasLimit
-  };
-}
-async function getGasPriceWei(client) {
-  try {
-    const gp = await client.l1.getGasPrice();
-    if (gp != null) return gp;
-  } catch {
-  }
-  try {
-    const fees = await client.l1.estimateFeesPerGas();
-    if (fees?.maxFeePerGas != null) return fees.maxFeePerGas;
-  } catch {
-  }
-  throw new Error("provider returned no gas price data");
-}
-function buildDirectRequestStruct(args) {
-  return {
-    chainId: args.chainId,
-    l2Contract: args.l2Contract,
-    mintValue: args.mintValue,
-    l2Value: args.l2Value,
-    l2Calldata: "0x",
-    l2GasLimit: args.l2GasLimit,
-    l2GasPerPubdataByteLimit: args.gasPerPubdata,
-    factoryDeps: [],
-    refundRecipient: args.refundRecipient
-  };
-}
 function encodeSecondBridgeArgs(token, amount, l2Receiver) {
   return encodeAbiParameters(
     [
@@ -169,30 +82,17 @@ function encodeSecondBridgeErc20Args(token, amount, l2Receiver) {
 function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
   return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
 }
-
-// src/adapters/viem/resources/deposits/context.ts
-async function commonCtx(p, client) {
-  const { bridgehub, l1AssetRouter } = await client.ensureAddresses();
-  const chainId = await client.l2.getChainId();
-  const sender = client.account.address;
-  const fee = await getFeeOverrides(client, p.l1TxOverrides);
-  const l2GasLimit = p.l2GasLimit ?? 300000n;
-  const gasPerPubdata = p.gasPerPubdata ?? 800n;
-  const operatorTip = p.operatorTip ?? 0n;
-  const refundRecipient = p.refundRecipient ?? sender;
-  const route = await pickDepositRoute(client, BigInt(chainId), p.token);
+function buildDirectRequestStruct(args) {
   return {
-    client,
-    l1AssetRouter,
-    route,
-    bridgehub,
-    chainIdL2: BigInt(chainId),
-    sender,
-    fee,
-    l2GasLimit,
-    gasPerPubdata,
-    operatorTip,
-    refundRecipient
+    chainId: args.chainId,
+    l2Contract: args.l2Contract,
+    mintValue: args.mintValue,
+    l2Value: args.l2Value,
+    l2Calldata: "0x",
+    l2GasLimit: args.l2GasLimit,
+    l2GasPerPubdataByteLimit: args.gasPerPubdata,
+    factoryDeps: [],
+    refundRecipient: args.refundRecipient
   };
 }
 var ERROR_ABIS = [];
@@ -323,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) {
@@ -344,44 +244,225 @@ 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/resources/deposits/routes/eth.ts
+// src/adapters/viem/estimator.ts
+function toCoreTx(tx) {
+  return {
+    to: tx.to,
+    from: tx.from,
+    data: tx.data,
+    value: tx.value,
+    gasLimit: tx.gas,
+    maxFeePerGas: tx.maxFeePerGas,
+    maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+  };
+}
+function viemToGasEstimator(client) {
+  return {
+    async estimateGas(tx, stateOverrides) {
+      if (stateOverrides) {
+        try {
+          const result = await client.request({
+            method: "eth_estimateGas",
+            params: [
+              {
+                from: tx.from,
+                to: tx.to,
+                data: tx.data,
+                value: tx.value,
+                gas: tx.gasLimit,
+                maxFeePerGas: tx.maxFeePerGas,
+                maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+              },
+              "latest",
+              stateOverrides
+            ]
+          });
+          return BigInt(result);
+        } catch (error) {
+          console.warn(
+            "Failed to estimate gas with state overrides, falling back to standard estimation:",
+            error
+          );
+        }
+      }
+      return await client.estimateGas({
+        account: tx.from,
+        to: tx.to,
+        data: tx.data,
+        value: tx.value,
+        gas: tx.gasLimit,
+        maxFeePerGas: tx.maxFeePerGas,
+        maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+      });
+    },
+    async estimateFeesPerGas() {
+      try {
+        const fees = await client.estimateFeesPerGas();
+        return {
+          maxFeePerGas: fees.maxFeePerGas,
+          maxPriorityFeePerGas: fees.maxPriorityFeePerGas
+        };
+      } catch {
+      }
+      try {
+        const gp = await client.getGasPrice();
+        return { gasPrice: gp };
+      } catch {
+        return {};
+      }
+    },
+    async getGasPrice() {
+      return await client.getGasPrice();
+    },
+    async call(tx) {
+      const res = await client.call({
+        to: tx.to,
+        data: tx.data,
+        value: tx.value,
+        account: tx.from
+      });
+      return res.data ?? "0x";
+    }
+  };
+}
+
+// src/adapters/viem/resources/deposits/services/gas.ts
+async function quoteL1Gas2(input) {
+  const { ctx, tx, overrides, fallbackGasLimit } = input;
+  const estimator = viemToGasEstimator(ctx.client.l1);
+  return quoteL1Gas({
+    estimator,
+    tx: toCoreTx(tx),
+    overrides,
+    fallbackGasLimit
+  });
+}
+async function quoteL2Gas3(input) {
+  const { ctx, route, l2TxForModeling, overrideGasLimit } = input;
+  const estimator = viemToGasEstimator(ctx.client.l2);
+  return quoteL2Gas({
+    estimator,
+    route,
+    tx: l2TxForModeling ? toCoreTx(l2TxForModeling) : void 0,
+    gasPerPubdata: ctx.gasPerPubdata,
+    l2GasLimit: ctx.l2GasLimit,
+    // TODO: investigate if this should be passed here; weird viem quirk
+    overrideGasLimit,
+    stateOverrides: input.stateOverrides
+  });
+}
+async function determineErc20L2Gas(input) {
+  const { ctx, l1Token } = input;
+  const DEFAULT_SAFE_L2_GAS_LIMIT = 3000000n;
+  if (ctx.l2GasLimit != null) {
+    return quoteL2Gas3({
+      ctx,
+      route: "erc20-nonbase",
+      overrideGasLimit: ctx.l2GasLimit
+    });
+  }
+  try {
+    const l2TokenAddress = ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).read.l2TokenAddress([l1Token]);
+    if (l2TokenAddress === zeroAddress) {
+      return quoteL2Gas3({
+        ctx,
+        route: "erc20-nonbase",
+        overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
+      });
+    }
+    const modelTx = {
+      to: input.modelTx?.to ?? ctx.sender,
+      from: input.modelTx?.from ?? ctx.sender,
+      data: input.modelTx?.data ?? "0x",
+      value: input.modelTx?.value ?? 0n
+    };
+    const gas = await quoteL2Gas3({
+      ctx,
+      route: "erc20-nonbase",
+      l2TxForModeling: modelTx
+    });
+    if (!gas) {
+      return quoteL2Gas3({
+        ctx,
+        route: "erc20-nonbase",
+        overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
+      });
+    }
+    return gas;
+  } catch (err) {
+    console.warn("Failed to determine ERC20 L2 gas; defaulting to safe gas limit.", err);
+    return quoteL2Gas3({
+      ctx,
+      route: "erc20-nonbase",
+      overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
+    });
+  }
+}
+
+// src/adapters/viem/resources/deposits/services/fee.ts
 var { wrapAs } = createErrorHandlers("deposits");
+async function quoteL2BaseCost(input) {
+  const { ctx, l2GasLimit } = input;
+  const estimator = viemToGasEstimator(ctx.client.l1);
+  const fees = await estimator.estimateFeesPerGas();
+  const gasPrice = fees.maxFeePerGas ?? fees.gasPrice ?? await estimator.getGasPrice();
+  return wrapAs(
+    "RPC",
+    "deposits.fees.l2BaseCost",
+    async () => {
+      return await ctx.client.l1.readContract({
+        address: ctx.bridgehub,
+        abi: IBridgehub_default,
+        functionName: "l2TransactionBaseCost",
+        args: [ctx.chainIdL2, gasPrice, l2GasLimit, ctx.gasPerPubdata]
+      });
+    },
+    { ctx: { chainIdL2: ctx.chainIdL2 } }
+  );
+}
+
+// src/adapters/viem/resources/deposits/routes/eth.ts
+var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 function routeEthDirect() {
   return {
     async build(p, ctx) {
-      const { gasPriceForBaseCost } = ctx.fee;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const rawBaseCost = await wrapAs(
-        "CONTRACT",
-        OP_DEPOSITS.eth.baseCost,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "l2TransactionBaseCost",
-          args: [ctx.chainIdL2, gasPriceForBaseCost, ctx.l2GasLimit, ctx.gasPerPubdata]
-        }),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost from Bridgehub."
+      const l2TxModel = {
+        to: p.to ?? ctx.sender,
+        from: ctx.sender,
+        data: "0x",
+        value: p.amount
+      };
+      const l2GasParams = await quoteL2Gas3({
+        ctx,
+        route: "eth-base",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit,
+        stateOverrides: {
+          [ctx.sender]: {
+            balance: "0xffffffffffffffffffff"
+          }
         }
-      );
-      const baseCost = rawBaseCost;
+      });
+      if (!l2GasParams) {
+        throw new Error("Failed to estimate L2 gas for deposit.");
+      }
+      const baseCost = await quoteL2BaseCost({ ctx, l2GasLimit: l2GasParams.gasLimit });
       const l2Contract = p.to ?? ctx.sender;
       const l2Value = p.amount;
       const mintValue = baseCost + ctx.operatorTip + l2Value;
       const req = buildDirectRequestStruct({
         chainId: ctx.chainIdL2,
         mintValue,
-        l2GasLimit: ctx.l2GasLimit,
+        l2GasLimit: l2GasParams.gasLimit,
         gasPerPubdata: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         l2Contract,
         l2Value
       });
-      const sim = await wrapAs(
+      const sim = await wrapAs2(
         "RPC",
         OP_DEPOSITS.eth.estGas,
         () => ctx.client.l1.simulateContract({
@@ -397,120 +478,116 @@ function routeEthDirect() {
           message: "Failed to simulate Bridgehub.requestL2TransactionDirect."
         }
       );
-      const resolvedL1GasLimit = sim.request.gas ?? ctx.l2GasLimit;
+      const data = encodeFunctionData({
+        abi: sim.request.abi,
+        functionName: sim.request.functionName,
+        args: sim.request.args
+      });
+      const l1TxCandidate = {
+        to: ctx.bridgehub,
+        data,
+        value: mintValue,
+        from: ctx.sender,
+        ...ctx.gasOverrides
+      };
+      const l1Gas = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides
+      });
       const steps = [
         {
           key: "bridgehub:direct",
           kind: "bridgehub:direct",
           description: "Bridge ETH via Bridgehub.requestL2TransactionDirect",
-          tx: { ...sim.request, ...txFeeOverrides }
+          tx: { ...sim.request, ...l1Gas }
         }
       ];
+      const fees = buildFeeBreakdown({
+        feeToken: ETH_ADDRESS,
+        l1Gas,
+        l2Gas: l2GasParams,
+        l2BaseCost: baseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
+      });
       return {
         steps,
         approvals: [],
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-
-// src/adapters/viem/resources/deposits/routes/erc20-nonbase.ts
-var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
-var BASE_COST_BUFFER_BPS = 100n;
-var BPS = 10000n;
-var withBuffer = (x) => x * (BPS + BASE_COST_BUFFER_BPS) / BPS;
+var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
+    // TODO: do we even need these validations?
     async preflight(p, ctx) {
-      await wrapAs2(
+      await wrapAs3(
         "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 wrapAs2(
-        "CONTRACT",
-        OP_DEPOSITS.nonbase.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        { ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 } }
-      );
-      await wrapAs2(
+      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.");
           }
         },
         { ctx: { depositToken: p.token, baseToken } }
       );
-      return;
     },
     async build(p, ctx) {
-      const { gasPriceForBaseCost } = ctx.fee;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const baseToken = await wrapAs2(
-        "CONTRACT",
-        OP_DEPOSITS.nonbase.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        { ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 } }
-      );
-      const MIN_L2_GAS_FOR_ERC20 = 2500000n;
-      const l2GasLimitUsed = ctx.l2GasLimit && ctx.l2GasLimit > 0n ? ctx.l2GasLimit < MIN_L2_GAS_FOR_ERC20 ? MIN_L2_GAS_FOR_ERC20 : ctx.l2GasLimit : MIN_L2_GAS_FOR_ERC20;
-      const rawBaseCost = await wrapAs2(
-        "CONTRACT",
-        OP_DEPOSITS.nonbase.baseCost,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "l2TransactionBaseCost",
-          args: [ctx.chainIdL2, gasPriceForBaseCost, l2GasLimitUsed, ctx.gasPerPubdata]
-        }),
-        { ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 } }
-      );
-      const baseCost = rawBaseCost;
-      const mintValue = withBuffer(baseCost + ctx.operatorTip);
+      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,
+        l1Token: p.token,
+        modelTx: {
+          to: p.to ?? ctx.sender,
+          from: ctx.sender,
+          data: "0x",
+          value: 0n
+        }
+      });
+      if (!l2Gas) throw new Error("Failed to establish L2 gas parameters.");
+      const l2BaseCost = await quoteL2BaseCost({ ctx, l2GasLimit: l2Gas.gasLimit });
+      const mintValue = l2BaseCost + ctx.operatorTip;
       const approvals = [];
       const steps = [];
-      const depositAllowance = await wrapAs2(
+      const depositAllowance = await wrapAs3(
         "CONTRACT",
-        OP_DEPOSITS.nonbase.allowance,
+        OP_DEPOSITS.nonbase.allowanceToken,
         () => ctx.client.l1.readContract({
           address: p.token,
           abi: IERC20_default,
           functionName: "allowance",
-          args: [ctx.sender, ctx.l1AssetRouter]
+          args: [ctx.sender, assetRouter]
         }),
         {
-          ctx: { where: "erc20.allowance", token: p.token, spender: ctx.l1AssetRouter },
-          message: "Failed to read ERC-20 allowance for deposit token."
+          ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
+          message: "Failed to read deposit-token allowance."
         }
       );
-      const needsDepositApprove = depositAllowance < p.amount;
-      if (needsDepositApprove) {
-        const approveDepReq = await wrapAs2(
+      if (depositAllowance < p.amount) {
+        const approveSim = await wrapAs3(
           "CONTRACT",
           OP_DEPOSITS.nonbase.estGas,
           () => ctx.client.l1.simulateContract({
             address: p.token,
             abi: IERC20_default,
             functionName: "approve",
-            args: [ctx.l1AssetRouter, p.amount],
+            args: [assetRouter, p.amount],
             account: ctx.client.account
           }),
           {
@@ -518,60 +595,55 @@ function routeErc20NonBase() {
             message: "Failed to simulate deposit token approve."
           }
         );
-        approvals.push({ token: p.token, spender: ctx.l1AssetRouter, amount: p.amount });
+        approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
         steps.push({
-          key: `approve:${p.token}:${ctx.l1AssetRouter}`,
+          key: `approve:${p.token}:${assetRouter}`,
           kind: "approve",
           description: `Approve deposit token for amount`,
-          tx: { ...approveDepReq.request, ...txFeeOverrides }
+          tx: { ...approveSim.request }
         });
       }
-      const baseIsEth = isETH(baseToken);
-      let msgValue = 0n;
       if (!baseIsEth) {
-        const baseAllowance = await wrapAs2(
+        const baseAllowance = await wrapAs3(
           "CONTRACT",
-          OP_DEPOSITS.nonbase.allowanceFees,
+          OP_DEPOSITS.nonbase.allowanceBase,
           () => ctx.client.l1.readContract({
             address: baseToken,
             abi: IERC20_default,
             functionName: "allowance",
-            args: [ctx.sender, ctx.l1AssetRouter]
+            args: [ctx.sender, assetRouter]
           }),
           {
-            ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
+            ctx: { where: "erc20.allowance", token: baseToken, spender: assetRouter },
             message: "Failed to read base-token allowance."
           }
         );
         if (baseAllowance < mintValue) {
-          const approveBaseReq = await wrapAs2(
+          const approveBaseSim = await wrapAs3(
             "CONTRACT",
             OP_DEPOSITS.nonbase.estGas,
             () => ctx.client.l1.simulateContract({
               address: baseToken,
               abi: IERC20_default,
               functionName: "approve",
-              args: [ctx.l1AssetRouter, mintValue],
+              args: [assetRouter, mintValue],
               account: ctx.client.account
             }),
             {
               ctx: { where: "l1.simulateContract", to: baseToken },
-              message: "Failed to simulate base-token approve."
+              message: "Failed to simulate base token approve."
             }
           );
-          approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
+          approvals.push({ token: baseToken, spender: assetRouter, amount: mintValue });
           steps.push({
-            key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
+            key: `approve:${baseToken}:${assetRouter}`,
             kind: "approve",
             description: `Approve base token for mintValue`,
-            tx: { ...approveBaseReq.request, ...txFeeOverrides }
+            tx: { ...approveBaseSim.request }
           });
         }
-        msgValue = 0n;
-      } else {
-        msgValue = mintValue;
       }
-      const secondBridgeCalldata = await wrapAs2(
+      const secondBridgeCalldata = await wrapAs3(
         "INTERNAL",
         OP_DEPOSITS.nonbase.encodeCalldata,
         () => Promise.resolve(encodeSecondBridgeErc20Args(p.token, p.amount, p.to ?? ctx.sender)),
@@ -580,44 +652,60 @@ function routeErc20NonBase() {
             where: "encodeSecondBridgeErc20Args",
             token: p.token,
             amount: p.amount.toString()
-          }
+          },
+          message: "Failed to encode bridging calldata."
         }
       );
-      const outer = {
+      const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
         l2Value: 0n,
-        l2GasLimit: l2GasLimitUsed,
+        l2GasLimit: l2Gas.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
-        secondBridgeAddress: ctx.l1AssetRouter,
+        secondBridgeAddress: assetRouter,
         secondBridgeValue: 0n,
         secondBridgeCalldata
       };
+      const msgValue = baseIsEth ? mintValue : 0n;
+      const calldata = encodeFunctionData({
+        abi: IBridgehub_default,
+        functionName: "requestL2TransactionTwoBridges",
+        args: [requestStruct]
+      });
+      const l1TxCandidate = {
+        to: ctx.bridgehub,
+        data: calldata,
+        value: msgValue,
+        from: ctx.sender,
+        ...ctx.gasOverrides
+      };
+      const l1Gas = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
       const approvalsNeeded = approvals.length > 0;
       let bridgeTx;
-      let resolvedL1GasLimit;
-      const gasOverride = txFeeOverrides.gas;
       if (approvalsNeeded) {
         bridgeTx = {
           address: ctx.bridgehub,
           abi: IBridgehub_default,
           functionName: "requestL2TransactionTwoBridges",
-          args: [outer],
+          args: [requestStruct],
           value: msgValue,
-          account: ctx.client.account,
-          ...txFeeOverrides
+          account: ctx.client.account
         };
-        resolvedL1GasLimit = gasOverride ?? ctx.l2GasLimit;
       } else {
-        const sim = await wrapAs2(
+        const sim = await wrapAs3(
           "CONTRACT",
           OP_DEPOSITS.nonbase.estGas,
           () => ctx.client.l1.simulateContract({
             address: ctx.bridgehub,
             abi: IBridgehub_default,
             functionName: "requestL2TransactionTwoBridges",
-            args: [outer],
+            args: [requestStruct],
             value: msgValue,
             account: ctx.client.account
           }),
@@ -626,67 +714,64 @@ function routeErc20NonBase() {
             message: "Failed to simulate two-bridges request."
           }
         );
-        bridgeTx = { ...sim.request, ...txFeeOverrides };
-        resolvedL1GasLimit = sim.request.gas ?? ctx.l2GasLimit;
+        bridgeTx = { ...sim.request };
+      }
+      if (l1Gas) {
+        bridgeTx = {
+          ...bridgeTx,
+          gas: l1Gas.gasLimit,
+          maxFeePerGas: l1Gas.maxFeePerGas,
+          maxPriorityFeePerGas: l1Gas.maxPriorityFeePerGas
+        };
       }
       steps.push({
-        key: "bridgehub:two-bridges:nonbase",
+        key: "bridgehub:two-bridges:erc20-nonbase",
         kind: "bridgehub:two-bridges",
         description: baseIsEth ? "Bridge ERC-20 (fees in ETH) via Bridgehub.requestL2TransactionTwoBridges" : "Bridge ERC-20 (fees in base ERC-20) via Bridgehub.requestL2TransactionTwoBridges",
         tx: bridgeTx
       });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas,
+        l2Gas,
+        l2BaseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
+      });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-
-// src/adapters/viem/resources/deposits/routes/eth-nonbase.ts
-var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
-var BASE_COST_BUFFER_BPS2 = 100n;
-var BPS2 = 10000n;
-var withBuffer2 = (x) => x * (BPS2 + BASE_COST_BUFFER_BPS2) / BPS2;
+var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 function routeEthNonBase() {
   return {
+    // TODO: do we even need these validations?
     async preflight(p, ctx) {
-      await wrapAs3(
+      await wrapAs4(
         "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 wrapAs3(
-        "CONTRACT",
-        OP_DEPOSITS.ethNonBase.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      await wrapAs3(
+      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 wrapAs3(
+      const ethBal = await wrapAs4(
         "RPC",
         OP_DEPOSITS.ethNonBase.ethBalance,
         () => ctx.client.l1.getBalance({ address: ctx.sender }),
@@ -695,7 +780,7 @@ function routeEthNonBase() {
           message: "Failed to read L1 ETH balance."
         }
       );
-      await wrapAs3(
+      await wrapAs4(
         "VALIDATION",
         OP_DEPOSITS.ethNonBase.assertEthBalance,
         () => {
@@ -705,45 +790,27 @@ function routeEthNonBase() {
         },
         { ctx: { required: p.amount.toString(), balance: ethBal.toString() } }
       );
-      return;
     },
     async build(p, ctx) {
-      const { gasPriceForBaseCost } = ctx.fee;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const baseToken = await wrapAs3(
-        "CONTRACT",
-        OP_DEPOSITS.ethNonBase.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      const rawBaseCost = await wrapAs3(
-        "CONTRACT",
-        OP_DEPOSITS.ethNonBase.baseCost,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "l2TransactionBaseCost",
-          args: [ctx.chainIdL2, gasPriceForBaseCost, ctx.l2GasLimit, ctx.gasPerPubdata]
-        }),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost."
-        }
-      );
-      const baseCost = BigInt(rawBaseCost);
-      const mintValueRaw = baseCost + ctx.operatorTip;
-      const mintValue = withBuffer2(mintValueRaw);
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
+      const l2TxModel = {
+        to: p.to ?? ctx.sender,
+        from: ctx.sender,
+        data: "0x",
+        value: 0n
+      };
+      const l2Gas = await quoteL2Gas3({
+        ctx,
+        route: "eth-nonbase",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit
+      });
+      if (!l2Gas) throw new Error("Failed to estimate L2 gas parameters.");
+      const l2BaseCost = await quoteL2BaseCost({ ctx, l2GasLimit: l2Gas.gasLimit });
+      const mintValue = l2BaseCost + ctx.operatorTip;
       const approvals = [];
       const steps = [];
-      const allowance = await wrapAs3(
+      const allowance = await wrapAs4(
         "CONTRACT",
         OP_DEPOSITS.ethNonBase.allowanceBase,
         () => ctx.client.l1.readContract({
@@ -759,7 +826,7 @@ function routeEthNonBase() {
       );
       const needsApprove = allowance < mintValue;
       if (needsApprove) {
-        const approveSim = await wrapAs3(
+        const approveSim = await wrapAs4(
           "CONTRACT",
           OP_DEPOSITS.ethNonBase.estGas,
           () => ctx.client.l1.simulateContract({
@@ -778,11 +845,11 @@ function routeEthNonBase() {
         steps.push({
           key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
           kind: "approve",
-          description: `Approve base token for mintValue`,
+          description: `Approve base token for fees (mintValue)`,
           tx: { ...approveSim.request }
         });
       }
-      const secondBridgeCalldata = await wrapAs3(
+      const secondBridgeCalldata = await wrapAs4(
         "INTERNAL",
         OP_DEPOSITS.ethNonBase.encodeCalldata,
         () => Promise.resolve(encodeSecondBridgeEthArgs(p.amount, p.to ?? ctx.sender)),
@@ -795,11 +862,11 @@ function routeEthNonBase() {
           message: "Failed to encode ETH bridging calldata."
         }
       );
-      const outer = {
+      const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: 0n,
-        l2GasLimit: ctx.l2GasLimit,
+        l2Value: p.amount,
+        l2GasLimit: l2Gas.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         secondBridgeAddress: ctx.l1AssetRouter,
@@ -807,29 +874,32 @@ function routeEthNonBase() {
         secondBridgeCalldata
       };
       let bridgeTx;
-      let resolvedL1GasLimit;
+      let calldata;
       if (needsApprove) {
         bridgeTx = {
           address: ctx.bridgehub,
           abi: IBridgehub_default,
           functionName: "requestL2TransactionTwoBridges",
-          args: [outer],
+          args: [requestStruct],
           value: p.amount,
           // base ≠ ETH ⇒ msg.value == secondBridgeValue
           account: ctx.client.account
         };
-        resolvedL1GasLimit = ctx.l2GasLimit;
+        calldata = encodeFunctionData({
+          abi: IBridgehub_default,
+          functionName: "requestL2TransactionTwoBridges",
+          args: [requestStruct]
+        });
       } else {
-        const twoBridgesSim = await wrapAs3(
+        const sim = await wrapAs4(
           "CONTRACT",
           OP_DEPOSITS.ethNonBase.estGas,
           () => ctx.client.l1.simulateContract({
             address: ctx.bridgehub,
             abi: IBridgehub_default,
             functionName: "requestL2TransactionTwoBridges",
-            args: [outer],
+            args: [requestStruct],
             value: p.amount,
-            // base ≠ ETH ⇒ msg.value == secondBridgeValue
             account: ctx.client.account
           }),
           {
@@ -837,8 +907,33 @@ function routeEthNonBase() {
             message: "Failed to simulate Bridgehub two-bridges request."
           }
         );
-        bridgeTx = { ...twoBridgesSim.request, ...txFeeOverrides };
-        resolvedL1GasLimit = twoBridgesSim.request.gas ?? ctx.l2GasLimit;
+        calldata = encodeFunctionData({
+          abi: sim.request.abi,
+          functionName: sim.request.functionName,
+          args: sim.request.args
+        });
+        bridgeTx = { ...sim.request };
+      }
+      const l1TxCandidate = {
+        to: ctx.bridgehub,
+        data: calldata,
+        value: p.amount,
+        from: ctx.sender,
+        ...ctx.gasOverrides
+      };
+      const l1Gas = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
+      if (l1Gas) {
+        bridgeTx = {
+          ...bridgeTx,
+          gas: l1Gas.gasLimit,
+          maxFeePerGas: l1Gas.maxFeePerGas,
+          maxPriorityFeePerGas: l1Gas.maxPriorityFeePerGas
+        };
       }
       steps.push({
         key: "bridgehub:two-bridges:eth-nonbase",
@@ -846,48 +941,38 @@ function routeEthNonBase() {
         description: "Bridge ETH (fees in base ERC-20) via Bridgehub.requestL2TransactionTwoBridges",
         tx: bridgeTx
       });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas,
+        l2Gas,
+        l2BaseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
+      });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-
-// src/adapters/viem/resources/deposits/routes/erc20-base.ts
-var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
-var BASE_COST_BUFFER_BPS3 = 100n;
-var BPS3 = 10000n;
-var withBuffer3 = (x) => x * (BPS3 + BASE_COST_BUFFER_BPS3) / BPS3;
+var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
 function routeErc20Base() {
   return {
     async preflight(p, ctx) {
-      await wrapAs4(
+      await wrapAs5(
         "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 wrapAs4(
-        "CONTRACT",
-        OP_DEPOSITS.base.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      await wrapAs4(
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
+      await wrapAs5(
         "VALIDATION",
         OP_DEPOSITS.base.assertMatchesBase,
         () => {
@@ -897,45 +982,27 @@ function routeErc20Base() {
         },
         { ctx: { baseToken, provided: p.token, chainIdL2: ctx.chainIdL2 } }
       );
-      return;
     },
     async build(p, ctx) {
-      const { gasPriceForBaseCost } = ctx.fee;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const gasOverride = txFeeOverrides.gas;
-      const baseToken = await wrapAs4(
-        "CONTRACT",
-        OP_DEPOSITS.base.baseToken,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "baseToken",
-          args: [ctx.chainIdL2]
-        }),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      const rawBaseCost = await wrapAs4(
-        "CONTRACT",
-        OP_DEPOSITS.base.baseCost,
-        () => ctx.client.l1.readContract({
-          address: ctx.bridgehub,
-          abi: IBridgehub_default,
-          functionName: "l2TransactionBaseCost",
-          args: [ctx.chainIdL2, gasPriceForBaseCost, ctx.l2GasLimit, ctx.gasPerPubdata]
-        }),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost from Bridgehub."
-        }
-      );
-      const baseCost = rawBaseCost;
-      const l2Value = p.amount;
-      const rawMintValue = baseCost + ctx.operatorTip + l2Value;
-      const mintValue = withBuffer3(rawMintValue);
-      const allowance = await wrapAs4(
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
+      const l2TxModel = {
+        to: p.to ?? ctx.sender,
+        from: ctx.sender,
+        data: "0x",
+        value: 0n
+      };
+      const l2Gas = await quoteL2Gas3({
+        ctx,
+        route: "erc20-base",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit
+      });
+      if (!l2Gas) throw new Error("Failed to estimate L2 gas parameters.");
+      const l2BaseCost = await quoteL2BaseCost({ ctx, l2GasLimit: l2Gas.gasLimit });
+      const mintValue = l2BaseCost + ctx.operatorTip + p.amount;
+      const approvals = [];
+      const steps = [];
+      const allowance = await wrapAs5(
         "CONTRACT",
         OP_DEPOSITS.base.allowance,
         () => ctx.client.l1.readContract({
@@ -949,11 +1016,9 @@ function routeErc20Base() {
           message: "Failed to read base-token allowance."
         }
       );
-      const approvals = [];
-      const steps = [];
       const needsApprove = allowance < mintValue;
       if (needsApprove) {
-        const approveSim = await wrapAs4(
+        const approveSim = await wrapAs5(
           "CONTRACT",
           OP_DEPOSITS.base.estGas,
           () => ctx.client.l1.simulateContract({
@@ -973,20 +1038,20 @@ function routeErc20Base() {
           key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
           kind: "approve",
           description: "Approve base token for mintValue",
-          tx: { ...approveSim.request, ...txFeeOverrides }
+          tx: { ...approveSim.request }
         });
       }
       const req = buildDirectRequestStruct({
         chainId: ctx.chainIdL2,
         mintValue,
-        l2GasLimit: ctx.l2GasLimit,
+        l2GasLimit: l2Gas.gasLimit,
         gasPerPubdata: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         l2Contract: p.to ?? ctx.sender,
-        l2Value
+        l2Value: p.amount
       });
       let bridgeTx;
-      let resolvedL1GasLimit;
+      let calldata;
       if (needsApprove) {
         bridgeTx = {
           address: ctx.bridgehub,
@@ -994,13 +1059,16 @@ function routeErc20Base() {
           functionName: "requestL2TransactionDirect",
           args: [req],
           value: 0n,
-          // base is ERC-20 ⇒ msg.value MUST be 0
-          account: ctx.client.account,
-          ...txFeeOverrides
+          // base token is ERC-20 ⇒ msg.value MUST be 0
+          account: ctx.client.account
         };
-        resolvedL1GasLimit = gasOverride ?? ctx.l2GasLimit;
+        calldata = encodeFunctionData({
+          abi: IBridgehub_default,
+          functionName: "requestL2TransactionDirect",
+          args: [req]
+        });
       } else {
-        const sim = await wrapAs4(
+        const sim = await wrapAs5(
           "RPC",
           OP_DEPOSITS.base.estGas,
           () => ctx.client.l1.simulateContract({
@@ -1016,8 +1084,33 @@ function routeErc20Base() {
             message: "Failed to simulate Bridgehub.requestL2TransactionDirect."
           }
         );
-        bridgeTx = { ...sim.request, ...txFeeOverrides };
-        resolvedL1GasLimit = sim.request.gas ?? ctx.l2GasLimit;
+        calldata = encodeFunctionData({
+          abi: sim.request.abi,
+          functionName: sim.request.functionName,
+          args: sim.request.args
+        });
+        bridgeTx = { ...sim.request };
+      }
+      const l1TxCandidate = {
+        to: ctx.bridgehub,
+        data: calldata,
+        value: 0n,
+        from: ctx.sender,
+        ...ctx.gasOverrides
+      };
+      const l1Gas = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
+      if (l1Gas) {
+        bridgeTx = {
+          ...bridgeTx,
+          gas: l1Gas.gasLimit,
+          maxFeePerGas: l1Gas.maxFeePerGas,
+          maxPriorityFeePerGas: l1Gas.maxPriorityFeePerGas
+        };
       }
       steps.push({
         key: "bridgehub:direct:erc20-base",
@@ -1025,10 +1118,18 @@ function routeErc20Base() {
         description: "Bridge base ERC-20 via Bridgehub.requestL2TransactionDirect",
         tx: bridgeTx
       });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas,
+        l2Gas,
+        l2BaseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
+      });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
@@ -1108,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");
@@ -1117,37 +1472,26 @@ 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, quoteExtras } = await ROUTES[route].build(p, ctx);
-    const { baseCost, mintValue } = quoteExtras;
-    const fallbackGasLimit = quoteExtras.l1GasLimit;
-    const resolveGasLimit = () => {
-      if (ctx.fee.gasLimit != null) return ctx.fee.gasLimit;
-      for (let i = steps.length - 1; i >= 0; i--) {
-        const candidate = steps[i].tx.gas;
-        if (candidate != null) return candidate;
-      }
-      if (fallbackGasLimit != null) return fallbackGasLimit;
-      return ctx.l2GasLimit;
-    };
-    const gasLimit = resolveGasLimit();
+    const { steps, approvals, fees } = await ROUTES[route].build(p, ctx);
     return {
       route: ctx.route,
       summary: {
         route: ctx.route,
         approvalsNeeded: approvals,
-        baseCost,
-        mintValue,
-        gasPerPubdata: ctx.gasPerPubdata,
-        fees: {
-          gasLimit,
-          maxFeePerGas: ctx.fee.maxFeePerGas,
-          maxPriorityFeePerGas: ctx.fee.maxPriorityFeePerGas
-        }
+        amounts: {
+          transfer: { token: p.token, amount: p.amount }
+        },
+        fees,
+        // Legacy fields (maintained for backward compatibility)
+        baseCost: fees.l2?.baseCost,
+        mintValue: fees.mintValue
       },
       steps
     };
@@ -1222,7 +1566,7 @@ function createDepositsResource(client) {
             step.tx.gas = overrides.gasLimit;
           }
         }
-        if (step.tx.gas == null) {
+        if (!p.l1TxOverrides?.gasLimit) {
           try {
             const feePart = step.tx.maxFeePerGas != null && step.tx.maxPriorityFeePerGas != null ? {
               maxFeePerGas: step.tx.maxFeePerGas,
@@ -1436,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,
@@ -1470,18 +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 fee = await getL2FeeOverrides(client, p.l2TxOverrides);
-  const route = pickWithdrawRoute({
-    token: p.token,
-    baseIsEth
-  });
-  const l2GasLimit = p.l2GasLimit ?? 300000n;
-  const gasBufferPct = 15;
+  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,
@@ -1492,56 +1814,101 @@ async function commonCtx2(p, client) {
     l2NativeTokenVault,
     l2BaseTokenSystem,
     baseIsEth,
-    l2GasLimit,
-    gasBufferPct,
-    fee
+    gasOverrides: p.l2TxOverrides
+  };
+}
+
+// src/adapters/viem/resources/withdrawals/services/gas.ts
+async function quoteL2Gas4(input) {
+  const { ctx, tx } = input;
+  const estimator = viemToGasEstimator(ctx.client.l2);
+  return quoteL2Gas2({
+    estimator,
+    tx: toCoreTx(tx),
+    overrides: ctx.gasOverrides
+  });
+}
+
+// src/adapters/viem/resources/withdrawals/services/fee.ts
+function buildFeeBreakdown2(p) {
+  const l2Total = p.l2Gas?.maxCost ?? 0n;
+  const l2 = {
+    total: l2Total,
+    gasLimit: p.l2Gas?.gasLimit ?? 0n,
+    maxFeePerGas: p.l2Gas?.maxFeePerGas ?? 0n,
+    maxPriorityFeePerGas: p.l2Gas?.maxPriorityFeePerGas
+  };
+  return {
+    token: p.feeToken,
+    maxTotal: l2Total,
+    l2
   };
 }
 
 // src/adapters/viem/resources/withdrawals/routes/eth.ts
-var { wrapAs: wrapAs5 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
 function routeEthBase() {
   return {
     async build(p, ctx) {
-      const toL1 = p.to ?? ctx.sender;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const sim = await wrapAs5(
-        "CONTRACT",
-        OP_WITHDRAWALS.eth.estGas,
-        () => ctx.client.l2.simulateContract({
-          address: L2_BASE_TOKEN_ADDRESS,
-          abi: IBaseToken_default,
-          functionName: "withdraw",
-          args: [toL1],
-          value: p.amount,
-          account: ctx.client.account,
-          ...txFeeOverrides
-        }),
+      const steps = [];
+      const data = await wrapAs7(
+        "INTERNAL",
+        OP_WITHDRAWALS.eth.encodeWithdraw,
+        () => Promise.resolve(
+          encodeFunctionData({
+            abi: IBaseToken_default,
+            functionName: "withdraw",
+            args: [p.to ?? ctx.sender]
+          })
+        ),
         {
-          ctx: { where: "l2.simulateContract", to: L2_BASE_TOKEN_ADDRESS },
-          message: "Failed to simulate L2 ETH withdraw."
+          ctx: { where: "L2BaseToken.withdraw", to: p.to ?? ctx.sender },
+          message: "Failed to encode ETH withdraw calldata."
         }
       );
-      const steps = [
-        {
-          key: "l2-base-token:withdraw",
-          kind: "l2-base-token:withdraw",
-          description: "Withdraw ETH via L2 Base Token System",
-          tx: { ...sim.request, ...txFeeOverrides }
-        }
-      ];
-      return { steps, approvals: [], quoteExtras: {} };
+      const L2tx = {
+        to: L2_BASE_TOKEN_ADDRESS,
+        data,
+        value: p.amount,
+        from: ctx.sender
+      };
+      const l2Gas = await quoteL2Gas4({ ctx, tx: L2tx });
+      if (l2Gas) {
+        L2tx.gas = l2Gas.gasLimit;
+        L2tx.maxFeePerGas = l2Gas.maxFeePerGas;
+        L2tx.maxPriorityFeePerGas = l2Gas.maxPriorityFeePerGas;
+      }
+      const tx = {
+        address: L2_BASE_TOKEN_ADDRESS,
+        abi: IBaseToken_default,
+        functionName: "withdraw",
+        args: [p.to ?? ctx.sender],
+        value: p.amount,
+        account: ctx.client.account,
+        ...l2Gas
+      };
+      const fees = buildFeeBreakdown2({
+        feeToken: L2_BASE_TOKEN_ADDRESS,
+        l2Gas
+      });
+      steps.push({
+        key: "l2-base-token:withdraw",
+        kind: "l2-base-token:withdraw",
+        description: "Withdraw ETH via L2 Base Token System",
+        tx
+      });
+      return { steps, approvals: [], fees };
     }
   };
 }
-var { wrapAs: wrapAs6 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
 function routeErc20NonBase2() {
   return {
     // TODO: add preflight validations here
     async build(p, ctx) {
-      const toL1 = p.to ?? ctx.sender;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const current = await wrapAs6(
+      const steps = [];
+      const approvals = [];
+      const current = await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.allowance,
         () => ctx.client.l2.readContract({
@@ -1561,12 +1928,26 @@ function routeErc20NonBase2() {
           message: "Failed to read L2 ERC-20 allowance."
         }
       );
-      const needsApprove = current < p.amount;
-      const steps = [];
-      const approvals = [];
-      if (needsApprove) {
+      if (current < p.amount) {
         approvals.push({ token: p.token, spender: ctx.l2NativeTokenVault, amount: p.amount });
-        const approveSim = await wrapAs6(
+        const data = encodeFunctionData({
+          abi: IERC20_default,
+          functionName: "approve",
+          args: [ctx.l2NativeTokenVault, p.amount]
+        });
+        const approveTxCandidate = {
+          to: p.token,
+          data,
+          value: 0n,
+          from: ctx.sender
+        };
+        const approveGas = await quoteL2Gas4({ ctx, tx: approveTxCandidate });
+        if (approveGas) {
+          approveTxCandidate.gas = approveGas.gasLimit;
+          approveTxCandidate.maxFeePerGas = approveGas.maxFeePerGas;
+          approveTxCandidate.maxPriorityFeePerGas = approveGas.maxPriorityFeePerGas;
+        }
+        const approveSim = await wrapAs8(
           "CONTRACT",
           OP_WITHDRAWALS.erc20.estGas,
           () => ctx.client.l2.simulateContract({
@@ -1575,21 +1956,26 @@ function routeErc20NonBase2() {
             functionName: "approve",
             args: [ctx.l2NativeTokenVault, p.amount],
             account: ctx.client.account,
-            ...txFeeOverrides
+            ...approveGas
           }),
           {
             ctx: { where: "l2.simulateContract", to: p.token },
             message: "Failed to simulate L2 ERC-20 approve."
           }
         );
+        const { ...approveRequest } = approveSim.request;
+        const approveTx = {
+          ...approveRequest
+        };
         steps.push({
           key: `approve:l2:${p.token}:${ctx.l2NativeTokenVault}`,
           kind: "approve:l2",
           description: `Approve ${p.amount} to NativeTokenVault`,
-          tx: { ...approveSim.request, ...txFeeOverrides }
+          tx: approveTx
         });
       }
-      const ensure = await wrapAs6(
+      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({
@@ -1603,28 +1989,44 @@ 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" },
           { type: "address", name: "l1Receiver" },
           { type: "address", name: "l2Token" }
         ],
-        [p.amount, toL1, p.token]
+        [p.amount, p.to ?? ctx.sender, p.token]
       );
+      const withdrawCalldata = encodeFunctionData({
+        abi: IL2AssetRouter_default,
+        functionName: "withdraw",
+        args: [assetId, assetData]
+      });
+      const withdrawTxCandidate = {
+        to: ctx.l2AssetRouter,
+        data: withdrawCalldata,
+        value: 0n,
+        from: ctx.sender
+      };
+      const withdrawGas = await quoteL2Gas4({ ctx, tx: withdrawTxCandidate });
+      if (withdrawGas) {
+        withdrawTxCandidate.gas = withdrawGas.gasLimit;
+        withdrawTxCandidate.maxFeePerGas = withdrawGas.maxFeePerGas;
+        withdrawTxCandidate.maxPriorityFeePerGas = withdrawGas.maxPriorityFeePerGas;
+      }
       let withdrawTx;
-      if (needsApprove) {
+      if (current < p.amount) {
         withdrawTx = {
           address: ctx.l2AssetRouter,
           abi: IL2AssetRouter_default,
           functionName: "withdraw",
           args: [assetId, assetData],
           account: ctx.client.account,
-          ...txFeeOverrides
+          ...withdrawGas
         };
       } else {
-        const sim = await wrapAs6(
+        const sim = await wrapAs8(
           "CONTRACT",
           OP_WITHDRAWALS.erc20.estGas,
           () => ctx.client.l2.simulateContract({
@@ -1633,14 +2035,18 @@ function routeErc20NonBase2() {
             functionName: "withdraw",
             args: [assetId, assetData],
             account: ctx.client.account,
-            ...txFeeOverrides
+            ...withdrawGas
           }),
           {
             ctx: { where: "l2.simulateContract", to: ctx.l2AssetRouter },
             message: "Failed to simulate L2 ERC-20 withdraw."
           }
         );
-        withdrawTx = { ...sim.request, ...txFeeOverrides };
+        const { ...withdrawRequest } = sim.request;
+        withdrawTx = {
+          ...withdrawRequest,
+          ...withdrawGas
+        };
       }
       steps.push({
         key: "l2-asset-router:withdraw",
@@ -1648,63 +2054,15 @@ function routeErc20NonBase2() {
         description: "Burn on L2 & send L2\u2192L1 message",
         tx: withdrawTx
       });
-      return { steps, approvals, quoteExtras: {} };
-    }
-  };
-}
-
-// src/adapters/viem/resources/withdrawals/routes/eth-nonbase.ts
-var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
-function routeEthNonBase2() {
-  return {
-    async preflight(p, ctx) {
-      await wrapAs7(
-        "VALIDATION",
-        OP_WITHDRAWALS.ethNonBase.assertNonEthBase,
-        () => {
-          if (p.token.toLowerCase() !== L2_BASE_TOKEN_ADDRESS.toLowerCase()) {
-            throw new Error("eth-nonbase route requires the L2 base-token alias (0x\u2026800A).");
-          }
-          if (ctx.baseIsEth) {
-            throw new Error("eth-nonbase route requires chain base \u2260 ETH.");
-          }
-        },
-        { ctx: { token: p.token, baseIsEth: ctx.baseIsEth } }
-      );
-    },
-    async build(p, ctx) {
-      const toL1 = p.to ?? ctx.sender;
-      const txFeeOverrides = buildViemFeeOverrides(ctx.fee);
-      const sim = await wrapAs7(
-        "CONTRACT",
-        OP_WITHDRAWALS.ethNonBase.estGas,
-        () => ctx.client.l2.simulateContract({
-          address: L2_BASE_TOKEN_ADDRESS,
-          abi: IBaseToken_default,
-          functionName: "withdraw",
-          args: [toL1],
-          value: p.amount,
-          account: ctx.client.account,
-          ...txFeeOverrides
-        }),
-        {
-          ctx: { where: "l2.simulateContract", to: L2_BASE_TOKEN_ADDRESS },
-          message: "Failed to simulate L2 base-token withdraw."
-        }
-      );
-      const steps = [
-        {
-          key: "l2-base-token:withdraw",
-          kind: "l2-base-token:withdraw",
-          description: "Withdraw base token via L2 Base Token System (base \u2260 ETH)",
-          tx: { ...sim.request, ...txFeeOverrides }
-        }
-      ];
-      return { steps, approvals: [], quoteExtras: {} };
+      const fees = buildFeeBreakdown2({
+        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",
@@ -1721,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),
@@ -1738,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
@@ -1748,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,
         () => {
@@ -1760,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),
@@ -1777,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 })),
@@ -1786,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),
@@ -1795,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(),
@@ -1811,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(),
@@ -1823,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(),
@@ -1834,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({
@@ -1868,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(),
@@ -1877,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({
@@ -1893,7 +2251,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.estimate,
         () => client.ensureAddresses(),
@@ -1902,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({
@@ -1926,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(),
@@ -1945,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(),
@@ -1964,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(),
@@ -2023,40 +2381,32 @@ function createFinalizationServices(client) {
 
 // src/adapters/viem/resources/withdrawals/index.ts
 var ROUTES2 = {
-  "eth-base": routeEthBase(),
+  base: routeEthBase(),
   // BaseTokenSystem.withdraw, chain base = ETH
-  "eth-nonbase": routeEthNonBase2(),
-  // BaseTokenSystem.withdraw, chain base ≠ ETH
   "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 } = await ROUTES2[ctx.route].build(p, ctx);
-    const resolveGasLimit = () => {
-      if (ctx.fee.gasLimit != null) return ctx.fee.gasLimit;
-      for (let i = steps.length - 1; i >= 0; i--) {
-        const candidate = steps[i].tx.gas;
-        if (candidate != null) return candidate;
-      }
-      return void 0;
-    };
-    const gasLimit = resolveGasLimit();
-    const summary = {
+    const { steps, approvals, fees } = await ROUTES2[ctx.route].build(p, ctx);
+    return {
       route: ctx.route,
-      approvalsNeeded: approvals,
-      suggestedL2GasLimit: ctx.l2GasLimit,
-      fees: {
-        gasLimit,
-        maxFeePerGas: ctx.fee.maxFeePerGas,
-        maxPriorityFeePerGas: ctx.fee.maxPriorityFeePerGas
-      }
+      summary: {
+        route: ctx.route,
+        approvalsNeeded: approvals,
+        amounts: {
+          transfer: { token: p.token, amount: p.amount }
+        },
+        fees
+      },
+      steps
     };
-    return { route: ctx.route, summary, steps };
   }
   const finalizeCache = /* @__PURE__ */ new Map();
   const quote = (p) => wrap2(OP_WITHDRAWALS.quote, async () => (await buildPlan(p)).summary, {
@@ -2090,7 +2440,7 @@ function createWithdrawalsResource(client) {
           }
           if (overrides.gasLimit != null) step.tx.gas = overrides.gasLimit;
         }
-        if (step.tx.gas == null) {
+        if (!p.l2TxOverrides?.gasLimit) {
           try {
             const feePart = step.tx.maxFeePerGas != null && step.tx.maxPriorityFeePerGas != null ? {
               maxFeePerGas: step.tx.maxFeePerGas,
@@ -2389,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, buildViemFeeOverrides, checkBaseCost, classifyReadinessFromRevert, createDepositsResource, createErrorHandlers, createFinalizationServices, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNTVAssetId, encodeNTVTransferData, encodeNativeTokenVaultAssetId, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getFeeOverrides, getGasPriceWei, getL2FeeOverrides, registerErrorAbi, scaleGasLimit, toZKsyncError };
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError };