@matterlabs/zksync-js 0.0.13 → 0.0.15

package/dist/core/index.js

@@ -1,5 +1,5 @@
-export { pickDepositRoute } from '../chunk-HI64OOAR.js';
-export { findL1MessageSentLog, isL1MessageSentLog, messengerLogIndex, pickWithdrawRoute } from '../chunk-E3KP7XCG.js';
-export { makeTransportFromEthers, makeTransportFromViem, zks_exports as zksRpc } from '../chunk-4S4XDA4N.js';
-export { abi_exports as abi, factory_exports as errors, formatEnvelopePretty, hexEq, isAddress, isAddressEq, isETH, isHash, isHash66, isHash66Array, isHashArray, normalizeAddrEq, normalizeL1Token } from '../chunk-RI73VJSH.js';
-export { ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS } from '../chunk-QQ2OR434.js';
+export { pickDepositRoute } from '../chunk-HVHMLAYH.js';
+export { findL1MessageSentLog, isL1MessageSentLog, messengerLogIndex, pickWithdrawRoute } from '../chunk-3HHUZXSV.js';
+export { makeTransportFromEthers, makeTransportFromViem } from '../chunk-BWKWWLY4.js';
+export { abi_exports as abi, factory_exports as errors, formatEnvelopePretty, hexEq, isAddress, isAddressEq, isETH, isHash, isHash66, isHash66Array, isHashArray, normalizeAddrEq, normalizeL1Token, zks_exports as zksRpc } from '../chunk-JXR5V5YK.js';
+export { ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS } from '../chunk-MT4X5FEO.js';

package/dist/core/internal/abis/IERC7786Attributes.d.ts

@@ -1,42 +1,52 @@
 declare const IERC7786AttributesABI: readonly [{
+    readonly type: "function";
+    readonly name: "executionAddress";
     readonly inputs: readonly [{
-        readonly internalType: "bytes";
         readonly name: "_executionAddress";
         readonly type: "bytes";
+        readonly internalType: "bytes";
     }];
-    readonly name: "executionAddress";
     readonly outputs: readonly [];
     readonly stateMutability: "pure";
-    readonly type: "function";
 }, {
+    readonly type: "function";
+    readonly name: "indirectCall";
     readonly inputs: readonly [{
-        readonly internalType: "uint256";
         readonly name: "_indirectCallMessageValue";
         readonly type: "uint256";
+        readonly internalType: "uint256";
     }];
-    readonly name: "indirectCall";
     readonly outputs: readonly [];
     readonly stateMutability: "pure";
-    readonly type: "function";
 }, {
+    readonly type: "function";
+    readonly name: "interopCallValue";
     readonly inputs: readonly [{
-        readonly internalType: "uint256";
         readonly name: "_interopCallValue";
         readonly type: "uint256";
+        readonly internalType: "uint256";
     }];
-    readonly name: "interopCallValue";
     readonly outputs: readonly [];
     readonly stateMutability: "pure";
-    readonly type: "function";
 }, {
+    readonly type: "function";
+    readonly name: "unbundlerAddress";
     readonly inputs: readonly [{
-        readonly internalType: "bytes";
         readonly name: "_unbundlerAddress";
         readonly type: "bytes";
+        readonly internalType: "bytes";
     }];
-    readonly name: "unbundlerAddress";
     readonly outputs: readonly [];
     readonly stateMutability: "pure";
+}, {
     readonly type: "function";
+    readonly name: "useFixedFee";
+    readonly inputs: readonly [{
+        readonly name: "_useFixed";
+        readonly type: "bool";
+        readonly internalType: "bool";
+    }];
+    readonly outputs: readonly [];
+    readonly stateMutability: "pure";
 }];
 export default IERC7786AttributesABI;

package/dist/core/internal/abis/IInteropCenter.d.ts

