@matterlabs/zksync-js 0.0.8 → 0.0.9

package/dist/adapters/viem/sdk.js

@@ -1,6 +1,6 @@
-export { createViemSdk } from '../../chunk-LNIEQ7AN.js';
-import '../../chunk-NODVRI3E.js';
-import '../../chunk-QZVYN3YA.js';
-import '../../chunk-5V2JRM5J.js';
-import '../../chunk-3GFCAGGI.js';
+export { createViemSdk } from '../../chunk-5AG6B7UX.js';
+import '../../chunk-AIFHAPJC.js';
+import '../../chunk-ZVHFVUDE.js';
+import '../../chunk-SRPKTXIF.js';
+import '../../chunk-FBKBF7YM.js';
 import '../../chunk-C3AGOEHR.js';

package/dist/{chunk-LNIEQ7AN.js → chunk-5AG6B7UX.js}

@@ -1,9 +1,9 @@
-import { createNTVCodec, buildFeeBreakdown, quoteL2Gas, quoteL1Gas, quoteL2Gas2 } from './chunk-NODVRI3E.js';
-import { findL1MessageSentLog, messengerLogIndex, normalizeL1Token, isAddressEq, hexEq, isHash66, isETH, normalizeAddrEq, pickWithdrawRoute } from './chunk-QZVYN3YA.js';
-import { createErrorOps, REVERT_TO_READINESS } from './chunk-5V2JRM5J.js';
-import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, OP_WITHDRAWALS, createError, OP_DEPOSITS, isZKsyncError, isReceiptNotFound, IBridgehub_default, IL2AssetRouter_default, IBaseToken_default } from './chunk-3GFCAGGI.js';
-import { ETH_ADDRESS, L1_MESSENGER_ADDRESS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, SAFE_L1_BRIDGE_GAS } from './chunk-C3AGOEHR.js';
-import { keccak256, encodeAbiParameters, decodeErrorResult, concat, decodeAbiParameters, decodeEventLog, encodeFunctionData, zeroAddress } from 'viem';
+import { createNTVCodec, toGasOverrides, buildFeeBreakdown, quoteL2Gas, quoteL1Gas, quoteL2Gas2 } from './chunk-AIFHAPJC.js';
+import { findL1MessageSentLog, messengerLogIndex, pickWithdrawRoute } from './chunk-ZVHFVUDE.js';
+import { createErrorOps, REVERT_TO_READINESS } from './chunk-SRPKTXIF.js';
+import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, isHash66, OP_WITHDRAWALS, createError, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, isZKsyncError, isReceiptNotFound, IBridgehub_default, isETH, normalizeAddrEq, IL2AssetRouter_default, IBaseToken_default } from './chunk-FBKBF7YM.js';
+import { ETH_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, L1_MESSENGER_ADDRESS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, SAFE_L1_BRIDGE_GAS } from './chunk-C3AGOEHR.js';
+import { keccak256, encodeAbiParameters, decodeErrorResult, concat, decodeEventLog, decodeAbiParameters, encodeFunctionData, zeroAddress } from 'viem';
 
 // src/adapters/viem/resources/deposits/context.ts
 async function commonCtx(p, client, tokens, contracts) {
@@ -39,7 +39,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,
@@ -1101,7 +1101,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 = decodeEventLog({
@@ -1133,7 +1133,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",
@@ -1480,7 +1480,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 {
@@ -1627,14 +1633,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
@@ -1770,7 +1776,7 @@ async function commonCtx2(p, client, tokens, contracts) {
     l2NativeTokenVault,
     l2BaseTokenSystem,
     baseIsEth,
-    gasOverrides: p.l2TxOverrides
+    gasOverrides: p.l2TxOverrides ? toGasOverrides(p.l2TxOverrides) : void 0
   };
 }
 
@@ -2124,27 +2130,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(
@@ -2181,15 +2171,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,
@@ -2206,15 +2188,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,
@@ -2277,15 +2251,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,
@@ -2386,6 +2352,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;
@@ -2419,6 +2393,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,
@@ -2426,6 +2401,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 } : {}
@@ -2726,4 +2702,4 @@ function createViemSdk(client) {
   };
 }
 
-export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError };
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs, registerErrorAbi, toZKsyncError };

package/dist/{chunk-NODVRI3E.js → chunk-AIFHAPJC.js}

@@ -1,4 +1,4 @@
-import { IBridgehub_default } from './chunk-3GFCAGGI.js';
+import { IBridgehub_default } from './chunk-FBKBF7YM.js';
 import { BUFFER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS } from './chunk-C3AGOEHR.js';
 
 // src/core/codec/ntv.ts
@@ -15,6 +15,12 @@ function createNTVCodec(deps) {
   };
 }
 
+// src/core/types/fees.ts
+function toGasOverrides(overrides) {
+  const { nonce: _, ...gas } = overrides;
+  return gas;
+}
+
 // src/core/resources/deposits/fee.ts
 function buildFeeBreakdown(p) {
   const l1MaxTotal = p.l1Gas?.maxCost ?? 0n;
@@ -228,4 +234,4 @@ async function quoteL2Gas2(input) {
   }
 }
 
-export { buildFeeBreakdown, createNTVCodec, quoteL1Gas, quoteL2BaseCost, quoteL2Gas, quoteL2Gas2 };
+export { buildFeeBreakdown, createNTVCodec, quoteL1Gas, quoteL2BaseCost, quoteL2Gas, quoteL2Gas2, toGasOverrides };