@matterlabs/zksync-js 0.0.11 → 0.0.13

package/dist/adapters/viem/client.js

@@ -1,6 +1,6 @@
-export { createViemClient } from '../../chunk-EWBYKU4G.js';
-import '../../chunk-QUI3J42E.js';
-import '../../chunk-USXSAFYA.js';
-import '../../chunk-H3BPVVMN.js';
-import '../../chunk-QFEYV4O3.js';
-import '../../chunk-C3AGOEHR.js';
+export { createViemClient } from '../../chunk-2RIARDXZ.js';
+import '../../chunk-5R7L5NM5.js';
+import '../../chunk-4S4XDA4N.js';
+import '../../chunk-53MC5BR2.js';
+import '../../chunk-RI73VJSH.js';
+import '../../chunk-QQ2OR434.js';

package/dist/adapters/viem/index.cjs

@@ -33,7 +33,7 @@ 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 = 700000n;
+var SAFE_L1_BRIDGE_GAS = 800000n;
 
 // src/core/utils/addr.ts
 function isAddressEq(a, b) {
@@ -450,8 +450,8 @@ function ensureHex(value, field, context) {
   });
 }
 function ensureNumber(value, field, opts) {
-  const operation = opts?.operation ?? "zksrpc.normalizeGenesis";
-  const messagePrefix = opts?.messagePrefix ?? "Malformed genesis response";
+  const operation = opts?.operation;
+  const messagePrefix = opts?.messagePrefix;
   if (isNumber(value)) return value;
   if (isBigint(value)) return Number(value);
   if (typeof value === "string" && value.trim() !== "") {
@@ -589,7 +589,6 @@ function normalizeGenesis(raw) {
         context: { valueType: typeof contractsRaw }
       });
     }
-    const executionVersion = ensureNumber(record["execution_version"], "execution_version");
     const genesisRoot = ensureHex(record["genesis_root"], "genesis_root", {});
     const initialContracts = contractsRaw.map(
       (entry, index) => normalizeContractTuple(entry, index)
@@ -598,7 +597,6 @@ function normalizeGenesis(raw) {
     return {
       initialContracts,
       additionalStorage,
-      executionVersion,
       genesisRoot
     };
   } catch (e) {
@@ -5855,6 +5853,7 @@ function viemToGasEstimator(client) {
 }
 
 // src/adapters/viem/resources/deposits/services/gas.ts
+var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
 async function quoteL1Gas2(input) {
   const { ctx, tx, overrides, fallbackGasLimit } = input;
   const estimator = viemToGasEstimator(ctx.client.l1);
@@ -5879,24 +5878,24 @@ async function quoteL2Gas2(input) {
     stateOverrides: input.stateOverrides
   });
 }
-async function determineErc20L2Gas(input) {
-  const { ctx, l1Token } = input;
-  const DEFAULT_SAFE_L2_GAS_LIMIT = 3000000n;
+async function determineNonBaseL2Gas(input) {
+  const { ctx, l1Token, route } = input;
+  const fallbackQuote = () => quoteL2Gas2({
+    ctx,
+    route,
+    overrideGasLimit: DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT
+  });
   if (ctx.l2GasLimit != null) {
     return quoteL2Gas2({
       ctx,
-      route: "erc20-nonbase",
+      route,
       overrideGasLimit: ctx.l2GasLimit
     });
   }
   try {
-    const l2TokenAddress = ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).read.l2TokenAddress([l1Token]);
+    const l2TokenAddress = input.knownL2Token ?? (ctx.tokens ? await ctx.tokens.toL2Address(l1Token) : await (await ctx.contracts.l2NativeTokenVault()).read.l2TokenAddress([l1Token]));
     if (l2TokenAddress === viem.zeroAddress) {
-      return quoteL2Gas2({
-        ctx,
-        route: "erc20-nonbase",
-        overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
-      });
+      return fallbackQuote();
     }
     const modelTx = {
       to: input.modelTx?.to ?? ctx.sender,
@@ -5906,26 +5905,34 @@ async function determineErc20L2Gas(input) {
     };
     const gas = await quoteL2Gas2({
       ctx,
-      route: "erc20-nonbase",
+      route,
       l2TxForModeling: modelTx
     });
-    if (!gas) {
-      return quoteL2Gas2({
-        ctx,
-        route: "erc20-nonbase",
-        overrideGasLimit: DEFAULT_SAFE_L2_GAS_LIMIT
-      });
+    if (!gas || gas.gasLimit === 0n) {
+      return fallbackQuote();
     }
     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
-    });
+    console.warn("Failed to determine non-base deposit L2 gas; defaulting to safe gas limit.", err);
+    return fallbackQuote();
   }
 }
+async function determineErc20L2Gas(input) {
+  return determineNonBaseL2Gas({
+    ...input,
+    route: "erc20-nonbase",
+    knownL2Token: input.ctx.resolvedToken?.l2
+  });
+}
+async function determineEthNonBaseL2Gas(input) {
+  return determineNonBaseL2Gas({
+    ctx: input.ctx,
+    route: "eth-nonbase",
+    l1Token: input.ctx.resolvedToken?.l1 ?? FORMAL_ETH_ADDRESS,
+    knownL2Token: input.ctx.resolvedToken?.l2,
+    modelTx: input.modelTx
+  });
+}
 
 // src/adapters/viem/resources/deposits/services/fee.ts
 var { wrapAs } = createErrorHandlers("deposits");
@@ -6352,11 +6359,9 @@ function routeEthNonBase() {
         data: "0x",
         value: 0n
       };
-      const l2Gas = await quoteL2Gas2({
+      const l2Gas = await determineEthNonBaseL2Gas({
         ctx,
-        route: "eth-nonbase",
-        l2TxForModeling: l2TxModel,
-        overrideGasLimit: ctx.l2GasLimit
+        modelTx: l2TxModel
       });
       if (!l2Gas) throw new Error("Failed to estimate L2 gas parameters.");
       const l2BaseCost = await quoteL2BaseCost({ ctx, l2GasLimit: l2Gas.gasLimit });
@@ -7847,7 +7852,7 @@ function createFinalizationServices(client) {
         chainId: BigInt(chainId),
         l2BatchNumber: proof.batchNumber,
         l2MessageIndex: proof.id,
-        l2Sender: L2_ASSET_ROUTER_ADDRESS,
+        l2Sender: parsed.to,
         l2TxNumberInBatch: txIndex,
         message,
         merkleProof: proof.proof