@matterlabs/zksync-js 0.0.7 → 0.0.9

package/dist/adapters/viem/index.d.ts

@@ -4,6 +4,7 @@ export * from './sdk';
 export * from './resources/utils';
 export { createDepositsResource } from './resources/deposits';
 export type { DepositsResource } from './resources/deposits';
+export { getL2TransactionHashFromLogs } from './resources/deposits/services/verification';
 export { createWithdrawalsResource } from './resources/withdrawals';
 export { createFinalizationServices } from './resources/withdrawals';
 export type { WithdrawalsResource, FinalizationServices } from './resources/withdrawals';

package/dist/adapters/viem/index.js

@@ -1,8 +1,9 @@
-export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, registerErrorAbi, toZKsyncError } from '../../chunk-KRIRXY74.js';
-import '../../chunk-NNFWIAVG.js';
-import '../../chunk-P5PIWVEO.js';
-import '../../chunk-KAMEGD6I.js';
-export { createViemClient as createClient, createViemClient } from '../../chunk-7VP6742W.js';
-import '../../chunk-WY36Z6YB.js';
-import '../../chunk-GIXLOHLK.js';
-import '../../chunk-NCR42O6O.js';
+export { buildDirectRequestStruct, classifyReadinessFromRevert, createContractsResource, createDepositsResource, createErrorHandlers, createFinalizationServices, createTokensResource, createViemSdk, createWithdrawalsResource, decodeRevert, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs, registerErrorAbi, toZKsyncError } from '../../chunk-5AG6B7UX.js';
+import '../../chunk-AIFHAPJC.js';
+import '../../chunk-ZVHFVUDE.js';
+export { createViemClient as createClient, createViemClient } from '../../chunk-KLNFDFLA.js';
+import '../../chunk-UIXU35ZU.js';
+import '../../chunk-QDJOEVGJ.js';
+import '../../chunk-SRPKTXIF.js';
+import '../../chunk-FBKBF7YM.js';
+import '../../chunk-C3AGOEHR.js';

package/dist/adapters/viem/resources/deposits/context.d.ts

@@ -2,7 +2,7 @@ import type { ViemClient } from '../../client';
 import type { Address, Hex } from '../../../../core/types/primitives';
 import type { DepositParams, DepositRoute } from '../../../../core/types/flows/deposits';
 import type { CommonCtx } from '../../../../core/types/flows/base';
-import type { TxOverrides } from '../../../../core/types/fees';
+import { type TxGasOverrides } from '../../../../core/types/fees';
 import type { ResolvedToken, TokensResource } from '../../../../core/types/flows/token';
 import type { ContractsResource } from '../contracts';
 export interface BuildCtx extends CommonCtx {
@@ -14,7 +14,7 @@ export interface BuildCtx extends CommonCtx {
     baseTokenL1: Address;
     baseIsEth: boolean;
     l1AssetRouter: Address;
-    gasOverrides?: TxOverrides;
+    gasOverrides?: TxGasOverrides;
     l2GasLimit?: bigint;
     gasPerPubdata: bigint;
     operatorTip: bigint;
@@ -33,7 +33,7 @@ export declare function commonCtx(p: DepositParams, client: ViemClient, tokens:
     bridgehub: `0x${string}`;
     chainIdL2: bigint;
     sender: `0x${string}`;
-    gasOverrides: TxOverrides | undefined;
+    gasOverrides: TxGasOverrides | undefined;
     l2GasLimit: bigint | undefined;
     gasPerPubdata: bigint;
     operatorTip: bigint;

package/dist/adapters/viem/resources/deposits/services/gas.d.ts

@@ -1,14 +1,14 @@
 import { type TransactionRequest } from 'viem';
 import type { BuildCtx } from '../context';
 import type { DepositRoute } from '../../../../../core/types/flows/deposits';
-import type { TxOverrides } from '../../../../../core/types/fees';
+import type { TxGasOverrides } from '../../../../../core/types/fees';
 import type { Address } from '../../../../../core/types/primitives';
 import { type GasQuote } from '../../../../../core/resources/deposits/gas';
 export type { GasQuote };
 export type QuoteL1GasInput = {
     ctx: BuildCtx;
     tx: TransactionRequest;
-    overrides?: TxOverrides;
+    overrides?: TxGasOverrides;
     fallbackGasLimit?: bigint;
 };
 export type QuoteL2GasInput = {

package/dist/adapters/viem/resources/deposits/services/verification.d.ts

@@ -1,6 +1,6 @@
 import type { PublicClient, TransactionReceipt, Log } from 'viem';
 import type { Hex } from '../../../../../core/types/primitives';
-export declare function extractL2TxHashFromL1Logs(logs: ReadonlyArray<Log>): Hex | null;
+export declare function getL2TransactionHashFromLogs(logs: ReadonlyArray<Log>): Hex | null;
 export declare function waitForL2ExecutionFromL1Tx(l1: PublicClient, l2: PublicClient, l1TxHash: Hex): Promise<{
     l2Receipt: TransactionReceipt;
     l2TxHash: Hex;

package/dist/adapters/viem/resources/withdrawals/context.d.ts

@@ -2,7 +2,7 @@ import type { ViemClient } from '../../client';
 import type { Address } from '../../../../core/types/primitives';
 import { type WithdrawParams, type WithdrawRoute } from '../../../../core/types/flows/withdrawals';
 import type { CommonCtx } from '../../../../core/types/flows/base';
-import type { TxOverrides } from '../../../../core/types/fees';
+import { type TxGasOverrides } from '../../../../core/types/fees';
 import type { Hex } from '../../../../core/types/primitives';
 import type { ResolvedToken, TokensResource } from '../../../../core/types/flows/token';
 import type { ContractsResource } from '../contracts';
@@ -20,7 +20,7 @@ export interface BuildCtx extends CommonCtx {
     l2AssetRouter: Address;
     l2NativeTokenVault: Address;
     l2BaseTokenSystem: Address;
-    gasOverrides?: TxOverrides;
+    gasOverrides?: TxGasOverrides;
 }
 export declare function commonCtx(p: WithdrawParams, client: ViemClient, tokens: TokensResource, contracts: ContractsResource): Promise<BuildCtx & {
     route: WithdrawRoute;

package/dist/adapters/viem/sdk.cjs

@@ -3646,6 +3646,12 @@ var MailboxABI = [
 ];
 var Mailbox_default = MailboxABI;
 
+// src/core/types/fees.ts
+function toGasOverrides(overrides) {
+  const { nonce: _, ...gas } = overrides;
+  return gas;
+}
+
 // src/adapters/viem/resources/deposits/context.ts
 async function commonCtx(p, client, tokens, contracts) {
   const { bridgehub, l1AssetRouter } = await contracts.addresses();
@@ -3680,7 +3686,7 @@ async function commonCtx(p, client, tokens, contracts) {
     bridgehub,
     chainIdL2: BigInt(chainId),
     sender,
-    gasOverrides: p.l1TxOverrides,
+    gasOverrides: p.l1TxOverrides ? toGasOverrides(p.l1TxOverrides) : void 0,
     l2GasLimit: p.l2GasLimit,
     gasPerPubdata,
     operatorTip,
@@ -3736,6 +3742,37 @@ function buildDirectRequestStruct(args) {
   };
 }
 
+// src/core/utils/hash.ts
+var RegExpHex = /^0x[0-9a-fA-F]*$/;
+var isHash = (x, length) => {
+  if (!x || typeof x !== "string") return false;
+  return (x.length === length) && RegExpHex.test(x);
+};
+var isHash66 = (x) => isHash(x, 66);
+
+// src/core/utils/number.ts
+var isNumber = (x) => typeof x === "number" && Number.isFinite(x);
+var isBigint = (x) => typeof x === "bigint";
+
+// src/core/utils/addr.ts
+function isAddressEq(a, b) {
+  return a.toLowerCase() === b.toLowerCase();
+}
+function isETH(token) {
+  return isAddressEq(token, FORMAL_ETH_ADDRESS) || isAddressEq(token, L2_BASE_TOKEN_ADDRESS) || isAddressEq(token, ETH_ADDRESS);
+}
+function normalizeAddrEq(a, b) {
+  if (!a || !b) return false;
+  const normalize = (s) => {
+    const hasPrefix = s.slice(0, 2).toLowerCase() === "0x";
+    const body = hasPrefix ? s.slice(2) : s;
+    return `0x${body.toLowerCase()}`;
+  };
+  return normalize(a) === normalize(b);
+}
+var hexEq = (a, b) => a.toLowerCase() === b.toLowerCase();
+var normalizeL1Token = (token) => isAddressEq(token, FORMAL_ETH_ADDRESS) ? ETH_ADDRESS : token;
+
 // src/core/errors/formatter.ts
 function elideMiddle(s, max = 96) {
   if (s.length <= max) return s;
@@ -3746,7 +3783,7 @@ function shortJSON(v, max = 240) {
   try {
     const s = JSON.stringify(
       v,
-      (_k, val) => typeof val === "bigint" ? `${val.toString()}n` : val
+      (_k, val) => isBigint(val) ? `${val.toString()}n` : val
     );
     return s.length > max ? elideMiddle(s, max) : s;
   } catch {
@@ -3766,7 +3803,7 @@ function formatContextLine(ctx) {
   if (txHash !== void 0)
     parts.push(`txHash=${typeof txHash === "string" ? txHash : shortJSON(txHash, 96)}`);
   if (nonce !== void 0) {
-    const nonceStr = typeof nonce === "string" || typeof nonce === "number" || typeof nonce === "bigint" ? String(nonce) : shortJSON(nonce, 48);
+    const nonceStr = typeof nonce === "string" || isNumber(nonce) || isBigint(nonce) ? String(nonce) : shortJSON(nonce, 48);
     parts.push(`nonce=${nonceStr}`);
   }
   return parts.length ? `  ${kv("Context", parts.join("  \u2022  "))}` : void 0;
@@ -3796,17 +3833,17 @@ function formatCause(c) {
     const head = [];
     if (obj.name !== void 0) {
       const nameVal = obj.name;
-      const nameStr = typeof nameVal === "string" || typeof nameVal === "number" || typeof nameVal === "bigint" || typeof nameVal === "boolean" ? String(nameVal) : shortJSON(nameVal, 120);
+      const nameStr = typeof nameVal === "string" || isNumber(nameVal) || isBigint(nameVal) || typeof nameVal === "boolean" ? String(nameVal) : shortJSON(nameVal, 120);
       head.push(`name=${nameStr}`);
     }
     if (obj.code !== void 0) {
       const codeVal = obj.code;
-      const codeStr = typeof codeVal === "string" || typeof codeVal === "number" || typeof codeVal === "bigint" || typeof codeVal === "boolean" ? String(codeVal) : shortJSON(codeVal, 120);
+      const codeStr = typeof codeVal === "string" || isNumber(codeVal) || isBigint(codeVal) || typeof codeVal === "boolean" ? String(codeVal) : shortJSON(codeVal, 120);
       head.push(`code=${codeStr}`);
     }
     if (head.length) out.push(`  ${kv("Cause", head.join("  "))}`);
     if (obj.message) {
-      const messageStr = typeof obj.message === "string" || typeof obj.message === "number" || typeof obj.message === "bigint" || typeof obj.message === "boolean" ? String(obj.message) : shortJSON(obj.message, 600);
+      const messageStr = typeof obj.message === "string" || isNumber(obj.message) || isBigint(obj.message) || typeof obj.message === "boolean" ? String(obj.message) : shortJSON(obj.message, 600);
       out.push(`              message=${elideMiddle(messageStr, 600)}`);
     }
     if (obj.data) {
@@ -3881,12 +3918,13 @@ if (kInspect) {
     enumerable: false
   });
 }
-function isZKsyncError(e) {
+function isZKsyncError(e, opts) {
   if (!e || typeof e !== "object") return false;
   const maybe = e;
   if (!("envelope" in maybe)) return false;
   const envelope = maybe.envelope;
-  return typeof envelope?.type === "string" && typeof envelope?.message === "string";
+  if (typeof envelope?.type !== "string" || typeof envelope?.message !== "string") return false;
+  return true;
 }
 function isReceiptNotFound(e) {
   const chain = [];
@@ -4009,11 +4047,9 @@ var OP_WITHDRAWALS = {
       rawReceipt: "withdrawals.finalize.fetchParams:rawReceipt",
       messengerIndex: "withdrawals.finalize.fetchParams:messengerIndex",
       proof: "withdrawals.finalize.fetchParams:proof",
-      network: "withdrawals.finalize.fetchParams:network",
-      ensureAddresses: "withdrawals.finalize.fetchParams:ensureAddresses"
+      network: "withdrawals.finalize.fetchParams:network"
     },
     readiness: {
-      ensureAddresses: "withdrawals.finalize.readiness:ensureAddresses",
       isFinalized: "withdrawals.finalize.readiness:isWithdrawalFinalized",
       simulate: "withdrawals.finalize.readiness:simulate"
     },
@@ -4634,28 +4670,6 @@ function routeEthDirect() {
     }
   };
 }
-
-// src/core/utils/addr.ts
-var isHash66 = (x) => !!x && x.startsWith("0x") && x.length === 66;
-function isAddressEq(a, b) {
-  return a.toLowerCase() === b.toLowerCase();
-}
-function isETH(token) {
-  return isAddressEq(token, FORMAL_ETH_ADDRESS) || isAddressEq(token, L2_BASE_TOKEN_ADDRESS) || isAddressEq(token, ETH_ADDRESS);
-}
-function normalizeAddrEq(a, b) {
-  if (!a || !b) return false;
-  const normalize = (s) => {
-    const hasPrefix = s.slice(0, 2).toLowerCase() === "0x";
-    const body = hasPrefix ? s.slice(2) : s;
-    return `0x${body.toLowerCase()}`;
-  };
-  return normalize(a) === normalize(b);
-}
-var hexEq = (a, b) => a.toLowerCase() === b.toLowerCase();
-var normalizeL1Token = (token) => isAddressEq(token, FORMAL_ETH_ADDRESS) ? ETH_ADDRESS : token;
-
-// src/adapters/viem/resources/deposits/routes/erc20-nonbase.ts
 var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 function routeErc20NonBase() {
   return {
@@ -5282,7 +5296,7 @@ var I_BRIDGEHUB_NEW_PRIORITY_REQUEST = {
     { name: "data", type: "bytes", indexed: false }
   ]
 };
-function extractL2TxHashFromL1Logs(logs) {
+function getL2TransactionHashFromLogs(logs) {
   for (const lg of logs) {
     try {
       const parsed = viem.decodeEventLog({
@@ -5314,7 +5328,7 @@ function extractL2TxHashFromL1Logs(logs) {
 async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   const l1Receipt = await l1.waitForTransactionReceipt({ hash: l1TxHash });
   if (!l1Receipt) throw new Error("No L1 receipt found");
-  const l2TxHash = extractL2TxHashFromL1Logs(l1Receipt.logs);
+  const l2TxHash = getL2TransactionHashFromLogs(l1Receipt.logs);
   if (!l2TxHash) {
     throw createError("VERIFICATION", {
       message: "Failed to extract L2 transaction hash from L1 logs",
@@ -5677,7 +5691,13 @@ function createDepositsResource(client, tokens, contracts) {
       const plan = await prepare(p);
       const stepHashes = {};
       const from = client.account.address;
-      let next = await client.l1.getTransactionCount({ address: from, blockTag: "latest" });
+      let next;
+      if (typeof p.l1TxOverrides?.nonce === "number") {
+        next = p.l1TxOverrides.nonce;
+      } else {
+        const blockTag = p.l1TxOverrides?.nonce ?? "latest";
+        next = await client.l1.getTransactionCount({ address: from, blockTag });
+      }
       for (const step of plan.steps) {
         if (step.kind === "approve") {
           try {
@@ -5824,14 +5844,14 @@ function createDepositsResource(client, tokens, contracts) {
       if (!l1Rcpt) return { phase: "L1_PENDING", l1TxHash };
       let l2TxHash;
       try {
-        l2TxHash = extractL2TxHashFromL1Logs(l1Rcpt.logs) ?? void 0;
+        l2TxHash = getL2TransactionHashFromLogs(l1Rcpt.logs) ?? void 0;
       } catch (e) {
         throw toZKsyncError(
           "INTERNAL",
           {
             resource: "deposits",
-            operation: "deposits.status.extractL2TxHashFromL1Logs",
-            context: { where: "extractL2TxHashFromL1Logs", l1TxHash },
+            operation: "deposits.status.getL2TransactionHashFromLogs",
+            context: { where: "getL2TransactionHashFromLogs", l1TxHash },
             message: "Failed to derive L2 transaction hash from L1 logs."
           },
           e
@@ -5980,7 +6000,7 @@ async function commonCtx2(p, client, tokens, contracts) {
     l2NativeTokenVault,
     l2BaseTokenSystem,
     baseIsEth,
-    gasOverrides: p.l2TxOverrides
+    gasOverrides: p.l2TxOverrides ? toGasOverrides(p.l2TxOverrides) : void 0
   };
 }
 
@@ -6201,8 +6221,7 @@ function routeErc20NonBase2() {
           tx: approveTx
         });
       }
-      const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l2" }) : void 0);
-      const assetId = resolved?.assetId ?? (await wrapAs8(
+      const assetId = (await wrapAs8(
         "CONTRACT",
         OP_WITHDRAWALS.erc20.ensureRegistered,
         () => ctx.client.l2.simulateContract({
@@ -6236,7 +6255,7 @@ function routeErc20NonBase2() {
         value: 0n,
         from: ctx.sender
       };
-      const withdrawGas = await quoteL2Gas4({ ctx, tx: withdrawTxCandidate });
+      const withdrawGas = current >= p.amount ? await quoteL2Gas4({ ctx, tx: withdrawTxCandidate }) : void 0;
       if (withdrawGas) {
         withdrawTxCandidate.gas = withdrawGas.gasLimit;
         withdrawTxCandidate.maxFeePerGas = withdrawGas.maxFeePerGas;
@@ -6290,11 +6309,14 @@ function routeErc20NonBase2() {
   };
 }
 
-// src/core/resources/withdrawals/events.ts
+// src/core/utils/events.ts
+function extractPreferAddress(opts) {
+  const preferAddr = typeof opts?.prefer === "object" ? opts.prefer.address : opts?.prefer === "assetRouter" ? L2_ASSET_ROUTER_ADDRESS : L1_MESSENGER_ADDRESS;
+  return (preferAddr || L1_MESSENGER_ADDRESS).toLowerCase();
+}
 function findL1MessageSentLog(receipt, opts) {
   const index = opts?.index;
-  const preferAddr = typeof opts?.prefer === "object" ? opts?.prefer.address : opts?.prefer === "assetRouter" ? L2_ASSET_ROUTER_ADDRESS : L1_MESSENGER_ADDRESS;
-  const prefer = (preferAddr ?? L1_MESSENGER_ADDRESS).toLowerCase();
+  const preferAddr = extractPreferAddress(opts);
   const matches = receipt.logs.filter((lg) => {
     const t0 = (lg.topics?.[0] ?? "").toLowerCase();
     return t0 === TOPIC_L1_MESSAGE_SENT_NEW || t0 === TOPIC_L1_MESSAGE_SENT_LEG;
@@ -6302,7 +6324,7 @@ function findL1MessageSentLog(receipt, opts) {
   if (!matches.length) {
     throw new Error("No L1MessageSent event found in L2 receipt logs.");
   }
-  const preferred = matches.find((lg) => (lg.address ?? "").toLowerCase() === prefer);
+  const preferred = matches.find((lg) => (lg.address ?? "").toLowerCase() === preferAddr);
   const chosen = preferred ?? matches[index] ?? matches[0];
   if (!chosen) {
     throw new Error("No suitable L1MessageSent event found.");
@@ -6428,27 +6450,11 @@ function createFinalizationServices(client) {
         message,
         merkleProof: proof.proof
       };
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       return { params, nullifier: l1Nullifier };
     },
     async simulateFinalizeReadiness(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.readiness.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       const done = await (async () => {
         try {
           const result = await wrapAs9(
@@ -6485,15 +6491,7 @@ function createFinalizationServices(client) {
       }
     },
     async isWithdrawalFinalized(key) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       return await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.isFinalized,
@@ -6510,15 +6508,7 @@ function createFinalizationServices(client) {
       );
     },
     async estimateFinalization(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.estimate,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       const gasLimit = await wrapAs9(
         "RPC",
         OP_WITHDRAWALS.finalize.estimate,
@@ -6581,15 +6571,7 @@ function createFinalizationServices(client) {
       };
     },
     async finalizeDeposit(params) {
-      const { l1Nullifier } = await wrapAs9(
-        "INTERNAL",
-        OP_WITHDRAWALS.finalize.fetchParams.ensureAddresses,
-        () => client.ensureAddresses(),
-        {
-          ctx: { where: "ensureAddresses" },
-          message: "Failed to ensure L1 Nullifier address."
-        }
-      );
+      const { l1Nullifier } = await client.ensureAddresses();
       try {
         const hash = await client.l1Wallet.writeContract({
           address: l1Nullifier,
@@ -6690,6 +6672,14 @@ function createWithdrawalsResource(client, tokens, contracts) {
       const plan = await prepare(p);
       const stepHashes = {};
       const l2Wallet = client.getL2Wallet();
+      const from = client.account.address;
+      let next;
+      if (typeof p.l2TxOverrides?.nonce === "number") {
+        next = p.l2TxOverrides.nonce;
+      } else {
+        const blockTag = p.l2TxOverrides?.nonce ?? "pending";
+        next = await client.l2.getTransactionCount({ address: from, blockTag });
+      }
       for (const step of plan.steps) {
         if (p.l2TxOverrides) {
           const overrides = p.l2TxOverrides;
@@ -6723,6 +6713,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
           maxFeePerGas: step.tx.maxFeePerGas,
           maxPriorityFeePerGas: step.tx.maxPriorityFeePerGas
         } : {};
+        const nonce = next++;
         const baseReq = {
           address: step.tx.address,
           abi: step.tx.abi,
@@ -6730,6 +6721,7 @@ function createWithdrawalsResource(client, tokens, contracts) {
           args: step.tx.args ?? [],
           account: step.tx.account ?? l2Wallet.account ?? client.account,
           gas: step.tx.gas,
+          nonce,
           ...fee1559,
           ...step.tx.dataSuffix ? { dataSuffix: step.tx.dataSuffix } : {},
           ...step.tx.chain ? { chain: step.tx.chain } : {}