@gearbox-protocol/sdk 13.0.0-next.9 → 13.1.0-next.1

package/dist/esm/sdk/accounts/CreditAccountsServiceV310.js

@@ -42,7 +42,7 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       })
     };
     const calls = [...priceUpdatesCalls, addBotCall];
-    const tx = targetContract.type === "creditAccount" ? cm.creditFacade.multicall(targetContract.creditAccount, calls) : void 0;
+    const tx = targetContract.type === "creditAccount" ? await this.multicallTx(cm, targetContract.creditAccount, calls) : void 0;
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -77,7 +77,7 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -90,13 +90,14 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     creditAccount: ca,
     permits,
     to,
-    tokensToClaim
+    tokensToClaim,
+    calls: wrapCalls = []
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
+    const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
     const claimPath = await router.findClaimAllRewards({
-      calls: [],
       tokensToClaim,
       creditAccount: ca
     });
@@ -107,15 +108,21 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
+      ...wrapCalls,
       ...this.prepareDisableQuotas(ca),
       ...this.prepareDecreaseDebt(ca),
+      ...unwrapCalls,
       ...claimPath.calls,
-      ...this.prepareDisableTokens(ca),
       ...assetsToWithdraw.map(
         (t) => this.prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
       )
     ];
-    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
+    const tx = await this.closeCreditAccountTx(
+      cm,
+      ca.creditAccount,
+      calls,
+      operation
+    );
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -132,7 +139,6 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
-      calls: [],
       tokensToClaim,
       creditAccount: ca
     });
@@ -140,11 +146,13 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       creditManager: ca.creditManager,
       creditAccount: ca
     });
