@gearbox-protocol/sdk 11.12.0 → 12.0.0-next.2

package/dist/cjs/sdk/market/pricefeeds/updates/PythUpdater.js

@@ -56,25 +56,23 @@ const PythOptions = import_v4.z.object({
   ignoreMissingFeeds: import_v4.z.boolean().optional()
 });
 class PythUpdater extends import_base.SDKConstruct {
-  #logger;
   #cache;
   #historicalTimestamp;
   #api;
   #ignoreMissingFeeds;
   constructor(sdk, opts = {}) {
     super(sdk);
-    this.#logger = (0, import_utils.childLogger)("PythUpdater", sdk.logger);
     this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
     this.#api = opts.apiProxy ?? "https://hermes.pyth.network/v2/updates/price/";
     this.#api = this.#api.endsWith("/") ? this.#api : `${this.#api}/`;
     const ts = opts.historicTimestamp;
     if (ts) {
       this.#historicalTimestamp = ts === true ? Number(this.sdk.timestamp) : ts;
-      this.#logger?.debug(
+      this.logger?.debug(
         `using historical timestamp ${this.#historicalTimestamp}`
       );
     }
-    this.#cache = new import_PriceUpdatesCache.PriceUpdatesCache({
+    this.#cache = import_PriceUpdatesCache.PriceUpdatesCache.get("pyth", {
       // currently staleness period is 240 seconds on all networks, add some buffer
       // this period of 4 minutes is selected based on time that is required for user to sign transaction with wallet
       // so it's unlikely to decrease
@@ -86,7 +84,7 @@ class PythUpdater extends import_base.SDKConstruct {
     if (feeds.length === 0) {
       return [];
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `generating update transactions for ${feeds.length} pyth price feeds`
     );
     const pythFeeds = new Map(
@@ -121,7 +119,7 @@ class PythUpdater extends import_base.SDKConstruct {
         tsRange = `${tsRange} - ${maxTimestamp} (${maxDelta})`;
       }
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `generated ${results.length} update transactions for pyth price feeds: ${Array.from(pythFeeds.keys()).join(", ")}${tsRange}`
     );
     return results;
@@ -132,7 +130,7 @@ class PythUpdater extends import_base.SDKConstruct {
    * @returns
    */
   async #getPayloads(dataFeedsIds) {
-    this.#logger?.debug(
+    this.logger?.debug(
       `getting pyth payloads for ${dataFeedsIds.size} price feeds: ${Array.from(dataFeedsIds).join(", ")}`
     );
     const fromCache = [];
@@ -151,7 +149,7 @@ class PythUpdater extends import_base.SDKConstruct {
     for (const resp of fromPyth) {
       this.#cache.set(resp, resp.dataFeedId);
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `got ${fromPyth.length} new pyth updates and ${fromCache.length} from cache`
     );
     return [...fromCache, ...fromPyth];
@@ -167,7 +165,7 @@ class PythUpdater extends import_base.SDKConstruct {
     }
     const ids = Array.from(dataFeedsIds);
     const tsStr = this.#historicalTimestamp ? ` with historical timestamp ${this.#historicalTimestamp}` : "";
-    this.#logger?.debug(
+    this.logger?.debug(
       `fetching pyth payloads for ${dataFeedsIds.size} price feeds: ${ids.join(", ")}${tsStr}`
     );
     const url = new URL(this.#api + (this.#historicalTimestamp ?? "latest"));

package/dist/cjs/sdk/market/pricefeeds/updates/RedstoneUpdater.js

@@ -61,7 +61,6 @@ const RedstoneOptions = import_v4.z.object({
   enableLogging: import_v4.z.boolean().optional()
 });
 class RedstoneUpdater extends import_base.SDKConstruct {
-  #logger;
   #cache;
   #historicalTimestampMs;
   #gateways;
@@ -69,7 +68,6 @@ class RedstoneUpdater extends import_base.SDKConstruct {
   #enableLogging;
   constructor(sdk, opts = {}) {
     super(sdk);
-    this.#logger = (0, import_utils.childLogger)("RedstoneUpdater", sdk.logger);
     this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
     this.#enableLogging = opts.enableLogging;
     this.#gateways = opts.gateways?.length ? opts.gateways : void 0;
@@ -77,11 +75,11 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     if (ts) {
       ts = ts === true ? Number(this.sdk.timestamp) * 1e3 : ts;
       this.#historicalTimestampMs = 6e4 * Math.floor(ts / 6e4);
-      this.#logger?.debug(
+      this.logger?.debug(
         `using historical timestamp ${this.#historicalTimestampMs}`
       );
     }
-    this.#cache = new import_PriceUpdatesCache.PriceUpdatesCache({
+    this.#cache = import_PriceUpdatesCache.PriceUpdatesCache.get("redstone", {
       // currently staleness period is 240 seconds on all networks, add some buffer
       // this period of 4 minutes is selected based on time that is required for user to sign transaction with wallet
       // so it's unlikely to decrease
@@ -93,7 +91,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     if (feeds.length === 0) {
       return [];
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `generating update transactions for ${feeds.length} redstone price feeds`
     );
     const groupedFeeds = {};
@@ -150,7 +148,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
         tsRange = `${tsRange} - ${maxTimestamp} (${maxDelta})`;
       }
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `generated ${results.length} update transactions for redstone price feeds: ${Array.from(priceFeeds.keys()).join(", ")}${tsRange}`
     );
     return results;
@@ -175,7 +173,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     for (const { timestamp, dataFeedId } of result) {
       const delta = Number(this.sdk.timestamp) - timestamp;
       if (delta >= 240 && delta < 255) {
-        this.#logger?.warn(
+        this.logger?.warn(
           `payload for ${dataFeedId} has expired by ${delta} seconds`
         );
         expired = true;
@@ -199,7 +197,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
    * @returns
    */
   async #getPayloads(dataServiceId, dataFeedsIds, uniqueSignersCount) {
-    this.#logger?.debug(
+    this.logger?.debug(
       `getting redstone payloads for ${dataFeedsIds.size} data feeds in ${dataServiceId} with ${uniqueSignersCount} signers: ${Array.from(dataFeedsIds).join(", ")}`
     );
     const fromCache = [];
@@ -224,7 +222,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     for (const resp of fromRedstone) {
       this.#cache.set(resp, dataServiceId, resp.dataFeedId, uniqueSignersCount);
     }
-    this.#logger?.debug(
+    this.logger?.debug(
       `got ${fromRedstone.length} new redstone updates and ${fromCache.length} from cache`
     );
     return [...fromCache, ...fromRedstone];
@@ -243,7 +241,7 @@ class RedstoneUpdater extends import_base.SDKConstruct {
     }
     const dataPackagesIds = Array.from(dataFeedsIds);
     const tsStr = this.#historicalTimestampMs ? ` with historical timestamp ${this.#historicalTimestampMs}` : "";
-    this.#logger?.debug(
+    this.logger?.debug(
       `fetching redstone payloads for ${dataFeedsIds.size} data feeds in ${dataServiceId} with ${uniqueSignersCount} signers: ${dataPackagesIds.join(", ")}${tsStr}`
     );
     const wrapper = new import_evm_connector.DataServiceWrapper({
@@ -272,14 +270,14 @@ class RedstoneUpdater extends import_base.SDKConstruct {
       const signedDataPackages = packagesByDataFeedId[dataFeedId];
       if (!signedDataPackages) {
         if (this.#ignoreMissingFeeds) {
-          this.#logger?.warn(`cannot find data packages for ${dataFeedId}`);
+          this.logger?.warn(`cannot find data packages for ${dataFeedId}`);
           continue;
         }
         throw new Error(`cannot find data packages for ${dataFeedId}`);
       }
       if (signedDataPackages.length !== uniqueSignersCount) {
         if (this.#ignoreMissingFeeds) {
-          this.#logger?.warn(
+          this.logger?.warn(
             `got ${signedDataPackages.length} data packages for ${dataFeedId}, but expected ${uniqueSignersCount}`
           );
           continue;

package/dist/cjs/sdk/router/AbstractRouterContract.js

@@ -30,6 +30,11 @@ class AbstractRouterContract extends import_base.BaseContract {
   hooks = new import_internal.Hooks();
   addHook = this.hooks.addHook.bind(this.hooks);
   removeHook = this.hooks.removeHook.bind(this.hooks);
+  sdk;
+  constructor(sdk, args) {
+    super(sdk, args);
+    this.sdk = sdk;
+  }
   getExpectedAndLeftover(ca, cm, options = {}) {
     const b = options.balances ? options.balances : this.getDefaultExpectedAndLeftover(
       ca,

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -299,15 +299,15 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
    * @returns
    */
   #convertToUSDForSort(oracle, token, amount) {
-    const scale = 10n ** BigInt(this.sdk.tokensMeta.get(token)?.decimals ?? 0);
+    const scale = 10n ** BigInt(this.tokensMeta.get(token)?.decimals ?? 0);
     const price = oracle.mainPrices.get(token)?.price || oracle.reservePrices.get(token)?.price || scale;
     return amount * price / scale;
   }
   #debugTokenData(tData) {
     return tData.map((t) => ({
       token: this.labelAddress(t.token),
-      balance: `${this.sdk.tokensMeta.formatBN(t.token, t.balance)} (${t.balance})`,
-      leftoverBalance: this.sdk.tokensMeta.formatBN(t.token, t.leftoverBalance) + ` (${t.leftoverBalance})`,
+      balance: `${this.tokensMeta.formatBN(t.token, t.balance)} (${t.balance})`,
+      leftoverBalance: this.tokensMeta.formatBN(t.token, t.leftoverBalance) + ` (${t.leftoverBalance})`,
       numSplits: t.numSplits,
       claimRewards: t.claimRewards
     }));

package/dist/cjs/sdk/router/createRouter.js

@@ -25,6 +25,10 @@ var import_constants = require("../constants/index.js");
 var import_RouterV300Contract = require("./RouterV300Contract.js");
 var import_RouterV310Contract = require("./RouterV310Contract.js");
 function createRouter(sdk, address, version) {
+  const contract = sdk.getContract(address);
+  if (contract) {
+    return contract;
+  }
   if ((0, import_constants.isV300)(version)) {
     return new import_RouterV300Contract.RouterV300Contract(sdk, address, version);
   }

package/dist/cjs/sdk/utils/abi-decode.js

@@ -0,0 +1,58 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var abi_decode_exports = {};
+__export(abi_decode_exports, {
+  functionArgsToMap: () => functionArgsToMap
+});
+module.exports = __toCommonJS(abi_decode_exports);
+var import_viem = require("viem");
+var import_utils = require("../../sdk/utils/index.js");
+function functionArgsToMap(abi, functionName, args) {
+  const abiItem = (0, import_viem.getAbiItem)({
+    abi,
+    name: functionName,
+    args
+  });
+  if (!abiItem || abiItem.type !== "function") {
+    throw new import_viem.AbiFunctionNotFoundError(functionName);
+  }
+  const namedArgs = {};
+  if (Array.isArray(args)) {
+    args.forEach((value, i) => {
+      const input = abiItem.inputs?.[i];
+      if (input?.name) {
+        namedArgs[input.name] = input.type.startsWith("tuple") ? (0, import_utils.json_stringify)(value) : String(value);
+      }
+    });
+  } else {
+    Object.entries(args || {}).forEach(([key, value]) => {
+      const index = parseInt(key, 10);
+      if (!Number.isNaN(index) && abiItem.inputs?.[index]?.name) {
+        namedArgs[abiItem.inputs[index].name] = String(value);
+      } else {
+        namedArgs[key] = String(value);
+      }
+    });
+  }
+  return namedArgs;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  functionArgsToMap
+});

package/dist/cjs/sdk/utils/index.js

@@ -17,6 +17,7 @@ var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./AddressMap.js"), module.exports);
 __reExport(utils_exports, require("./AddressSet.js"), module.exports);
+__reExport(utils_exports, require("./abi-decode.js"), module.exports);
 __reExport(utils_exports, require("./bytes32ToString.js"), module.exports);
 __reExport(utils_exports, require("./childLogger.js"), module.exports);
 __reExport(utils_exports, require("./createRawTx.js"), module.exports);
@@ -35,6 +36,7 @@ __reExport(utils_exports, require("./zod.js"), module.exports);
 0 && (module.exports = {
   ...require("./AddressMap.js"),
   ...require("./AddressSet.js"),
+  ...require("./abi-decode.js"),
   ...require("./bytes32ToString.js"),
   ...require("./childLogger.js"),
   ...require("./createRawTx.js"),

package/dist/esm/dev/create2.js

@@ -5,10 +5,10 @@ import {
   stringToHex
 } from "viem";
 import { getCode, sendTransaction } from "viem/actions";
-import { SDKConstruct } from "../sdk/index.js";
+import { Construct } from "../sdk/index.js";
 const PUBLIC_CREATE2_FACTORY = "0x4e59b44847b379578588920ca78fbf26c0b4956c";
 const DEFAULT_CREATE2_SALT = "GEARBOX";
-class Create2Deployer extends SDKConstruct {
+class Create2Deployer extends Construct {
   #walletClient;
   #logger;
   constructor(sdk, walletClient) {

package/dist/esm/dev/mint/AbstractMinter.js

@@ -1,18 +1,14 @@
 import { parseEther } from "viem";
 import { ierc20Abi } from "../../abi/iERC20.js";
-import {
-  SDKConstruct
-} from "../../sdk/index.js";
+import { SDKConstruct } from "../../sdk/index.js";
 import { iOwnableAbi } from "../abi.js";
 class AbstractMinter extends SDKConstruct {
   anvil;
-  logger;
   name;
-  constructor(sdk, anvil, name = "Minter") {
+  constructor(sdk, anvil) {
     super(sdk);
     this.anvil = anvil;
-    this.name = name;
-    this.logger = sdk.logger?.child?.({ name }) ?? sdk.logger;
+    this.name = this.constructor.name;
   }
   async tryMint(token, dest, amount) {
     const amnt = this.fmt(token, amount);

package/dist/esm/dev/mint/DealMinter.js

@@ -1,8 +1,5 @@
 import AbstractMinter from "./AbstractMinter.js";
 class DealMinter extends AbstractMinter {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "DealMinter");
-  }
   async mint(token, dest, amount) {
     const { deal } = await import("viem-deal").catch(() => ({ deal: null }));
     if (!deal) {

package/dist/esm/dev/mint/DirectMinter.js

@@ -1,9 +1,6 @@
 import { parseAbi } from "viem";
 import AbstractMinter from "./AbstractMinter.js";
 class DirectMinter extends AbstractMinter {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "DirectMinter");
-  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/esm/dev/mint/FallbackMinter.js

@@ -2,7 +2,7 @@ import AbstractMinter from "./AbstractMinter.js";
 class FallbackMinter extends AbstractMinter {
   #minters;
   constructor(sdk, anvil, minters) {
-    super(sdk, anvil, "FallbackMinter");
+    super(sdk, anvil);
     this.#minters = minters;
   }
   async mint(token, dest, amount) {

package/dist/esm/dev/mint/TransferMinter.js

@@ -2,9 +2,6 @@ import { parseAbi } from "viem";
 import { ierc20Abi } from "../../abi/iERC20.js";
 import AbstractMinter from "./AbstractMinter.js";
 class TransferMinter extends AbstractMinter {
-  constructor(sdk, anvil) {
-    super(sdk, anvil, "TransferMinter");
-  }
   async mint(token, dest, amount) {
     const owner = await this.getOwner(token);
     const stopImpersonating = await this.impersonateWithBalance(owner);

package/dist/esm/permissionless/bindings/address-provider.js

@@ -1,10 +1,10 @@
-import { stringToHex } from "viem";
-import { iAddressProviderV310Abi } from "../../abi/310/generated.js";
-import { BaseContract } from "./base-contract.js";
-const abi = iAddressProviderV310Abi;
-class AddressProviderContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "AddressProvider");
+import {
+  stringToHex
+} from "viem";
+import { AddressProviderV310Contract } from "../../sdk/index.js";
+class AddressProviderContract extends AddressProviderV310Contract {
+  constructor(addr, client) {
+    super({ client }, addr);
   }
   async getAddressOrRevert(key, version = 0n) {
     return await this.contract.read.getAddressOrRevert([

package/dist/esm/permissionless/bindings/bytecode-repository.js

@@ -6,13 +6,13 @@ import {
   stringToHex
 } from "viem";
 import { iBytecodeRepositoryAbi } from "../../abi/310/iBytecodeRepository.js";
+import { BaseContract } from "../../sdk/index.js";
 import { normalizeSignature } from "../utils/index.js";
 import { BYTECODE_REPOSITORY } from "../utils/literals.js";
-import { BaseContract } from "./base-contract.js";
 const abi = iBytecodeRepositoryAbi;
 class BytecodeRepositoryContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "BytecodeRepository");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "BytecodeRepository" });
   }
   async getBytecodeByHash(hash) {
     return await this.contract.read.getBytecode([hash]);
@@ -189,69 +189,67 @@ class BytecodeRepositoryContract extends BaseContract {
   }
   parseFunctionParams(params) {
     switch (params.functionName) {
+      // TODO: simple array -> map can be removed, since this is what super.parseFunctionParams does
       case "allowSystemContract": {
         const [bytecodeHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash
-        });
+        };
       }
       case "addAuditor": {
         const [auditor, name] = params.args;
-        return this.wrapParseCall(params, {
-          auditor,
-          name
-        });
+        return { auditor, name };
       }
       case "removeAuditor": {
         const [auditor] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           auditor
-        });
+        };
       }
       case "addPublicDomain": {
         const [domain] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           domain: hexToString(domain, { size: 32 })
-        });
+        };
       }
       case "removePublicContractType": {
         const [contractType] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: hexToString(contractType, { size: 32 })
-        });
+        };
       }
       case "forbidInitCode": {
         const [bytecodeHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash
-        });
+        };
       }
       case "setTokenSpecificPostfix": {
         const [token, postfix] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           token,
           postfix: hexToString(postfix, { size: 32 })
-        });
+        };
       }
       case "uploadBytecode": {
         const [uploadData] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           contractType: hexToString(uploadData.contractType, { size: 32 }),
           version: uploadData.version.toString(),
           initCode: uploadData.initCode,
           author: uploadData.author,
           source: uploadData.source,
           authorSignature: uploadData.authorSignature
-        });
+        };
       }
       case "submitAuditReport": {
         const [bytecodeHash, { auditor, reportUrl, signature }] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           bytecodeHash,
           auditor,
           reportUrl,
           signature
-        });
+        };
       }
       // TODO: add all functions here!
       // case "deployContract": {
@@ -272,7 +270,7 @@ class BytecodeRepositoryContract extends BaseContract {
       //   });
       // }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async signBytecodeHash(bytecodeHash, auditor, reportUrl, signature, sponsor) {

package/dist/esm/permissionless/bindings/compressors/token-compressor.js

@@ -3,11 +3,11 @@ import {
   parseAbi
 } from "viem";
 import { tokenCompressorAbi } from "../../../abi/compressors/tokenCompressor.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = tokenCompressorAbi;
 class TokenCompressorContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "TokenCompressor");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "TokenCompressor" });
   }
   async getTokenInfo(token) {
     const result = await this.contract.read.getTokenInfo([token]);

package/dist/esm/permissionless/bindings/compressors/withdrawal-compressor.js

@@ -2,11 +2,11 @@ import {
   hexToString
 } from "viem";
 import { withdrawalCompressorAbi } from "../../../abi/compressors/withdrawalCompressor.js";
-import { BaseContract } from "../base-contract.js";
+import { BaseContract } from "../../../sdk/index.js";
 const abi = withdrawalCompressorAbi;
 class WithdrawalCompressorContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "RoutingManager");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "WithdrawalCompressor" });
   }
   parseFunctionParams(params) {
     const { functionName, args } = params;
@@ -14,22 +14,16 @@ class WithdrawalCompressorContract extends BaseContract {
       case "setWithdrawableTypeToCompressorType": {
         const [withdrawableType, compressorType] = args;
         return {
-          chainId: 0,
-          target: this.address,
-          label: this.name,
-          functionName,
-          args: {
-            withdrawableType: hexToString(withdrawableType, {
-              size: 32
-            }),
-            compressorType: hexToString(compressorType, {
-              size: 32
-            })
-          }
+          withdrawableType: hexToString(withdrawableType, {
+            size: 32
+          }),
+          compressorType: hexToString(compressorType, {
+            size: 32
+          })
         };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
 }

package/dist/esm/permissionless/bindings/cross-chain-multisig.js

@@ -5,17 +5,19 @@ import {
   zeroAddress
 } from "viem";
 import { crossChainMultisigAbi } from "../../abi/310/crossChainMultisig.js";
-import { json_stringify } from "../../sdk/utils/index.js";
+import {
+  BaseContract,
+  json_stringify
+} from "../../sdk/index.js";
 import { Addresses } from "../deployment/addresses.js";
 import { normalizeSignature } from "../utils/index.js";
 import { CROSS_CHAIN_MULTISIG } from "../utils/literals.js";
-import { BaseContract } from "./base-contract.js";
 import { InstanceManagerContract } from "./instance-manager.js";
 import { MarketConfiguratorFactoryContract } from "./market-configurator-factory.js";
 const abi = crossChainMultisigAbi;
 class CrossChainMultisigContract extends BaseContract {
-  constructor(address, client) {
-    super(abi, address, client, "CrossChainMultisig");
+  constructor(addr, client) {
+    super({ client }, { abi, addr, name: "CrossChainMultisig" });
   }
   async getExecutedBatches(fromBlock, toBlock) {
     const events = await this.getEvents("ExecuteBatch", fromBlock, toBlock);
@@ -66,7 +68,9 @@ class CrossChainMultisigContract extends BaseContract {
       transactionHash,
       blockNumber,
       hash: proposalHash,
-      parsedCalls: calls.map((c) => BaseContract.parseCall(c)),
+      parsedCalls: calls.map(
+        (c) => this.register.parseFunctionData(c.target, c.callData)
+      ),
       signatures
     };
   }
@@ -158,7 +162,7 @@ class CrossChainMultisigContract extends BaseContract {
   async getSigners() {
     return [...await this.contract.read.getSigners()];
   }
-  decodeFunctionData(target, calldata) {
+  #decodeFunctionData(target, calldata) {
     switch (target.toLowerCase()) {
       case this.address.toLowerCase(): {
         return this.parseFunctionData(calldata);
@@ -188,38 +192,38 @@ class CrossChainMultisigContract extends BaseContract {
     switch (params.functionName) {
       case "addSigner": {
         const [signer] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           signer
-        });
+        };
       }
       case "removeSigner": {
         const [signer] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           signer
-        });
+        };
       }
       case "setConfirmationThreshold": {
         const [threshold] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           threshold: threshold.toString()
-        });
+        };
       }
       case "submitBatch": {
         const [name, calls, prevHash] = params.args;
-        return this.wrapParseCall(params, {
+        return {
           name,
           calls: json_stringify(
             calls.map(({ chainId, target, callData }) => ({
-              ...this.decodeFunctionData(target, callData),
+              ...this.#decodeFunctionData(target, callData),
               chainId: Number(chainId),
               target
             }))
           ),
           prevHash
-        });
+        };
       }
       default:
-        return void 0;
+        return super.parseFunctionParams(params);
     }
   }
   async validateProposalSignature(proposalHash, signature) {