@gearbox-protocol/sdk 14.12.0-next.30 → 14.12.0-next.32

package/dist/cjs/preview/preview/buildDelayedPreview.js

@@ -22,70 +22,106 @@ __export(buildDelayedPreview_exports, {
 });
 module.exports = __toCommonJS(buildDelayedPreview_exports);
 var import_viem = require("viem");
+var import_common_utils = require("../../common-utils/index.js");
 var import_sdk = require("../../sdk/index.js");
 var import_types = require("./types.js");
-function buildDelayedPreview(state, before, detected, convert) {
+function buildDelayedPreview(afterInstant, before, detected, convert) {
   const { request, intent } = detected;
-  const post = state.clone();
+  const post = afterInstant.clone();
+  const converter = makeSafeConverter(convert);
+  const claimed = applyClaim(post, request);
+  const collateralWithdrawn = new import_sdk.AssetsMap();
+  switch (intent?.type) {
+    case "CLOSE_ACCOUNT":
+      return buildClosePreview(post, converter);
+    case "DECREASE_LEVERAGE":
+      repayFromClaim(post, request.claimToken, converter.convert, claimed);
+      break;
+    case "WITHDRAW_COLLATERAL": {
+      const withdrawn = import_common_utils.BigIntMath.min(
+        intent.withdrawAmount,
+        post.balances.getOrZero(intent.withdrawToken)
+      );
+      if (withdrawn > 0n) {
+        post.balances.dec(intent.withdrawToken, withdrawn);
+        collateralWithdrawn.upsert(intent.withdrawToken, withdrawn);
+      }
+      const claimSpentOnWithdrawal = (0, import_viem.isAddressEqual)(
+        intent.withdrawToken,
+        request.claimToken
+      ) ? withdrawn : 0n;
+      repayFromClaim(
+        post,
+        request.claimToken,
+        converter.convert,
+        import_common_utils.BigIntMath.max(claimed - claimSpentOnWithdrawal, 0n)
+      );
+      break;
+    }
+    default:
+      break;
+  }
+  return buildAdjustPreview(post, before, collateralWithdrawn, converter);
+}
+function makeSafeConverter(convert) {
   let error;
-  const safeConvert = (token, to, amount) => {
-    try {
-      return convert(token, to, amount);
-    } catch {
-      error ??= {
-        code: import_types.ERROR_UNPRICEABLE_TOKEN,
-        message: `cannot price token ${token}`
-      };
-      return 0n;
+  return {
+    convert: (token, to, amount) => {
+      try {
+        return convert(token, to, amount);
+      } catch {
+        error ??= {
+          code: import_types.ERROR_UNPRICEABLE_TOKEN,
+          message: `cannot price token ${token}`
+        };
+        return 0n;
+      }
+    },
+    get error() {
+      return error;
     }
   };
+}
+function applyClaim(post, request) {
   const claimed = post.balances.getOrZero(request.phantomToken);
   post.balances.upsert(request.phantomToken, 0n);
   post.quotas.upsert(request.phantomToken, 0n);
   post.balances.inc(request.claimToken, claimed);
-  if (intent?.type === "CLOSE_ACCOUNT") {
-    const totalValue2 = post.balances.sum(
-      (token, balance) => balance > 0n ? safeConvert(token, post.underlying, balance) : 0n
-    );
-    const receivedAmount = totalValue2 > post.totalDebt ? totalValue2 - post.totalDebt : 0n;
-    const preview2 = {
-      operation: "CloseCreditAccount",
-      permanent: true,
-      creditManager: post.creditManager,
-      creditAccount: post.creditAccount,
-      receivedAmount,
-      error
-    };
-    return preview2;
+  return claimed;
+}
+function repayFromClaim(post, claimToken, convert, amount) {
+  const spent = import_common_utils.BigIntMath.min(amount, post.balances.getOrZero(claimToken));
+  if (spent <= 0n) {
+    return;
   }
-  const collateralWithdrawn = new import_sdk.AssetsMap();
-  const repayFromClaim = (amount) => {
-    const available = post.balances.getOrZero(request.claimToken);
-    const spent = amount > available ? available : amount;
-    if (spent <= 0n) {
-      return;
-    }
-    const received = safeConvert(request.claimToken, post.underlying, spent);
-    post.balances.dec(request.claimToken, spent);
-    post.balances.inc(post.underlying, received);
-    post.repay(received);
+  const received = convert(claimToken, post.underlying, spent);
+  post.balances.dec(claimToken, spent);
+  post.balances.inc(post.underlying, received);
+  post.repay(received);
+}
+function totalValueInUnderlying(post, convert, dust) {
+  return post.balances.sum(
+    (token, balance) => balance > dust ? convert(token, post.underlying, balance) : 0n
+  );
+}
+function buildClosePreview(post, converter) {
+  const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
+  return {
+    operation: "CloseCreditAccount",
+    permanent: false,
+    creditManager: post.creditManager,
+    creditAccount: post.creditAccount,
+    receivedAmount: import_common_utils.BigIntMath.max(totalValue - post.totalDebt, 0n),
+    error: converter.error
   };
-  if (intent?.type === "DECREASE_LEVERAGE") {
-    repayFromClaim(claimed);
-  } else if (intent?.type === "WITHDRAW_COLLATERAL") {
-    const running = post.balances.getOrZero(intent.withdrawToken);
-    const withdrawn = intent.withdrawAmount > running ? running : intent.withdrawAmount;
-    if (withdrawn > 0n) {
-      post.balances.dec(intent.withdrawToken, withdrawn);
-      collateralWithdrawn.upsert(intent.withdrawToken, withdrawn);
-    }
-    const remainingClaim = (0, import_viem.isAddressEqual)(intent.withdrawToken, request.claimToken) && claimed > withdrawn ? claimed - withdrawn : claimed;
-    repayFromClaim(remainingClaim);
-  }
-  const totalValue = post.balances.sum(
-    (token, balance) => balance > import_types.PREVIEW_DUST ? safeConvert(token, post.underlying, balance) : 0n
+}
+function buildAdjustPreview(post, before, collateralWithdrawn, converter) {
+  const totalValue = totalValueInUnderlying(
+    post,
+    converter.convert,
+    import_types.PREVIEW_DUST
   );
-  const preview = {
+  return {
     operation: "AdjustCreditAccount",
     creditManager: post.creditManager,
     creditAccount: post.creditAccount,
@@ -101,9 +137,8 @@ function buildDelayedPreview(state, before, detected, convert) {
     quotasChange: post.quotas.difference(before.quotas).toAssets(),
     assets: post.balances.toAssets(import_types.PREVIEW_DUST),
     assetsChange: post.balances.difference(before.balances).toAssets(import_types.PREVIEW_DUST),
-    error
+    error: converter.error
   };
-  return preview;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/rewards/rewards/extra-apy.js

@@ -50,23 +50,27 @@ function getKeyForPoolPointsInfo(i) {
 class PoolPointsAPI {
   constructor() {
   }
+  static defaultBackendUrl = "https://api.gearbox.foundation";
   static async getTotalTokensOnProtocol({
     tokensToCheck,
     tokensList,
-    network
+    network,
+    backendUrl = PoolPointsAPI.defaultBackendUrl
   }) {
     const list = [...new Set(tokensToCheck)];
     const res = await Promise.allSettled(
-      list.map((t) => PoolPointsAPI.getTokenTotal(t, network, tokensList))
+      list.map(
+        (t) => PoolPointsAPI.getTokenTotal(t, network, tokensList, backendUrl)
+      )
     );
     return res.map((r, i) => [
       list[i],
       r
     ]);
   }
-  static async getTokenTotal(token, network, tokensList) {
+  static async getTokenTotal(token, network, tokensList, backendUrl) {
     const chainId = import_sdk.chains[network]?.id;
-    const url = `https://api.gearbox.foundation/v1/getBalanceAt?asset=${token}&chainId=${chainId}`;
+    const url = `${backendUrl}/v1/getBalanceAt?asset=${token}&chainId=${chainId}`;
     const result = await import_axios.default.get(url);
     const balance = result.data.result.reduce(
       (sum, r) => r.effective_balance + sum,

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

@@ -620,10 +620,12 @@ class CreditAccountsServiceV310 extends import_base.SDKConstruct {
     assetsToWithdraw,
     to
   }) {
+    const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
     return [
       ...routerCalls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
+      ...unwrapCalls,
       ...assetsToWithdraw.map(
         (t) => this.#prepareWithdrawToken(ca.creditFacade, t, import_constants.MAX_UINT256, to)
       )

package/dist/esm/preview/preview/buildDelayedPreview.js

@@ -1,71 +1,107 @@
 import { isAddressEqual } from "viem";
+import { BigIntMath } from "../../common-utils/index.js";
 import { AssetsMap } from "../../sdk/index.js";
 import {
   ERROR_UNPRICEABLE_TOKEN,
   PREVIEW_DUST
 } from "./types.js";
-function buildDelayedPreview(state, before, detected, convert) {
+function buildDelayedPreview(afterInstant, before, detected, convert) {
   const { request, intent } = detected;
-  const post = state.clone();
+  const post = afterInstant.clone();
+  const converter = makeSafeConverter(convert);
+  const claimed = applyClaim(post, request);
+  const collateralWithdrawn = new AssetsMap();
+  switch (intent?.type) {
+    case "CLOSE_ACCOUNT":
+      return buildClosePreview(post, converter);
+    case "DECREASE_LEVERAGE":
+      repayFromClaim(post, request.claimToken, converter.convert, claimed);
+      break;
+    case "WITHDRAW_COLLATERAL": {
+      const withdrawn = BigIntMath.min(
+        intent.withdrawAmount,
+        post.balances.getOrZero(intent.withdrawToken)
+      );
+      if (withdrawn > 0n) {
+        post.balances.dec(intent.withdrawToken, withdrawn);
+        collateralWithdrawn.upsert(intent.withdrawToken, withdrawn);
+      }
+      const claimSpentOnWithdrawal = isAddressEqual(
+        intent.withdrawToken,
+        request.claimToken
+      ) ? withdrawn : 0n;
+      repayFromClaim(
+        post,
+        request.claimToken,
+        converter.convert,
+        BigIntMath.max(claimed - claimSpentOnWithdrawal, 0n)
+      );
+      break;
+    }
+    default:
+      break;
+  }
+  return buildAdjustPreview(post, before, collateralWithdrawn, converter);
+}
+function makeSafeConverter(convert) {
   let error;
-  const safeConvert = (token, to, amount) => {
-    try {
-      return convert(token, to, amount);
-    } catch {
-      error ??= {
-        code: ERROR_UNPRICEABLE_TOKEN,
-        message: `cannot price token ${token}`
-      };
-      return 0n;
+  return {
+    convert: (token, to, amount) => {
+      try {
+        return convert(token, to, amount);
+      } catch {
+        error ??= {
+          code: ERROR_UNPRICEABLE_TOKEN,
+          message: `cannot price token ${token}`
+        };
+        return 0n;
+      }
+    },
+    get error() {
+      return error;
     }
   };
+}
+function applyClaim(post, request) {
   const claimed = post.balances.getOrZero(request.phantomToken);
   post.balances.upsert(request.phantomToken, 0n);
   post.quotas.upsert(request.phantomToken, 0n);
   post.balances.inc(request.claimToken, claimed);
-  if (intent?.type === "CLOSE_ACCOUNT") {
-    const totalValue2 = post.balances.sum(
-      (token, balance) => balance > 0n ? safeConvert(token, post.underlying, balance) : 0n
-    );
-    const receivedAmount = totalValue2 > post.totalDebt ? totalValue2 - post.totalDebt : 0n;
-    const preview2 = {
-      operation: "CloseCreditAccount",
-      permanent: true,
-      creditManager: post.creditManager,
-      creditAccount: post.creditAccount,
-      receivedAmount,
-      error
-    };
-    return preview2;
+  return claimed;
+}
+function repayFromClaim(post, claimToken, convert, amount) {
+  const spent = BigIntMath.min(amount, post.balances.getOrZero(claimToken));
+  if (spent <= 0n) {
+    return;
   }
-  const collateralWithdrawn = new AssetsMap();
-  const repayFromClaim = (amount) => {
-    const available = post.balances.getOrZero(request.claimToken);
-    const spent = amount > available ? available : amount;
-    if (spent <= 0n) {
-      return;
-    }
-    const received = safeConvert(request.claimToken, post.underlying, spent);
-    post.balances.dec(request.claimToken, spent);
-    post.balances.inc(post.underlying, received);
-    post.repay(received);
+  const received = convert(claimToken, post.underlying, spent);
+  post.balances.dec(claimToken, spent);
+  post.balances.inc(post.underlying, received);
+  post.repay(received);
+}
+function totalValueInUnderlying(post, convert, dust) {
+  return post.balances.sum(
+    (token, balance) => balance > dust ? convert(token, post.underlying, balance) : 0n
+  );
+}
+function buildClosePreview(post, converter) {
+  const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
+  return {
+    operation: "CloseCreditAccount",
+    permanent: false,
+    creditManager: post.creditManager,
+    creditAccount: post.creditAccount,
+    receivedAmount: BigIntMath.max(totalValue - post.totalDebt, 0n),
+    error: converter.error
   };
-  if (intent?.type === "DECREASE_LEVERAGE") {
-    repayFromClaim(claimed);
-  } else if (intent?.type === "WITHDRAW_COLLATERAL") {
-    const running = post.balances.getOrZero(intent.withdrawToken);
-    const withdrawn = intent.withdrawAmount > running ? running : intent.withdrawAmount;
-    if (withdrawn > 0n) {
-      post.balances.dec(intent.withdrawToken, withdrawn);
-      collateralWithdrawn.upsert(intent.withdrawToken, withdrawn);
-    }
-    const remainingClaim = isAddressEqual(intent.withdrawToken, request.claimToken) && claimed > withdrawn ? claimed - withdrawn : claimed;
-    repayFromClaim(remainingClaim);
-  }
-  const totalValue = post.balances.sum(
-    (token, balance) => balance > PREVIEW_DUST ? safeConvert(token, post.underlying, balance) : 0n
+}
+function buildAdjustPreview(post, before, collateralWithdrawn, converter) {
+  const totalValue = totalValueInUnderlying(
+    post,
+    converter.convert,
+    PREVIEW_DUST
   );
-  const preview = {
+  return {
     operation: "AdjustCreditAccount",
     creditManager: post.creditManager,
     creditAccount: post.creditAccount,
@@ -81,9 +117,8 @@ function buildDelayedPreview(state, before, detected, convert) {
     quotasChange: post.quotas.difference(before.quotas).toAssets(),
     assets: post.balances.toAssets(PREVIEW_DUST),
     assetsChange: post.balances.difference(before.balances).toAssets(PREVIEW_DUST),
-    error
+    error: converter.error
   };
-  return preview;
 }
 export {
   buildDelayedPreview

package/dist/esm/rewards/rewards/extra-apy.js

@@ -20,23 +20,27 @@ function getKeyForPoolPointsInfo(i) {
 class PoolPointsAPI {
   constructor() {
   }
+  static defaultBackendUrl = "https://api.gearbox.foundation";
   static async getTotalTokensOnProtocol({
     tokensToCheck,
     tokensList,
-    network
+    network,
+    backendUrl = PoolPointsAPI.defaultBackendUrl
   }) {
     const list = [...new Set(tokensToCheck)];
     const res = await Promise.allSettled(
-      list.map((t) => PoolPointsAPI.getTokenTotal(t, network, tokensList))
+      list.map(
+        (t) => PoolPointsAPI.getTokenTotal(t, network, tokensList, backendUrl)
+      )
     );
     return res.map((r, i) => [
       list[i],
       r
     ]);
   }
-  static async getTokenTotal(token, network, tokensList) {
+  static async getTokenTotal(token, network, tokensList, backendUrl) {
     const chainId = chains[network]?.id;
-    const url = `https://api.gearbox.foundation/v1/getBalanceAt?asset=${token}&chainId=${chainId}`;
+    const url = `${backendUrl}/v1/getBalanceAt?asset=${token}&chainId=${chainId}`;
     const result = await axios.get(url);
     const balance = result.data.result.reduce(
       (sum, r) => r.effective_balance + sum,

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

@@ -616,10 +616,12 @@ class CreditAccountsServiceV310 extends SDKConstruct {
     assetsToWithdraw,
     to
   }) {
+    const unwrapCalls = await this.getRedeemDiffCalls(1n, ca.creditManager) ?? [];
     return [
       ...routerCalls,
       ...this.#prepareDisableQuotas(ca),
       ...this.#prepareDecreaseDebt(ca),
+      ...unwrapCalls,
       ...assetsToWithdraw.map(
         (t) => this.#prepareWithdrawToken(ca.creditFacade, t, MAX_UINT256, to)
       )

package/dist/types/preview/preview/buildDelayedPreview.d.ts

@@ -31,11 +31,12 @@ export type ConvertFn = (token: Address, to: Address, amount: bigint) => bigint;
  *
  * The changes (`debtChange`, `quotasChange`, `assetsChange`) are reported
  * relative to the account state before the whole transaction, not the
- * post-instant state: to the user the delayed preview answers "where will
+ * post-instant-part state: to the user the delayed preview answers "where will
  * the account end up compared to now", so the transient phantom token
  * (minted by the instant part, burned by the claim) nets out to nothing.
  *
- * @param state - Account state after the instant part of the transaction.
+ * @param afterInstant - Account state after the instant part of the
+ * transaction.
  * @param before - Account state before the transaction (the diff base).
  */
-export declare function buildDelayedPreview(state: CreditAccountState, before: CreditAccountState, detected: DetectedDelayedOperation, convert: ConvertFn): InstantOperationPreview;
+export declare function buildDelayedPreview(afterInstant: CreditAccountState, before: CreditAccountState, detected: DetectedDelayedOperation, convert: ConvertFn): InstantOperationPreview;

package/dist/types/rewards/rewards/extra-apy.d.ts

@@ -12,6 +12,7 @@ export interface GetTotalTokensOnProtocolProps {
     tokensToCheck: Array<Address>;
     tokensList: Record<Address, TokenData>;
     network: NetworkType;
+    backendUrl?: string;
 }
 export type PoolPointsBase = Record<Address, Array<{
     key: string;
@@ -21,7 +22,8 @@ export type PoolPointsBase = Record<Address, Array<{
 export declare function getKeyForPoolPointsInfo(i: PoolPointsInfo<string>): string;
 export declare class PoolPointsAPI {
     private constructor();
-    static getTotalTokensOnProtocol({ tokensToCheck, tokensList, network, }: GetTotalTokensOnProtocolProps): Promise<[`0x${string}`, PromiseSettledResult<Asset>][]>;
+    private static defaultBackendUrl;
+    static getTotalTokensOnProtocol({ tokensToCheck, tokensList, network, backendUrl, }: GetTotalTokensOnProtocolProps): Promise<[`0x${string}`, PromiseSettledResult<Asset>][]>;
     private static getTokenTotal;
     static getPointsByPool({ poolRewards, totalTokenBalances, pools, tokensList, }: GetPointsByPoolProps): PoolPointsBase;
     private static getPoolTokenPoints;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "14.12.0-next.30",
+  "version": "14.12.0-next.32",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {