@gearbox-protocol/sdk 13.0.0-next.2 → 13.0.0-next.20

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

@@ -23,6 +23,9 @@ import {
   RAY,
   VERSION_RANGE_310
 } from "../constants/index.js";
+import {
+  SecuritizeKYCFactory
+} from "../market/index.js";
 import { assetsMap } from "../router/index.js";
 import { BigIntMath } from "../sdk-legacy/index.js";
 import { AddressMap } from "../utils/index.js";
@@ -402,7 +405,12 @@ class AbstractCreditAccountService extends SDKConstruct {
         (t) => this.prepareWithdrawToken(ca.creditFacade, t, 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, routerCloseResult, creditFacade: cm.creditFacade };
   }
   /**
@@ -432,7 +440,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -474,7 +482,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     tx.value = ethAmount.toString(10);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
@@ -525,7 +533,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       ]) : [],
       this.#prepareChangeDebt(creditAccount.creditFacade, change, isDecrease)
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -560,7 +568,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -676,7 +684,7 @@ class AbstractCreditAccountService extends SDKConstruct {
         averageQuota
       })
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -741,7 +749,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       compareBalances,
       ...quotaCalls
     ];
-    const tx = cm.creditFacade.multicall(creditAccount.creditAccount, calls);
+    const tx = await this.multicallTx(cm, creditAccount.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
   /**
@@ -768,48 +776,64 @@ class AbstractCreditAccountService extends SDKConstruct {
       ),
       ...this.#prepareEnableTokens(ca.creditFacade, enabledTokens)
     ];
-    const tx = cm.creditFacade.multicall(ca.creditAccount, calls);
+    const tx = await this.multicallTx(cm, ca.creditAccount, calls);
     return { tx, calls, creditFacade: cm.creditFacade };
   }
+  /**
+   * Returns address to which approval should be given on collateral token
+   * It's credit manager for classical markets and special wallet for KYC markets
+   * @param options - {@link GetApprovalAddressProps}
+   * @returns
+   **/
+  async getApprovalAddress(options) {
+    const { creditManager } = options;
+    const suite = this.sdk.marketRegister.findCreditManager(creditManager);
+    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+      if ("creditAccount" in options) {
+        return factory.getWallet(options.creditAccount);
+      }
+      return factory.precomputeWalletAddress(creditManager, options.borrower);
+    }
+    return suite.creditManager.address;
+  }
   /**
    * Executes swap specified by given calls, update quotas of affected tokens
-     - Open credit account is executed in the following order: price update -> increase debt -> add collateral ->
-      -> update quotas -> (optionally: execute swap path for trading/strategy) -> 
-      -> (optionally: withdraw debt for lending)
-    - Basic open credit account: price update -> increase debt -> add collateral -> update quotas
-    - Lending: price update -> increase debt -> add collateral -> update quotas -> withdraw debt
-    - Strategy/trading: price update -> increase debt -> add collateral -> update quotas -> execute swap path
-    - In strategy is possible situation when collateral is added, but not swapped; the only swapped value in this case will be debt
-   * @param {bigint} ethAmount - native token amount to attach to tx
-   * @param {Address} creditManager - address of credit manager to open credit account on
-   * @param {Array<Asset>} collateral - array of collateral which can be just directly added or swapped using the path {@link Asset}
-   * @param {Record<Address, PermitResult>} permits - permits of collateral tokens (in any permittable token is present) {@link PermitResult}
-   * @param {bigint} debt - debt to open credit account with
-   * @param {boolean} withdrawDebt - flag to withdraw debt to wallet after opening credit account; 
-      used for borrowing functionality
-   * @param {bigint} referralCode - referral code to open credit account with
-   * @param {Address} to - wallet address to transfer credit account to\
-   * @param {Array<MultiCall>} calls - array of MultiCall from router methods findOpenStrategyPath {@link MultiCall}.
-      Used for trading and strategy functionality
-   * @param {Array<Asset>} averageQuota - average quota for tokens after open {@link Asset}
-   * @param {Array<Asset>} minQuota - minimum quota for tokens after open  {@link Asset}
+   * - Open credit account is executed in the following order: price update -> increase debt -> add collateral ->
+   *  -> update quotas -> (optionally: execute swap path for trading/strategy) ->
+   *  -> (optionally: withdraw debt for lending)
+   *- Basic open credit account: price update -> increase debt -> add collateral -> update quotas
+   *- Lending: price update -> increase debt -> add collateral -> update quotas -> withdraw debt
+   *- Strategy/trading: price update -> increase debt -> add collateral -> update quotas -> execute swap path
+   *- In strategy is possible situation when collateral is added, but not swapped; the only swapped value in this case will be debt
    * @returns All necessary data to execute the transaction (call, credit facade)
-   */
-  async openCA({
-    ethAmount,
-    creditManager,
-    collateral,
-    permits,
-    debt,
-    withdrawDebt,
-    referralCode,
-    to,
-    calls: openPathCalls,
-    minQuota,
-    averageQuota
-  }) {
+   **/
+  async openCA(props) {
+    const {
+      ethAmount,
+      creditManager,
+      reopenCreditAccount,
+      collateral,
+      permits,
+      debt,
+      withdrawToken,
+      referralCode,
+      to,
+      calls: openPathCalls,
+      callsAfter,
+      minQuota,
+      averageQuota
+    } = props;
     const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
     const cm = cmSuite.creditManager;
+    let tokenToWithdraw;
+    if (withdrawToken === true) {
+      tokenToWithdraw = cm.underlying;
+    } else if (typeof withdrawToken === "string") {
+      tokenToWithdraw = withdrawToken;
+    }
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: cm.address,
       desiredQuotas: averageQuota
@@ -819,13 +843,27 @@ class AbstractCreditAccountService extends SDKConstruct {
       this.#prepareIncreaseDebt(cm.creditFacade, debt),
       ...this.prepareAddCollateral(cm.creditFacade, collateral, permits),
       ...openPathCalls,
-      ...withdrawDebt ? [this.prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : [],
+      // путь из underlying в withdrawal token
+      ...tokenToWithdraw ? [
+        this.prepareWithdrawToken(
+          cm.creditFacade,
+          tokenToWithdraw,
+          MAX_UINT256,
+          to
+        )
+      ] : [],
       ...this.prepareUpdateQuotas(cm.creditFacade, {
         minQuota,
         averageQuota
-      })
+      }),
+      ...callsAfter ?? []
     ];
-    const tx = cmSuite.creditFacade.openCreditAccount(to, calls, referralCode);
+    let tx;
+    if (reopenCreditAccount) {
+      tx = await this.multicallTx(cmSuite, reopenCreditAccount, calls);
+    } else {
+      tx = await this.openCreditAccountTx(cmSuite, to, calls, referralCode);
+    }
     tx.value = ethAmount.toString(10);
     return { calls, tx, creditFacade: cmSuite.creditFacade };
   }
