@matterlabs/zksync-js 0.0.1 → 0.0.3

package/dist/adapters/ethers/index.cjs

@@ -223,35 +223,17 @@ var OP_DEPOSITS = {
     assertErc20Asset: "deposits.erc20-base:assertErc20Asset",
     assertMatchesBase: "deposits.erc20-base:assertMatchesBase",
     baseToken: "deposits.erc20-base:baseToken",
-    allowance: "deposits.erc20-base:allowance",
-    baseCost: "deposits.erc20-base:l2TransactionBaseCost",
-    estGas: "deposits.erc20-base:estimateGas"
-  },
+    allowance: "deposits.erc20-base:allowance"},
   nonbase: {
-    baseToken: "deposits.erc20-nonbase:baseToken",
-    assertNotEthAsset: "deposits.erc20-nonbase:assertNotEthAsset",
-    allowance: "deposits.erc20-nonbase:allowance",
-    allowanceFees: "deposits.erc20-nonbase:allowanceFeesBaseToken",
-    baseCost: "deposits.erc20-nonbase:l2TransactionBaseCost",
     encodeCalldata: "deposits.erc20-nonbase:encodeSecondBridgeErc20Args",
-    estGas: "deposits.erc20-nonbase:estimateGas",
-    assertBaseIsEth: "deposits.erc20-nonbase:assertBaseIsEth",
-    assertBaseIsErc20: "deposits.erc20-nonbase:assertBaseIsErc20",
     assertNonBaseToken: "deposits.erc20-nonbase:assertNonBaseToken",
     allowanceToken: "deposits.erc20-nonbase:allowanceToken",
     allowanceBase: "deposits.erc20-nonbase:allowanceBase"
   },
