@gearbox-protocol/sdk 13.0.0-next.29 → 13.0.0-next.30

package/dist/esm/sdk/base/BaseContract.js

@@ -11,6 +11,8 @@ import {
   bytes32ToString,
   createRawTx,
   functionArgsToMap,
+  functionArgsToRecord,
+  getFunctionSignature,
   json_stringify
 } from "../utils/index.js";
 import { Construct } from "./Construct.js";
@@ -39,15 +41,15 @@ class BaseContract extends Construct {
   version;
   address;
   name;
-  constructor({ client, logger }, args) {
-    super({ client, logger });
+  constructor(options, args) {
+    super(options);
     this.abi = args.abi;
     this.address = getAddress(args.addr);
     this.contract = getContract({
       address: this.address,
       // add exceptions for better error decoding
       abi: [...this.abi, ...errorAbis],
-      client
+      client: this.client
     });
     this.version = Number(args.version || 0);
     this.contractType = args.contractType ?? "";
@@ -195,6 +197,57 @@ class BaseContract extends Construct {
       args
     };
   }
+  /**
+   * Parses calldata into structured result with preserved original types.
+   * When strict is true, throws {@link ContractParseError} on unknown selectors;
+   * otherwise returns a fallback with the raw calldata.
+   */
+  parseFunctionDataV2(calldata, strict) {
+    try {
+      const decoded = decodeFunctionData({
+        abi: this.abi,
+        data: calldata
+      });
+      const functionName = getFunctionSignature(this.abi, calldata);
+      return this.wrapParseCallV2(
+        functionName,
+        this.parseFunctionParamsV2(decoded, strict)
+      );
+    } catch (e) {
+      if (strict) {
+        throw new ContractParseError(e, {
+          address: this.address,
+          callData: calldata,
+          contractName: this.name
+        });
+      }
+      this.logger?.warn(e);
+      const selector = calldata.slice(0, 10);
+      const data = `0x${calldata.slice(10)}`;
+      return this.wrapParseCallV2(`unknown function ${selector}`, {
+        _data: data
+      });
+    }
+  }
+  /**
+   * Converts viem-decoded function arguments to a record preserving original types.
+   * Override in subclasses to handle nesting (e.g., multicall inner calls).
+   * @param strict - propagated from parseFunctionDataV2 for recursive parsing
+   */
+  parseFunctionParamsV2(params, _strict) {
+    return functionArgsToRecord(this.abi, params.functionName, params.args);
+  }
+  wrapParseCallV2(functionName, rawArgs) {
+    return {
+      chainId: this.chainId,
+      target: this.address,
+      contractType: this.contractType,
+      label: this.register.labelAddress(this.address, true),
+      version: this.version,
+      functionName,
+      rawArgs
+    };
+  }
   /**
    * Creates a raw transaction for a function in this contract
    * @param parameters

package/dist/esm/sdk/base/ChainContractsRegister.js

@@ -113,6 +113,39 @@ class ChainContractsRegister {
       (call) => this.parseFunctionData(call.target, call.callData)
     );
   }
+  /**
+   * Parses calldata for a contract at the given address, preserving original types.
+   * When strict is true, throws on unknown address or selector; otherwise returns a fallback.
+   */
+  parseFunctionDataV2(address, calldata, strict) {
+    const contract = this.contracts.get(address);
+    if (contract) {
+      return contract.parseFunctionDataV2(calldata, strict);
+    }
+    if (strict) {
+      throw new Error(`contract ${address} not found on chain ${this.chainId}`);
+    }
+    const selector = calldata.slice(0, 10);
+    const data = `0x${calldata.slice(10)}`;
+    return {
+      chainId: this.chainId,
+      target: address,
+      contractType: "",
+      label: this.labelAddress(address, true),
+      version: 0,
+      functionName: `unknown function ${selector}`,
+      rawArgs: { _data: data }
+    };
+  }
+  /**
+   * Parses multicalls preserving original types.
+   * When strict is true, throws on unknown targets or selectors.
+   */
+  parseMultiCallV2(calls, strict) {
+    return calls.map(
+      (call) => this.parseFunctionDataV2(call.target, call.callData, strict)
+    );
+  }
 }
 export {
   ChainContractsRegister

package/dist/esm/sdk/base/Construct.js

@@ -8,9 +8,17 @@ class Construct {
    * Indicates that contract state needs to be updated
    */
   #dirty = false;
-  constructor({ client, logger }) {
-    this.client = client;
-    this.register = ChainContractsRegister.for(client, logger);
+  constructor(options) {
+    const { logger } = options;
+    if ("client" in options) {
+      const { client } = options;
+      this.client = client;
+      this.register = ChainContractsRegister.for(client, logger);
+    } else {
+      const { register } = options;
+      this.register = register;
+      this.client = register.client;
+    }
     this.logger = childLogger(
       this.constructor.name,
       this.register.logger ?? logger

package/dist/esm/sdk/base/PlaceholderContract.js

@@ -1,8 +1,8 @@
 import { BaseContract } from "./BaseContract.js";
 const abi = [];
 class PlaceholderContract extends BaseContract {
-  constructor(sdk, args) {
-    super(sdk, { ...args, abi });
+  constructor(options, args) {
+    super(options, { ...args, abi });
   }
 }
 export {

package/dist/esm/sdk/base/errors.js

@@ -0,0 +1,11 @@
+class MissingSerializedParamsError extends Error {
+  constructor(propertyName) {
+    super(
+      `Cannot access '${propertyName}': serializedParams were not provided`
+    );
+    this.name = "MissingSerializedParamsError";
+  }
+}
+export {
+  MissingSerializedParamsError
+};

package/dist/esm/sdk/base/index.js

@@ -1,6 +1,7 @@
 export * from "./BaseContract.js";
 export * from "./ChainContractsRegister.js";
 export * from "./Construct.js";
+export * from "./errors.js";
 export * from "./PlaceholderContract.js";
 export * from "./SDKConstruct.js";
 export * from "./TokensMeta.js";

package/dist/esm/sdk/market/adapters/PlaceholderAdapterContracts.js

@@ -1,9 +1,18 @@
-import { PlaceholderContract } from "../../base/index.js";
+import {
+  MissingSerializedParamsError,
+  PlaceholderContract
+} from "../../base/index.js";
 class PlaceholderAdapterContract extends PlaceholderContract {
-  targetContract;
-  constructor(sdk, args) {
-    super(sdk, args.baseParams);
-    this.targetContract = args.targetContract;
+  #targetContract;
+  constructor(options, args) {
+    super(options, args.baseParams);
+    this.#targetContract = args.targetContract;
+  }
+  get targetContract() {
+    if (!this.#targetContract) {
+      throw new MissingSerializedParamsError("targetContract");
+    }
+    return this.#targetContract;
   }
 }
 export {

package/dist/esm/sdk/market/adapters/index.js

@@ -1,3 +1,3 @@
-export * from "./factory.js";
+export * from "./createAdapter.js";
 export * from "./PlaceholderAdapterContracts.js";
 export * from "./types.js";

package/dist/esm/sdk/market/credit/CreditFacadeV310BaseContract.js

@@ -0,0 +1,86 @@
+import {
+  iCreditFacadeMulticallV310Abi,
+  iCreditFacadeV310Abi
+} from "../../../abi/310/generated.js";
+import { iPausableAbi } from "../../../abi/iPausable.js";
+import { BaseContract } from "../../base/index.js";
+const abi = [
+  ...iCreditFacadeV310Abi,
+  ...iCreditFacadeMulticallV310Abi,
+  ...iPausableAbi
+];
+class CreditFacadeV310BaseContract extends BaseContract {
+  constructor(options, args) {
+    super(options, { ...args, abi });
+  }
+  parseFunctionParamsV2(params, strict) {
+    switch (params.functionName) {
+      case "openCreditAccount": {
+        const [onBehalfOf, calls, referralCode] = params.args;
+        return {
+          onBehalfOf,
+          calls: this.register.parseMultiCallV2([...calls], strict),
+          referralCode
+        };
+      }
+      case "closeCreditAccount": {
+        const [creditAccount, calls] = params.args;
+        return {
+          creditAccount,
+          calls: this.register.parseMultiCallV2([...calls], strict)
+        };
+      }
+      case "botMulticall":
+      case "multicall": {
+        const [creditAccount, calls] = params.args;
+        return {
+          creditAccount,
+          calls: this.register.parseMultiCallV2([...calls], strict)
+        };
+      }
+      case "liquidateCreditAccount": {
+        const [creditAccount, to, calls] = params.args;
+        return {
+          creditAccount,
+          to,
+          calls: this.register.parseMultiCallV2([...calls], strict)
+        };
+      }
+      default:
+        return super.parseFunctionParamsV2(params, strict);
+    }
+  }
+  stringifyFunctionParams(params) {
+    switch (params.functionName) {
+      case "openCreditAccount": {
+        const [onBehalfOf, calls, referralCode] = params.args;
+        return [
+          this.labelAddress(onBehalfOf),
+          this.register.parseMultiCall([...calls]).join(","),
+          `${referralCode}`
+        ];
+      }
+      case "closeCreditAccount": {
+        const [creditAccount, calls] = params.args;
+        return [
+          this.labelAddress(creditAccount),
+          this.register.parseMultiCall([...calls]).join(",")
+        ];
+      }
+      case "liquidateCreditAccount": {
+        const [creditAccount, to, calls] = params.args;
+        return [
+          this.labelAddress(creditAccount),
+          this.labelAddress(to),
+          this.register.parseMultiCall([...calls]).join(",")
+        ];
+      }
+      default:
+        return super.stringifyFunctionParams(params);
+    }
+  }
+}
+export {
+  CreditFacadeV310BaseContract,
+  abi as creditFacadeV310Abi
+};

package/dist/esm/sdk/market/credit/CreditFacadeV310Contract.js

@@ -1,28 +1,17 @@
-import {
-  iCreditFacadeMulticallV310Abi,
-  iCreditFacadeV310Abi
-} from "../../../abi/310/generated.js";
-import { iPausableAbi } from "../../../abi/iPausable.js";
-import { BaseContract } from "../../base/index.js";
 import { ADDRESS_0X0 } from "../../constants/index.js";
 import {
   fmtBinaryMask,
   formatBNvalue,
   formatTimestamp
 } from "../../utils/index.js";
-const abi = [
-  ...iCreditFacadeV310Abi,
-  ...iCreditFacadeMulticallV310Abi,
-  ...iPausableAbi
-];
-class CreditFacadeV310Contract extends BaseContract {
+import { CreditFacadeV310BaseContract } from "./CreditFacadeV310BaseContract.js";
+class CreditFacadeV310Contract extends CreditFacadeV310BaseContract {
   underlying;
   constructor(options, { creditFacade, creditManager }) {
     const { baseParams, ...rest } = creditFacade;
     super(options, {
       ...baseParams,
-      name: `CreditFacadeV310(${creditManager.name})`,
-      abi
+      name: `CreditFacadeV310(${creditManager.name})`
     });
     Object.assign(this, rest);
     this.underlying = creditManager.underlying;
@@ -89,35 +78,6 @@ class CreditFacadeV310Contract extends BaseContract {
       args: [to, calls, referralCode]
     });
   }
-  stringifyFunctionParams(params) {
-    switch (params.functionName) {
-      case "openCreditAccount": {
-        const [onBehalfOf, calls, referralCode] = params.args;
-        return [
-          this.labelAddress(onBehalfOf),
-          this.register.parseMultiCall([...calls]).join(","),
-          `${referralCode}`
-        ];
-      }
-      case "closeCreditAccount": {
-        const [creditAccount, calls] = params.args;
-        return [
-          this.labelAddress(creditAccount),
-          this.register.parseMultiCall([...calls]).join(",")
-        ];
-      }
-      case "liquidateCreditAccount": {
-        const [creditAccount, to, calls] = params.args;
-        return [
-          this.labelAddress(creditAccount),
-          this.labelAddress(to),
-          this.register.parseMultiCall([...calls]).join(",")
-        ];
-      }
-      default:
-        return super.stringifyFunctionParams(params);
-    }
-  }
 }
 export {
   CreditFacadeV310Contract

package/dist/esm/sdk/market/credit/index.js

@@ -1,6 +1,7 @@
 export * from "./CreditConfiguratorV300Contract.js";
 export * from "./CreditConfiguratorV310Contract.js";
 export * from "./CreditFacadeV300Contract.js";
+export * from "./CreditFacadeV310BaseContract.js";
 export * from "./CreditFacadeV310Contract.js";
 export * from "./CreditManagerV300Contract.js";
 export * from "./CreditManagerV310Contract.js";

package/dist/esm/sdk/market/pool/SecuritizeKYCFactory.js

@@ -1,9 +1,11 @@
+import { iSecuritizeDegenNFTAbi } from "../../../abi/310/iSecuritizeDegenNFT.js";
 import { iSecuritizeKYCFactoryAbi } from "../../../abi/310/iSecuritizeKYCFactory.js";
 import { BaseContract } from "../../base/index.js";
 import { AddressMap } from "../../index.js";
 const abi = iSecuritizeKYCFactoryAbi;
 class SecuritizeKYCFactory extends BaseContract {
   investorCache;
+  #degenNFT;
   constructor(options, address) {
     super(options, {
       addr: address,
@@ -39,7 +41,12 @@ class SecuritizeKYCFactory extends BaseContract {
     return investor;
   }
   async getDSTokens() {
-    const tokens = await this.contract.read.getDSTokens();
+    const degenNFT = await this.getDegenNFT();
+    const tokens = await this.client.readContract({
+      address: degenNFT,
+      abi: iSecuritizeDegenNFTAbi,
+      functionName: "getDSTokens"
+    });
     return [...tokens];
   }
   multicall(creditAccount, calls, tokensToRegister) {
@@ -54,6 +61,12 @@ class SecuritizeKYCFactory extends BaseContract {
       args: [creditManager, calls, tokensToRegister]
     });
   }
+  async getDegenNFT() {
+    if (!this.#degenNFT) {
+      this.#degenNFT = await this.contract.read.getDegenNFT();
+    }
+    return this.#degenNFT;
+  }
 }
 export {
   SecuritizeKYCFactory

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

@@ -1,8 +1,19 @@
 import {
   AbiFunctionNotFoundError,
-  getAbiItem
+  getAbiItem,
+  toFunctionSelector,
+  toFunctionSignature
 } from "viem";
 import { json_stringify } from "../../sdk/utils/index.js";
+function getFunctionSignature(abi, calldataOrSelector) {
+  const selector = calldataOrSelector.slice(0, 10);
+  for (const item of abi) {
+    if (item.type === "function" && toFunctionSelector(item) === selector) {
+      return toFunctionSignature(item);
+    }
+  }
+  throw new Error(`Function with selector ${selector} not found in ABI`);
+}
 function functionArgsToMap(abi, functionName, args) {
   const abiItem = getAbiItem({
     abi,
@@ -32,6 +43,36 @@ function functionArgsToMap(abi, functionName, args) {
   }
   return namedArgs;
 }
+function functionArgsToRecord(abi, functionName, args) {
+  const abiItem = getAbiItem({
+    abi,
+    name: functionName,
+    args
+  });
+  if (!abiItem || abiItem.type !== "function") {
+    throw new AbiFunctionNotFoundError(functionName);
+  }
+  const namedArgs = {};
+  if (Array.isArray(args)) {
+    args.forEach((value, i) => {
+      const input = abiItem.inputs?.[i];
+      const key = input?.name || `${i}`;
+      namedArgs[key] = 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] = value;
+      } else {
+        namedArgs[key] = value;
+      }
+    });
+  }
+  return namedArgs;
+}
 export {
-  functionArgsToMap
+  functionArgsToMap,
+  functionArgsToRecord,
+  getFunctionSignature
 };