@@ -1166,80 +1204,64 @@ class AbstractCreditAccountService extends SDKConstruct {
       VERSION_RANGE_310
     )[0];
   }
-}
-const iMellowClaimerAdapterAbi = [
-  {
-    type: "function",
-    name: "getMultiVaultSubvaultIndices",
-    inputs: [{ name: "multiVault", type: "address", internalType: "address" }],
-    outputs: [
-      {
-        name: "subvaultIndices",
-        type: "uint256[]",
-        internalType: "uint256[]"
-      },
-      {
-        name: "withdrawalIndices",
-        type: "uint256[][]",
-        internalType: "uint256[][]"
-      }
-    ],
-    stateMutability: "view"
-  },
-  {
-    type: "function",
-    name: "getUserSubvaultIndices",
-    inputs: [
-      { name: "multiVault", type: "address", internalType: "address" },
-      { name: "user", type: "address", internalType: "address" }
-    ],
-    outputs: [
-      {
-        name: "subvaultIndices",
-        type: "uint256[]",
-        internalType: "uint256[]"
-      },
-      {
-        name: "withdrawalIndices",
-        type: "uint256[][]",
-        internalType: "uint256[][]"
-      }
-    ],
-    stateMutability: "view"
-  },
-  {
-    type: "function",
-    name: "multiAccept",
-    inputs: [
-      { name: "multiVault", type: "address", internalType: "address" },
-      {
-        name: "subvaultIndices",
-        type: "uint256[]",
-        internalType: "uint256[]"
-      },
-      { name: "indices", type: "uint256[][]", internalType: "uint256[][]" }
-    ],
-    outputs: [{ name: "", type: "bool", internalType: "bool" }],
-    stateMutability: "nonpayable"
-  },
-  {
-    type: "function",
-    name: "multiAcceptAndClaim",
-    inputs: [
-      { name: "multiVault", type: "address", internalType: "address" },
-      {
-        name: "subvaultIndices",
-        type: "uint256[]",
-        internalType: "uint256[]"
-      },
-      { name: "indices", type: "uint256[][]", internalType: "uint256[][]" },
-      { name: "", type: "address", internalType: "address" },
-      { name: "maxAssets", type: "uint256", internalType: "uint256" }
-    ],
-    outputs: [{ name: "", type: "bool", internalType: "bool" }],
-    stateMutability: "nonpayable"
+  /**
+   * Wrapper that selects between credit facade and KYC factory
+   * @param suite
+   * @param to
+   * @param calls
+   * @param referralCode
+   * @returns
+   */
+  async openCreditAccountTx(suite, to, calls, referralCode) {
+    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+      const tokensToRegister = await factory.getDSTokens();
+      return factory.openCreditAccount(
+        suite.creditManager.address,
+        calls,
+        tokensToRegister
+      );
+    }
+    return suite.creditFacade.openCreditAccount(to, calls, referralCode ?? 0n);
+  }
+  /**
+   * Wrapper that selects between credit facade and KYC factory
+   * @param suite
+   * @param creditAccount
+   * @param calls
+   * @returns
+   */
+  async multicallTx(suite, creditAccount, calls) {
+    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      const tokensToRegister = [];
+      const factory = new SecuritizeKYCFactory(this.sdk, underlying.kycFactory);
+      return factory.multicall(creditAccount, calls, tokensToRegister);
+    }
+    return suite.creditFacade.multicall(creditAccount, calls);
+  }
+  /**
+   * Wrapper that selects between credit facade and KYC factory
+   * @param suite
+   * @param creditAccount
+   * @param calls
+   * @param operation
+   * @returns
+   */
+  async closeCreditAccountTx(suite, creditAccount, calls, operation) {
+    await this.sdk.tokensMeta.loadTokenData(suite.underlying);
+    const underlying = this.sdk.tokensMeta.mustGet(suite.underlying);
+    if (this.sdk.tokensMeta.isKYCUnderlying(underlying)) {
+      throw new Error(
+        "KYC underlying is not supported for close credit account"
+      );
+    }
+    return operation === "close" ? suite.creditFacade.closeCreditAccount(creditAccount, calls) : suite.creditFacade.multicall(creditAccount, calls);
   }
-];
+}
 export {
   AbstractCreditAccountService,
   getWithdrawalCompressorAddress

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 };
   }
   /**
@@ -115,7 +115,12 @@ class CreditAccountServiceV310 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 };
   }
   /**
@@ -186,7 +191,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/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() {