@matterlabs/zksync-js 0.0.15 → 0.0.16

package/dist/adapters/ethers/index.js

@@ -1,9 +1,9 @@
-export { createEthersClient as createClient, createEthersClient } from '../../chunk-MZBKM3GH.js';
-export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-HGB3DOV2.js';
-export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-65HAYKVL.js';
-import '../../chunk-K2UVKMLN.js';
+export { createEthersClient as createClient, createEthersClient } from '../../chunk-24TE2NNJ.js';
+export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-5HG2DUYW.js';
+export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-NJK325XV.js';
+import '../../chunk-NLUCYVMX.js';
 import '../../chunk-3HHUZXSV.js';
 import '../../chunk-BWKWWLY4.js';
-import '../../chunk-MDPX5LNW.js';
-import '../../chunk-JXR5V5YK.js';
+import '../../chunk-JSBMIT4S.js';
+import '../../chunk-UEKFQAOS.js';
 import '../../chunk-MT4X5FEO.js';

package/dist/adapters/ethers/resources/interop/index.d.ts

@@ -1,4 +1,5 @@
 import type { EthersClient } from '../../client';
+import type { Hex } from '../../../../core/types/primitives';
 import type { AttributesResource } from '../../../../core/resources/interop/attributes/resource';
 import type { InteropRoute, InteropPlan, InteropQuote, InteropStatus, InteropFinalizationResult, InteropParams, InteropHandle, InteropWaitable, InteropFinalizationInfo } from '../../../../core/types/flows/interop';
 import type { ContractsResource } from '../contracts';
@@ -6,7 +7,7 @@ import type { TokensResource } from '../../../../core/types/flows/token';
 import type { InteropRouteStrategy } from './routes/types';
 import type { TransactionRequest } from 'ethers';
 import { createInteropFinalizationServices, type InteropFinalizationServices } from './services/finalization';
-import type { LogsQueryOptions } from './services/finalization/data-fetchers';
+import { type LogsQueryOptions } from './services/finalization/data-fetchers';
 import type { ChainRef, InteropConfig } from './types';
 export declare const ROUTES: Record<InteropRoute, InteropRouteStrategy>;
 export interface InteropResource {
@@ -57,6 +58,8 @@ export interface InteropResource {
         ok: false;
         error: unknown;
     }>;
+    getInteropRoot(dstChain: ChainRef, rootChainId: bigint, batchNumber: bigint): Promise<Hex>;
+    verifyBundle(dstChain: ChainRef, h: InteropWaitable | InteropFinalizationInfo): Promise<InteropFinalizationResult>;
 }
 export declare function createInteropResource(client: EthersClient, config?: InteropConfig, tokens?: TokensResource, contracts?: ContractsResource, attributes?: AttributesResource): InteropResource;
 export { createInteropFinalizationServices };

package/dist/adapters/ethers/resources/interop/services/finalization/bundle.d.ts

@@ -13,3 +13,7 @@ export declare function executeBundle(client: EthersClient, dstProvider: Abstrac
     hash: Hex;
     wait: () => Promise<TransactionReceipt>;
 }>;
+export declare function verifyBundle(client: EthersClient, dstProvider: AbstractProvider, info: InteropFinalizationInfo): Promise<{
+    hash: Hex;
+    wait: () => Promise<TransactionReceipt>;
+}>;

package/dist/adapters/ethers/sdk.cjs

