@matterlabs/zksync-js 0.0.15 → 0.0.17

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"
@@ -8403,8 +8404,8 @@ function buildFeeBreakdown(p) {
 
 // src/core/resources/deposits/priority.ts
 var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
-var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 6n;
-var ERAVM_PRIORITY_L2_GAS_BUFFER = 30n;
+var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
+var PRIORITY_L2_GAS_BUFFER = 40n;
 var maxBigInt2 = (a, b) => a > b ? a : b;
 var ceilDiv = (a, b) => (a + b - 1n) / b;
 function derivePriorityTxGasBreakdown(input) {
@@ -8432,10 +8433,7 @@ function derivePriorityBodyGasEstimateCap(input) {
   return input.minBodyGas * (input.multiplier ?? DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER);
 }
 function applyPriorityL2GasLimitBuffer(input) {
-  if (!isEraVmChain(input.chainIdL2)) {
-    return input.gasLimit;
-  }
-  return input.gasLimit * (100n + ERAVM_PRIORITY_L2_GAS_BUFFER) / 100n;
+  return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
 }
 var EMPTY_BYTES = "0x";
 var ZERO_RESERVED_WORDS = [0n, 0n, 0n, 0n];
@@ -8944,7 +8942,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 +8950,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 +8958,7 @@ function routeEthNonBase() {
       const l1TxCandidate = {
         to: ctx.bridgehub,
         data,
-        value: p.amount,
-        // base ≠ ETH ⇒ msg.value == secondBridgeValue
+        value: bridgehubValue,
         from: ctx.sender,
         ...ctx.gasOverrides
       };
@@ -11090,13 +11088,23 @@ function routeIndirect() {
 // src/adapters/ethers/resources/interop/routes/direct.ts
 function routeDirect() {
   return {
-    // eslint-disable-next-line @typescript-eslint/require-await
     async preflight(params, ctx) {
       preflightDirect(params, {
         dstChainId: ctx.dstChainId,
         baseTokens: ctx.baseTokens,
         l2AssetRouter: ctx.l2AssetRouter,
         l2NativeTokenVault: ctx.l2NativeTokenVault});
+      for (const action of params.actions) {
+        const code = await ctx.dstProvider.getCode(action.to);
+        if (!code || code === "0x") {
+          throw createError("VALIDATION", {
+            resource: "interop",
+            operation: OP_INTEROP.routes.direct.preflight,
+            message: `Destination address ${action.to} is not a contract on the destination chain. The receiver must be a contract that implements the IERC7786Recipient interface (receiveMessage).`,
+            context: { to: action.to, action: action.type }
+          });
+        }
+      }
     },
     async build(params, ctx) {
       const steps = [];
@@ -11346,7 +11354,7 @@ async function getBundleStatus(client, dstProvider, topics, bundleHash, opts) {
   }
   return { phase: "SENT" };
 }
-async function executeBundle(client, dstProvider, info, opts) {
+async function executeBundle(client, dstProvider, info, opts, txOverrides) {
   const { topics } = getTopics();
   const { bundleHash, encodedData, proof } = info;
   const dstStatus = await getBundleStatus(client, dstProvider, topics, bundleHash, opts);
@@ -11364,7 +11372,11 @@ async function executeBundle(client, dstProvider, info, opts) {
   const { interopHandler } = await client.ensureAddresses();
   const handler = new ethers.Contract(interopHandler, IInteropHandler_default, signer);
   try {
-    const txResponse = await handler.executeBundle(encodedData, proof);
+    const txResponse = await handler.executeBundle(
+      encodedData,
+      proof,
+      txOverrides ?? {}
+    );
     const hash = txResponse.hash;
     return {
       hash,
@@ -11407,6 +11419,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;
@@ -11758,8 +11824,8 @@ function createInteropFinalizationServices(client) {
     wait(dstProvider, gwProvider, input, opts) {
       return waitForFinalization(client, dstProvider, gwProvider, input, opts);
     },
-    async finalize(dstProvider, info, opts) {
-      const execResult = await executeBundle(client, dstProvider, info, opts);
+    async finalize(dstProvider, info, opts, txOverrides) {
+      const execResult = await executeBundle(client, dstProvider, info, opts, txOverrides);
       await execResult.wait();
       return {
         bundleHash: info.bundleHash,
@@ -11969,22 +12035,47 @@ function createInteropResource(client, config, tokens, contracts, attributes) {
     ctx: { where: "interop.wait" }
   });
   const tryWait = (dstChain, h, opts) => toResult2(OP_INTEROP.tryWait, () => wait(dstChain, h, opts));
-  const finalize = (dstChain, h, opts) => wrap7(
+  const finalize = (dstChain, h, opts, txOverrides) => wrap7(
     OP_INTEROP.finalize,
     async () => {
       const dstProvider = resolveChainRef(dstChain);
       if (isInteropFinalizationInfo(h)) {
-        return svc.finalize(dstProvider, h, opts);
+        return svc.finalize(dstProvider, h, opts, txOverrides);
       }
       const info = await svc.wait(dstProvider, getGwProvider(), h);
-      return svc.finalize(dstProvider, info, opts);
+      return svc.finalize(dstProvider, info, opts, txOverrides);
     },
     {
       message: "Failed to finalize/execute interop bundle on destination.",
       ctx: { where: "interop.finalize" }
     }
   );
-  const tryFinalize = (dstChain, h, opts) => toResult2(OP_INTEROP.tryFinalize, () => finalize(dstChain, h, opts));
+  const tryFinalize = (dstChain, h, opts, txOverrides) => toResult2(
+    OP_INTEROP.tryFinalize,
+    () => finalize(dstChain, h, opts, txOverrides)
+  );
+  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 +12087,9 @@ function createInteropResource(client, config, tokens, contracts, attributes) {
     wait,
     tryWait,
     finalize,
-    tryFinalize
+    tryFinalize,
+    getInteropRoot: interopGetRoot,
+    verifyBundle: verifyBundle2
   };
 }