@matterlabs/zksync-js 0.0.7 → 0.0.8

package/dist/adapters/viem/index.js

@@ -1,8 +1,8 @@
-export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError } from '../../chunk-KRIRXY74.js';
-import '../../chunk-NNFWIAVG.js';
-import '../../chunk-P5PIWVEO.js';
-import '../../chunk-KAMEGD6I.js';
-export { createViemClient as createClient, createViemClient } from '../../chunk-7VP6742W.js';
-import '../../chunk-WY36Z6YB.js';
-import '../../chunk-GIXLOHLK.js';
-import '../../chunk-NCR42O6O.js';
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError } from '../../chunk-LNIEQ7AN.js';
+import '../../chunk-NODVRI3E.js';
+import '../../chunk-QZVYN3YA.js';
+import '../../chunk-5V2JRM5J.js';
+export { createViemClient as createClient, createViemClient } from '../../chunk-ODMBZ2VX.js';
+import '../../chunk-SHQQI3UD.js';
+import '../../chunk-3GFCAGGI.js';
+import '../../chunk-C3AGOEHR.js';

package/dist/adapters/viem/sdk.cjs

@@ -3736,6 +3736,37 @@ function buildDirectRequestStruct(args) {
   };
 }
 
+// src/core/utils/hash.ts
+var RegExpHex = /^0x[0-9a-fA-F]*$/;
+var isHash = (x, length) => {
+  if (!x || typeof x !== "string") return false;
+  return (x.length === length) && RegExpHex.test(x);
+};
+var isHash66 = (x) => isHash(x, 66);
+
+// src/core/utils/number.ts
+var isNumber = (x) => typeof x === "number" && Number.isFinite(x);
+var isBigint = (x) => typeof x === "bigint";
+
+// src/core/utils/addr.ts
+function isAddressEq(a, b) {
+  return a.toLowerCase() === b.toLowerCase();
+}
+function isETH(token) {
+  return isAddressEq(token, FORMAL_ETH_ADDRESS) || isAddressEq(token, L2_BASE_TOKEN_ADDRESS) || isAddressEq(token, ETH_ADDRESS);
+}
+function normalizeAddrEq(a, b) {
+  if (!a || !b) return false;
+  const normalize = (s) => {
+    const hasPrefix = s.slice(0, 2).toLowerCase() === "0x";
+    const body = hasPrefix ? s.slice(2) : s;
+    return `0x${body.toLowerCase()}`;
+  };
+  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/core/errors/formatter.ts
 function elideMiddle(s, max = 96) {
   if (s.length <= max) return s;
@@ -3746,7 +3777,7 @@ function shortJSON(v, max = 240) {
   try {
     const s = JSON.stringify(
       v,
-      (_k, val) => typeof val === "bigint" ? `${val.toString()}n` : val
+      (_k, val) => isBigint(val) ? `${val.toString()}n` : val
     );
     return s.length > max ? elideMiddle(s, max) : s;
   } catch {
@@ -3766,7 +3797,7 @@ function formatContextLine(ctx) {
   if (txHash !== void 0)
     parts.push(`txHash=${typeof txHash === "string" ? txHash : shortJSON(txHash, 96)}`);
   if (nonce !== void 0) {
-    const nonceStr = typeof nonce === "string" || typeof nonce === "number" || typeof nonce === "bigint" ? String(nonce) : shortJSON(nonce, 48);
+    const nonceStr = typeof nonce === "string" || isNumber(nonce) || isBigint(nonce) ? String(nonce) : shortJSON(nonce, 48);
     parts.push(`nonce=${nonceStr}`);
   }
   return parts.length ? `  ${kv("Context", parts.join("  \u2022  "))}` : void 0;
@@ -3796,17 +3827,17 @@ function formatCause(c) {
     const head = [];
     if (obj.name !== void 0) {
       const nameVal = obj.name;
-      const nameStr = typeof nameVal === "string" || typeof nameVal === "number" || typeof nameVal === "bigint" || typeof nameVal === "boolean" ? String(nameVal) : shortJSON(nameVal, 120);
+      const nameStr = typeof nameVal === "string" || isNumber(nameVal) || isBigint(nameVal) || typeof nameVal === "boolean" ? String(nameVal) : shortJSON(nameVal, 120);
       head.push(`name=${nameStr}`);
     }
     if (obj.code !== void 0) {
       const codeVal = obj.code;
-      const codeStr = typeof codeVal === "string" || typeof codeVal === "number" || typeof codeVal === "bigint" || typeof codeVal === "boolean" ? String(codeVal) : shortJSON(codeVal, 120);
+      const codeStr = typeof codeVal === "string" || isNumber(codeVal) || isBigint(codeVal) || typeof codeVal === "boolean" ? String(codeVal) : shortJSON(codeVal, 120);
       head.push(`code=${codeStr}`);
     }
     if (head.length) out.push(`  ${kv("Cause", head.join("  "))}`);
     if (obj.message) {
-      const messageStr = typeof obj.message === "string" || typeof obj.message === "number" || typeof obj.message === "bigint" || typeof obj.message === "boolean" ? String(obj.message) : shortJSON(obj.message, 600);
+      const messageStr = typeof obj.message === "string" || isNumber(obj.message) || isBigint(obj.message) || typeof obj.message === "boolean" ? String(obj.message) : shortJSON(obj.message, 600);
       out.push(`              message=${elideMiddle(messageStr, 600)}`);
     }
     if (obj.data) {
@@ -4634,28 +4665,6 @@ function routeEthDirect() {
     }
   };
 }
-
-// src/core/utils/addr.ts
-var isHash66 = (x) => !!x && x.startsWith("0x") && x.length === 66;
-function isAddressEq(a, b) {
-  return a.toLowerCase() === b.toLowerCase();
-}
-function isETH(token) {
-  return isAddressEq(token, FORMAL_ETH_ADDRESS) || isAddressEq(token, L2_BASE_TOKEN_ADDRESS) || isAddressEq(token, ETH_ADDRESS);
-}
-function normalizeAddrEq(a, b) {
-  if (!a || !b) return false;
-  const normalize = (s) => {
-    const hasPrefix = s.slice(0, 2).toLowerCase() === "0x";
-    const body = hasPrefix ? s.slice(2) : s;
-    return `0x${body.toLowerCase()}`;
-  };
-  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/viem/resources/deposits/routes/erc20-nonbase.ts
 var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
@@ -6201,8 +6210,7 @@ function routeErc20NonBase2() {
           tx: approveTx
         });
       }
-      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l2" }) : void 0);
-      const assetId = resolved?.assetId ?? (await wrapAs8(
+      const assetId = (await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.ensureRegistered,
         () => ctx.client.l2.simulateContract({
@@ -6236,7 +6244,7 @@ function routeErc20NonBase2() {
         value: 0n,
         from: ctx.sender
       };
-      const withdrawGas = await quoteL2Gas4({ ctx, tx: withdrawTxCandidate });
+      const withdrawGas = current >= p.amount ? await quoteL2Gas4({ ctx, tx: withdrawTxCandidate }) : void 0;
       if (withdrawGas) {
         withdrawTxCandidate.gas = withdrawGas.gasLimit;
         withdrawTxCandidate.maxFeePerGas = withdrawGas.maxFeePerGas;
@@ -6290,11 +6298,14 @@ function routeErc20NonBase2() {
   };
 }
 
-// src/core/resources/withdrawals/events.ts
+// src/core/utils/events.ts
+function extractPreferAddress(opts) {
+  const preferAddr = typeof opts?.prefer === "object" ? opts.prefer.address : opts?.prefer === "assetRouter" ? L2_ASSET_ROUTER_ADDRESS : L1_MESSENGER_ADDRESS;
+  return (preferAddr || L1_MESSENGER_ADDRESS).toLowerCase();
+}
 function findL1MessageSentLog(receipt, opts) {
   const index = opts?.index;
-  const preferAddr = typeof opts?.prefer === "object" ? opts?.prefer.address : opts?.prefer === "assetRouter" ? L2_ASSET_ROUTER_ADDRESS : L1_MESSENGER_ADDRESS;
-  const prefer = (preferAddr ?? L1_MESSENGER_ADDRESS).toLowerCase();
+  const preferAddr = extractPreferAddress(opts);
   const matches = receipt.logs.filter((lg) => {
     const t0 = (lg.topics?.[0] ?? "").toLowerCase();
     return t0 === TOPIC_L1_MESSAGE_SENT_NEW || t0 === TOPIC_L1_MESSAGE_SENT_LEG;
@@ -6302,7 +6313,7 @@ function findL1MessageSentLog(receipt, opts) {
   if (!matches.length) {
     throw new Error("No L1MessageSent event found in L2 receipt logs.");
   }
-  const preferred = matches.find((lg) => (lg.address ?? "").toLowerCase() === prefer);
+  const preferred = matches.find((lg) => (lg.address ?? "").toLowerCase() === preferAddr);
   const chosen = preferred ?? matches[index] ?? matches[0];
   if (!chosen) {
     throw new Error("No suitable L1MessageSent event found.");