@@ -358,6 +358,10 @@ declare const IInteropCenterABI: readonly [{
             readonly name: "destinationChainId";
             readonly type: "uint256";
             readonly internalType: "uint256";
+        }, {
+            readonly name: "destinationBaseTokenAssetId";
+            readonly type: "bytes32";
+            readonly internalType: "bytes32";
         }, {
             readonly name: "interopBundleSalt";
             readonly type: "bytes32";

package/dist/core/resources/deposits/chains.d.ts

@@ -0,0 +1 @@
+export declare function isEraVmChain(chainIdL2: bigint): boolean;

package/dist/core/resources/deposits/gas.d.ts

@@ -10,6 +10,13 @@ export type GasQuote = {
     gasPerPubdata?: bigint;
     maxCost: bigint;
 };
+export declare function applyGasBuffer(gasLimit: bigint, bufferPct?: bigint): bigint;
+export declare function resolveCreateDepositL1GasLimit(input: {
+    chainIdL2: bigint;
+    stepKey: string;
+    preparedGasLimit?: bigint;
+    estimatedGasLimit?: bigint;
+}): bigint | undefined;
 export type QuoteL1GasInput = {
     estimator: GasEstimator;
     tx: CoreTransactionRequest;

package/dist/core/resources/deposits/priority.d.ts

@@ -0,0 +1,41 @@
+import type { Address } from '../../types/primitives';
+export type PriorityTxGasBreakdown = {
+    encodedLength: bigint;
+    minBodyGas: bigint;
+    overhead: bigint;
+    derivedBodyGas: bigint;
+    derivedL2GasLimit: bigint;
+    priorityTxMaxGasLimit: bigint;
+    priorityTxMaxGasLimitExceeded: boolean;
+};
+export declare const DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 6n;
+export declare function applyL1ToL2Alias(address: Address): Address;
+/**
+ * Mirrors the priority-tx floor math used by ZKsync's TransactionValidator.
+ * Source of truth for constants:
+ * https://github.com/matter-labs/era-contracts/blob/main/l1-contracts/contracts/common/Config.sol
+ * Mailbox encodes the priority transaction with `abi.encode(transaction)` before validation, and
+ * TransactionValidator uses that encoded length to derive the minimum body gas and overhead.
+ */
+export declare function derivePriorityTxGasBreakdown(input: {
+    encodedLength: bigint;
+    gasPerPubdata: bigint;
+    factoryDepsCount?: bigint;
+}): PriorityTxGasBreakdown;
+/**
+ * Exact L2 estimateGas can overestimate substantially for first-bridge token deployment paths.
+ * Keep the protocol floor as the lower bound, but cap pathological estimates to a multiple of the floor.
+ */
+export declare function clampPriorityBodyGasEstimate(input: {
+    rawBodyGas: bigint;
+    minBodyGas: bigint;
+    multiplier?: bigint;
+}): bigint;
+export declare function derivePriorityBodyGasEstimateCap(input: {
+    minBodyGas: bigint;
+    multiplier?: bigint;
+}): bigint;
+export declare function applyPriorityL2GasLimitBuffer(input: {
+    chainIdL2: bigint;
+    gasLimit: bigint;
+}): bigint;

package/dist/core/resources/interop/attributes/bundle.d.ts

@@ -3,4 +3,5 @@ import type { AttributesCodec } from './types';
 export declare function createBundleAttributes(codec: AttributesCodec): {
     executionAddress: (executor: Address) => Hex;
     unbundlerAddress: (addr: Address) => Hex;
+    useFixedFee: (enabled: boolean) => Hex;
 };

package/dist/core/resources/interop/attributes/resource.d.ts

@@ -7,6 +7,7 @@ export declare function createAttributesResource(codec: AttributesCodec): {
     bundle: {
         executionAddress: (executor: import("../../..").Address) => import("../../..").Hex;
         unbundlerAddress: (addr: import("../../..").Address) => import("../../..").Hex;
+        useFixedFee: (enabled: boolean) => import("../../..").Hex;
     };
 };
 export type AttributesResource = ReturnType<typeof createAttributesResource>;

package/dist/core/resources/interop/plan.d.ts

@@ -1,12 +1,20 @@
 import type { Address, Hex } from '../../types/primitives';
 import type { ApprovalNeed } from '../../types/flows/base';
-import type { InteropParams } from '../../types/flows/interop';
+import type { InteropParams, InteropFee } from '../../types/flows/interop';
 export type InteropStarter = [Hex, Hex, Hex[]];
+/** Fee token and amount to include in quoteExtras. */
+export interface InteropFeeInfo {
+    /** Approval needed to cover the fee (ZK fixed-fee path). null = no approval needed. */
+    approval: ApprovalNeed | null;
+    /** Interop fee token address and total fee amount. fee.amount is added to msg.value for protocol-fee path. */
+    fee: InteropFee;
+}
 export interface InteropBundleBuild {
     dstChain: Hex;
     starters: InteropStarter[];
     bundleAttributes: Hex[];
     approvals: ApprovalNeed[];
+    interopFee: InteropFee;
     quoteExtras: {
         totalActionValue: bigint;
         bridgedTokenTotal: bigint;
@@ -34,6 +42,6 @@ export interface InteropStarterData {
     assetRouterPayload?: Hex;
 }
 export declare function preflightDirect(params: InteropParams, ctx: InteropBuildCtx): void;
-export declare function buildDirectBundle(params: InteropParams, ctx: InteropBuildCtx, attrs: InteropAttributes): InteropBundleBuild;
+export declare function buildDirectBundle(params: InteropParams, ctx: InteropBuildCtx, attrs: InteropAttributes, interopFeeInfo: InteropFeeInfo): InteropBundleBuild;
 export declare function preflightIndirect(params: InteropParams, ctx: InteropBuildCtx): void;
-export declare function buildIndirectBundle(params: InteropParams, ctx: InteropBuildCtx, attrs: InteropAttributes, starterData: InteropStarterData[]): InteropBundleBuild;
+export declare function buildIndirectBundle(params: InteropParams, ctx: InteropBuildCtx, attrs: InteropAttributes, starterData: InteropStarterData[], interopFeeInfo: InteropFeeInfo): InteropBundleBuild;

package/dist/core/resources/interop/protocol.d.ts

@@ -0,0 +1,3 @@
+import type { ProtocolVersion } from '../../types/primitives';
+export declare const MIN_INTEROP_PROTOCOL = 31;
+export declare function assertProtocolVersion(chainId: bigint, protocolVersion: ProtocolVersion): void;

package/dist/core/rpc/types.d.ts

@@ -26,6 +26,7 @@ export type ProofNormalized = {
     batchNumber: bigint;
     proof: Hex[];
     root: Hex;
+    gatewayBlockNumber?: bigint;
 };
 export type GenesisContractDeployment = {
     address: Address;

package/dist/core/rpc/zks.d.ts

@@ -1,10 +1,14 @@
 import type { RpcTransport, ReceiptWithL2ToL1, ProofNormalized, GenesisInput, BlockMetadata } from './types';
 import type { Hex, Address } from '../types/primitives';
+export declare enum ProofTarget {
+    L1BatchRoot = "l1BatchRoot",
+    MessageRoot = "messageRoot"
+}
 /** ZKsync-specific RPC methods. */
 export interface ZksRpc {
     getBridgehubAddress(): Promise<Address>;
     getBytecodeSupplierAddress(): Promise<Address>;
-    getL2ToL1LogProof(txHash: Hex, index: number): Promise<ProofNormalized>;
+    getL2ToL1LogProof(txHash: Hex, index: number, proofTarget?: ProofTarget): Promise<ProofNormalized>;
     getReceiptWithL2ToL1(txHash: Hex): Promise<ReceiptWithL2ToL1 | null>;
     getBlockMetadataByNumber(blockNumber: number): Promise<BlockMetadata | null>;
     getGenesis(): Promise<GenesisInput>;

package/dist/core/types/errors.d.ts

@@ -224,5 +224,10 @@ export declare const OP_INTEROP: {
             readonly poll: "interop.svc.wait:poll";
             readonly timeout: "interop.svc.wait:timeout";
         };
+        readonly fees: {
+            readonly zkInteropFee: "interop.svc.fees:zkInteropFee";
+            readonly zkToken: "interop.svc.fees:zkToken";
+            readonly protocolFee: "interop.svc.fees:protocolFee";
+        };
     };
 };

package/dist/core/types/flows/interop.d.ts

@@ -43,9 +43,18 @@ export interface InteropParams {
     unbundling?: {
         by: Address;
     };
+    /** Optional: true - to use fixed ZK fee for the bundle, false - to use dynamic base token fee */
+    fee?: {
+        useFixed: boolean;
+    };
     /** Optional: Gas overrides for L2 transaction */
     txOverrides?: TxOverrides;
 }
+/** Fee token address and total fee amount. Amount is added to msg.value for protocol-fee path. */
+export interface InteropFee {
+    token: Address;
+    amount: bigint;
+}
 /**
  * Cost and approval quote for an interop operation before execution.
  * Provides fee estimates and required token approvals.
@@ -59,8 +68,8 @@ export interface InteropQuote {
     totalActionValue: bigint;
     /** Total ERC-20 token amounts to be bridged */
     bridgedTokenTotal: bigint;
-    /** Optional: Estimated L1 fee */
-    l1Fee?: bigint;
+    /** Interop fee details */
+    interopFee: InteropFee;
     /** Optional: Estimated L2 fee */
     l2Fee?: bigint;
 }
@@ -131,22 +140,6 @@ export interface InteropStatus {
     /** Destination chain execution transaction hash */
     dstExecTxHash?: Hex;
 }
-/**
- * Interop expected root data.
- */
-export interface InteropExpectedRoot {
-    /** Chain ID where the state root is published (settlement layer) */
-    rootChainId: bigint;
-    /** Batch number containing the interop message */
-    batchNumber: bigint;
-    /** Expected merkle root hash for verification */
-    expectedRoot: Hex;
-}
-/**
- * Type guard to safely check if an object is InteropExpectedRoot.
- * Validates all required and nested fields.
- */
-export declare function isInteropExpectedRoot(obj: unknown): obj is InteropExpectedRoot;
 /**
  * Interop message proof.
  */
@@ -184,8 +177,6 @@ export interface InteropFinalizationInfo {
     bundleHash: Hex;
     /** Destination chain ID (EIP-155 format) */
     dstChainId: bigint;
-    /** Expected state root for batch verification */
-    expectedRoot: InteropExpectedRoot;
     /** Interop message proof */
     proof: InteropMessageProof;
     /** Encoded calldata for the finalization transaction */

package/dist/core/types/primitives.d.ts

@@ -1,4 +1,6 @@
 export type Address = `0x${string}`;
 export type Hex = `0x${string}`;
 export type Hash = Hex;
+/** Semver protocol version tuple: [patch, minor, major] as returned by getSemverProtocolVersion(). */
+export type ProtocolVersion = readonly [number, number, number];
 export declare const ZERO_HASH: Hash;

package/dist/index.cjs

@@ -22,6 +22,12 @@ __export(constants_exports, {
   L1_FEE_ESTIMATION_COEF_NUMERATOR: () => L1_FEE_ESTIMATION_COEF_NUMERATOR,
   L1_MESSENGER_ADDRESS: () => L1_MESSENGER_ADDRESS,
   L1_SOPH_TOKEN_ADDRESS: () => L1_SOPH_TOKEN_ADDRESS,
+  L1_TX_DELTA_544_ENCODING_BYTES: () => L1_TX_DELTA_544_ENCODING_BYTES,
+  L1_TX_DELTA_FACTORY_DEPS_L2_GAS: () => L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
+  L1_TX_DELTA_FACTORY_DEPS_PUBDATA: () => L1_TX_DELTA_FACTORY_DEPS_PUBDATA,
+  L1_TX_INTRINSIC_L2_GAS: () => L1_TX_INTRINSIC_L2_GAS,
+  L1_TX_INTRINSIC_PUBDATA: () => L1_TX_INTRINSIC_PUBDATA,
+  L1_TX_MIN_L2_GAS_BASE: () => L1_TX_MIN_L2_GAS_BASE,
   L2_ASSET_ROUTER_ADDRESS: () => L2_ASSET_ROUTER_ADDRESS,
   L2_BASE_TOKEN_ADDRESS: () => L2_BASE_TOKEN_ADDRESS,
   L2_INTEROP_CENTER_ADDRESS: () => L2_INTEROP_CENTER_ADDRESS,
@@ -29,6 +35,7 @@ __export(constants_exports, {
   L2_INTEROP_ROOT_STORAGE_ADDRESS: () => L2_INTEROP_ROOT_STORAGE_ADDRESS,
   L2_MESSAGE_VERIFICATION_ADDRESS: () => L2_MESSAGE_VERIFICATION_ADDRESS,
   L2_NATIVE_TOKEN_VAULT_ADDRESS: () => L2_NATIVE_TOKEN_VAULT_ADDRESS,
+  PRIORITY_TX_MAX_GAS_LIMIT: () => PRIORITY_TX_MAX_GAS_LIMIT,
   SAFE_L1_BRIDGE_GAS: () => SAFE_L1_BRIDGE_GAS,
   TOPIC_CANONICAL_ASSIGNED: () => TOPIC_CANONICAL_ASSIGNED,
   TOPIC_CANONICAL_SUCCESS: () => TOPIC_CANONICAL_SUCCESS,
@@ -37,6 +44,7 @@ __export(constants_exports, {
   TOPIC_L1_MESSAGE_SENT_NEW: () => TOPIC_L1_MESSAGE_SENT_NEW,
   TX_MEMORY_OVERHEAD_GAS: () => TX_MEMORY_OVERHEAD_GAS,
   TX_OVERHEAD_GAS: () => TX_OVERHEAD_GAS,
+  TX_SLOT_OVERHEAD_L2_GAS: () => TX_SLOT_OVERHEAD_L2_GAS,
   k256hex: () => k256hex
 });
 var k256hex = (s) => `0x${utils.bytesToHex(sha3.keccak_256(utils.utf8ToBytes(s)))}`.toLowerCase();
@@ -62,7 +70,15 @@ var TX_OVERHEAD_GAS = 10000n;
 var TX_MEMORY_OVERHEAD_GAS = 10n;
 var DEFAULT_PUBDATA_BYTES = 155n;
 var DEFAULT_ABI_BYTES = 400n;
-var SAFE_L1_BRIDGE_GAS = 800000n;
+var SAFE_L1_BRIDGE_GAS = 3000000n;
+var L1_TX_INTRINSIC_L2_GAS = 167157n;
+var L1_TX_INTRINSIC_PUBDATA = 88n;
+var L1_TX_MIN_L2_GAS_BASE = 173484n;
+var L1_TX_DELTA_544_ENCODING_BYTES = 1656n;
+var L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
+var L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
+var TX_SLOT_OVERHEAD_L2_GAS = 10000n;
+var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
 var L1_FEE_ESTIMATION_COEF_NUMERATOR = 12;
 var L1_FEE_ESTIMATION_COEF_DENOMINATOR = 10;
 
@@ -4202,56 +4218,69 @@ var IERC20_default = IERC20ABI;
 // src/core/internal/abis/IERC7786Attributes.ts
 var IERC7786AttributesABI = [
   {
+    type: "function",
+    name: "executionAddress",
     inputs: [
       {
-        internalType: "bytes",
         name: "_executionAddress",
-        type: "bytes"
+        type: "bytes",
+        internalType: "bytes"
       }
     ],
-    name: "executionAddress",
     outputs: [],
-    stateMutability: "pure",
-    type: "function"
+    stateMutability: "pure"
   },
   {
+    type: "function",
+    name: "indirectCall",
     inputs: [
       {
-        internalType: "uint256",
         name: "_indirectCallMessageValue",
-        type: "uint256"
+        type: "uint256",
+        internalType: "uint256"
       }
     ],
-    name: "indirectCall",
     outputs: [],
-    stateMutability: "pure",
-    type: "function"
+    stateMutability: "pure"
   },
   {
+    type: "function",
+    name: "interopCallValue",
     inputs: [
       {
-        internalType: "uint256",
         name: "_interopCallValue",
-        type: "uint256"
+        type: "uint256",
+        internalType: "uint256"
       }
     ],
-    name: "interopCallValue",
     outputs: [],
-    stateMutability: "pure",
-    type: "function"
+    stateMutability: "pure"
   },
   {
+    type: "function",
+    name: "unbundlerAddress",
     inputs: [
       {
-        internalType: "bytes",
         name: "_unbundlerAddress",
-        type: "bytes"
+        type: "bytes",
+        internalType: "bytes"
       }
     ],
-    name: "unbundlerAddress",
     outputs: [],
-    stateMutability: "pure",
-    type: "function"
+    stateMutability: "pure"
+  },
+  {
+    type: "function",
+    name: "useFixedFee",
+    inputs: [
+      {
+        name: "_useFixed",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    outputs: [],
+    stateMutability: "pure"
   }
 ];
 var IERC7786Attributes_default = IERC7786AttributesABI;
@@ -5099,6 +5128,11 @@ var IInteropCenterABI = [
             type: "uint256",
             internalType: "uint256"
           },
+          {
+            name: "destinationBaseTokenAssetId",
+            type: "bytes32",
+            internalType: "bytes32"
+          },
           {
             name: "interopBundleSalt",
             type: "bytes32",
@@ -6930,6 +6964,7 @@ function shapeCause(err) {
 // src/core/rpc/zks.ts
 var zks_exports = {};
 __export(zks_exports, {
+  ProofTarget: () => ProofTarget,
   createZksRpc: () => createZksRpc,
   normalizeBlockMetadata: () => normalizeBlockMetadata,
   normalizeGenesis: () => normalizeGenesis,
@@ -6953,6 +6988,11 @@ async function withRpcOp(operation, message, ctx, fn) {
 }
 
 // src/core/rpc/zks.ts
+var ProofTarget = /* @__PURE__ */ ((ProofTarget2) => {
+  ProofTarget2["L1BatchRoot"] = "l1BatchRoot";
+  ProofTarget2["MessageRoot"] = "messageRoot";
+  return ProofTarget2;
+})(ProofTarget || {});
 var METHODS = {
   getBridgehub: "zks_getBridgehubContract",
   getL2ToL1LogProof: "zks_getL2ToL1LogProof",
@@ -6970,6 +7010,7 @@ function normalizeProof(p) {
     const raw = p ?? {};
     const idRaw = raw?.id ?? raw?.index;
     const bnRaw = raw?.batch_number ?? raw?.batchNumber;
+    const gwBlockNumberRaw = raw?.gatewayBlockNumber;
     if (idRaw == null || bnRaw == null) {
       throw createError("RPC", {
         resource: "zksrpc",
@@ -6990,7 +7031,8 @@ function normalizeProof(p) {
       id: toBig(idRaw),
       batchNumber: toBig(bnRaw),
       proof: toHexArray(raw?.proof),
-      root: raw.root
+      root: raw.root,
+      gatewayBlockNumber: gwBlockNumberRaw != null ? toBig(gwBlockNumberRaw) : void 0
     };
   } catch (e) {
     if (isZKsyncError(e)) throw e;
@@ -7267,13 +7309,15 @@ function createZksRpc(transport) {
       );
     },
     // Fetches a proof for an L2→L1 log emitted in the given transaction.
-    async getL2ToL1LogProof(txHash, index) {
+    async getL2ToL1LogProof(txHash, index, proofTarget) {
       return withRpcOp(
         "zksrpc.getL2ToL1LogProof",
         "Failed to fetch L2\u2192L1 log proof.",
-        { txHash, index },
+        { txHash, index, proofTarget },
         async () => {
-          const proof = await transport(METHODS.getL2ToL1LogProof, [txHash, index]);
+          const params = [txHash, index];
+          if (proofTarget != void 0) params.push(proofTarget);
+          const proof = await transport(METHODS.getL2ToL1LogProof, params);
           if (!proof) {
             throw createError("STATE", {
               resource: "zksrpc",