@@ -377,6 +377,7 @@ var OP_INTEROP = {
   tryWait: "interop.tryWait",
   finalize: "interop.finalize",
   tryFinalize: "interop.tryFinalize",
+  verify: "interop.verify",
   context: {
     chainTypeManager: "interop.chainTypeManager",
     protocolVersion: "interop.protocolVersion"
@@ -7026,7 +7027,7 @@ function routeEthNonBase() {
       const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: p.amount,
+        l2Value: 0n,
         l2GasLimit: l2GasParams.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
@@ -7034,6 +7035,7 @@ function routeEthNonBase() {
         secondBridgeValue: p.amount,
         secondBridgeCalldata
       };
+      const bridgehubValue = p.amount;
       const bridgehub = await ctx.contracts.bridgehub();
       const data = bridgehub.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
         requestStruct
@@ -7041,8 +7043,7 @@ function routeEthNonBase() {
       const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
-        value: p.amount,
-        // base ≠ ETH ⇒ msg.value == secondBridgeValue
+        value: bridgehubValue,
         from: ctx.sender,
         ...ctx.gasOverrides
       };
@@ -9489,6 +9490,60 @@ async function executeBundle(client, dstProvider, info, opts) {
     );
   }
 }
+async function verifyBundle(client, dstProvider, info) {
+  const signer = await wrap4(OP_INTEROP.verify, () => client.signerFor(dstProvider), {
+    message: "Failed to resolve destination signer for verifyBundle."
+  });
+  const { interopHandler } = await client.ensureAddresses();
+  const handler = new ethers.Contract(interopHandler, IInteropHandler_default, signer);
+  try {
+    const txResponse = await handler.verifyBundle(
+      info.encodedData,
+      info.proof
+    );
+    const hash = txResponse.hash;
+    return {
+      hash,
+      wait: async () => {
+        try {
+          const receipt = await txResponse.wait();
+          if (!receipt || receipt.status !== 1) {
+            throw createError("EXECUTION", {
+              resource: "interop",
+              operation: OP_INTEROP.verify,
+              message: "Interop bundle verification reverted on destination.",
+              context: { txHash: hash }
+            });
+          }
+          return receipt;
+        } catch (e) {
+          if (isZKsyncError(e)) throw e;
+          throw toZKsyncError(
+            "EXECUTION",
+            {
+              resource: "interop",
+              operation: OP_INTEROP.verify,
+              message: "Failed while waiting for verifyBundle transaction on destination.",
+              context: { txHash: hash }
+            },
+            e
+          );
+        }
+      }
+    };
+  } catch (e) {
+    if (isZKsyncError(e)) throw e;
+    throw toZKsyncError(
+      "EXECUTION",
+      {
+        resource: "interop",
+        operation: OP_INTEROP.verify,
+        message: "Failed to send verifyBundle transaction on destination chain."
+      },
+      e
+    );
+  }
+}
 
 // src/core/resources/interop/finalization.ts
 var DEFAULT_POLL_MS = 1e3;
@@ -10067,6 +10122,28 @@ function createInteropResource(client, config, tokens, contracts, attributes) {
     }
   );
   const tryFinalize = (dstChain, h, opts) => toResult2(OP_INTEROP.tryFinalize, () => finalize(dstChain, h, opts));
+  const interopGetRoot = (dstChain, rootChainId, batchNumber) => wrap6(
+    OP_INTEROP.svc.status.getRoot,
+    () => getInteropRoot(resolveChainRef(dstChain), rootChainId, batchNumber),
+    {
+      message: "Failed to get interop root from the destination chain.",
+      ctx: { where: "interop.getInteropRoot" }
+    }
+  );
+  const verifyBundle2 = (dstChain, h) => wrap6(
+    OP_INTEROP.verify,
+    async () => {
+      const dstProvider = resolveChainRef(dstChain);
+      const info = isInteropFinalizationInfo(h) ? h : await svc.wait(dstProvider, getGwProvider(), h);
+      const result = await verifyBundle(client, dstProvider, info);
+      await result.wait();
+      return { bundleHash: info.bundleHash, dstExecTxHash: result.hash };
+    },
+    {
+      message: "Failed to verify interop bundle on destination.",
+      ctx: { where: "interop.verifyBundle" }
+    }
+  );
   return {
     quote,
     tryQuote,
@@ -10078,7 +10155,9 @@ function createInteropResource(client, config, tokens, contracts, attributes) {
     wait,
     tryWait,
     finalize,
-    tryFinalize
+    tryFinalize,
+    getInteropRoot: interopGetRoot,
+    verifyBundle: verifyBundle2
   };
 }