-  eth: {
-    baseCost: "deposits.eth:l2TransactionBaseCost",
-    estGas: "deposits.eth:estimateGas"
-  },
   ethNonBase: {
-    baseToken: "deposits.eth-nonbase:baseToken",
-    baseCost: "deposits.eth-nonbase:l2TransactionBaseCost",
     allowanceBase: "deposits.eth-nonbase:allowanceBaseToken",
     ethBalance: "deposits.eth-nonbase:getEthBalance",
     encodeCalldata: "deposits.eth-nonbase:encodeSecondBridgeEthArgs",
-    estGas: "deposits.eth-nonbase:estimateGas",
     assertEthAsset: "deposits.eth-nonbase:assertEthAsset",
     assertNonEthBase: "deposits.eth-nonbase:assertNonEthBase",
     assertEthBalance: "deposits.eth-nonbase:assertEthBalance"
@@ -603,8 +585,12 @@ var TOPIC_L1_MESSAGE_SENT_NEW = k256hex("L1MessageSent(uint256,bytes32,bytes)");
 var TOPIC_L1_MESSAGE_SENT_LEG = k256hex("L1MessageSent(address,bytes32,bytes)");
 var TOPIC_CANONICAL_ASSIGNED = "0x779f441679936c5441b671969f37400b8c3ed0071cb47444431bf985754560df";
 var TOPIC_CANONICAL_SUCCESS = "0xe4def01b981193a97a9e81230d7b9f31812ceaf23f864a828a82c687911cb2df";
-var L1_FEE_ESTIMATION_COEF_NUMERATOR = 12;
-var L1_FEE_ESTIMATION_COEF_DENOMINATOR = 10;
+var BUFFER = 20n;
+var TX_OVERHEAD_GAS = 10000n;
+var TX_MEMORY_OVERHEAD_GAS = 10n;
+var DEFAULT_PUBDATA_BYTES = 155n;
+var DEFAULT_ABI_BYTES = 400n;
+var SAFE_L1_BRIDGE_GAS = 600000n;
 
 // src/core/internal/abis/IBridgehub.ts
 var IBridgehubABI = [
@@ -5094,7 +5080,183 @@ var MailboxABI = [
 ];
 var Mailbox_default = MailboxABI;
 
+// src/core/errors/withdrawal-revert-map.ts
+var REVERT_TO_READINESS = {
+  // Already done
+  WithdrawalAlreadyFinalized: { kind: "FINALIZED" },
+  // Temporary — try later
+  BatchNotExecuted: { kind: "NOT_READY", reason: "batch-not-executed" },
+  LocalRootIsZero: { kind: "NOT_READY", reason: "root-missing" },
+  // Permanent — won’t become ready for this tx
+  WrongL2Sender: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  InvalidSelector: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  L2WithdrawalMessageWrongLength: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  WrongMsgLength: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  TokenNotLegacy: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  TokenIsLegacy: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  InvalidProof: { kind: "UNFINALIZABLE", reason: "message-invalid" },
+  InvalidChainId: { kind: "UNFINALIZABLE", reason: "invalid-chain" },
+  NotSettlementLayer: { kind: "UNFINALIZABLE", reason: "settlement-layer" },
+  // Likely environment mismatch — treat as permanent for this tx
+  OnlyEraSupported: { kind: "UNFINALIZABLE", reason: "unsupported" },
+  LocalRootMustBeZero: { kind: "UNFINALIZABLE", reason: "unsupported" }
+};
+
+// src/adapters/ethers/errors/revert.ts
+var ERROR_IFACES = [];
+var IFACE_ERROR_STRING = new ethers.Interface(["error Error(string)"]);
+var IFACE_PANIC = new ethers.Interface(["error Panic(uint256)"]);
+(function bootstrapDefaultIfaces() {
+  try {
+    ERROR_IFACES.push({
+      name: "IL1Nullifier",
+      iface: new ethers.Interface(IL1Nullifier_default)
+    });
+  } catch {
+  }
+  try {
+    ERROR_IFACES.push({ name: "IERC20", iface: new ethers.Interface(IERC20_default) });
+  } catch {
+  }
+  try {
+    ERROR_IFACES.push({
+      name: "IL1NativeTokenVault",
+      iface: new ethers.Interface(L1NativeTokenVault_default)
+    });
+  } catch {
+  }
+  try {
+    ERROR_IFACES.push({
+      name: "IL2NativeTokenVault",
+      iface: new ethers.Interface(L2NativeTokenVault_default)
+    });
+  } catch {
+  }
+  try {
+    ERROR_IFACES.push({ name: "Mailbox", iface: new ethers.Interface(Mailbox_default) });
+  } catch {
+  }
+})();
+function registerErrorAbi(name, abi2) {
+  const existing = ERROR_IFACES.findIndex((x) => x.name === name);
+  const entry = { name, iface: new ethers.Interface(abi2) };
+  if (existing >= 0) ERROR_IFACES[existing] = entry;
+  else ERROR_IFACES.push(entry);
+}
+function extractRevertData(e) {
+  const maybe = (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    e?.data?.data ?? e?.error?.data ?? e?.data ?? e?.error?.error?.data ?? e?.info?.error?.data
+  );
+  if (typeof maybe === "string" && maybe.startsWith("0x") && maybe.length >= 10) {
+    return maybe;
+  }
+  return void 0;
+}
+function decodeRevert(e) {
+  const data = extractRevertData(e);
+  if (!data) return;
+  const selector = `0x${data.slice(2, 10)}`;
+  try {
+    const parsed = IFACE_ERROR_STRING.parseError(data);
+    if (parsed?.name === "Error") {
+      const args = parsed.args ? Array.from(parsed.args) : void 0;
+      return { selector, name: "Error", args };
+    }
+  } catch {
+  }
+  try {
+    const parsed = IFACE_PANIC.parseError(data);
+    if (parsed?.name === "Panic") {
+      const args = parsed.args ? Array.from(parsed.args) : void 0;
+      return { selector, name: "Panic", args };
+    }
+  } catch {
+  }
+  for (const { name, iface } of ERROR_IFACES) {
+    try {
+      const parsed = iface.parseError(data);
+      if (parsed) {
+        const args = parsed.args ? Array.from(parsed.args) : void 0;
+        return {
+          selector,
+          name: parsed.name,
+          args,
+          contract: name
+        };
+      }
+    } catch {
+    }
+  }
+  return { selector };
+}
+function classifyReadinessFromRevert(e) {
+  const r = decodeRevert(e);
+  const name = r?.name;
+  if (name && REVERT_TO_READINESS[name]) return REVERT_TO_READINESS[name];
+  const msg = (() => {
+    if (typeof e !== "object" || e === null) return "";
+    const obj = e;
+    const maybeMsg = obj["shortMessage"] ?? obj["message"];
+    return typeof maybeMsg === "string" ? maybeMsg : "";
+  })();
+  const lower = String(msg).toLowerCase();
+  if (lower.includes("paused")) return { kind: "NOT_READY", reason: "paused" };
+  if (name || r?.selector) {
+    return { kind: "UNFINALIZABLE", reason: "unsupported", detail: name ?? r?.selector };
+  }
+  return { kind: "NOT_READY", reason: "unknown", detail: lower || void 0 };
+}
+
+// src/adapters/ethers/errors/error-ops.ts
+function toZKsyncError(type, base, err) {
+  if (isZKsyncError(err)) return err;
+  const revert = decodeRevert(err);
+  return createError(type, { ...base, ...revert ? { revert } : {}, cause: shapeCause(err) });
+}
+function resolveMessage(op, msg) {
+  if (!msg) return `Error during ${op}.`;
+  return typeof msg === "function" ? msg() : msg;
+}
+function createErrorHandlers(resource) {
+  async function run(kind, operation, fn, opts) {
+    try {
+      return await fn();
+    } catch (e) {
+      if (isZKsyncError(e)) throw e;
+      const message = resolveMessage(operation, opts?.message);
+      throw toZKsyncError(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
+    }
+  }
+  function wrap2(operation, fn, opts) {
+    return run("INTERNAL", operation, fn, opts);
+  }
+  function wrapAs10(kind, operation, fn, opts) {
+    return run(kind, operation, fn, opts);
+  }
+  async function toResult2(operation, fn, opts) {
+    try {
+      const value = await wrap2(operation, fn, opts);
+      return { ok: true, value };
+    } catch (e) {
+      const shaped = isZKsyncError(e) ? e : toZKsyncError(
+        "INTERNAL",
+        {
+          resource,
+          operation,
+          context: opts?.ctx ?? {},
+          message: resolveMessage(operation, opts?.message)
+        },
+        e
+      );
+      return { ok: false, error: shaped };
+    }
+  }
+  return { wrap: wrap2, wrapAs: wrapAs10, toResult: toResult2 };
+}
+
 // src/adapters/ethers/client.ts
+var { wrapAs } = createErrorHandlers("client");
 function createEthersClient(args) {
   const { l1, l2, signer } = args;
   let boundSigner = signer;
@@ -5192,7 +5354,10 @@ function createEthersClient(args) {
   async function baseToken(chainId) {
     const { bridgehub } = await ensureAddresses();
     const bh = new ethers.Contract(bridgehub, IBridgehub_default, l1);
-    return await bh.baseToken(chainId);
+    return await wrapAs("CONTRACT", OP_DEPOSITS.base.baseToken, () => bh.baseToken(chainId), {
+      ctx: { where: "bridgehub.baseToken", chainIdL2: chainId },
+      message: "Failed to read base token."
+    });
   }
   const client = {
     kind: "ethers",
@@ -5231,6 +5396,8 @@ function normalizeAddrEq(a, b) {
   };
   return normalize(a) === normalize(b);
 }
+var hexEq = (a, b) => a.toLowerCase() === b.toLowerCase();
+var normalizeL1Token = (token) => isAddressEq(token, FORMAL_ETH_ADDRESS) ? ETH_ADDRESS : token;
 
 // src/adapters/ethers/resources/deposits/services/verification.ts
 var I_BRIDGEHUB = new ethers.Interface([
@@ -5297,119 +5464,66 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   return { l2Receipt, l2TxHash };
 }
 
-// src/core/utils/gas.ts
-function assertNoLegacyGas(overrides) {
-  if (!overrides) return;
-  if ("gasPrice" in overrides && overrides.gasPrice !== void 0) {
-    throw new Error("Legacy gasPrice is not supported; use EIP-1559 fields instead.");
-  }
-}
-function assertPriorityFeeBounds(fees) {
-  if (fees.maxPriorityFeePerGas > fees.maxFeePerGas) {
-    throw new Error("maxPriorityFeePerGas cannot exceed maxFeePerGas.");
-  }
-}
-
-// src/adapters/ethers/resources/utils.ts
-function supportsGetGasPrice(provider) {
-  return typeof provider === "object" && provider !== null && typeof provider.getGasPrice === "function";
-}
-function encodeNativeTokenVaultAssetId(chainId, address) {
-  const abi = new ethers.AbiCoder();
-  const hex = abi.encode(
-    ["uint256", "address", "address"],
-    [chainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, address]
-  );
-  return ethers.ethers.keccak256(hex);
+// src/adapters/ethers/resources/deposits/context.ts
+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 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 new ethers.AbiCoder().encode(["uint256", "address", "address"], [amount, receiver, token]);
 }
 function encodeSecondBridgeDataV1(assetId, transferData) {
-  const abi = new ethers.AbiCoder();
-  const data = abi.encode(["bytes32", "bytes"], [assetId, transferData]);
+  const abi2 = new ethers.AbiCoder();
+  const data = abi2.encode(["bytes32", "bytes"], [assetId, transferData]);
   return ethers.ethers.concat(["0x01", data]);
 }
-function encodeNTVAssetId(chainId, address) {
-  const abi = new ethers.AbiCoder();
-  const hex = abi.encode(
-    ["uint256", "address", "address"],
-    [chainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, address]
+function encodeSecondBridgeArgs(token, amount, l2Receiver) {
+  return ethers.AbiCoder.defaultAbiCoder().encode(
+    ["address", "uint256", "address"],
+    [token, amount, l2Receiver]
   );
-  return ethers.ethers.keccak256(hex);
 }
-function encodeNTVTransferData(amount, receiver, token) {
-  return new ethers.AbiCoder().encode(["uint256", "address", "address"], [amount, receiver, token]);
-}
-function scaleGasLimit(gasLimit) {
-  return gasLimit * BigInt(L1_FEE_ESTIMATION_COEF_NUMERATOR) / BigInt(L1_FEE_ESTIMATION_COEF_DENOMINATOR);
-}
-async function checkBaseCost(baseCost, value) {
-  const resolvedValue = await value;
-  if (baseCost > resolvedValue) {
-    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(resolvedValue)}!`
-    );
-  }
-}
-async function getFeeOverrides(client, overrides) {
-  assertNoLegacyGas(overrides);
-  const fd = await client.l1.getFeeData();
-  const maxFeeFromProvider = fd.maxFeePerGas ?? void 0;
-  const maxPriorityFromProvider = fd.maxPriorityFeePerGas ?? void 0;
-  const gasPriceFallback = fd.gasPrice ?? void 0;
-  const maxFeePerGas = overrides?.maxFeePerGas ?? maxFeeFromProvider ?? gasPriceFallback;
-  if (maxFeePerGas == null) throw new Error("provider returned no gas price data");
-  const maxPriorityFeePerGas = overrides?.maxPriorityFeePerGas ?? maxPriorityFromProvider ?? maxFeePerGas;
-  assertPriorityFeeBounds({ maxFeePerGas, maxPriorityFeePerGas });
-  const gasPriceForBaseCost = overrides?.maxFeePerGas ?? maxFeeFromProvider ?? gasPriceFallback ?? maxFeePerGas;
-  return {
-    gasLimit: overrides?.gasLimit,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    gasPriceForBaseCost
-  };
-}
-async function getL2FeeOverrides(client, overrides) {
-  assertNoLegacyGas(overrides);
-  let maxFeeFromProvider;
-  let maxPriorityFromProvider;
-  let gasPriceFallback;
-  try {
-    const fd = await client.l2.getFeeData();
-    if (fd?.maxFeePerGas != null) maxFeeFromProvider = fd.maxFeePerGas;
-    if (fd?.maxPriorityFeePerGas != null) {
-      maxPriorityFromProvider = fd.maxPriorityFeePerGas;
-    }
-    if (fd?.gasPrice != null) gasPriceFallback = fd.gasPrice;
-  } catch {
-  }
-  if (gasPriceFallback == null) {
-    try {
-      if (supportsGetGasPrice(client.l2)) {
-        const gp = await client.l2.getGasPrice();
-        gasPriceFallback = typeof gp === "bigint" ? gp : BigInt(gp.toString());
-      }
-    } catch {
-    }
-  }
-  const maxFeePerGas = overrides?.maxFeePerGas ?? maxFeeFromProvider ?? gasPriceFallback;
-  if (maxFeePerGas == null) {
-    throw new Error("L2 provider returned no gas price data");
-  }
-  const maxPriorityFeePerGas = overrides?.maxPriorityFeePerGas ?? maxPriorityFromProvider ?? maxFeePerGas;
-  assertPriorityFeeBounds({ maxFeePerGas, maxPriorityFeePerGas });
-  return {
-    gasLimit: overrides?.gasLimit,
-    maxFeePerGas,
-    maxPriorityFeePerGas
-  };
+function encodeSecondBridgeErc20Args(token, amount, l2Receiver) {
+  return encodeSecondBridgeArgs(token, amount, l2Receiver);
 }
-async function getGasPriceWei(client) {
-  const fd = await client.l1.getFeeData();
-  if (fd.gasPrice != null) return fd.gasPrice;
-  if (fd.maxFeePerGas != null) return fd.maxFeePerGas;
-  throw new Error("provider returned no gas price data");
+function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
+  return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
 }
 function buildDirectRequestStruct(args) {
   return {
@@ -5424,389 +5538,465 @@ function buildDirectRequestStruct(args) {
     refundRecipient: args.refundRecipient
   };
 }
-function encodeSecondBridgeArgs(token, amount, l2Receiver) {
-  return ethers.AbiCoder.defaultAbiCoder().encode(
-    ["address", "uint256", "address"],
-    [token, amount, l2Receiver]
-  );
-}
-function encodeSecondBridgeErc20Args(token, amount, l2Receiver) {
-  return encodeSecondBridgeArgs(token, amount, l2Receiver);
-}
-function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
-  return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
-}
-
-// src/core/resources/deposits/route.ts
-async function pickDepositRoute(client, chainIdL2, token) {
-  if (isETH(token)) {
-    const base2 = await client.baseToken(chainIdL2);
-    return isETH(base2) ? "eth-base" : "eth-nonbase";
-  }
-  const base = await client.baseToken(chainIdL2);
-  return normalizeAddrEq(token, base) ? "erc20-base" : "erc20-nonbase";
-}
 
-// src/adapters/ethers/resources/deposits/context.ts
-async function commonCtx(p, client) {
-  const { bridgehub, l1AssetRouter } = await client.ensureAddresses();
-  const { chainId } = await client.l2.getNetwork();
-  const sender = await client.signer.getAddress();
-  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);
+// src/core/resources/deposits/gas.ts
+function makeGasQuote(p) {
+  const maxPriorityFeePerGas = p.maxPriorityFeePerGas ?? 0n;
   return {
-    client,
-    l1AssetRouter,
-    route,
-    bridgehub,
-    chainIdL2: BigInt(chainId),
-    sender,
-    fee,
-    l2GasLimit,
-    gasPerPubdata,
-    operatorTip,
-    refundRecipient
+    gasLimit: p.gasLimit,
+    maxFeePerGas: p.maxFeePerGas,
+    maxPriorityFeePerGas,
+    gasPerPubdata: p.gasPerPubdata,
+    maxCost: p.gasLimit * p.maxFeePerGas
   };
 }
-
-// src/core/errors/withdrawal-revert-map.ts
-var REVERT_TO_READINESS = {
-  // Already done
-  WithdrawalAlreadyFinalized: { kind: "FINALIZED" },
-  // Temporary — try later
-  BatchNotExecuted: { kind: "NOT_READY", reason: "batch-not-executed" },
-  LocalRootIsZero: { kind: "NOT_READY", reason: "root-missing" },
-  // Permanent — won’t become ready for this tx
-  WrongL2Sender: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  InvalidSelector: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  L2WithdrawalMessageWrongLength: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  WrongMsgLength: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  TokenNotLegacy: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  TokenIsLegacy: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  InvalidProof: { kind: "UNFINALIZABLE", reason: "message-invalid" },
-  InvalidChainId: { kind: "UNFINALIZABLE", reason: "invalid-chain" },
-  NotSettlementLayer: { kind: "UNFINALIZABLE", reason: "settlement-layer" },
-  // Likely environment mismatch — treat as permanent for this tx
-  OnlyEraSupported: { kind: "UNFINALIZABLE", reason: "unsupported" },
-  LocalRootMustBeZero: { kind: "UNFINALIZABLE", reason: "unsupported" }
-};
-
-// src/adapters/ethers/errors/revert.ts
-var ERROR_IFACES = [];
-var IFACE_ERROR_STRING = new ethers.Interface(["error Error(string)"]);
-var IFACE_PANIC = new ethers.Interface(["error Panic(uint256)"]);
-(function bootstrapDefaultIfaces() {
+async function fetchFees(estimator) {
   try {
-    ERROR_IFACES.push({
-      name: "IL1Nullifier",
-      iface: new ethers.Interface(IL1Nullifier_default)
-    });
+    const fees = await estimator.estimateFeesPerGas();
+    if (fees.maxFeePerGas != null) {
+      return {
+        maxFeePerGas: fees.maxFeePerGas,
+        maxPriorityFeePerGas: fees.maxPriorityFeePerGas ?? 0n
+      };
+    }
+    if (fees.gasPrice != null) {
+      return {
+        maxFeePerGas: fees.gasPrice,
+        maxPriorityFeePerGas: 0n
+      };
+    }
   } catch {
   }
   try {
-    ERROR_IFACES.push({ name: "IERC20", iface: new ethers.Interface(IERC20_default) });
+    const gp = await estimator.getGasPrice();
+    return { maxFeePerGas: gp, maxPriorityFeePerGas: 0n };
   } catch {
+    return { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
+  }
+}
+async function quoteL1Gas(input) {
+  const { estimator, tx, overrides, fallbackGasLimit } = input;
+  let market;
+  const getMarket = async () => {
+    if (market) return market;
+    market = await fetchFees(estimator);
+    return market;
+  };
+  const maxFeePerGas = overrides?.maxFeePerGas ?? (tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : (await getMarket()).maxFeePerGas);
+  const maxPriorityFeePerGas = overrides?.maxPriorityFeePerGas ?? (tx.maxPriorityFeePerGas != null ? BigInt(tx.maxPriorityFeePerGas) : (await getMarket()).maxPriorityFeePerGas);
+  const explicitGasLimit = overrides?.gasLimit ?? (tx.gasLimit != null ? BigInt(tx.gasLimit) : void 0);
+  if (explicitGasLimit != null) {
+    return makeGasQuote({ gasLimit: explicitGasLimit, maxFeePerGas, maxPriorityFeePerGas });
   }
   try {
-    ERROR_IFACES.push({
-      name: "IL1NativeTokenVault",
-      iface: new ethers.Interface(L1NativeTokenVault_default)
+    const est = await estimator.estimateGas(tx);
+    const buffered = BigInt(est) * (100n + BUFFER) / 100n;
+    return makeGasQuote({ gasLimit: buffered, maxFeePerGas, maxPriorityFeePerGas });
+  } catch (err) {
+    if (fallbackGasLimit != null) {
+      return makeGasQuote({ gasLimit: fallbackGasLimit, maxFeePerGas, maxPriorityFeePerGas });
+    }
+    console.warn("L1 gas estimation failed", err);
+    return void 0;
+  }
+}
+async function quoteL2Gas(input) {
+  const { estimator, route, tx, gasPerPubdata, l2GasLimit, overrideGasLimit, stateOverrides } = input;
+  const market = await fetchFees(estimator);
+  const maxFeePerGas = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
+  const txGasLimit = tx?.gasLimit != null ? BigInt(tx.gasLimit) : void 0;
+  const explicit = overrideGasLimit ?? txGasLimit;
+  if (explicit != null) {
+    return makeGasQuote({
+      gasLimit: explicit,
+      maxFeePerGas,
+      gasPerPubdata
     });
-  } catch {
   }
-  try {
-    ERROR_IFACES.push({
-      name: "IL2NativeTokenVault",
-      iface: new ethers.Interface(L2NativeTokenVault_default)
+  if (!tx) {
+    return makeGasQuote({
+      gasLimit: l2GasLimit ?? 0n,
+      maxFeePerGas,
+      gasPerPubdata
     });
-  } catch {
   }
   try {
-    ERROR_IFACES.push({ name: "Mailbox", iface: new ethers.Interface(Mailbox_default) });
-  } catch {
+    const execEstimate = await estimator.estimateGas(tx, stateOverrides);
+    const memoryBytes = route === "erc20-nonbase" ? 500n : DEFAULT_ABI_BYTES;
+    const pubdataBytes = route === "erc20-nonbase" ? 200n : DEFAULT_PUBDATA_BYTES;
+    const pp = gasPerPubdata ?? 800n;
+    const memoryOverhead = memoryBytes * TX_MEMORY_OVERHEAD_GAS;
+    const pubdataOverhead = pubdataBytes * pp;
+    let total = BigInt(execEstimate) + TX_OVERHEAD_GAS + memoryOverhead + pubdataOverhead;
+    total = total * (100n + BUFFER) / 100n;
+    return makeGasQuote({
+      gasLimit: total,
+      maxFeePerGas,
+      gasPerPubdata: pp
+    });
+  } catch (err) {
+    console.warn("L2 gas estimation failed", err);
+    return makeGasQuote({
+      gasLimit: l2GasLimit ?? 0n,
+      maxFeePerGas,
+      gasPerPubdata
+    });
   }
-})();
-function registerErrorAbi(name, abi) {
-  const existing = ERROR_IFACES.findIndex((x) => x.name === name);
-  const entry = { name, iface: new ethers.Interface(abi) };
-  if (existing >= 0) ERROR_IFACES[existing] = entry;
-  else ERROR_IFACES.push(entry);
 }
-function extractRevertData(e) {
-  const maybe = (
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    e?.data?.data ?? e?.error?.data ?? e?.data ?? e?.error?.error?.data ?? e?.info?.error?.data
-  );
-  if (typeof maybe === "string" && maybe.startsWith("0x") && maybe.length >= 10) {
-    return maybe;
+async function quoteL2BaseCost(input) {
+  const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata } = input;
+  const market = await fetchFees(estimator);
+  const l1GasPrice = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
+  if (l1GasPrice === 0n) {
+    throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
   }
-  return void 0;
+  const data = encode2(IBridgehub_default, "l2TransactionBaseCost", [
+    chainIdL2,
+    l1GasPrice,
+    l2GasLimit,
+    gasPerPubdata
+  ]);
+  const raw = await estimator.call({
+    to: bridgehub,
+    data
+  });
+  return BigInt(raw);
 }
-function decodeRevert(e) {
-  const data = extractRevertData(e);
-  if (!data) return;
-  const selector = `0x${data.slice(2, 10)}`;
-  try {
-    const parsed = IFACE_ERROR_STRING.parseError(data);
-    if (parsed?.name === "Error") {
-      const args = parsed.args ? Array.from(parsed.args) : void 0;
-      return { selector, name: "Error", args };
-    }
-  } catch {
-  }
-  try {
-    const parsed = IFACE_PANIC.parseError(data);
-    if (parsed?.name === "Panic") {
-      const args = parsed.args ? Array.from(parsed.args) : void 0;
-      return { selector, name: "Panic", args };
-    }
-  } catch {
-  }
-  for (const { name, iface } of ERROR_IFACES) {
-    try {
-      const parsed = iface.parseError(data);
-      if (parsed) {
-        const args = parsed.args ? Array.from(parsed.args) : void 0;
-        return {
-          selector,
-          name: parsed.name,
-          args,
-          contract: name
-        };
+
+// src/adapters/ethers/estimator.ts
+function toCoreTx(tx) {
+  return {
+    to: tx.to,
+    from: tx.from,
+    data: tx.data,
+    value: tx.value ? BigInt(tx.value) : void 0,
+    gasLimit: tx.gasLimit ? BigInt(tx.gasLimit) : void 0,
+    maxFeePerGas: tx.maxFeePerGas ? BigInt(tx.maxFeePerGas) : void 0,
+    maxPriorityFeePerGas: tx.maxPriorityFeePerGas ? BigInt(tx.maxPriorityFeePerGas) : void 0
+  };
+}
+function ethersToGasEstimator(provider) {
+  return {
+    async estimateGas(tx, stateOverrides) {
+      const ethTx = {
+        to: tx.to,
+        from: tx.from,
+        data: tx.data,
+        value: tx.value,
+        gasLimit: tx.gasLimit,
+        maxFeePerGas: tx.maxFeePerGas,
+        maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+      };
+      if (stateOverrides && "send" in provider) {
+        try {
+          const jsonRpcProvider = provider;
+          const result = await jsonRpcProvider.send("eth_estimateGas", [
+            ethTx,
+            "latest",
+            stateOverrides
+          ]);
+          return BigInt(result);
+        } catch (error) {
+          console.warn(
+            "Failed to estimate gas with state overrides, falling back to standard estimation:",
+            error
+          );
+        }
+      } else if (stateOverrides) {
+        console.warn('Provider does not support "send", skipping state overrides estimation.');
       }
-    } catch {
+      return await provider.estimateGas(ethTx);
+    },
+    async estimateFeesPerGas() {
+      const fd = await provider.getFeeData();
+      return {
+        maxFeePerGas: fd.maxFeePerGas != null ? BigInt(fd.maxFeePerGas) : void 0,
+        maxPriorityFeePerGas: fd.maxPriorityFeePerGas != null ? BigInt(fd.maxPriorityFeePerGas) : void 0,
+        gasPrice: fd.gasPrice != null ? BigInt(fd.gasPrice) : void 0
+      };
+    },
+    async getGasPrice() {
+      const fd = await provider.getFeeData();
+      if (fd.gasPrice != null) return BigInt(fd.gasPrice);
+      throw new Error("Could not fetch gas price");
+    },
+    async call(tx) {
+      const ethTx = {
+        to: tx.to,
+        data: tx.data,
+        value: tx.value,
+        from: tx.from
+      };
+      return await provider.call(ethTx);
     }
-  }
-  return { selector };
+  };
 }
-function classifyReadinessFromRevert(e) {
-  const r = decodeRevert(e);
-  const name = r?.name;
-  if (name && REVERT_TO_READINESS[name]) return REVERT_TO_READINESS[name];
-  const msg = (() => {
-    if (typeof e !== "object" || e === null) return "";
-    const obj = e;
-    const maybeMsg = obj["shortMessage"] ?? obj["message"];
-    return typeof maybeMsg === "string" ? maybeMsg : "";
-  })();
-  const lower = String(msg).toLowerCase();
-  if (lower.includes("paused")) return { kind: "NOT_READY", reason: "paused" };
-  if (name || r?.selector) {
-    return { kind: "UNFINALIZABLE", reason: "unsupported", detail: name ?? r?.selector };
-  }
-  return { kind: "NOT_READY", reason: "unknown", detail: lower || void 0 };
+
+// src/adapters/ethers/resources/deposits/services/fee.ts
+var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
+var encode = (abi2, fn, args) => {
+  return new ethers.Interface(abi2).encodeFunctionData(fn, args);
+};
+async function quoteL2BaseCost2(input) {
+  const { ctx, l2GasLimit } = input;
+  const estimator = ethersToGasEstimator(ctx.client.l1);
+  return wrapAs2(
+    "RPC",
+    "deposits.fees.l2BaseCost",
+    () => quoteL2BaseCost({
+      estimator,
+      encode,
+      bridgehub: ctx.bridgehub,
+      chainIdL2: ctx.chainIdL2,
+      l2GasLimit,
+      gasPerPubdata: ctx.gasPerPubdata
+    }),
+    { ctx: { chainIdL2: ctx.chainIdL2 } }
+  );
 }
 
-// src/adapters/ethers/errors/error-ops.ts
-function toZKsyncError(type, base, err) {
-  if (isZKsyncError(err)) return err;
-  const revert = decodeRevert(err);
-  return createError(type, { ...base, ...revert ? { revert } : {}, cause: shapeCause(err) });
+// src/adapters/ethers/resources/deposits/services/gas.ts
+async function quoteL1Gas2(input) {
+  const { ctx, tx, overrides, fallbackGasLimit } = input;
+  const estimator = ethersToGasEstimator(ctx.client.l1);
+  return quoteL1Gas({
+    estimator,
+    tx: toCoreTx(tx),
+    overrides,
+    fallbackGasLimit
+  });
 }
-function resolveMessage(op, msg) {
-  if (!msg) return `Error during ${op}.`;
-  return typeof msg === "function" ? msg() : msg;
+async function quoteL2Gas2(input) {
+  const { ctx, route, l2TxForModeling, overrideGasLimit } = input;
+  const estimator = ethersToGasEstimator(ctx.client.l2);
+  return quoteL2Gas({
+    estimator,
+    route,
+    tx: l2TxForModeling ? toCoreTx(l2TxForModeling) : void 0,
+    gasPerPubdata: ctx.gasPerPubdata,
+    l2GasLimit: ctx.l2GasLimit,
+    overrideGasLimit,
+    stateOverrides: input.stateOverrides
+  });
 }
-function createErrorHandlers(resource) {
-  async function run(kind, operation, fn, opts) {
-    try {
-      return await fn();
-    } catch (e) {
-      if (isZKsyncError(e)) throw e;
-      const message = resolveMessage(operation, opts?.message);
-      throw toZKsyncError(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
-    }
-  }
-  function wrap2(operation, fn, opts) {
-    return run("INTERNAL", operation, fn, opts);
-  }
-  function wrapAs9(kind, operation, fn, opts) {
-    return run(kind, operation, fn, opts);
+async function determineErc20L2Gas(input) {
+  const { ctx, l1Token } = input;
+  const DEFAULT_SAFE_L2_GAS_LIMIT = 3000000n;
+  if (ctx.l2GasLimit != null) {
+    return quoteL2Gas2({
+      ctx,
+      route: "erc20-nonbase",
+      overrideGasLimit: ctx.l2GasLimit
+    });
   }
-  async function toResult2(operation, fn, opts) {
-    try {
-      const value = await wrap2(operation, fn, opts);
-      return { ok: true, value };
-    } catch (e) {
-      const shaped = isZKsyncError(e) ? e : toZKsyncError(
-        "INTERNAL",
-        {
-          resource,
-          operation,
-          context: opts?.ctx ?? {},
-          message: resolveMessage(operation, opts?.message)
-        },
-        e
-      );
-      return { ok: false, error: shaped };
+  try {
+    const l2TokenAddress = ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).l2TokenAddress(l1Token);
+    if (l2TokenAddress === "0x0000000000000000000000000000000000000000") {
+      return quoteL2Gas2({
+        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 quoteL2Gas2({
+      ctx,
+      route: "erc20-nonbase",
+      l2TxForModeling: modelTx
+    });
+    if (!gas) {
+      return quoteL2Gas2({
+        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 quoteL2Gas2({
+      ctx,
+      route: "erc20-nonbase",
+      overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
+    });
   }
-  return { wrap: wrap2, wrapAs: wrapAs9, toResult: toResult2 };
+}
+
+// src/core/resources/deposits/fee.ts
+function buildFeeBreakdown(p) {
+  const l1MaxTotal = p.l1Gas?.maxCost ?? 0n;
+  const l2Total = p.l2BaseCost + p.operatorTip;
+  const l1 = {
+    gasLimit: p.l1Gas?.gasLimit ?? 0n,
+    maxFeePerGas: p.l1Gas?.maxFeePerGas ?? 0n,
+    maxPriorityFeePerGas: p.l1Gas?.maxPriorityFeePerGas,
+    maxTotal: l1MaxTotal
+  };
+  const l2 = {
+    total: l2Total,
+    baseCost: p.l2BaseCost,
+    operatorTip: p.operatorTip,
+    gasLimit: p.l2Gas?.gasLimit ?? 0n,
+    maxFeePerGas: p.l2Gas?.maxFeePerGas ?? 0n,
+    maxPriorityFeePerGas: p.l2Gas?.maxPriorityFeePerGas,
+    gasPerPubdata: p.l2Gas?.gasPerPubdata ?? 0n
+  };
+  return {
+    token: p.feeToken,
+    maxTotal: l1MaxTotal + l2Total,
+    mintValue: p.mintValue,
+    l1,
+    l2
+  };
 }
 
 // src/adapters/ethers/resources/deposits/routes/eth.ts
-var { wrapAs } = createErrorHandlers("deposits");
 function routeEthDirect() {
   return {
     async build(p, ctx) {
-      const bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const { gasPriceForBaseCost, gasLimit: overrideGasLimit, ...txFeeOverrides } = ctx.fee;
-      const rawBaseCost = await wrapAs(
-        "CONTRACT",
-        OP_DEPOSITS.eth.baseCost,
-        () => bh.l2TransactionBaseCost(
-          ctx.chainIdL2,
-          gasPriceForBaseCost,
-          ctx.l2GasLimit,
-          ctx.gasPerPubdata
-        ),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost from Bridgehub."
+      const bh = await ctx.contracts.bridgehub();
+      const l2TxModel = {
+        to: p.to ?? ctx.sender,
+        from: ctx.sender,
+        data: "0x",
+        value: 0n
+      };
+      const l2GasParams = await quoteL2Gas2({
+        ctx,
+        route: "eth-base",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit,
+        stateOverrides: {
+          [ctx.sender]: {
+            balance: "0xffffffffffffffffffff"
+          }
         }
-      );
-      const baseCost = BigInt(rawBaseCost);
-      const l2Contract = p.to ?? ctx.sender;
-      const l2Value = p.amount;
-      const mintValue = baseCost + ctx.operatorTip + l2Value;
+      });
+      if (!l2GasParams) {
+        throw new Error("Failed to estimate L2 gas for deposit.");
+      }
+      const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
+      const mintValue = baseCost + ctx.operatorTip + p.amount;
       const req = buildDirectRequestStruct({
         chainId: ctx.chainIdL2,
         mintValue,
-        l2GasLimit: ctx.l2GasLimit,
+        l2GasLimit: l2GasParams.gasLimit,
         gasPerPubdata: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
-        l2Contract,
-        l2Value
+        l2Contract: p.to ?? ctx.sender,
+        l2Value: p.amount
       });
       const data = bh.interface.encodeFunctionData("requestL2TransactionDirect", [req]);
-      let resolvedL1GasLimit = overrideGasLimit ?? ctx.l2GasLimit;
-      const tx = {
+      const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
         value: mintValue,
         from: ctx.sender,
-        ...txFeeOverrides
+        ...ctx.gasOverrides
       };
-      if (overrideGasLimit != null) {
-        tx.gasLimit = overrideGasLimit;
-        resolvedL1GasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs(
-            "RPC",
-            OP_DEPOSITS.eth.estGas,
-            () => ctx.client.l1.estimateGas(tx),
-            {
-              ctx: { where: "l1.estimateGas", to: ctx.bridgehub },
-              message: "Failed to estimate gas for Bridgehub request."
-            }
-          );
-          const buffered = BigInt(est) * 115n / 100n;
-          tx.gasLimit = buffered;
-          resolvedL1GasLimit = buffered;
-        } catch {
-        }
+      const l1GasParams = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides
+      });
+      if (l1GasParams) {
+        l1TxCandidate.gasLimit = l1GasParams.gasLimit;
+        l1TxCandidate.maxFeePerGas = l1GasParams.maxFeePerGas;
+        l1TxCandidate.maxPriorityFeePerGas = l1GasParams.maxPriorityFeePerGas;
       }
       const steps = [
         {
           key: "bridgehub:direct",
           kind: "bridgehub:direct",
           description: "Bridge ETH via Bridgehub.requestL2TransactionDirect",
-          tx
+          tx: l1TxCandidate
         }
       ];
+      const fees = buildFeeBreakdown({
+        feeToken: ETH_ADDRESS,
+        l1Gas: l1GasParams,
+        l2Gas: l2GasParams,
+        l2BaseCost: baseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
+      });
       return {
         steps,
         approvals: [],
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
-var MIN_L2_GAS_FOR_ERC20 = 2500000n;
+var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
-    async preflight() {
-    },
-    async build(p, ctx) {
-      const bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const assetRouter = ctx.l1AssetRouter;
-      const { gasPriceForBaseCost, gasLimit: overrideGasLimit, ...txFeeOverrides } = ctx.fee;
-      const txOverrides = overrideGasLimit != null ? { ...txFeeOverrides, gasLimit: overrideGasLimit } : txFeeOverrides;
-      let resolvedL1GasLimit = overrideGasLimit ?? ctx.l2GasLimit;
-      const baseToken = await wrapAs2(
-        "CONTRACT",
-        OP_DEPOSITS.nonbase.baseToken,
-        () => bh.baseToken(ctx.chainIdL2),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      await wrapAs2(
+    async preflight(p, ctx) {
+      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 wrapAs3(
         "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.");
           }
         },
         { ctx: { depositToken: p.token, baseToken } }
       );
-      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(
-        "RPC",
-        OP_DEPOSITS.nonbase.baseCost,
-        () => bh.l2TransactionBaseCost(
-          ctx.chainIdL2,
-          gasPriceForBaseCost,
-          l2GasLimitUsed,
-          ctx.gasPerPubdata
-        ),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost from Bridgehub."
+    },
+    async build(p, ctx) {
+      const l1Signer = ctx.client.getL1Signer();
+      const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
+      const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
+      const l2GasParams = await determineErc20L2Gas({
+        ctx,
+        l1Token: p.token,
+        modelTx: {
+          to: p.to ?? ctx.sender,
+          from: ctx.sender,
+          data: "0x",
+          value: 0n
         }
-      );
-      const baseCost = BigInt(rawBaseCost);
+      });
+      if (!l2GasParams) throw new Error("Failed to establish L2 gas parameters.");
+      const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
       const mintValue = baseCost + ctx.operatorTip;
       const approvals = [];
       const steps = [];
-      const l1Signer = ctx.client.getL1Signer();
-      {
-        const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
-        const allowanceToken = await wrapAs2(
-          "RPC",
-          OP_DEPOSITS.nonbase.allowanceToken,
-          () => erc20Deposit.allowance(ctx.sender, assetRouter),
-          {
-            ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
-            message: "Failed to read deposit-token allowance."
-          }
-        );
-        if (allowanceToken < p.amount) {
-          approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
-          const data = erc20Deposit.interface.encodeFunctionData("approve", [
-            assetRouter,
-            p.amount
-          ]);
-          steps.push({
-            key: `approve:${p.token}:${assetRouter}`,
-            kind: "approve",
-            description: `Approve ${p.amount} for router (deposit token)`,
-            tx: { to: p.token, data, from: ctx.sender, ...txOverrides }
-          });
+      const assetRouter = ctx.l1AssetRouter;
+      const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
+      const allowanceToken = await wrapAs3(
+        "RPC",
+        OP_DEPOSITS.nonbase.allowanceToken,
+        () => erc20Deposit.allowance(ctx.sender, assetRouter),
+        {
+          ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
+          message: "Failed to read deposit-token allowance."
         }
+      );
+      if (allowanceToken < p.amount) {
+        approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
+        steps.push({
+          key: `approve:${p.token}:${assetRouter}`,
+          kind: "approve",
+          description: `Approve ${p.amount} for router (deposit token)`,
+          tx: {
+            to: p.token,
+            data: erc20Deposit.interface.encodeFunctionData("approve", [assetRouter, p.amount]),
+            from: ctx.sender,
+            ...ctx.gasOverrides
+          }
+        });
       }
-      const baseIsEth = isETH(baseToken);
       if (!baseIsEth) {
         const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
-        const allowanceBase = await wrapAs2(
+        const allowanceBase = await wrapAs3(
           "RPC",
           OP_DEPOSITS.nonbase.allowanceBase,
           () => erc20Base.allowance(ctx.sender, assetRouter),
@@ -5817,16 +6007,20 @@ function routeErc20NonBase() {
         );
         if (allowanceBase < mintValue) {
           approvals.push({ token: baseToken, spender: assetRouter, amount: mintValue });
-          const data = erc20Base.interface.encodeFunctionData("approve", [assetRouter, mintValue]);
           steps.push({
             key: `approve:${baseToken}:${assetRouter}`,
             kind: "approve",
             description: `Approve base token for mintValue`,
-            tx: { to: baseToken, data, from: ctx.sender, ...txOverrides }
+            tx: {
+              to: baseToken,
+              data: erc20Base.interface.encodeFunctionData("approve", [assetRouter, mintValue]),
+              from: ctx.sender,
+              ...ctx.gasOverrides
+            }
           });
         }
       }
-      const secondBridgeCalldata = await wrapAs2(
+      const secondBridgeCalldata = await wrapAs3(
         "INTERNAL",
         OP_DEPOSITS.nonbase.encodeCalldata,
         () => Promise.resolve(encodeSecondBridgeErc20Args(p.token, p.amount, p.to ?? ctx.sender)),
@@ -5835,98 +6029,88 @@ function routeErc20NonBase() {
           message: "Failed to encode bridging calldata."
         }
       );
-      const outer = {
+      const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        // fees (in ETH if base=ETH, else pulled as base ERC-20)
         l2Value: 0n,
-        l2GasLimit: l2GasLimitUsed,
+        l2GasLimit: l2GasParams.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         secondBridgeAddress: assetRouter,
         secondBridgeValue: 0n,
         secondBridgeCalldata
       };
-      const dataTwo = bh.interface.encodeFunctionData("requestL2TransactionTwoBridges", [outer]);
-      const bridgeTx = {
+      const bh = await ctx.contracts.bridgehub();
+      const data = bh.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
+        requestStruct
+      ]);
+      const txValue = baseIsEth ? mintValue : 0n;
+      const l1TxCandidate = {
         to: ctx.bridgehub,
-        data: dataTwo,
-        value: baseIsEth ? mintValue : 0n,
+        data,
+        value: txValue,
         from: ctx.sender,
-        ...txOverrides
+        ...ctx.gasOverrides
       };
-      if (overrideGasLimit != null) {
-        bridgeTx.gasLimit = overrideGasLimit;
-        resolvedL1GasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs2(
-            "RPC",
-            OP_DEPOSITS.nonbase.estGas,
-            () => ctx.client.l1.estimateGas(bridgeTx),
-            {
-              ctx: { where: "l1.estimateGas", to: ctx.bridgehub, baseIsEth },
-              message: "Failed to estimate gas for Bridgehub request."
-            }
-          );
-          const buffered = BigInt(est) * 125n / 100n;
-          bridgeTx.gasLimit = buffered;
-          resolvedL1GasLimit = buffered;
-        } catch {
-        }
+      const l1GasParams = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
+      if (l1GasParams) {
+        l1TxCandidate.gasLimit = l1GasParams.gasLimit;
+        l1TxCandidate.maxFeePerGas = l1GasParams.maxFeePerGas;
+        l1TxCandidate.maxPriorityFeePerGas = l1GasParams.maxPriorityFeePerGas;
       }
       steps.push({
-        key: "bridgehub:two-bridges:nonbase",
+        key: "bridgehub:two-bridges",
         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
+        description: baseIsEth ? "Bridge ERC-20 (Fees paid in ETH)" : "Bridge ERC-20 (Fees paid in Base Token)",
+        tx: l1TxCandidate
+      });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas: l1GasParams,
+        l2Gas: l2GasParams,
+        l2BaseCost: baseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
       });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, baseToken, baseIsEth, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
-var BASE_COST_BUFFER_BPS = 100n;
-var BPS = 10000n;
-var withBuffer = (x) => x * (BPS + BASE_COST_BUFFER_BPS) / BPS;
+var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 function routeEthNonBase() {
   return {
     async preflight(p, ctx) {
-      await wrapAs3(
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
+      await wrapAs4(
         "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 bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const baseToken = await wrapAs3(
-        "CONTRACT",
-        OP_DEPOSITS.ethNonBase.baseToken,
-        () => bh.baseToken(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(ctx.sender),
@@ -5935,7 +6119,7 @@ function routeEthNonBase() {
           message: "Failed to read L1 ETH balance."
         }
       );
-      await wrapAs3(
+      await wrapAs4(
         "VALIDATION",
         OP_DEPOSITS.ethNonBase.assertEthBalance,
         () => {
@@ -5948,63 +6132,50 @@ function routeEthNonBase() {
       return;
     },
     async build(p, ctx) {
-      const bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const { gasPriceForBaseCost, gasLimit: overrideGasLimit, ...txFeeOverrides } = ctx.fee;
-      const txOverrides = overrideGasLimit != null ? { ...txFeeOverrides, gasLimit: overrideGasLimit } : txFeeOverrides;
-      const baseToken = await wrapAs3(
-        "CONTRACT",
-        OP_DEPOSITS.ethNonBase.baseToken,
-        () => bh.baseToken(ctx.chainIdL2),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      const rawBaseCost = await wrapAs3(
+      const l1Signer = ctx.client.getL1Signer();
+      const baseToken = ctx.baseTokenL1;
+      const l2TxModel = {
+        to: p.to ?? ctx.sender,
+        from: ctx.sender,
+        data: "0x",
+        value: 0n
+      };
+      const l2GasParams = await quoteL2Gas2({
+        ctx,
+        route: "eth-nonbase",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit
+      });
+      if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
+      const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
+      const mintValue = baseCost + ctx.operatorTip;
+      const approvals = [];
+      const steps = [];
+      const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
+      const allowance = await wrapAs4(
         "RPC",
-        OP_DEPOSITS.ethNonBase.baseCost,
-        () => bh.l2TransactionBaseCost(
-          ctx.chainIdL2,
-          gasPriceForBaseCost,
-          ctx.l2GasLimit,
-          ctx.gasPerPubdata
-        ),
+        OP_DEPOSITS.ethNonBase.allowanceBase,
+        () => erc20Base.allowance(ctx.sender, ctx.l1AssetRouter),
         {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost."
+          ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
+          message: "Failed to read base-token allowance."
         }
       );
-      const baseCost = BigInt(rawBaseCost);
-      const mintValueRaw = baseCost + ctx.operatorTip;
-      const mintValue = withBuffer(mintValueRaw);
-      const approvals = [];
-      const steps = [];
-      {
-        const erc20 = new ethers.Contract(baseToken, IERC20_default, ctx.client.getL1Signer());
-        const allowance = await wrapAs3(
-          "RPC",
-          OP_DEPOSITS.ethNonBase.allowanceBase,
-          () => erc20.allowance(ctx.sender, ctx.l1AssetRouter),
-          {
-            ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
-            message: "Failed to read base-token allowance."
+      if (allowance < mintValue) {
+        approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
+        steps.push({
+          key: `approve:${baseToken}`,
+          kind: "approve",
+          description: `Approve base token for fees (mintValue)`,
+          tx: {
+            to: baseToken,
+            data: erc20Base.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
+            from: ctx.sender,
+            ...ctx.gasOverrides
           }
-        );
-        if (allowance < mintValue) {
-          approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
-          const data = erc20.interface.encodeFunctionData("approve", [
-            ctx.l1AssetRouter,
-            mintValue
-          ]);
-          steps.push({
-            key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
-            kind: "approve",
-            description: `Approve base token for mintValue`,
-            tx: { to: baseToken, data, from: ctx.sender, ...txOverrides }
-          });
-        }
+        });
       }
-      const secondBridgeCalldata = await wrapAs3(
+      const secondBridgeCalldata = await wrapAs4(
         "INTERNAL",
         OP_DEPOSITS.ethNonBase.encodeCalldata,
         () => Promise.resolve(encodeSecondBridgeEthArgs(p.amount, p.to ?? ctx.sender)),
@@ -6016,93 +6187,79 @@ function routeEthNonBase() {
           }
         }
       );
-      const outer = {
+      const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: 0n,
-        l2GasLimit: ctx.l2GasLimit,
+        l2Value: p.amount,
+        l2GasLimit: l2GasParams.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         secondBridgeAddress: ctx.l1AssetRouter,
         secondBridgeValue: p.amount,
         secondBridgeCalldata
       };
-      const dataTwo = new ethers.Contract(
-        ctx.bridgehub,
-        IBridgehub_default,
-        ctx.client.l1
-      ).interface.encodeFunctionData("requestL2TransactionTwoBridges", [outer]);
-      let resolvedL1GasLimit = overrideGasLimit ?? ctx.l2GasLimit;
-      const bridgeTx = {
+      const bridgehub = await ctx.contracts.bridgehub();
+      const data = bridgehub.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
+        requestStruct
+      ]);
+      const l1TxCandidate = {
         to: ctx.bridgehub,
-        data: dataTwo,
+        data,
         value: p.amount,
         // base ≠ ETH ⇒ msg.value == secondBridgeValue
         from: ctx.sender,
-        ...txOverrides
+        ...ctx.gasOverrides
       };
-      if (overrideGasLimit != null) {
-        bridgeTx.gasLimit = overrideGasLimit;
-        resolvedL1GasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs3(
-            "RPC",
-            OP_DEPOSITS.ethNonBase.estGas,
-            () => ctx.client.l1.estimateGas(bridgeTx),
-            {
-              ctx: { where: "l1.estimateGas", to: ctx.bridgehub },
-              message: "Failed to estimate gas for Bridgehub request."
-            }
-          );
-          const buffered = BigInt(est) * 115n / 100n;
-          bridgeTx.gasLimit = buffered;
-          resolvedL1GasLimit = buffered;
-        } catch {
-        }
+      const l1GasParams = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
+      if (l1GasParams) {
+        l1TxCandidate.gasLimit = l1GasParams.gasLimit;
+        l1TxCandidate.maxFeePerGas = l1GasParams.maxFeePerGas;
+        l1TxCandidate.maxPriorityFeePerGas = l1GasParams.maxPriorityFeePerGas;
       }
       steps.push({
         key: "bridgehub:two-bridges:eth-nonbase",
         kind: "bridgehub:two-bridges",
         description: "Bridge ETH (fees in base ERC-20) via Bridgehub.requestL2TransactionTwoBridges",
-        tx: bridgeTx
+        tx: l1TxCandidate
+      });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas: l1GasParams,
+        l2Gas: l2GasParams,
+        l2BaseCost: baseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
       });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
-var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
-var BASE_COST_BUFFER_BPS2 = 100n;
-var BPS2 = 10000n;
-var withBuffer2 = (x) => x * (BPS2 + BASE_COST_BUFFER_BPS2) / BPS2;
+var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
 function routeErc20Base() {
   return {
     async preflight(p, ctx) {
-      await wrapAs4(
+      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
+      await wrapAs5(
         "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 bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const baseToken = await wrapAs4(
-        "CONTRACT",
-        OP_DEPOSITS.base.baseToken,
-        () => bh.baseToken(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,
         () => {
@@ -6115,42 +6272,28 @@ function routeErc20Base() {
       return;
     },
     async build(p, ctx) {
-      const bh = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
-      const { gasPriceForBaseCost, gasLimit: overrideGasLimit, ...txFeeOverrides } = ctx.fee;
-      const txOverrides = overrideGasLimit != null ? { ...txFeeOverrides, gasLimit: overrideGasLimit } : txFeeOverrides;
-      let resolvedL1GasLimit = overrideGasLimit ?? ctx.l2GasLimit;
-      const baseToken = await wrapAs4(
-        "CONTRACT",
-        OP_DEPOSITS.base.baseToken,
-        () => bh.baseToken(ctx.chainIdL2),
-        {
-          ctx: { where: "bridgehub.baseToken", chainIdL2: ctx.chainIdL2 },
-          message: "Failed to read base token."
-        }
-      );
-      const rawBaseCost = await wrapAs4(
-        "RPC",
-        OP_DEPOSITS.base.baseCost,
-        () => bh.l2TransactionBaseCost(
-          ctx.chainIdL2,
-          gasPriceForBaseCost,
-          ctx.l2GasLimit,
-          ctx.gasPerPubdata
-        ),
-        {
-          ctx: { where: "l2TransactionBaseCost", chainIdL2: ctx.chainIdL2 },
-          message: "Could not fetch L2 base cost from Bridgehub."
-        }
-      );
-      const baseCost = BigInt(rawBaseCost);
-      const l2Value = p.amount;
-      const rawMintValue = baseCost + ctx.operatorTip + l2Value;
-      const mintValue = withBuffer2(rawMintValue);
+      const l1Signer = ctx.client.getL1Signer();
+      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 l2GasParams = await quoteL2Gas2({
+        ctx,
+        route: "erc20-base",
+        l2TxForModeling: l2TxModel,
+        overrideGasLimit: ctx.l2GasLimit
+      });
+      if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
+      const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
+      const mintValue = baseCost + ctx.operatorTip + p.amount;
       const approvals = [];
       const steps = [];
       {
-        const erc20 = new ethers.Contract(baseToken, IERC20_default, ctx.client.getL1Signer());
-        const allowance = await wrapAs4(
+        const erc20 = new ethers.Contract(baseToken, IERC20_default, l1Signer);
+        const allowance = await wrapAs5(
           "RPC",
           OP_DEPOSITS.base.allowance,
           () => erc20.allowance(ctx.sender, ctx.l1AssetRouter),
@@ -6161,75 +6304,350 @@ function routeErc20Base() {
         );
         if (allowance < mintValue) {
           approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
-          const data2 = erc20.interface.encodeFunctionData("approve", [
-            ctx.l1AssetRouter,
-            mintValue
-          ]);
           steps.push({
             key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
             kind: "approve",
             description: "Approve base token for mintValue",
-            tx: { to: baseToken, data: data2, from: ctx.sender, ...txOverrides }
+            tx: {
+              to: baseToken,
+              data: erc20.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
+              from: ctx.sender,
+              ...ctx.gasOverrides
+            }
           });
         }
       }
-      const req = buildDirectRequestStruct({
+      const requestStruct = buildDirectRequestStruct({
         chainId: ctx.chainIdL2,
         mintValue,
-        l2GasLimit: ctx.l2GasLimit,
+        l2GasLimit: l2GasParams.gasLimit,
         gasPerPubdata: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
         l2Contract: p.to ?? ctx.sender,
-        l2Value
+        l2Value: p.amount
       });
-      const data = new ethers.Contract(
-        ctx.bridgehub,
-        IBridgehub_default,
-        ctx.client.l1
-      ).interface.encodeFunctionData("requestL2TransactionDirect", [req]);
-      const tx = {
+      const bridgehub = await ctx.contracts.bridgehub();
+      const data = bridgehub.interface.encodeFunctionData("requestL2TransactionDirect", [
+        requestStruct
+      ]);
+      const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
         value: 0n,
         // base token is ERC-20 ⇒ msg.value MUST be 0
         from: ctx.sender,
-        ...txOverrides
+        ...ctx.gasOverrides
       };
-      if (overrideGasLimit != null) {
-        tx.gasLimit = overrideGasLimit;
-        resolvedL1GasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs4(
-            "RPC",
-            OP_DEPOSITS.base.estGas,
-            () => ctx.client.l1.estimateGas(tx),
-            {
-              ctx: { where: "l1.estimateGas", to: ctx.bridgehub },
-              message: "Failed to estimate gas for Bridgehub request."
-            }
-          );
-          const buffered = BigInt(est) * 115n / 100n;
-          tx.gasLimit = buffered;
-          resolvedL1GasLimit = buffered;
-        } catch {
-        }
+      const l1GasParams = await quoteL1Gas2({
+        ctx,
+        tx: l1TxCandidate,
+        overrides: ctx.gasOverrides,
+        fallbackGasLimit: SAFE_L1_BRIDGE_GAS
+      });
+      if (l1GasParams) {
+        l1TxCandidate.gasLimit = l1GasParams.gasLimit;
+        l1TxCandidate.maxFeePerGas = l1GasParams.maxFeePerGas;
+        l1TxCandidate.maxPriorityFeePerGas = l1GasParams.maxPriorityFeePerGas;
       }
       steps.push({
         key: "bridgehub:direct:erc20-base",
         kind: "bridgehub:direct",
         description: "Bridge base ERC-20 via Bridgehub.requestL2TransactionDirect",
-        tx
+        tx: l1TxCandidate
+      });
+      const fees = buildFeeBreakdown({
+        feeToken: baseToken,
+        l1Gas: l1GasParams,
+        l2Gas: l2GasParams,
+        l2BaseCost: baseCost,
+        operatorTip: ctx.operatorTip,
+        mintValue
       });
       return {
         steps,
         approvals,
-        quoteExtras: { baseCost, mintValue, l1GasLimit: resolvedL1GasLimit }
+        fees
       };
     }
   };
 }
 
+// src/core/codec/ntv.ts
+function createNTVCodec(deps) {
+  function encodeAssetId(originChainId, ntvAddress, tokenAddress) {
+    const encoded = deps.encode(
+      ["uint256", "address", "address"],
+      [originChainId, ntvAddress, tokenAddress]
+    );
+    return deps.keccak256(encoded);
+  }
+  return {
+    encodeAssetId
+  };
+}
+
+// src/adapters/ethers/resources/tokens/tokens.ts
+var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
+var abi = ethers.AbiCoder.defaultAbiCoder();
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => abi.encode(types, values),
+  keccak256: (data) => ethers.ethers.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();
+        const chainId = await l2NativeTokenVault.L1_CHAIN_ID();
+        return chainId;
+      });
+    }
+    return l2NtvL1ChainIdPromise;
+  }
+  async function getBaseTokenAssetId() {
+    if (!baseTokenAssetIdPromise) {
+      baseTokenAssetIdPromise = wrapAs6("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 = wrapAs6("INTERNAL", "wethL1", async () => {
+        const { l1NativeTokenVault } = await client.contracts();
+        const weth = await l1NativeTokenVault.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.WETH_TOKEN();
+        return weth;
+      });
+    }
+    return wethL2Promise;
+  }
+  async function toL2Address(l1Token) {
+    return wrapAs6("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 wrapAs6("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 wrapAs6("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 wrapAs6("CONTRACT", "tokens.assetIdOfL2", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      const assetId = await l2NativeTokenVault.assetId(l2Token);
+      return assetId;
+    });
+  }
+  async function l2TokenFromAssetId(assetId) {
+    return wrapAs6("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
+      const { l2NativeTokenVault } = await client.contracts();
+      const tokenAddr = await l2NativeTokenVault.tokenAddress(assetId);
+      return tokenAddr;
+    });
+  }
+  async function l1TokenFromAssetId(assetId) {
+    return wrapAs6("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
+      const { l1NativeTokenVault } = await client.contracts();
+      const tokenAddr = await l1NativeTokenVault.tokenAddress(assetId);
+      return tokenAddr;
+    });
+  }
+  async function originChainId(assetId) {
+    return wrapAs6("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 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.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/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");
 var ROUTES = {
@@ -6238,42 +6656,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.gasLimit;
-        if (candidate == null) continue;
-        if (typeof candidate === "bigint") return candidate;
-        try {
-          return BigInt(candidate.toString());
-        } catch {
-        }
-      }
-      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
     };
@@ -6342,7 +6744,7 @@ function createDepositsResource(client) {
             step.tx.maxPriorityFeePerGas = overrides.maxPriorityFeePerGas;
           }
         }
-        if (!step.tx.gasLimit) {
+        if (!p.l1TxOverrides?.gasLimit) {
           try {
             const est = await client.l1.estimateGas(step.tx);
             step.tx.gasLimit = BigInt(est) * 115n / 100n;
@@ -6533,28 +6935,12 @@ function normalizeTokenForRouting(token) {
 function pickWithdrawRoute(args) {
   const tokenNorm = normalizeTokenForRouting(args.token);
   const isL2BaseAlias = tokenNorm.toLowerCase() === L2_BASE_TOKEN_ADDRESS.toLowerCase();
-  if (isL2BaseAlias) return args.baseIsEth ? "eth-base" : "eth-nonbase";
+  if (isL2BaseAlias) return "base";
   return "erc20-nonbase";
 }
-async function ntvBaseAssetId(l2, ntv) {
-  const c = new ethers.Contract(ntv, L2NativeTokenVault_default, l2);
-  return await c.BASE_TOKEN_ASSET_ID();
-}
-async function ntvL1ChainId(l2, ntv) {
-  const c = new ethers.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,
@@ -6563,16 +6949,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 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});
   return {
     client,
+    tokens,
+    contracts,
+    resolvedToken,
+    baseTokenAssetId,
+    baseTokenL1,
     bridgehub,
     chainIdL2,
     sender,
@@ -6583,29 +6974,111 @@ async function commonCtx2(p, client) {
     l2NativeTokenVault,
     l2BaseTokenSystem,
     baseIsEth,
-    l2GasLimit,
-    gasBufferPct,
-    fee
+    gasOverrides: p.l2TxOverrides
+  };
+}
+
+// src/core/resources/withdrawals/gas.ts
+function makeGasQuote2(p) {
+  return {
+    gasLimit: p.gasLimit,
+    maxFeePerGas: p.maxFeePerGas,
+    maxPriorityFeePerGas: p.maxPriorityFeePerGas,
+    maxCost: p.gasLimit * p.maxFeePerGas
+  };
+}
+async function fetchFees2(estimator) {
+  try {
+    const fees = await estimator.estimateFeesPerGas();
+    if (fees.maxFeePerGas != null) {
+      return {
+        maxFeePerGas: fees.maxFeePerGas,
+        maxPriorityFeePerGas: fees.maxPriorityFeePerGas ?? 0n
+      };
+    }
+    if (fees.gasPrice != null) {
+      return {
+        maxFeePerGas: fees.gasPrice,
+        maxPriorityFeePerGas: 0n
+      };
+    }
+  } catch {
+  }
+  try {
+    const gp = await estimator.getGasPrice();
+    return { maxFeePerGas: gp, maxPriorityFeePerGas: 0n };
+  } catch {
+    return { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
+  }
+}
+async function quoteL2Gas3(input) {
+  const { estimator, tx, overrides } = input;
+  const market = await fetchFees2(estimator);
+  const o = overrides;
+  const maxFeePerGas = o?.maxFeePerGas ?? (tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : market.maxFeePerGas);
+  const maxPriorityFeePerGas = o?.maxPriorityFeePerGas ?? (tx.maxPriorityFeePerGas != null ? BigInt(tx.maxPriorityFeePerGas) : market.maxPriorityFeePerGas);
+  const explicitGasLimit = o?.gasLimit ?? (tx.gasLimit != null ? BigInt(tx.gasLimit) : void 0);
+  if (explicitGasLimit != null) {
+    return makeGasQuote2({
+      gasLimit: explicitGasLimit,
+      maxFeePerGas,
+      maxPriorityFeePerGas
+    });
+  }
+  try {
+    const est = await estimator.estimateGas(tx);
+    const buffered = BigInt(est) * (100n + BUFFER) / 100n;
+    return makeGasQuote2({
+      gasLimit: buffered,
+      maxFeePerGas,
+      maxPriorityFeePerGas
+    });
+  } catch (err) {
+    console.warn("Failed to estimate L2 gas for withdrawal.", err);
+    return void 0;
+  }
+}
+
+// src/adapters/ethers/resources/withdrawals/services/gas.ts
+async function quoteL2Gas4(input) {
+  const { ctx, tx } = input;
+  const estimator = ethersToGasEstimator(ctx.client.l2);
+  return quoteL2Gas3({
+    estimator,
+    tx: toCoreTx(tx),
+    overrides: ctx.gasOverrides
+  });
+}
+
+// src/adapters/ethers/resources/withdrawals/services/fees.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
   };
 }
-var { wrapAs: wrapAs5 } = createErrorHandlers("withdrawals");
+
+// src/adapters/ethers/resources/withdrawals/routes/eth.ts
+var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
 function routeEthBase() {
   return {
     async build(p, ctx) {
       const steps = [];
-      const { gasLimit: overrideGasLimit, maxFeePerGas, maxPriorityFeePerGas } = ctx.fee;
-      const base = new ethers.Contract(
-        L2_BASE_TOKEN_ADDRESS,
-        new ethers.Interface(IBaseToken_default),
-        ctx.client.l2
-      );
-      const toL1 = p.to ?? ctx.sender;
-      const data = await wrapAs5(
+      const base = await ctx.contracts.l2BaseTokenSystem();
+      const data = await wrapAs7(
         "INTERNAL",
         OP_WITHDRAWALS.eth.encodeWithdraw,
-        () => Promise.resolve(base.interface.encodeFunctionData("withdraw", [toL1])),
+        () => Promise.resolve(base.interface.encodeFunctionData("withdraw", [p.to ?? ctx.sender])),
         {
-          ctx: { where: "L2BaseToken.withdraw", to: toL1 },
+          ctx: { where: "L2BaseToken.withdraw", to: p.to ?? ctx.sender },
           message: "Failed to encode ETH withdraw calldata."
         }
       );
@@ -6613,38 +7086,29 @@ function routeEthBase() {
         to: L2_BASE_TOKEN_ADDRESS,
         data,
         from: ctx.sender,
-        value: p.amount,
-        maxFeePerGas,
-        maxPriorityFeePerGas
+        value: p.amount
       };
-      if (overrideGasLimit != null) {
-        tx.gasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs5(
-            "RPC",
-            OP_WITHDRAWALS.eth.estGas,
-            () => ctx.client.l2.estimateGas(tx),
-            {
-              ctx: { where: "l2.estimateGas", to: L2_BASE_TOKEN_ADDRESS },
-              message: "Failed to estimate gas for L2 ETH withdraw."
-            }
-          );
-          tx.gasLimit = BigInt(est) * 115n / 100n;
-        } catch {
-        }
-      }
+      const gas = await quoteL2Gas4({ ctx, tx });
+      if (gas) {
+        tx.gasLimit = gas.gasLimit;
+        tx.maxFeePerGas = gas.maxFeePerGas;
+        tx.maxPriorityFeePerGas = gas.maxPriorityFeePerGas;
+      }
+      const fees = buildFeeBreakdown2({
+        feeToken: L2_BASE_TOKEN_ADDRESS,
+        l2Gas: gas
+      });
       steps.push({
         key: "l2-base-token:withdraw",
         kind: "l2-base-token:withdraw",
         description: "Withdraw ETH via L2 Base Token System",
         tx
       });
-      return { steps, approvals: [], quoteExtras: {} };
+      return { steps, approvals: [], fees };
     }
   };
 }
-var { wrapAs: wrapAs6 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
 var SIG = {
   withdraw: "withdraw(bytes32,bytes)"
 };
@@ -6653,10 +7117,8 @@ function routeErc20NonBase2() {
     async build(p, ctx) {
       const steps = [];
       const approvals = [];
-      const { gasLimit: overrideGasLimit, maxFeePerGas, maxPriorityFeePerGas } = ctx.fee;
-      const txOverrides = overrideGasLimit != null ? { maxFeePerGas, maxPriorityFeePerGas, gasLimit: overrideGasLimit } : { maxFeePerGas, maxPriorityFeePerGas };
       const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.getL2Signer());
-      const current = await wrapAs6(
+      const current = await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.allowance,
         () => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
@@ -6676,39 +7138,51 @@ function routeErc20NonBase2() {
           ctx.l2NativeTokenVault,
           p.amount
         ]);
+        const approveTx = {
+          to: p.token,
+          data,
+          from: ctx.sender
+        };
+        const approveGas = await quoteL2Gas4({ ctx, tx: approveTx });
+        if (approveGas) {
+          approveTx.gasLimit = approveGas.gasLimit;
+          approveTx.maxFeePerGas = approveGas.maxFeePerGas;
+          approveTx.maxPriorityFeePerGas = approveGas.maxPriorityFeePerGas;
+        }
         steps.push({
           key: `approve:l2:${p.token}:${ctx.l2NativeTokenVault}`,
           kind: "approve:l2",
           description: `Approve ${p.amount} to NativeTokenVault`,
-          tx: { to: p.token, data, from: ctx.sender, ...txOverrides }
+          tx: approveTx
         });
       }
-      const ntv = new ethers.Contract(ctx.l2NativeTokenVault, L2NativeTokenVault_default, ctx.client.l2);
-      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 wrapAs8(
         "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 wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.erc20.encodeAssetData,
         () => Promise.resolve(
-          ethers.AbiCoder.defaultAbiCoder().encode(
-            ["uint256", "address", "address"],
-            [p.amount, p.to ?? ctx.sender, p.token]
-          )
+          encodeNativeTokenVaultTransferData(p.amount, p.to ?? ctx.sender, p.token)
         ),
         {
           ctx: { where: "AbiCoder.encode", token: p.token, to: p.to ?? ctx.sender },
           message: "Failed to encode burn/withdraw asset data."
         }
       );
-      const l2ar = new ethers.Contract(ctx.l2AssetRouter, IL2AssetRouter_default, ctx.client.l2);
-      const dataWithdraw = await wrapAs6(
+      const l2ar = await ctx.contracts.l2AssetRouter();
+      const dataWithdraw = await wrapAs8(
         "INTERNAL",
         OP_WITHDRAWALS.erc20.encodeWithdraw,
         () => Promise.resolve(l2ar.interface.encodeFunctionData(SIG.withdraw, [assetId, assetData])),
@@ -6720,81 +7194,25 @@ function routeErc20NonBase2() {
       const withdrawTx = {
         to: ctx.l2AssetRouter,
         data: dataWithdraw,
-        from: ctx.sender,
-        ...txOverrides
+        from: ctx.sender
       };
+      const withdrawGas = await quoteL2Gas4({ ctx, tx: withdrawTx });
+      if (withdrawGas) {
+        withdrawTx.gasLimit = withdrawGas.gasLimit;
+        withdrawTx.maxFeePerGas = withdrawGas.maxFeePerGas;
+        withdrawTx.maxPriorityFeePerGas = withdrawGas.maxPriorityFeePerGas;
+      }
       steps.push({
         key: "l2-asset-router:withdraw",
         kind: "l2-asset-router:withdraw",
         description: "Burn on L2 & send L2\u2192L1 message",
         tx: withdrawTx
       });
-      return { steps, approvals, quoteExtras: {} };
-    }
-  };
-}
-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 steps = [];
-      const { gasLimit: overrideGasLimit, maxFeePerGas, maxPriorityFeePerGas } = ctx.fee;
-      const toL1 = p.to ?? ctx.sender;
-      const iface = new ethers.Interface(IBaseToken_default);
-      const data = await wrapAs7(
-        "INTERNAL",
-        OP_WITHDRAWALS.eth.encodeWithdraw,
-        // reuse label for base-token system call
-        () => Promise.resolve(iface.encodeFunctionData("withdraw", [toL1])),
-        { ctx: { where: "L2BaseToken.withdraw", to: toL1 } }
-      );
-      const tx = {
-        to: L2_BASE_TOKEN_ADDRESS,
-        data,
-        from: ctx.sender,
-        value: p.amount,
-        maxFeePerGas,
-        maxPriorityFeePerGas
-      };
-      if (overrideGasLimit != null) {
-        tx.gasLimit = overrideGasLimit;
-      } else {
-        try {
-          const est = await wrapAs7(
-            "RPC",
-            OP_WITHDRAWALS.eth.estGas,
-            () => ctx.client.l2.estimateGas(tx),
-            {
-              ctx: { where: "l2.estimateGas", to: L2_BASE_TOKEN_ADDRESS },
-              message: "Failed to estimate gas for L2 base-token withdraw."
-            }
-          );
-          tx.gasLimit = BigInt(est) * 115n / 100n;
-        } catch {
-        }
-      }
-      steps.push({
-        key: "l2-base-token:withdraw",
-        kind: "l2-base-token:withdraw",
-        description: "Withdraw base token via L2 Base Token System (base \u2260 ETH)",
-        tx
+      const fees = buildFeeBreakdown2({
+        feeToken: ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2),
+        l2Gas: withdrawGas
       });
-      return { steps, approvals: [], quoteExtras: {} };
+      return { steps, approvals, fees };
     }
   };
 }
@@ -6832,7 +7250,7 @@ function messengerLogIndex(raw, opts) {
 }
 
 // src/adapters/ethers/resources/withdrawals/services/finalization.ts
-var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
+var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
 var IL1NullifierMini = [
   "function isWithdrawalFinalized(uint256,uint256,uint256) view returns (bool)"
 ];
@@ -6840,7 +7258,7 @@ function createFinalizationServices(client) {
   const { l1, l2, signer } = client;
   return {
     async fetchFinalizeDepositParams(l2TxHash) {
-      const parsed = await wrapAs8(
+      const parsed = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.fetchParams.receipt,
         () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -6857,7 +7275,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
@@ -6867,7 +7285,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,
         () => Promise.resolve(ethers.AbiCoder.defaultAbiCoder().decode(["bytes"], ev.data)[0]),
@@ -6876,7 +7294,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),
@@ -6893,7 +7311,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 })),
@@ -6902,7 +7320,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),
@@ -6911,7 +7329,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,
         () => l2.getNetwork(),
@@ -6930,7 +7348,7 @@ function createFinalizationServices(client) {
         message,
         merkleProof: proof.proof
       };
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -6942,7 +7360,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(),
@@ -6954,7 +7372,7 @@ function createFinalizationServices(client) {
       const done = await (async () => {
         try {
           const cMini = new ethers.Contract(l1Nullifier, IL1NullifierMini, l1);
-          const isFinalized = await wrapAs8(
+          const isFinalized = await wrapAs9(
             "RPC",
             OP_WITHDRAWALS.finalize.readiness.isFinalized,
             () => cMini.isWithdrawalFinalized(
@@ -6982,7 +7400,7 @@ function createFinalizationServices(client) {
       }
     },
     async isWithdrawalFinalized(key) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -6992,7 +7410,7 @@ function createFinalizationServices(client) {
         }
       );
       const c = new ethers.Contract(l1Nullifier, IL1NullifierMini, l1);
-      return await wrapAs8(
+      return await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.isFinalized,
         () => c.isWithdrawalFinalized(key.chainIdL2, key.l2BatchNumber, key.l2MessageIndex),
@@ -7003,7 +7421,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.estimate,
         () => client.ensureAddresses(),
@@ -7014,7 +7432,7 @@ function createFinalizationServices(client) {
       );
       const signer2 = client.getL1Signer();
       const c = new ethers.Contract(l1Nullifier, IL1Nullifier_default, signer2);
-      const gasLimit = await wrapAs8(
+      const gasLimit = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.estimate,
         () => c.finalizeDeposit.estimateGas(params),
@@ -7029,7 +7447,7 @@ function createFinalizationServices(client) {
           message: "Failed to estimate gas for finalizeDeposit."
         }
       );
-      const feeData = await wrapAs8("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
+      const feeData = await wrapAs9("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
         ctx: { where: "l1.getFeeData" },
         message: "Failed to estimate fee data for finalizeDeposit."
       });
@@ -7050,7 +7468,7 @@ function createFinalizationServices(client) {
       };
     },
     async finalizeDeposit(params) {
-      const { l1Nullifier } = await wrapAs8(
+      const { l1Nullifier } = await wrapAs9(
         "INTERNAL",
         OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
         () => client.ensureAddresses(),
@@ -7106,45 +7524,32 @@ function createFinalizationServices(client) {
 
 // src/adapters/ethers/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.gasLimit;
-        if (candidate == null) continue;
-        if (typeof candidate === "bigint") return candidate;
-        try {
-          return BigInt(candidate.toString());
-        } catch {
-        }
-      }
-      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(
@@ -7454,62 +7859,17 @@ 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
   };
 }
 
 exports.buildDirectRequestStruct = buildDirectRequestStruct;
-exports.checkBaseCost = checkBaseCost;
 exports.classifyReadinessFromRevert = classifyReadinessFromRevert;
 exports.createClient = createEthersClient;
 exports.createDepositsResource = createDepositsResource;
@@ -7517,21 +7877,15 @@ exports.createErrorHandlers = createErrorHandlers;
 exports.createEthersClient = createEthersClient;
 exports.createEthersSdk = createEthersSdk;
 exports.createFinalizationServices = createFinalizationServices;
+exports.createTokensResource = createTokensResource;
 exports.createWithdrawalsResource = createWithdrawalsResource;
 exports.decodeRevert = decodeRevert;
-exports.encodeNTVAssetId = encodeNTVAssetId;
-exports.encodeNTVTransferData = encodeNTVTransferData;
-exports.encodeNativeTokenVaultAssetId = encodeNativeTokenVaultAssetId;
 exports.encodeNativeTokenVaultTransferData = encodeNativeTokenVaultTransferData;
 exports.encodeSecondBridgeArgs = encodeSecondBridgeArgs;
 exports.encodeSecondBridgeDataV1 = encodeSecondBridgeDataV1;
 exports.encodeSecondBridgeErc20Args = encodeSecondBridgeErc20Args;
 exports.encodeSecondBridgeEthArgs = encodeSecondBridgeEthArgs;
-exports.getFeeOverrides = getFeeOverrides;
-exports.getGasPriceWei = getGasPriceWei;
-exports.getL2FeeOverrides = getL2FeeOverrides;
 exports.registerErrorAbi = registerErrorAbi;
-exports.scaleGasLimit = scaleGasLimit;
 exports.toZKsyncError = toZKsyncError;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map