@gearbox-protocol/sdk 13.0.0-next.3 → 13.0.0-next.31

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

@@ -65,7 +65,7 @@ class CreditAccountServiceV300 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 };
   }
   /**
@@ -102,7 +102,12 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
         (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 };
   }
   /**
@@ -166,7 +171,7 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
       ),
       ...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({
@@ -258,7 +263,7 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
+    const tx = await this.multicallTx(cm, ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**

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,11 +90,13 @@ 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,
@@ -107,15 +109,22 @@ 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 };
   }
   /**
@@ -140,11 +149,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)
       )
@@ -186,7 +197,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/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

@@ -25,7 +25,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 +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/TokensMeta.js

@@ -1,24 +1,43 @@
 import {
-  decodeAbiParameters
+  decodeAbiParameters,
+  erc20Abi
 } from "viem";
+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, formatBN } from "../utils/index.js";
+} from "./token-types.js";
 class TokensMeta extends AddressMap {
   #client;
-  #tokenDataLoaded = false;
-  constructor(client) {
+  #tokenDataLoaded = new AddressSet();
+  #logger;
+  constructor(client, logger) {
     super(void 0, "tokensMeta");
     this.#client = client;
+    this.#logger = logger?.child?.({ name: "TokensMeta" }) ?? logger;
   }
   reset() {
     this.clear();
-    this.#tokenDataLoaded = false;
+    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;
@@ -26,21 +45,48 @@ class TokensMeta extends AddressMap {
   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) {
-      throw new Error("extended token data not loaded");
+    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) {
-      throw new Error("extended token data not loaded");
+    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();
@@ -51,6 +97,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()) {
@@ -60,6 +110,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;
@@ -79,12 +138,18 @@ 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
    */
-  async loadTokenData() {
-    const tokens = this.keys();
+  async loadTokenData(...tokens) {
+    const tokenz = new AddressSet(tokens.length > 0 ? tokens : this.keys());
+    const tokensToLoad = Array.from(tokenz.difference(this.#tokenDataLoaded));
+    if (tokensToLoad.length === 0) {
+      return;
+    }
     const resp = await this.#client.multicall({
-      contracts: tokens.flatMap(
+      contracts: tokensToLoad.flatMap(
         (t) => [
           {
             address: t,
@@ -101,10 +166,21 @@ class TokensMeta extends AddressMap {
       allowFailure: true,
       batchSize: 0
     });
-    for (let i = 0; i < tokens.length; i++) {
-      this.#overrideTokenMeta(tokens[i], resp[i], resp[i + 1]);
+    this.#logger?.debug(`loaded ${resp.length} contract types`);
+    const kycFactories = new AddressSet();
+    for (let i = 0; i < tokensToLoad.length; i++) {
+      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.#tokenDataLoaded = true;
+    this.#logger?.debug(`found ${kycFactories.size} KYC factories`);
+    await this.#loadDSTokens(kycFactories);
   }
   #overrideTokenMeta(token, contractTypeResp, serializeResp) {
     const meta = this.mustGet(token);
@@ -118,13 +194,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) {
@@ -161,6 +239,72 @@ class TokensMeta extends AddressMap {
       });
     }
   }
+  async #loadDSTokens(kycFactories) {
+    const resp = await this.#client.multicall({
+      contracts: kycFactories.map((address) => ({
+        address,
+        abi: iSecuritizeKYCFactoryAbi,
+        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";

package/dist/esm/sdk/chain/chains.js

@@ -66,7 +66,8 @@ const chains = {
         "0x601067eba24bb5b558a184fc082525637e96a42d": "Gami Labs"
       },
       testMarketConfigurators: {
-        "0x99df7330bf42d596af2e9d9836d4fc2077c574aa": "M11 Credit"
+        "0x99df7330bf42d596af2e9d9836d4fc2077c574aa": "M11 Credit",
+        "0xE0527dE5908B3fc2e054B7eEE0DeF6c9965AbF24": "Securitize"
       },
       isPublic: true,
       wellKnownToken: {

package/dist/esm/sdk/market/MarketRegister.js

@@ -1,5 +1,4 @@
 import { marketCompressorAbi } from "../../abi/compressors/marketCompressor.js";
-import { SDKConstruct } from "../base/index.js";
 import {
   ADDRESS_0X0,
   AP_MARKET_COMPRESSOR,
@@ -9,7 +8,8 @@ import { AddressMap } from "../utils/index.js";
 import { simulateWithPriceUpdates } from "../utils/viem/index.js";
 import { MarketConfiguratorContract } from "./MarketConfiguratorContract.js";
 import { MarketSuite } from "./MarketSuite.js";
-class MarketRegister extends SDKConstruct {
+import { ZapperRegister } from "./ZapperRegister.js";
+class MarketRegister extends ZapperRegister {
   /**
    * Mapping pool.address -> MarketSuite
    */

package/dist/esm/sdk/market/MarketSuite.js

@@ -44,6 +44,9 @@ class MarketSuite extends SDKConstruct {
   get underlying() {
     return this.pool.underlying;
   }
+  async getKYCFactory() {
+    return this.pool.getKYCFactory();
+  }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
   }