@matterlabs/zksync-js 0.0.8 → 0.0.9

package/dist/adapters/viem/index.d.ts

@@ -4,6 +4,7 @@ export * from './sdk';
 export * from './resources/utils';
 export { createDepositsResource } from './resources/deposits';
 export type { DepositsResource } from './resources/deposits';
+export { getL2TransactionHashFromLogs } from './resources/deposits/services/verification';
 export { createWithdrawalsResource } from './resources/withdrawals';
 export { createFinalizationServices } from './resources/withdrawals';
 export type { WithdrawalsResource, FinalizationServices } from './resources/withdrawals';

package/dist/adapters/viem/index.js

@@ -1,8 +1,9 @@
-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';
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs, registerErrorAbi, toZKsyncError } from '../../chunk-5AG6B7UX.js';
+import '../../chunk-AIFHAPJC.js';
+import '../../chunk-ZVHFVUDE.js';
+export { createViemClient as createClient, createViemClient } from '../../chunk-KLNFDFLA.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/resources/deposits/context.d.ts

@@ -2,7 +2,7 @@ import type { ViemClient } from '../../client';
 import type { Address, Hex } from '../../../../core/types/primitives';
 import type { DepositParams, DepositRoute } from '../../../../core/types/flows/deposits';
 import type { CommonCtx } from '../../../../core/types/flows/base';
