@matterlabs/zksync-js 0.0.16 → 0.0.18

package/dist/adapters/ethers/index.js

@@ -1,7 +1,7 @@
 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 { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-U72MNQIY.js';
 export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-NJK325XV.js';
-import '../../chunk-NLUCYVMX.js';
+import '../../chunk-6LYAENO6.js';
 import '../../chunk-3HHUZXSV.js';
 import '../../chunk-BWKWWLY4.js';
 import '../../chunk-JSBMIT4S.js';

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

@@ -6,6 +6,7 @@ import type { ContractsResource } from '../contracts';
 import type { TokensResource } from '../../../../core/types/flows/token';
 import type { InteropRouteStrategy } from './routes/types';
 import type { TransactionRequest } from 'ethers';
+import type { TxGasOverrides } from '../../../../core/types/fees';
 import { createInteropFinalizationServices, type InteropFinalizationServices } from './services/finalization';
 import { type LogsQueryOptions } from './services/finalization/data-fetchers';
 import type { ChainRef, InteropConfig } from './types';
@@ -50,8 +51,8 @@ export interface InteropResource {
         ok: false;
         error: unknown;
     }>;
-    finalize(dstChain: ChainRef, h: InteropWaitable | InteropFinalizationInfo, opts?: LogsQueryOptions): Promise<InteropFinalizationResult>;
-    tryFinalize(dstChain: ChainRef, h: InteropWaitable | InteropFinalizationInfo, opts?: LogsQueryOptions): Promise<{
+    finalize(dstChain: ChainRef, h: InteropWaitable | InteropFinalizationInfo, opts?: LogsQueryOptions, txOverrides?: TxGasOverrides): Promise<InteropFinalizationResult>;
+    tryFinalize(dstChain: ChainRef, h: InteropWaitable | InteropFinalizationInfo, opts?: LogsQueryOptions, txOverrides?: TxGasOverrides): Promise<{
         ok: true;
         value: InteropFinalizationResult;
     } | {

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

@@ -1,6 +1,7 @@
 import { type AbstractProvider, type TransactionReceipt } from 'ethers';
 import type { Hex } from '../../../../../../core/types/primitives';
 import type { InteropFinalizationInfo } from '../../../../../../core/types/flows/interop';
+import type { TxGasOverrides } from '../../../../../../core/types/fees';
 import type { EthersClient } from '../../../../client';
 import type { InteropPhase } from '../../../../../../core/types/flows/interop';
 import type { InteropTopics } from '../../../../../../core/resources/interop/events';
@@ -9,7 +10,7 @@ export declare function getBundleStatus(client: EthersClient, dstProvider: Abstr
     phase: InteropPhase;
     dstExecTxHash?: Hex;
 }>;
-export declare function executeBundle(client: EthersClient, dstProvider: AbstractProvider, info: InteropFinalizationInfo, opts?: LogsQueryOptions): Promise<{
+export declare function executeBundle(client: EthersClient, dstProvider: AbstractProvider, info: InteropFinalizationInfo, opts?: LogsQueryOptions, txOverrides?: TxGasOverrides): Promise<{
     hash: Hex;
     wait: () => Promise<TransactionReceipt>;
 }>;

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

@@ -2,12 +2,13 @@ import type { AbstractProvider } from 'ethers';
 import type { InteropStatus, InteropWaitable, InteropFinalizationInfo, InteropFinalizationResult } from '../../../../../../core/types/flows/interop';
 import type { EthersClient } from '../../../../client';
 import type { LogsQueryOptions } from './data-fetchers';
+import type { TxGasOverrides } from '../../../../../../core/types/fees';
 export interface InteropFinalizationServices {
     status(dstProvider: AbstractProvider, input: InteropWaitable, opts?: LogsQueryOptions): Promise<InteropStatus>;
     wait(dstProvider: AbstractProvider, gwProvider: AbstractProvider, input: InteropWaitable, opts?: {
         pollMs?: number;
         timeoutMs?: number;
     }): Promise<InteropFinalizationInfo>;
-    finalize(dstProvider: AbstractProvider, info: InteropFinalizationInfo, opts?: LogsQueryOptions): Promise<InteropFinalizationResult>;
+    finalize(dstProvider: AbstractProvider, info: InteropFinalizationInfo, opts?: LogsQueryOptions, txOverrides?: TxGasOverrides): Promise<InteropFinalizationResult>;
 }
 export declare function createInteropFinalizationServices(client: EthersClient): InteropFinalizationServices;

package/dist/adapters/ethers/sdk.cjs

@@ -6481,8 +6481,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) {
@@ -6510,10 +6510,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];
@@ -6644,6 +6641,22 @@ var ZERO_HASH = "0x0000000000000000000000000000000000000000000000000000000000000
 var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
+async function encodeSecondBridgeErc20DepositCalldata(input) {
+  if (!input.ctx.resolvedToken) {
+    return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
+  }
+  const { chainId: l1ChainId } = await input.ctx.client.l1.getNetwork();
+  const isL1Origin = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID || input.ctx.resolvedToken.originChainId === 0n || input.ctx.resolvedToken.originChainId === BigInt(l1ChainId);
+  if (isL1Origin) {
+    return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
+  }
+  const transferData = encodeNativeTokenVaultTransferData(
+    input.amount,
+    input.receiver,
+    input.token
+  );
+  return encodeSecondBridgeDataV1(input.ctx.resolvedToken.assetId, transferData);
+}
 async function getPriorityGasModel(input) {
   try {
     const l1NativeTokenVault = await input.ctx.contracts.l1NativeTokenVault();
@@ -6716,9 +6729,14 @@ function routeErc20NonBase() {
       const secondBridgeCalldata = await wrapAs2(
         "INTERNAL",
         OP_DEPOSITS.nonbase.encodeCalldata,
-        () => Promise.resolve(encodeSecondBridgeErc20Args(p.token, p.amount, receiver)),
+        () => encodeSecondBridgeErc20DepositCalldata({
+          ctx,
+          token: p.token,
+          amount: p.amount,
+          receiver
+        }),
         {
-          ctx: { where: "encodeSecondBridgeErc20Args" },
+          ctx: { where: "encodeSecondBridgeErc20DepositCalldata" },
           message: "Failed to encode bridging calldata."
         }
       );
@@ -9173,13 +9191,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 = [];
@@ -9429,7 +9457,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);
@@ -9447,7 +9475,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,
@@ -9895,8 +9927,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,
@@ -10106,22 +10138,25 @@ 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) => wrap6(
+  const finalize = (dstChain, h, opts, txOverrides) => wrap6(
     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) => wrap6(
     OP_INTEROP.svc.status.getRoot,
     () => getInteropRoot(resolveChainRef(dstChain), rootChainId, batchNumber),