@matterlabs/zksync-js 0.0.15 → 0.0.16

package/dist/adapters/ethers/client.js

@@ -1,6 +1,6 @@
-export { createEthersClient } from '../../chunk-MZBKM3GH.js';
-import '../../chunk-65HAYKVL.js';
+export { createEthersClient } from '../../chunk-24TE2NNJ.js';
+import '../../chunk-NJK325XV.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/index.cjs

@@ -389,6 +389,7 @@ var OP_INTEROP = {
   tryWait: "interop.tryWait",
   finalize: "interop.finalize",
   tryFinalize: "interop.tryFinalize",
+  verify: "interop.verify",
   context: {
     chainTypeManager: "interop.chainTypeManager",
     protocolVersion: "interop.protocolVersion"
@@ -8944,7 +8945,7 @@ function routeEthNonBase() {
       const requestStruct = {
         chainId: ctx.chainIdL2,
         mintValue,
-        l2Value: p.amount,
+        l2Value: 0n,
         l2GasLimit: l2GasParams.gasLimit,
         l2GasPerPubdataByteLimit: ctx.gasPerPubdata,
         refundRecipient: ctx.refundRecipient,
@@ -8952,6 +8953,7 @@ function routeEthNonBase() {
         secondBridgeValue: p.amount,
         secondBridgeCalldata
       };
+      const bridgehubValue = p.amount;
       const bridgehub = await ctx.contracts.bridgehub();
       const data = bridgehub.interface.encodeFunctionData("requestL2TransactionTwoBridges", [
         requestStruct
@@ -8959,8 +8961,7 @@ function routeEthNonBase() {
       const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
-        value: p.amount,
-        // base ≠ ETH ⇒ msg.value == secondBridgeValue
+        value: bridgehubValue,
         from: ctx.sender,
         ...ctx.gasOverrides
       };
@@ -11407,6 +11408,60 @@ async function executeBundle(client, dstProvider, info, opts) {
     );
   }
 }
+async function verifyBundle(client, dstProvider, info) {
+  const signer = await wrap5(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;
@@ -11985,6 +12040,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) => wrap7(
+    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) => wrap7(
+    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,
@@ -11996,7 +12073,9 @@ function createInteropResource(client, config, tokens, contracts, attributes) {
     wait,
     tryWait,
     finalize,
-    tryFinalize
+    tryFinalize,
+    getInteropRoot: interopGetRoot,
+    verifyBundle: verifyBundle2
   };
 }