@gearbox-protocol/sdk 13.3.0-next.3 → 13.3.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" ? await this.multicallTx(cm, targetContract.creditAccount, calls) : void 0;
+    const tx = targetContract.type === "creditAccount" ? cm.creditFacade.multicall(targetContract.creditAccount, calls) : void 0;
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -77,7 +77,7 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
         averageQuota
       })
     ];
-    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
+    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -90,13 +90,11 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     creditAccount: ca,
     permits,
     to,
-    tokensToClaim,
-    calls: wrapCalls = []
+    tokensToClaim
   }) {
     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({
       tokensToClaim,
       creditAccount: ca
@@ -108,21 +106,14 @@ 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,
       ...assetsToWithdraw.map(
         (t) => this.prepareWithdrawToken(ca.creditFacade, t.token, MAX_UINT256, to)
       )
     ];
-    const tx = await this.closeCreditAccountTx(
-      cm,
-      ca.creditAccount,
-      calls,
-      operation
-    );
+    const tx = operation === "close" ? cm.creditFacade.closeCreditAccount(ca.creditAccount, calls) : cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -146,13 +137,11 @@ 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)
       )
@@ -196,7 +185,7 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
       ...claimPath.calls,
       ...this.prepareUpdateQuotas(ca.creditFacade, { minQuota, averageQuota })
     ];
