@gearbox-protocol/sdk 10.2.2 → 10.2.4

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

@@ -315,6 +315,7 @@ class AbstractCreditAccountService extends import_base.SDKConstruct {
       creditManager: ca.creditManager,
       creditAccount: ca
     });
+    console.log("CLOSE", this.sdk.parseMultiCall(routerCloseResult.calls));
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...routerCloseResult.calls,

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

@@ -97,15 +97,18 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     assetsToWithdraw,
     creditAccount: ca,
     permits,
-    to
+    to,
+    tokensToClaim
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca
     });
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
       creditAccount: ca
@@ -132,14 +135,17 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     assetsToWithdraw,
     creditAccount: ca,
     permits,
-    to
+    to,
+    tokensToClaim
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca
     });
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
       creditAccount: ca
@@ -167,12 +173,14 @@ class CreditAccountServiceV310 extends import_AbstractCreditAccountsService.Abst
     calls: legacyCalls,
     creditAccount: ca,
     minQuota,
-    averageQuota
+    averageQuota,
+    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
     });
     if (claimPath.calls.length === 0) throw new Error("No path to execute");

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -146,7 +146,7 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
    * Implements {@link IRouterContract.findClaimAllRewards}
    */
   async findClaimAllRewards(props) {
-    const tData = props.creditAccount.tokens.map((a) => ({
+    const tData = props.tokensToClaim.map((a) => ({
       balance: 0n,
       claimRewards: true,
       leftoverBalance: 0n,

package/dist/cjs/sdk/utils/formatter.js

@@ -21,13 +21,11 @@ __export(formatter_exports, {
   fmtBinaryMask: () => fmtBinaryMask,
   formatBN: () => formatBN,
   formatBNvalue: () => formatBNvalue,
-  formatBn4dig: () => formatBn4dig,
   formatDuration: () => formatDuration,
   formatNumberToString_: () => formatNumberToString_,
   numberWithCommas: () => numberWithCommas,
   percentFmt: () => percentFmt,
-  toBigInt: () => toBigInt,
-  toHumanFormat: () => toHumanFormat
+  toBigInt: () => toBigInt
 });
 module.exports = __toCommonJS(formatter_exports);
 var import_date_fns = require("date-fns");
@@ -79,6 +77,9 @@ const limitNum = (n, d = 18) => {
   }
 };
 function toHumanFormat(num, precision = 2) {
+  if (num >= BigInt(1e18)) {
+    return `${formatBn4dig(num / BigInt(1e12), precision)}T`;
+  }
   if (num >= BigInt(1e15)) {
     return `${formatBn4dig(num / BigInt(1e9), precision)}Bn`;
   }
@@ -125,11 +126,9 @@ function formatNumberToString_(value) {
   fmtBinaryMask,
   formatBN,
   formatBNvalue,
-  formatBn4dig,
   formatDuration,
   formatNumberToString_,
   numberWithCommas,
   percentFmt,
-  toBigInt,
-  toHumanFormat
+  toBigInt
 });

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

@@ -306,6 +306,7 @@ class AbstractCreditAccountService extends SDKConstruct {
       creditManager: ca.creditManager,
       creditAccount: ca
     });
+    console.log("CLOSE", this.sdk.parseMultiCall(routerCloseResult.calls));
     const calls = [
       ...operation === "close" ? [] : priceUpdates,
       ...routerCloseResult.calls,

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

@@ -74,15 +74,18 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     assetsToWithdraw,
     creditAccount: ca,
     permits,
-    to
+    to,
+    tokensToClaim
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const addCollateral = collateralAssets.filter((a) => a.balance > 0);
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca
     });
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
       creditAccount: ca
@@ -109,14 +112,17 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     assetsToWithdraw,
     creditAccount: ca,
     permits,
-    to
+    to,
+    tokensToClaim
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const router = this.sdk.routerFor(ca);
     const claimPath = await router.findClaimAllRewards({
       calls: [],
+      tokensToClaim,
       creditAccount: ca
     });
+    console.log("claimPath", this.sdk.parseMultiCall(claimPath.calls));
     const priceUpdates = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
       creditAccount: ca
@@ -144,12 +150,14 @@ class CreditAccountServiceV310 extends AbstractCreditAccountService {
     calls: legacyCalls,
     creditAccount: ca,
     minQuota,
-    averageQuota
+    averageQuota,
+    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
     });
     if (claimPath.calls.length === 0) throw new Error("No path to execute");

package/dist/esm/sdk/router/RouterV310Contract.js

@@ -123,7 +123,7 @@ class RouterV310Contract extends AbstractRouterContract {
    * Implements {@link IRouterContract.findClaimAllRewards}
    */
   async findClaimAllRewards(props) {
-    const tData = props.creditAccount.tokens.map((a) => ({
+    const tData = props.tokensToClaim.map((a) => ({
       balance: 0n,
       claimRewards: true,
       leftoverBalance: 0n,

package/dist/esm/sdk/utils/formatter.js

@@ -47,6 +47,9 @@ const limitNum = (n, d = 18) => {
   }
 };
 function toHumanFormat(num, precision = 2) {
+  if (num >= BigInt(1e18)) {
+    return `${formatBn4dig(num / BigInt(1e12), precision)}T`;
+  }
   if (num >= BigInt(1e15)) {
     return `${formatBn4dig(num / BigInt(1e9), precision)}Bn`;
   }
@@ -92,11 +95,9 @@ export {
   fmtBinaryMask,
   formatBN,
   formatBNvalue,
-  formatBn4dig,
   formatDuration,
   formatNumberToString_,
   numberWithCommas,
   percentFmt,
-  toBigInt,
-  toHumanFormat
+  toBigInt
 };

package/dist/types/sdk/accounts/CreditAccountsServiceV310.d.ts

@@ -12,13 +12,13 @@ export declare class CreditAccountServiceV310 extends AbstractCreditAccountServi
     /**
      * Implements {@link ICreditAccountsService.repayCreditAccount}
      */
-    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
+    repayCreditAccount({ operation, collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, }: RepayCreditAccountProps): Promise<CreditAccountOperationResult>;
     /**
      * Implements {@link ICreditAccountsService.repayAndLiquidateCreditAccount}
      */
-    repayAndLiquidateCreditAccount({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, }: RepayAndLiquidateCreditAccountProps): Promise<CreditAccountOperationResult>;
+    repayAndLiquidateCreditAccount({ collateralAssets, assetsToWithdraw, creditAccount: ca, permits, to, tokensToClaim, }: RepayAndLiquidateCreditAccountProps): Promise<CreditAccountOperationResult>;
     /**
      * Implements {@link ICreditAccountsService.claimFarmRewards}
      */
-    claimFarmRewards({ calls: legacyCalls, creditAccount: ca, minQuota, averageQuota, }: ClaimFarmRewardsProps): Promise<CreditAccountOperationResult>;
+    claimFarmRewards({ calls: legacyCalls, creditAccount: ca, minQuota, averageQuota, tokensToClaim, }: ClaimFarmRewardsProps): Promise<CreditAccountOperationResult>;
 }

package/dist/types/sdk/accounts/types.d.ts

@@ -108,6 +108,7 @@ export interface RepayAndLiquidateCreditAccountProps {
      * permits of tokens to withdraw (in any permittable token is present)
      */
     permits: Record<string, PermitResult>;
+    tokensToClaim: Asset[];
 }
 export interface PrepareUpdateQuotasProps {
     /**
@@ -222,6 +223,7 @@ export interface ClaimFarmRewardsProps extends PrepareUpdateQuotasProps {
      * minimal credit account data on which operation is performed
      */
     creditAccount: RouterCASlice;
+    tokensToClaim: Asset[];
 }
 export interface EnableTokensProps {
     /**

package/dist/types/sdk/router/types.d.ts

@@ -180,6 +180,10 @@ export interface FindClaimAllRewardsProps {
      * Minimal credit account data on which operation is performed
      */
     creditAccount: RouterCASlice;
+    /**
+     * List of token rewards of which we want to claim and swap to underlying token during closing ca process
+     */
+    tokensToClaim: Array<Asset>;
     /**
      * Legacy property - array of MultiCall from getRewards
      */

package/dist/types/sdk/utils/formatter.d.ts

@@ -5,8 +5,6 @@ export declare const toBigInt: (v: string | number | bigint | {
 export declare const percentFmt: (v: number | bigint | string, raw?: boolean) => string;
 export declare function formatBNvalue(num: number | bigint | string | undefined, decimals: number, precision?: number, raw?: boolean): string;
 export declare function formatBN(num: number | bigint | string | undefined, decimals: number, precision?: number): string;
-export declare function toHumanFormat(num: bigint, precision?: number): string;
-export declare function formatBn4dig(num: bigint, precision?: number): string;
 export declare function fmtBinaryMask(mask: bigint): string;
 export declare function numberWithCommas(x: number | bigint): string;
 export declare function formatDuration(seconds: number, raw?: boolean): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "10.2.2",
+  "version": "10.2.4",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",