@matterlabs/zksync-js 0.0.9 → 0.0.10

package/dist/adapters/viem/client.js

@@ -1,6 +1,6 @@
-export { createViemClient } from '../../chunk-KLNFDFLA.js';
+export { createViemClient } from '../../chunk-VKUTFNZA.js';
+import '../../chunk-N3FVEFOK.js';
 import '../../chunk-UIXU35ZU.js';
-import '../../chunk-QDJOEVGJ.js';
 import '../../chunk-SRPKTXIF.js';
 import '../../chunk-FBKBF7YM.js';
 import '../../chunk-C3AGOEHR.js';

package/dist/adapters/viem/index.cjs

@@ -3,7 +3,6 @@
 var viem = require('viem');
 var sha3 = require('@noble/hashes/sha3');
 var utils = require('@noble/hashes/utils');
-var ethers = require('ethers');
 
 // src/adapters/viem/client.ts
 
@@ -5276,20 +5275,20 @@ function resolveMessage(op, msg) {
   if (!msg) return `Error during ${op}.`;
   return typeof msg === "function" ? msg() : msg;
 }
-function createErrorOps(decodeRevert3) {
-  function toZKsyncError3(type, base, err) {
+function createErrorOps(decodeRevert2) {
+  function toZKsyncError2(type, base, err) {
     if (isZKsyncError(err)) return err;
-    const revert = decodeRevert3 ? decodeRevert3(err) : void 0;
+    const revert = decodeRevert2 ? decodeRevert2(err) : void 0;
     return createError(type, { ...base, ...revert ? { revert } : {}, cause: shapeCause(err) });
   }
-  function createErrorHandlers3(resource) {
+  function createErrorHandlers2(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 toZKsyncError3(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
+        throw toZKsyncError2(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
       }
     }
     function wrap3(operation, fn, opts) {
@@ -5303,7 +5302,7 @@ function createErrorOps(decodeRevert3) {
         const value = await wrap3(operation, fn, opts);
         return { ok: true, value };
       } catch (e) {
-        const shaped = isZKsyncError(e) ? e : toZKsyncError3(
+        const shaped = isZKsyncError(e) ? e : toZKsyncError2(
           "INTERNAL",
           {
             resource,
@@ -5318,7 +5317,7 @@ function createErrorOps(decodeRevert3) {
     }
     return { wrap: wrap3, wrapAs: wrapAs10, toResult: toResult2 };
   }
-  return { toZKsyncError: toZKsyncError3, createErrorHandlers: createErrorHandlers3 };
+  return { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 };
 }
 
 // src/core/errors/withdrawal-revert-map.ts
@@ -5343,48 +5342,57 @@ var REVERT_TO_READINESS = {
   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() {
+// src/adapters/viem/errors/revert.ts
+var ERROR_ABIS = [];
+var ABI_ERROR_STRING = [
+  { type: "error", name: "Error", inputs: [{ name: "message", type: "string" }] }
+];
+var ABI_PANIC = [
+  { type: "error", name: "Panic", inputs: [{ name: "code", type: "uint256" }] }
+];
+(function bootstrapDefaultAbis() {
   try {
-    ERROR_IFACES.push({
-      name: "IL1Nullifier",
-      iface: new ethers.Interface(IL1Nullifier_default)
-    });
+    ERROR_ABIS.push({ name: "IL1Nullifier", abi: IL1Nullifier_default });
   } catch {
   }
   try {
-    ERROR_IFACES.push({ name: "IERC20", iface: new ethers.Interface(IERC20_default) });
+    ERROR_ABIS.push({ name: "IERC20", abi: IERC20_default });
   } catch {
   }
   try {
-    ERROR_IFACES.push({
-      name: "IL1NativeTokenVault",
-      iface: new ethers.Interface(L1NativeTokenVault_default)
-    });
+    ERROR_ABIS.push({ name: "IL1NativeTokenVault", abi: L1NativeTokenVault_default });
   } catch {
   }
   try {
-    ERROR_IFACES.push({
-      name: "IL2NativeTokenVault",
-      iface: new ethers.Interface(L2NativeTokenVault_default)
-    });
+    ERROR_ABIS.push({ name: "IL2NativeTokenVault", abi: L2NativeTokenVault_default });
   } catch {
   }
   try {
-    ERROR_IFACES.push({ name: "Mailbox", iface: new ethers.Interface(Mailbox_default) });
+    ERROR_ABIS.push({ name: "Mailbox", abi: Mailbox_default });
   } catch {
   }
 })();
+function registerErrorAbi(name, abi) {
+  const i = ERROR_ABIS.findIndex((x) => x.name === name);
+  const entry = { name, abi };
+  if (i >= 0) ERROR_ABIS[i] = entry;
+  else ERROR_ABIS.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;
+  const candidates = [
+    e?.data?.data,
+    e?.error?.data,
+    e?.data,
+    e?.error?.error?.data,
+    e?.info?.error?.data,
+    e?.cause?.data,
+    e?.cause?.cause?.data,
+    e?.details
+  ];
+  for (const c of candidates) {
+    if (typeof c === "string" && c.startsWith("0x") && c.length >= 10) {
+      return c;
+    }
   }
   return void 0;
 }
@@ -5393,30 +5401,27 @@ function decodeRevert(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 };
+    const parsed = viem.decodeErrorResult({ abi: ABI_ERROR_STRING, data });
+    if (parsed?.errorName === "Error") {
+      return { selector, name: parsed.errorName, args: parsed.args ? [...parsed.args] : void 0 };
     }
   } 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 };
+    const parsed = viem.decodeErrorResult({ abi: ABI_PANIC, data });
+    if (parsed?.errorName === "Panic") {
+      return { selector, name: parsed.errorName, args: parsed.args ? [...parsed.args] : void 0 };
     }
   } catch {
   }
-  for (const { name, iface } of ERROR_IFACES) {
+  for (const { name, abi } of ERROR_ABIS) {
     try {
-      const parsed = iface.parseError(data);
-      if (parsed) {
-        const args = parsed.args ? Array.from(parsed.args) : void 0;
+      const parsed = viem.decodeErrorResult({ abi, data });
+      if (parsed && parsed.errorName) {
         return {
           selector,
-          name: parsed.name,
-          args,
+          name: parsed.errorName,
+          args: parsed.args ? [...parsed.args] : void 0,
           contract: name
         };
       }
@@ -5425,9 +5430,26 @@ function decodeRevert(e) {
   }
   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 maybe = obj["shortMessage"] ?? obj["message"];
+    return typeof maybe === "string" ? maybe : "";
+  })();
+  const lower = 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
-var { createErrorHandlers } = createErrorOps(decodeRevert);
+// src/adapters/viem/errors/error-ops.ts
+var { toZKsyncError, createErrorHandlers } = createErrorOps(decodeRevert);
 
 // src/adapters/viem/client.ts
 var { wrap } = createErrorHandlers("client");
@@ -5644,113 +5666,6 @@ function buildDirectRequestStruct(args) {
     refundRecipient: args.refundRecipient
   };
 }
-var ERROR_ABIS = [];
-var ABI_ERROR_STRING = [
-  { type: "error", name: "Error", inputs: [{ name: "message", type: "string" }] }
-];
-var ABI_PANIC = [
-  { type: "error", name: "Panic", inputs: [{ name: "code", type: "uint256" }] }
-];
-(function bootstrapDefaultAbis() {
-  try {
-    ERROR_ABIS.push({ name: "IL1Nullifier", abi: IL1Nullifier_default });
-  } catch {
-  }
-  try {
-    ERROR_ABIS.push({ name: "IERC20", abi: IERC20_default });
-  } catch {
-  }
-  try {
-    ERROR_ABIS.push({ name: "IL1NativeTokenVault", abi: L1NativeTokenVault_default });
-  } catch {
-  }
-  try {
-    ERROR_ABIS.push({ name: "IL2NativeTokenVault", abi: L2NativeTokenVault_default });
-  } catch {
-  }
-  try {
-    ERROR_ABIS.push({ name: "Mailbox", abi: Mailbox_default });
-  } catch {
-  }
-})();
-function registerErrorAbi(name, abi) {
-  const i = ERROR_ABIS.findIndex((x) => x.name === name);
-  const entry = { name, abi };
-  if (i >= 0) ERROR_ABIS[i] = entry;
-  else ERROR_ABIS.push(entry);
-}
-function extractRevertData2(e) {
-  const candidates = [
-    e?.data?.data,
-    e?.error?.data,
-    e?.data,
-    e?.error?.error?.data,
-    e?.info?.error?.data,
-    e?.cause?.data,
-    e?.cause?.cause?.data,
-    e?.details
-  ];
-  for (const c of candidates) {
-    if (typeof c === "string" && c.startsWith("0x") && c.length >= 10) {
-      return c;
-    }
-  }
-  return void 0;
-}
-function decodeRevert2(e) {
-  const data = extractRevertData2(e);
-  if (!data) return;
-  const selector = `0x${data.slice(2, 10)}`;
-  try {
-    const parsed = viem.decodeErrorResult({ abi: ABI_ERROR_STRING, data });
-    if (parsed?.errorName === "Error") {
-      return { selector, name: parsed.errorName, args: parsed.args ? [...parsed.args] : void 0 };
-    }
-  } catch {
-  }
-  try {
-    const parsed = viem.decodeErrorResult({ abi: ABI_PANIC, data });
-    if (parsed?.errorName === "Panic") {
-      return { selector, name: parsed.errorName, args: parsed.args ? [...parsed.args] : void 0 };
-    }
-  } catch {
-  }
-  for (const { name, abi } of ERROR_ABIS) {
-    try {
-      const parsed = viem.decodeErrorResult({ abi, data });
-      if (parsed && parsed.errorName) {
-        return {
-          selector,
-          name: parsed.errorName,
-          args: parsed.args ? [...parsed.args] : void 0,
-          contract: name
-        };
-      }
-    } catch {
-    }
-  }
-  return { selector };
-}
-function classifyReadinessFromRevert(e) {
-  const r = decodeRevert2(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 maybe = obj["shortMessage"] ?? obj["message"];
-    return typeof maybe === "string" ? maybe : "";
-  })();
-  const lower = 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/viem/errors/error-ops.ts
-var { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 } = createErrorOps(decodeRevert2);
 
 // src/core/resources/deposits/gas.ts
 function makeGasQuote(p) {
@@ -6013,7 +5928,7 @@ async function determineErc20L2Gas(input) {
 }
 
 // src/adapters/viem/resources/deposits/services/fee.ts
-var { wrapAs } = createErrorHandlers2("deposits");
+var { wrapAs } = createErrorHandlers("deposits");
 async function quoteL2BaseCost(input) {
   const { ctx, l2GasLimit } = input;
   const estimator = viemToGasEstimator(ctx.client.l1);
@@ -6063,7 +5978,7 @@ function buildFeeBreakdown(p) {
 }
 
 // src/adapters/viem/resources/deposits/routes/eth.ts
-var { wrapAs: wrapAs2 } = createErrorHandlers2("deposits");
+var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 function routeEthDirect() {
   return {
     async build(p, ctx) {
@@ -6157,7 +6072,7 @@ function routeEthDirect() {
     }
   };
 }
-var { wrapAs: wrapAs3 } = createErrorHandlers2("deposits");
+var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
     // TODO: do we even need these validations?
@@ -6384,7 +6299,7 @@ function routeErc20NonBase() {
     }
   };
 }
-var { wrapAs: wrapAs4 } = createErrorHandlers2("deposits");
+var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 function routeEthNonBase() {
   return {
     // TODO: do we even need these validations?
@@ -6595,7 +6510,7 @@ function routeEthNonBase() {
     }
   };
 }
-var { wrapAs: wrapAs5 } = createErrorHandlers2("deposits");
+var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
 function routeErc20Base() {
   return {
     async preflight(p, ctx) {
@@ -6863,7 +6778,7 @@ function createNTVCodec(deps) {
 }
 
 // src/adapters/viem/resources/tokens/tokens.ts
-var { wrapAs: wrapAs6 } = createErrorHandlers2("tokens");
+var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
 var ntvCodec = createNTVCodec({
   encode: (types, values) => viem.encodeAbiParameters(
     types.map((t, i) => ({ type: t, name: `arg${i}` })),
@@ -7119,7 +7034,7 @@ function createContractsResource(client) {
 }
 
 // src/adapters/viem/resources/deposits/index.ts
-var { wrap: wrap2, toResult } = createErrorHandlers2("deposits");
+var { wrap: wrap2, toResult } = createErrorHandlers("deposits");
 var ROUTES = {
   "eth-base": routeEthDirect(),
   "eth-nonbase": routeEthNonBase(),
@@ -7202,7 +7117,7 @@ function createDepositsResource(client, tokens, contracts) {
               continue;
             }
           } catch (e) {
-            throw toZKsyncError2(
+            throw toZKsyncError(
               "CONTRACT",
               {
                 resource: "deposits",
@@ -7283,7 +7198,7 @@ function createDepositsResource(client, tokens, contracts) {
           }
         } catch (e) {
           if (isZKsyncError(e)) throw e;
-          throw toZKsyncError2(
+          throw toZKsyncError(
             "EXECUTION",
             {
               resource: "deposits",
@@ -7317,7 +7232,7 @@ function createDepositsResource(client, tokens, contracts) {
       try {
         l1Rcpt = await client.l1.getTransactionReceipt({ hash: l1TxHash });
       } catch (e) {
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "RPC",
           {
             resource: "deposits",
@@ -7333,7 +7248,7 @@ function createDepositsResource(client, tokens, contracts) {
       try {
         l2TxHash = getL2TransactionHashFromLogs(l1Rcpt.logs) ?? void 0;
       } catch (e) {
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "INTERNAL",
           {
             resource: "deposits",
@@ -7352,7 +7267,7 @@ function createDepositsResource(client, tokens, contracts) {
         if (isReceiptNotFound(e)) {
           return { phase: "L2_PENDING", l1TxHash, l2TxHash };
         }
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "RPC",
           {
             resource: "deposits",
@@ -7381,7 +7296,7 @@ function createDepositsResource(client, tokens, contracts) {
       try {
         l1Receipt = await client.l1.waitForTransactionReceipt({ hash: l1Hash });
       } catch (e) {
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "RPC",
           {
             resource: "deposits",
@@ -7399,7 +7314,7 @@ function createDepositsResource(client, tokens, contracts) {
         return l2Receipt ?? null;
       } catch (e) {
         if (isZKsyncError(e)) throw e;
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "INTERNAL",
           {
             resource: "deposits",
@@ -7580,7 +7495,7 @@ function buildFeeBreakdown2(p) {
 }
 
 // src/adapters/viem/resources/withdrawals/routes/eth.ts
-var { wrapAs: wrapAs7 } = createErrorHandlers2("withdrawals");
+var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
 function routeEthBase() {
   return {
     async build(p, ctx) {
@@ -7635,7 +7550,7 @@ function routeEthBase() {
     }
   };
 }
-var { wrapAs: wrapAs8 } = createErrorHandlers2("withdrawals");
+var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
 function routeErc20NonBase2() {
   return {
     // TODO: add preflight validations here
@@ -7830,7 +7745,7 @@ function messengerLogIndex(raw, opts) {
   }
   return (hits[index] ?? hits[0]).i;
 }
-var { wrapAs: wrapAs9 } = createErrorHandlers2("withdrawals");
+var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
 var IL1NullifierMini = [
   {
     type: "function",
@@ -8073,7 +7988,7 @@ function createFinalizationServices(client) {
             try {
               return await client.l1.waitForTransactionReceipt({ hash });
             } catch (e) {
-              throw toZKsyncError2(
+              throw toZKsyncError(
                 "EXECUTION",
                 {
                   resource: "withdrawals",
@@ -8087,7 +8002,7 @@ function createFinalizationServices(client) {
           }
         };
       } catch (e) {
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "EXECUTION",
           {
             resource: "withdrawals",
@@ -8116,7 +8031,7 @@ var ROUTES2 = {
 };
 function createWithdrawalsResource(client, tokens, contracts) {
   const svc = createFinalizationServices(client);
-  const { wrap: wrap3, toResult: toResult2 } = createErrorHandlers2("withdrawals");
+  const { wrap: wrap3, toResult: toResult2 } = createErrorHandlers("withdrawals");
   const tokensResource = tokens ?? createTokensResource(client);
   const contractsResource = contracts ?? createContractsResource(client);
   async function buildPlan(p) {
@@ -8236,7 +8151,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
             });
           }
         } catch (e) {
-          throw toZKsyncError2(
+          throw toZKsyncError(
             "EXECUTION",
             {
               resource: "withdrawals",
@@ -8275,7 +8190,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
         if (isReceiptNotFound(e)) {
           return { phase: "L2_PENDING", l2TxHash };
         }
-        throw toZKsyncError2(
+        throw toZKsyncError(
           "RPC",
           {
             resource: "withdrawals",
@@ -8326,7 +8241,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
         try {
           rcpt = await client.l2.waitForTransactionReceipt({ hash: l2Hash });
         } catch (e) {
-          throw toZKsyncError2(
+          throw toZKsyncError(
             "RPC",
             {
               resource: "withdrawals",
@@ -8514,13 +8429,13 @@ exports.classifyReadinessFromRevert = classifyReadinessFromRevert;
 exports.createClient = createViemClient;
 exports.createContractsResource = createContractsResource;
 exports.createDepositsResource = createDepositsResource;
-exports.createErrorHandlers = createErrorHandlers2;
+exports.createErrorHandlers = createErrorHandlers;
 exports.createFinalizationServices = createFinalizationServices;
 exports.createTokensResource = createTokensResource;
 exports.createViemClient = createViemClient;
 exports.createViemSdk = createViemSdk;
 exports.createWithdrawalsResource = createWithdrawalsResource;
-exports.decodeRevert = decodeRevert2;
+exports.decodeRevert = decodeRevert;
 exports.encodeNativeTokenVaultTransferData = encodeNativeTokenVaultTransferData;
 exports.encodeSecondBridgeArgs = encodeSecondBridgeArgs;
 exports.encodeSecondBridgeDataV1 = encodeSecondBridgeDataV1;
@@ -8528,6 +8443,6 @@ exports.encodeSecondBridgeErc20Args = encodeSecondBridgeErc20Args;
 exports.encodeSecondBridgeEthArgs = encodeSecondBridgeEthArgs;
 exports.getL2TransactionHashFromLogs = getL2TransactionHashFromLogs;
 exports.registerErrorAbi = registerErrorAbi;
-exports.toZKsyncError = toZKsyncError2;
+exports.toZKsyncError = toZKsyncError;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map