-    const tx = await this.multicallTx(cm, ca.creditAccount, calls);
+    const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   async previewWithdrawLlamathenaProportionally(_) {

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

@@ -15,7 +15,7 @@ class ChainContractsRegister {
   logger;
   constructor(client, logger) {
     this.client = client;
-    this.tokensMeta = new TokensMeta(client, logger);
+    this.tokensMeta = new TokensMeta(client);
     this.logger = logger;
   }
   resetContracts() {

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

@@ -1,10 +1,3 @@
-import {
-  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,
@@ -12,33 +5,16 @@ import {
   bytes32ToString,
   formatBN
 } from "../utils/index.js";
-import {
-  KYC_UNDERLYING_DEFAULT,
-  KYC_UNDERLYING_ON_DEMAND
-} from "./token-types.js";
 class TokensMeta extends AddressMap {
   #client;
-  #tokenDataLoaded = new AddressSet();
-  #logger;
-  constructor(client, logger) {
+  #phantomTokensLoaded;
+  constructor(client) {
     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);
+    this.#phantomTokensLoaded = void 0;
   }
   symbol(token) {
     return this.mustGet(token).symbol;
@@ -47,78 +23,27 @@ class TokensMeta extends AddressMap {
     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 !!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 !!t.contractType?.startsWith("KYC_UNDERLYING::");
-  }
-  /**
-   * Returns true if the token is a DSToken, throws if the token data is not loaded
-   * @param t
-   * @returns
+   * Returns the phantom token type for a given token, or undefined for normal tokens
+   * Throws if the phantom token data is not loaded
    */
-  isDSToken(t) {
-    if (!this.#tokenDataLoaded.has(t.addr)) {
-      throw new Error(
-        `extended token data not loaded for ${t.symbol} (${t.addr})`
-      );
+  phantomTokenType(token) {
+    if (!this.#phantomTokensLoaded?.has(token)) {
+      throw new Error("phantom token data not loaded");
     }
-    return !!t.isDSToken;
+    return this.mustGet(token).phantomTokenType;
   }
   /**
    * Returns a map of all phantom tokens
-   * Throws if token data is not loaded
+   * Throws if the phantom token data is not loaded
    */
   get phantomTokens() {
-    const result = new AddressMap();
-    for (const [token, meta] of this.entries()) {
-      if (this.isPhantomToken(meta)) {
-        result.upsert(token, meta);
-      }
+    if (!this.#phantomTokensLoaded) {
+      throw new Error("phantom tokens not loaded");
     }
-    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()) {
-      if (this.isKYCUnderlying(meta)) {
-        result.upsert(token, meta);
-      }
-    }
-    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;
+    return new AddressMap(
+      this.entries().filter(([_, v]) => !!v.phantomTokenType),
+      "phantomTokens"
+    );
   }
   formatBN(arg0, arg1, arg2) {
     const token = typeof arg0 === "object" ? arg0.token : arg0;
@@ -139,184 +64,30 @@ class TokensMeta extends AddressMap {
     return meta;
   }
   /**
-   * Loads token information about phantom tokens, KYC underlying tokens and DSTokens
-   *
-   * @param tokens - tokens to load data for, defaults to all tokens
+   * Loads phantom token data for all known tokens from chain
    */
-  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;
-    }
+  async loadPhantomTokens() {
+    this.#phantomTokensLoaded = new AddressSet();
+    const tokens = this.keys();
     const resp = await this.#client.multicall({
-      contracts: tokensToLoad.flatMap(
-        (t) => [
-          {
-            address: t,
-            abi: iVersionAbi,
-            functionName: "contractType"
-          },
-          {
-            address: t,
-            abi: iStateSerializerAbi,
-            functionName: "serialize"
-          }
-        ]
+      contracts: tokens.map(
+        (t) => ({
+          address: t,
+          abi: iVersionAbi,
+          functionName: "contractType"
+        })
       ),
       allowFailure: true,
       batchSize: 0
     });
-    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.#logger?.debug(`found ${kycFactories.size} KYC factories`);
-    await this.#loadDSTokens(kycFactories);
-  }
-  #overrideTokenMeta(token, contractTypeResp, serializeResp) {
-    const meta = this.mustGet(token);
-    if (contractTypeResp.status === "success") {
-      const contractType = bytes32ToString(contractTypeResp.result);
-      if (contractType.startsWith("KYC_UNDERLYING::")) {
-        if (serializeResp.status === "success") {
-          this.#overrideKYCUnderlying(meta, contractType, serializeResp.result);
-        } else {
-          throw new Error(
-            `token ${meta.symbol} (${token}) is ${contractType} but serialize failed: ${serializeResp.error}`
-          );
+    for (let i = 0; i < resp.length; i++) {
+      if (resp[i].status === "success") {
+        const contractType = bytes32ToString(resp[i].result);
+        if (contractType.startsWith("PHANTOM_TOKEN::")) {
+          this.mustGet(tokens[i]).phantomTokenType = contractType;
         }
-      } 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) {
-      const decoded = decodeAbiParameters(
-        [
-          { type: "address", name: "kycFactory" },
-          { type: "address", name: "asset" }
-        ],
-        serialized
-      );
-      this.upsert(meta.addr, {
-        ...meta,
-        contractType,
-        kycFactory: decoded[0],
-        asset: decoded[1]
-      });
-    } else if (contractType === KYC_UNDERLYING_ON_DEMAND) {
-      const decoded = decodeAbiParameters(
-        [
-          { type: "address", name: "kycFactory" },
-          { type: "address", name: "asset" },
-          { type: "address", name: "pool" },
-          { type: "address", name: "liquidityProvider" }
-        ],
-        serialized
-      );
-      this.upsert(meta.addr, {
-        ...meta,
-        contractType,
-        kycFactory: decoded[0],
-        asset: decoded[1],
-        pool: decoded[2],
-        liquidityProvider: decoded[3]
-      });
-    }
-  }
-  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]
-      });
+      this.#phantomTokensLoaded.add(tokens[i]);
     }
   }
 }

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

@@ -5,5 +5,4 @@ export * from "./errors.js";
 export * from "./PlaceholderContract.js";
 export * from "./SDKConstruct.js";
 export * from "./TokensMeta.js";
-export * from "./token-types.js";
 export * from "./types.js";

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

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

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

@@ -4,4 +4,5 @@ export * from "./bot-permissions.js";
 export * from "./math.js";
 export * from "./networks.js";
 export * from "./periphery.js";
+export * from "./phantom-tokens.js";
 export * from "./versions.js";

package/dist/esm/sdk/{base/token-types.js → constants/phantom-tokens.js}

@@ -7,10 +7,6 @@ const PHANTOM_TOKEN_CONTRACT_TYPES = [
   "PHANTOM_TOKEN::STAKING_REWARDS",
   "PHANTOM_TOKEN::UPSHIFT_WITHDRAW"
 ];
-const KYC_UNDERLYING_DEFAULT = "KYC_UNDERLYING::DEFAULT";
-const KYC_UNDERLYING_ON_DEMAND = "KYC_UNDERLYING::ON_DEMAND";
 export {
-  KYC_UNDERLYING_DEFAULT,
-  KYC_UNDERLYING_ON_DEMAND,
   PHANTOM_TOKEN_CONTRACT_TYPES
 };

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

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

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

@@ -41,12 +41,6 @@ class MarketSuite extends SDKConstruct {
     this.priceOracle = createPriceOracle(sdk, marketData.priceOracle);
     this.lossPolicy = createLossPolicy(sdk, marketData.lossPolicy);
   }
-  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);
   }

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

@@ -5,4 +5,3 @@ export * from "./MarketSuite.js";
 export * from "./oracle/index.js";
 export * from "./pool/index.js";
 export * from "./pricefeeds/index.js";
-export * from "./types.js";

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

@@ -55,9 +55,6 @@ class PoolSuite extends SDKConstruct {
   get underlying() {
     return this.pool.underlying;
   }
-  async getKYCFactory() {
-    return this.pool.getKYCFactory();
-  }
   get dirty() {
     return this.pool.dirty || this.rateKeeper.dirty || this.pqk.dirty || this.interestRateModel.dirty;
   }

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

@@ -7,20 +7,16 @@ import {
   formatBNvalue,
   percentFmt
 } from "../../utils/index.js";
-import { SecuritizeKYCFactory } from "./SecuritizeKYCFactory.js";
 const abi = [...iPoolV310Abi, ...iPausableAbi];
 class PoolV310Contract extends BaseContract {
   creditManagerDebtParams;
-  #sdk;
-  #kycFactory;
-  constructor(sdk, data) {
+  constructor(options, data) {
     const { baseParams, creditManagerDebtParams, ...rest } = data;
-    super(sdk, {
+    super(options, {
       ...data.baseParams,
       name: `PoolV3(${data.name})`,
       abi
     });
-    this.#sdk = sdk;
     Object.assign(this, rest);
     this.creditManagerDebtParams = new AddressMap(
       creditManagerDebtParams.map((p) => [p.creditManager, p])
@@ -32,17 +28,6 @@ class PoolV310Contract extends BaseContract {
       symbol: data.symbol
     });
   }
-  async getKYCFactory() {
-    if (this.#kycFactory) {
-      return this.#kycFactory;
-    }
-    await this.#sdk.tokensMeta.loadTokenData(this.underlying);
-    const u = this.#sdk.tokensMeta.mustGet(this.underlying);
-    if (this.#sdk.tokensMeta.isKYCUnderlying(u)) {
-      this.#kycFactory = new SecuritizeKYCFactory(this.#sdk, u.kycFactory);
-    }
-    return this.#kycFactory;
-  }
   stateHuman(raw = true) {
     return {
       ...super.stateHuman(raw),

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

@@ -1,6 +1,4 @@
 export * from "./GaugeContract.js";
 export * from "./LinearInterestRateModelContract.js";
 export * from "./PoolSuite.js";
-export * from "./PoolV310Contract.js";
-export * from "./SecuritizeKYCFactory.js";
 export * from "./types.js";

package/dist/esm/sdk/pools/AbstractPoolService.js

@@ -0,0 +1,113 @@
+import { iPoolV310Abi } from "../../abi/310/generated.js";
+import { ierc20ZapperDepositsAbi } from "../../abi/iERC20ZapperDeposits.js";
+import { iethZapperDepositsAbi } from "../../abi/iETHZapperDeposits.js";
+import { iZapperAbi } from "../../abi/iZapper.js";
+import { SDKConstruct } from "../base/index.js";
+class AbstractPoolService extends SDKConstruct {
+  #version;
+  constructor(sdk, version) {
+    super(sdk);
+    this.#version = version;
+    this.logger?.debug(`Created PoolService with version: ${this.#version}`);
+  }
+  addLiquidity({
+    collateral,
+    pool,
+    account,
+    zapper,
+    permit,
+    nativeTokenAddress,
+    referralCode = 0n,
+    migrate
+  }) {
+    if (zapper?.tokenIn === nativeTokenAddress) {
+      return [
+        {
+          target: zapper.zapper,
+          abi: iethZapperDepositsAbi,
+          functionName: "depositWithReferral",
+          args: [account, referralCode],
+          value: collateral.balance
+        }
+      ];
+    } else if (zapper) {
+      return permit ? [
+        {
+          target: zapper.zapper,
+          abi: ierc20ZapperDepositsAbi,
+          functionName: "depositWithReferralAndPermit",
+          args: [
+            collateral.balance,
+            account,
+            referralCode,
+            permit.deadline,
+            permit.v,
+            permit.r,
+            permit.s
+          ]
+        }
+      ] : [
+        {
+          target: zapper.zapper,
+          abi: ierc20ZapperDepositsAbi,
+          functionName: "depositWithReferral",
+          args: [collateral.balance, account, referralCode]
+        }
+      ];
+    } else {
+      if (migrate) throw Error("No zapper for migration");
+      return [
+        {
+          target: pool,
+          abi: iPoolV310Abi,
+          functionName: "depositWithReferral",
+          args: [collateral.balance, account, referralCode]
+        }
+      ];
+    }
+  }
+  removeLiquidity({
+    pool,
+    amount,
+    account,
+    zapper,
+    permit
+  }) {
+    if (zapper) {
+      return permit ? [
+        {
+          target: zapper.zapper,
+          abi: iZapperAbi,
+          functionName: "redeemWithPermit",
+          args: [
+            amount,
+            account,
+            permit.deadline,
+            permit.v,
+            permit.r,
+            permit.s
+          ]
+        }
+      ] : [
+        {
+          target: zapper.zapper,
+          abi: iZapperAbi,
+          functionName: "redeem",
+          args: [amount, account]
+        }
+      ];
+    } else {
+      return [
+        {
+          target: pool,
+          abi: iPoolV310Abi,
+          functionName: "redeem",
+          args: [amount, account, account]
+        }
+      ];
+    }
+  }
+}
+export {
+  AbstractPoolService
+};

package/dist/esm/sdk/pools/PoolServiceV310.js

@@ -0,0 +1,6 @@
+import { AbstractPoolService } from "./AbstractPoolService.js";
+class PoolServiceV310 extends AbstractPoolService {
+}
+export {
+  PoolServiceV310
+};