+    const wrapCalls = await this.getDepositDiffCalls(1n, ca.creditManager) ?? [];
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const calls = [
       ...priceUpdates,
       ...this.prepareAddCollateral(ca.creditFacade, addCollateral, permits),
       ...claimPath.calls,
+      ...wrapCalls,
       ...assetsToWithdraw.map(
         (t) => this.prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
       )
@@ -160,21 +168,23 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
    * Implements {@link ICreditAccountsService.claimFarmRewards}
    */
   async claimFarmRewards({
-    calls: legacyCalls,
+    calls: externalCalls,
     creditAccount: ca,
     minQuota,
     averageQuota,
-    tokensToClaim,
-    forceCalls
+    tokensToClaim
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const router = this.sdk.routerFor(ca);
-    const claimPath = await router.findClaimAllRewards({
-      calls: legacyCalls,
-      tokensToClaim,
-      creditAccount: ca,
-      forceCalls
-    });
+    let claimPath;
+    if (externalCalls) {
+      claimPath = { calls: externalCalls };
+    } else {
+      claimPath = await router.findClaimAllRewards({
+        tokensToClaim,
+        creditAccount: ca
+      });
+    }
     if (claimPath.calls.length === 0) throw new Error("No path to execute");
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
@@ -186,7 +196,7 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       ...claimPath.calls,
       ...this.prepareUpdateQuotas(ca.creditFacade, { minQuota, averageQuota })
     ];
-    const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
+    const tx = await this.multicallTx(cm, ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   async previewWithdrawLlamathenaProportionally(_) {

package/dist/esm/sdk/accounts/createCreditAccountService.js

@@ -1,10 +1,6 @@
-import { isV300, isV310 } from "../constants/index.js";
-import { CreditAccountServiceV300 } from "./CreditAccountsServiceV300.js";
+import { isV310 } from "../constants/index.js";
 import { CreditAccountServiceV310 } from "./CreditAccountsServiceV310.js";
 function createCreditAccountService(sdk, version, options) {
-  if (isV300(version)) {
-    return new CreditAccountServiceV300(sdk, options);
-  }
   if (isV310(version)) {
     return new CreditAccountServiceV310(sdk, options);
   }

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

@@ -1,5 +1,4 @@
 export * from "./AbstractCreditAccountsService.js";
-export * from "./CreditAccountsServiceV300.js";
 export * from "./CreditAccountsServiceV310.js";
 export * from "./createCreditAccountService.js";
 export * from "./types.js";

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 ?? "";
@@ -55,8 +57,11 @@ class BaseContract extends Construct {
       this.contractType = bytes32ToString(this.contractType);
     }
     this.name = args.name || this.contractType || this.address || this.constructor.name;
-    this.register.setContract(this.address, this);
-    this.register.setAddressLabel(this.address, this.name);
+    const register = this.safeGetRegister();
+    if (register) {
+      register.setContract(this.address, this);
+      register.setAddressLabel(this.address, this.name);
+    }
   }
   stateHuman(_ = true) {
     return {
@@ -190,11 +195,62 @@ class BaseContract extends Construct {
       chainId: this.chainId,
       target: this.address,
       contractType: this.contractType,
-      label: this.register.labelAddress(this.address, true),
+      label: this.labelAddress(this.address, true),
       functionName,
       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.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

@@ -2,16 +2,6 @@ import { NOT_DEPLOYED } from "../constants/addresses.js";
 import { AddressMap } from "../utils/AddressMap.js";
 import { TokensMeta } from "./TokensMeta.js";
 class ChainContractsRegister {
-  static #chains = /* @__PURE__ */ new Map();
-  static for(client, logger) {
-    const chainId = client.chain.id;
-    let result = ChainContractsRegister.#chains.get(chainId);
-    if (!result) {
-      result = new ChainContractsRegister(client, logger);
-      ChainContractsRegister.#chains.set(chainId, result);
-    }
-    return result;
-  }
   contracts = new AddressMap(
     [],
     "contracts"
@@ -25,7 +15,7 @@ class ChainContractsRegister {
   logger;
   constructor(client, logger) {
     this.client = client;
-    this.tokensMeta = new TokensMeta(client);
+    this.tokensMeta = new TokensMeta(client, logger);
     this.logger = logger;
   }
   resetContracts() {
@@ -113,6 +103,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

@@ -3,19 +3,41 @@ import { ChainContractsRegister } from "./ChainContractsRegister.js";
 class Construct {
   logger;
   client;
-  register;
+  #register;
   /**
    * Indicates that contract state needs to be updated
    */
   #dirty = false;
-  constructor({ client, logger }) {
-    this.client = client;
-    this.register = ChainContractsRegister.for(client, logger);
+  constructor(options) {
+    if (options instanceof ChainContractsRegister) {
+      this.#register = options;
+      this.client = options.client;
+    } else if ("register" in options) {
+      this.#register = options.register;
+      this.client = options.register.client;
+    } else {
+      this.client = options.client;
+    }
     this.logger = childLogger(
       this.constructor.name,
-      this.register.logger ?? logger
+      this.#register?.logger ?? options.logger
     );
   }
+  /**
+   * Throws if register was not provided in constructor options
+   * Ephemeral contracts that do not need to access other contracts may not need it
+   */
+  get register() {
+    if (!this.#register) {
+      throw new Error(
+        "contracts register not available, it must be provided if contract needs to access other contracts"
+      );
+    }
+    return this.#register;
+  }
+  safeGetRegister() {
+    return this.#register;
+  }
   get chain() {
     return this.client.chain;
   }
@@ -37,19 +59,11 @@ class Construct {
   set dirty(value) {
     this.#dirty = value;
   }
-  /**
-   * Syntax sugar for rgister.tokensMeta
-   */
   get tokensMeta() {
     return this.register.tokensMeta;
   }
-  /**
-   * Syntax suggar for getting contract labels
-   * @param address
-   * @returns
-   */
-  labelAddress(address) {
-    return this.register.labelAddress(address);
+  labelAddress(address, omitAddress) {
+    return this.#register?.labelAddress(address, omitAddress) ?? address;
   }
   /**
    * Returns list of addresses that should be watched for events to sync state

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/SDKConstruct.js

@@ -2,7 +2,7 @@ import { Construct } from "./Construct.js";
 class SDKConstruct extends Construct {
   sdk;
   constructor(sdk) {
-    super(sdk);
+    super({ register: sdk });
     this.sdk = sdk;
   }
 }

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

@@ -1,50 +1,93 @@
 import {
-  decodeAbiParameters
+  decodeAbiParameters,
+  erc20Abi
 } from "viem";
+import { iSecuritizeDegenNFTAbi } from "../../abi/310/iSecuritizeDegenNFT.js";
+import { iSecuritizeKYCFactoryAbi } from "../../abi/310/iSecuritizeKYCFactory.js";
 import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
 import { iVersionAbi } from "../../abi/iVersion.js";
 import {
+  AddressMap,
+  AddressSet,
   bytes32ToString,
+  formatBN
+} from "../utils/index.js";
+import {
   KYC_UNDERLYING_DEFAULT,
   KYC_UNDERLYING_ON_DEMAND
-} from "../index.js";
-import { AddressMap, AddressSet, formatBN } from "../utils/index.js";
+} from "./token-types.js";
 class TokensMeta extends AddressMap {
   #client;
   #tokenDataLoaded = new AddressSet();
-  constructor(client) {
+  #logger;
+  constructor(client, logger) {
     super(void 0, "tokensMeta");
     this.#client = client;
+    this.#logger = logger?.child?.({ name: "TokensMeta" }) ?? logger;
   }
   reset() {
     this.clear();
     this.#tokenDataLoaded.clear();
   }
+  upsert(address, value) {
+    let v = value;
+    const existing = this.get(address);
+    if (existing && v) {
+      v = {
+        ...existing,
+        ...v
+      };
+    }
+    super.upsert(address, v);
+  }
   symbol(token) {
     return this.mustGet(token).symbol;
   }
   decimals(token) {
     return this.mustGet(token).decimals;
   }
+  /**
+   * Returns true if the token is a phantom token, throws if the token data is not loaded
+   * @param t
+   * @returns
+   */
   isPhantomToken(t) {
     if (!this.#tokenDataLoaded.has(t.addr)) {
       throw new Error(
         `extended token data not loaded for ${t.symbol} (${t.addr})`
       );
     }
-    return "contractType" in t && t.contractType.startsWith("PHANTOM_TOKEN::");
+    return !!t.contractType?.startsWith("PHANTOM_TOKEN::");
   }
+  /**
+   * Returns true if the token is a KYC underlying token, throws if the token data is not loaded
+   * @param t
+   * @returns
+   */
   isKYCUnderlying(t) {
     if (!this.#tokenDataLoaded.has(t.addr)) {
       throw new Error(
         `extended token data not loaded for ${t.symbol} (${t.addr})`
       );
     }
-    return "contractType" in t && t.contractType.startsWith("KYC_UNDERLYING::");
+    return !!t.contractType?.startsWith("KYC_UNDERLYING::");
+  }
+  /**
+   * Returns true if the token is a DSToken, throws if the token data is not loaded
+   * @param t
+   * @returns
+   */
+  isDSToken(t) {
+    if (!this.#tokenDataLoaded.has(t.addr)) {
+      throw new Error(
+        `extended token data not loaded for ${t.symbol} (${t.addr})`
+      );
+    }
+    return !!t.isDSToken;
   }
   /**
    * Returns a map of all phantom tokens
-   * Throws if the phantom token data is not loaded
+   * Throws if token data is not loaded
    */
   get phantomTokens() {
     const result = new AddressMap();
@@ -55,6 +98,10 @@ class TokensMeta extends AddressMap {
     }
     return result;
   }
+  /**
+   * Returns a map of all KYC underlying tokens
+   * Throws if token data is not loaded
+   */
   get kycUnderlyings() {
     const result = new AddressMap();
     for (const [token, meta] of this.entries()) {
@@ -64,6 +111,15 @@ class TokensMeta extends AddressMap {
     }
     return result;
   }
+  get dsTokens() {
+    const result = new AddressMap();
+    for (const [token, meta] of this.entries()) {
+      if (this.isDSToken(meta)) {
+        result.upsert(token, meta);
+      }
+    }
+    return result;
+  }
   formatBN(arg0, arg1, arg2) {
     const token = typeof arg0 === "object" ? arg0.token : arg0;
     const amount = typeof arg0 === "object" ? arg0.balance : arg1;
@@ -83,7 +139,7 @@ class TokensMeta extends AddressMap {
     return meta;
   }
   /**
-   * Loads token information about phantom token and KYC underlying tokens
+   * Loads token information about phantom tokens, KYC underlying tokens and DSTokens
    *
    * @param tokens - tokens to load data for, defaults to all tokens
    */
@@ -111,10 +167,21 @@ class TokensMeta extends AddressMap {
       allowFailure: true,
       batchSize: 0
     });
+    this.#logger?.debug(`loaded ${resp.length} contract types`);
+    const kycFactories = new AddressSet();
     for (let i = 0; i < tokensToLoad.length; i++) {
-      this.#overrideTokenMeta(tokensToLoad[i], resp[i], resp[i + 1]);
+      const meta = this.#overrideTokenMeta(
+        tokensToLoad[i],
+        resp[2 * i],
+        resp[2 * i + 1]
+      );
       this.#tokenDataLoaded.add(tokensToLoad[i]);
+      if (this.isKYCUnderlying(meta)) {
+        kycFactories.add(meta.kycFactory);
+      }
     }
+    this.#logger?.debug(`found ${kycFactories.size} KYC factories`);
+    await this.#loadDSTokens(kycFactories);
   }
   #overrideTokenMeta(token, contractTypeResp, serializeResp) {
     const meta = this.mustGet(token);
@@ -128,13 +195,15 @@ class TokensMeta extends AddressMap {
             `token ${meta.symbol} (${token}) is ${contractType} but serialize failed: ${serializeResp.error}`
           );
         }
-      } else if (contractType.startsWith("PHANTOM_TOKEN::")) {
+      } else {
         this.upsert(token, {
           ...meta,
           contractType
         });
       }
+      this.#logger?.debug(`token ${meta.symbol} is ${contractType}`);
     }
+    return this.mustGet(token);
   }
   #overrideKYCUnderlying(meta, contractType, serialized) {
     if (contractType === KYC_UNDERLYING_DEFAULT) {
@@ -171,6 +240,85 @@ class TokensMeta extends AddressMap {
       });
     }
   }
+  async #loadDSTokens(kycFactories) {
+    const degenNFTs = await this.#client.multicall({
+      contracts: kycFactories.map((address) => {
+        return {
+          address,
+          abi: iSecuritizeKYCFactoryAbi,
+          functionName: "getDegenNFT"
+        };
+      }),
+      allowFailure: false,
+      batchSize: 0
+    });
+    const resp = await this.#client.multicall({
+      contracts: degenNFTs.map((address) => {
+        return {
+          address,
+          abi: iSecuritizeDegenNFTAbi,
+          functionName: "getDSTokens"
+        };
+      }),
+      allowFailure: false,
+      batchSize: 0
+    });
+    const dsToken = new AddressSet(resp.flat());
+    const tokensToLoad = dsToken.difference(new Set(this.keys()));
+    this.#logger?.debug(
+      `found ${dsToken.size} DSTokens in KYC factories, need to load ${tokensToLoad.size} basic metadata`
+    );
+    await this.#loadWithoutCompressor(tokensToLoad);
+    for (const token of dsToken) {
+      const meta = this.mustGet(token);
+      this.upsert(token, {
+        ...meta,
+        isDSToken: true
+      });
+      this.#tokenDataLoaded.add(token);
+      this.#logger?.debug(`token ${meta.symbol} (${token}) is a DSToken`);
+    }
+  }
+  async #loadWithoutCompressor(tokens_) {
+    if (tokens_.size === 0) {
+      return;
+    }
+    const tokens = Array.from(tokens_);
+    const resp = await this.#client.multicall({
+      contracts: tokens.flatMap(
+        (t) => [
+          {
+            address: t,
+            abi: erc20Abi,
+            functionName: "symbol"
+          },
+          {
+            address: t,
+            abi: erc20Abi,
+            functionName: "name"
+          },
+          {
+            address: t,
+            abi: erc20Abi,
+            functionName: "decimals"
+          }
+        ]
+      ),
+      allowFailure: false,
+      batchSize: 0
+    });
+    this.#logger?.debug(
+      `loaded ${resp.length} basic metadata without compressor`
+    );
+    for (let i = 0; i < tokens.length; i++) {
+      this.upsert(tokens[i], {
+        addr: tokens[i],
+        symbol: resp[3 * i],
+        name: resp[3 * i + 1],
+        decimals: resp[3 * i + 2]
+      });
+    }
+  }
 }
 export {
   TokensMeta

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";