-import type { TxOverrides } from '../../../../core/types/fees';
+import { type TxGasOverrides } from '../../../../core/types/fees';
 import type { ResolvedToken, TokensResource } from '../../../../core/types/flows/token';
 import type { ContractsResource } from '../contracts';
 export interface BuildCtx extends CommonCtx {
@@ -14,7 +14,7 @@ export interface BuildCtx extends CommonCtx {
     baseTokenL1: Address;
     baseIsEth: boolean;
     l1AssetRouter: Address;
-    gasOverrides?: TxOverrides;
+    gasOverrides?: TxGasOverrides;
     l2GasLimit?: bigint;
     gasPerPubdata: bigint;
     operatorTip: bigint;
@@ -33,7 +33,7 @@ export declare function commonCtx(p: DepositParams, client: ViemClient, tokens:
     bridgehub: `0x${string}`;
     chainIdL2: bigint;
     sender: `0x${string}`;
-    gasOverrides: TxOverrides | undefined;
+    gasOverrides: TxGasOverrides | undefined;
     l2GasLimit: bigint | undefined;
     gasPerPubdata: bigint;
     operatorTip: bigint;

package/dist/adapters/viem/resources/deposits/services/gas.d.ts

@@ -1,14 +1,14 @@
 import { type TransactionRequest } from 'viem';
 import type { BuildCtx } from '../context';
 import type { DepositRoute } from '../../../../../core/types/flows/deposits';
-import type { TxOverrides } from '../../../../../core/types/fees';
+import type { TxGasOverrides } from '../../../../../core/types/fees';
 import type { Address } from '../../../../../core/types/primitives';
 import { type GasQuote } from '../../../../../core/resources/deposits/gas';
 export type { GasQuote };
 export type QuoteL1GasInput = {
     ctx: BuildCtx;
     tx: TransactionRequest;
-    overrides?: TxOverrides;
+    overrides?: TxGasOverrides;
     fallbackGasLimit?: bigint;
 };
 export type QuoteL2GasInput = {

package/dist/adapters/viem/resources/deposits/services/verification.d.ts

@@ -1,6 +1,6 @@
 import type { PublicClient, TransactionReceipt, Log } from 'viem';
 import type { Hex } from '../../../../../core/types/primitives';
-export declare function extractL2TxHashFromL1Logs(logs: ReadonlyArray<Log>): Hex | null;
+export declare function getL2TransactionHashFromLogs(logs: ReadonlyArray<Log>): Hex | null;
 export declare function waitForL2ExecutionFromL1Tx(l1: PublicClient, l2: PublicClient, l1TxHash: Hex): Promise<{
     l2Receipt: TransactionReceipt;
     l2TxHash: Hex;

package/dist/adapters/viem/resources/withdrawals/context.d.ts

@@ -2,7 +2,7 @@ import type { ViemClient } from '../../client';
 import type { Address } from '../../../../core/types/primitives';
 import { type WithdrawParams, type WithdrawRoute } from '../../../../core/types/flows/withdrawals';
 import type { CommonCtx } from '../../../../core/types/flows/base';
-import type { TxOverrides } from '../../../../core/types/fees';
+import { type TxGasOverrides } from '../../../../core/types/fees';
 import type { Hex } from '../../../../core/types/primitives';
 import type { ResolvedToken, TokensResource } from '../../../../core/types/flows/token';
 import type { ContractsResource } from '../contracts';
@@ -20,7 +20,7 @@ export interface BuildCtx extends CommonCtx {
     l2AssetRouter: Address;
     l2NativeTokenVault: Address;
     l2BaseTokenSystem: Address;
-    gasOverrides?: TxOverrides;
+    gasOverrides?: TxGasOverrides;
 }
 export declare function commonCtx(p: WithdrawParams, client: ViemClient, tokens: TokensResource, contracts: ContractsResource): Promise<BuildCtx & {
     route: WithdrawRoute;

package/dist/adapters/viem/sdk.cjs

@@ -3646,6 +3646,12 @@ var MailboxABI = [
 ];
 var Mailbox_default = MailboxABI;
 
+// src/core/types/fees.ts
+function toGasOverrides(overrides) {
+  const { nonce: _, ...gas } = overrides;
+  return gas;
+}
+
 // src/adapters/viem/resources/deposits/context.ts
 async function commonCtx(p, client, tokens, contracts) {
   const { bridgehub, l1AssetRouter } = await contracts.addresses();
@@ -3680,7 +3686,7 @@ async function commonCtx(p, client, tokens, contracts) {
     bridgehub,
     chainIdL2: BigInt(chainId),
     sender,
-    gasOverrides: p.l1TxOverrides,
+    gasOverrides: p.l1TxOverrides ? toGasOverrides(p.l1TxOverrides) : void 0,
     l2GasLimit: p.l2GasLimit,
     gasPerPubdata,
     operatorTip,
@@ -3912,12 +3918,13 @@ if (kInspect) {
     enumerable: false
   });
 }
-function isZKsyncError(e) {
+function isZKsyncError(e, opts) {
   if (!e || typeof e !== "object") return false;
   const maybe = e;
   if (!("envelope" in maybe)) return false;
   const envelope = maybe.envelope;
-  return typeof envelope?.type === "string" && typeof envelope?.message === "string";
+  if (typeof envelope?.type !== "string" || typeof envelope?.message !== "string") return false;
+  return true;
 }
 function isReceiptNotFound(e) {
   const chain = [];
@@ -4040,11 +4047,9 @@ var OP_WITHDRAWALS = {
       rawReceipt: "withdrawals.finalize.fetchParams:rawReceipt",
       messengerIndex: "withdrawals.finalize.fetchParams:messengerIndex",
       proof: "withdrawals.finalize.fetchParams:proof",
-      network: "withdrawals.finalize.fetchParams:network",
-      ensureAddresses: "withdrawals.finalize.fetchParams:ensureAddresses"
+      network: "withdrawals.finalize.fetchParams:network"
     },
     readiness: {
-      ensureAddresses: "withdrawals.finalize.readiness:ensureAddresses",
       isFinalized: "withdrawals.finalize.readiness:isWithdrawalFinalized",
       simulate: "withdrawals.finalize.readiness:simulate"
     },
@@ -5291,7 +5296,7 @@ var I_BRIDGEHUB_NEW_PRIORITY_REQUEST = {
     { name: "data", type: "bytes", indexed: false }
   ]
 };
-function extractL2TxHashFromL1Logs(logs) {
+function getL2TransactionHashFromLogs(logs) {
   for (const lg of logs) {
     try {
       const parsed = viem.decodeEventLog({
@@ -5323,7 +5328,7 @@ function extractL2TxHashFromL1Logs(logs) {
 async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   const l1Receipt = await l1.waitForTransactionReceipt({ hash: l1TxHash });
   if (!l1Receipt) throw new Error("No L1 receipt found");
-  const l2TxHash = extractL2TxHashFromL1Logs(l1Receipt.logs);
+  const l2TxHash = getL2TransactionHashFromLogs(l1Receipt.logs);
   if (!l2TxHash) {
     throw createError("VERIFICATION", {
       message: "Failed to extract L2 transaction hash from L1 logs",
@@ -5686,7 +5691,13 @@ function createDepositsResource(client, tokens, contracts) {
       const plan = await prepare(p);
       const stepHashes = {};
       const from = client.account.address;
-      let next = await client.l1.getTransactionCount({ address: from, blockTag: "latest" });
+      let next;
+      if (typeof p.l1TxOverrides?.nonce === "number") {
+        next = p.l1TxOverrides.nonce;
+      } else {
+        const blockTag = p.l1TxOverrides?.nonce ?? "latest";
+        next = await client.l1.getTransactionCount({ address: from, blockTag });
+      }
       for (const step of plan.steps) {
         if (step.kind === "approve") {
           try {
@@ -5833,14 +5844,14 @@ function createDepositsResource(client, tokens, contracts) {
       if (!l1Rcpt) return { phase: "L1_PENDING", l1TxHash };
       let l2TxHash;
       try {
-        l2TxHash = extractL2TxHashFromL1Logs(l1Rcpt.logs) ?? void 0;
+        l2TxHash = getL2TransactionHashFromLogs(l1Rcpt.logs) ?? void 0;
       } catch (e) {
         throw toZKsyncError(
           "INTERNAL",
           {
             resource: "deposits",
-            operation: "deposits.status.extractL2TxHashFromL1Logs",
-            context: { where: "extractL2TxHashFromL1Logs", l1TxHash },
+            operation: "deposits.status.getL2TransactionHashFromLogs",
+            context: { where: "getL2TransactionHashFromLogs", l1TxHash },
             message: "Failed to derive L2 transaction hash from L1 logs."
           },
           e
@@ -5989,7 +6000,7 @@ async function commonCtx2(p, client, tokens, contracts) {
     l2NativeTokenVault,
     l2BaseTokenSystem,
     baseIsEth,
-    gasOverrides: p.l2TxOverrides
+    gasOverrides: p.l2TxOverrides ? toGasOverrides(p.l2TxOverrides) : void 0
   };
 }
 
@@ -6439,27 +6450,11 @@ function createFinalizationServices(client) {
         message,
         merkleProof: proof.proof
       };
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       return { params, nullifier: l1Nullifier };
     },
     async simulateFinalizeReadiness(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.readiness.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       const done = await (async () => {
         try {
           const result = await wrapAs9(
@@ -6496,15 +6491,7 @@ function createFinalizationServices(client) {
       }
     },
     async isWithdrawalFinalized(key) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       return await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.isFinalized,
@@ -6521,15 +6508,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.estimate,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       const gasLimit = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.estimate,
@@ -6592,15 +6571,7 @@ function createFinalizationServices(client) {
       };
     },
     async finalizeDeposit(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       try {
         const hash = await client.l1Wallet.writeContract({
           address: l1Nullifier,
@@ -6701,6 +6672,14 @@ function createWithdrawalsResource(client, tokens, contracts) {
       const plan = await prepare(p);
       const stepHashes = {};
       const l2Wallet = client.getL2Wallet();
+      const from = client.account.address;
+      let next;
+      if (typeof p.l2TxOverrides?.nonce === "number") {
+        next = p.l2TxOverrides.nonce;
+      } else {
+        const blockTag = p.l2TxOverrides?.nonce ?? "pending";
+        next = await client.l2.getTransactionCount({ address: from, blockTag });
+      }
       for (const step of plan.steps) {
         if (p.l2TxOverrides) {
           const overrides = p.l2TxOverrides;
@@ -6734,6 +6713,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
           maxFeePerGas: step.tx.maxFeePerGas,
           maxPriorityFeePerGas: step.tx.maxPriorityFeePerGas
         } : {};
+        const nonce = next++;
         const baseReq = {
           address: step.tx.address,
           abi: step.tx.abi,
@@ -6741,6 +6721,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
           args: step.tx.args ?? [],
           account: step.tx.account ?? l2Wallet.account ?? client.account,
           gas: step.tx.gas,
+          nonce,
           ...fee1559,
           ...step.tx.dataSuffix ? { dataSuffix: step.tx.dataSuffix } : {},
           ...step.tx.chain ? { chain: step.tx.chain } : {}