@gearbox-protocol/sdk 14.12.0-next.31 → 14.12.0-next.33

package/dist/esm/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -1,4 +1,8 @@
-import { AP_WETH_TOKEN, NO_VERSION } from "../../sdk/index.js";
+import {
+  AP_WETH_TOKEN,
+  MAX_UINT256,
+  NO_VERSION
+} from "../../sdk/index.js";
 import { classifyCloseOrRepay } from "./detectCloseOrRepay.js";
 import {
   replayMulticall
@@ -9,8 +13,13 @@ async function previewCloseOrRepayCreditAccount(input, operation, permanent, opt
   const market = sdk.marketRegister.findByCreditManager(
     operation.creditManager
   );
+  const exitTokens = [market.underlying];
+  const meta = sdk.tokensMeta.get(market.underlying);
+  if (meta && sdk.tokensMeta.isRWAUnderlying(meta)) {
+    exitTokens.push(meta.asset);
+  }
   const replay = await replayMulticall(sdk, operation, options);
-  const kind = classifyCloseOrRepay(operation.multicall, market.underlying);
+  const kind = classifyCloseOrRepay(operation.multicall, exitTokens);
   return kind === "close" ? previewCloseCreditAccount(input, operation, permanent, replay) : previewRepayCreditAccount(input, operation, permanent, replay);
 }
 function previewCloseCreditAccount(input, operation, permanent, replay) {
@@ -19,6 +28,13 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
     operation.creditManager
   );
   const { after, error } = replay;
+  let receivedToken = market.underlying;
+  for (const m of operation.multicall) {
+    if (m.operation === "WithdrawCollateral" && m.amount === MAX_UINT256) {
+      receivedToken = m.token;
+      break;
+    }
+  }
   return {
     operation: "CloseCreditAccount",
     permanent,
@@ -26,7 +42,10 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
     creditAccount: operation.creditAccount,
     // On a malformed multicall the withdrawn amount depends on best-effort
     // replayed balances and may be unreliable
-    receivedAmount: after.collateralWithdrawn.getOrZero(market.underlying),
+    receivedAmount: {
+      token: receivedToken,
+      balance: after.collateralWithdrawn.getOrZero(receivedToken)
+    },
     error
   };
 }

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/dev/withdrawalAbi.d.ts

@@ -9,13 +9,13 @@ export declare const midasGatewayAbi: readonly [{
         readonly type: "address";
         readonly internalType: "address";
     }, {
-        readonly name: "_accessControl";
+        readonly name: "_quoteToken";
         readonly type: "address";
         readonly internalType: "address";
     }, {
-        readonly name: "_transferMaster";
-        readonly type: "address";
-        readonly internalType: "address";
+        readonly name: "_isAccessControlled";
+        readonly type: "bool";
+        readonly internalType: "bool";
     }, {
         readonly name: "_allowedMarketConfigurator";
         readonly type: "address";
@@ -32,6 +32,10 @@ export declare const midasGatewayAbi: readonly [{
         readonly name: "_redemptionLogger";
         readonly type: "address";
         readonly internalType: "address";
+    }, {
+        readonly name: "_withDelayedWithdrawals";
+        readonly type: "bool";
+        readonly internalType: "bool";
     }];
     readonly stateMutability: "nonpayable";
 }, {
@@ -78,10 +82,6 @@ export declare const midasGatewayAbi: readonly [{
     readonly type: "function";
     readonly name: "depositInstant";
     readonly inputs: readonly [{
-        readonly name: "tokenIn";
-        readonly type: "address";
-        readonly internalType: "address";
-    }, {
         readonly name: "amountToken";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -153,10 +153,6 @@ export declare const midasGatewayAbi: readonly [{
         readonly name: "account";
         readonly type: "address";
         readonly internalType: "address";
-    }, {
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
     }];
     readonly outputs: readonly [{
         readonly name: "pendingAmount";
@@ -184,12 +180,28 @@ export declare const midasGatewayAbi: readonly [{
     readonly stateMutability: "view";
 }, {
     readonly type: "function";
-    readonly name: "redeemInstant";
-    readonly inputs: readonly [{
-        readonly name: "tokenOut";
+    readonly name: "phantomToken";
+    readonly inputs: readonly [];
+    readonly outputs: readonly [{
+        readonly name: "";
         readonly type: "address";
         readonly internalType: "address";
-    }, {
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly name: "quoteToken";
+    readonly inputs: readonly [];
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly type: "address";
+        readonly internalType: "address";
+    }];
+    readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly name: "redeemInstant";
+    readonly inputs: readonly [{
         readonly name: "amountMTokenIn";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -214,10 +226,6 @@ export declare const midasGatewayAbi: readonly [{
     readonly type: "function";
     readonly name: "requestRedeem";
     readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }, {
         readonly name: "amountMTokenIn";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -266,10 +274,6 @@ export declare const midasGatewayAbi: readonly [{
     readonly type: "function";
     readonly name: "withdraw";
     readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }, {
         readonly name: "amount";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -283,10 +287,6 @@ export declare const midasGatewayAbi: readonly [{
         readonly name: "redeemer";
         readonly type: "address";
         readonly internalType: "address";
-    }, {
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
     }, {
         readonly name: "amount";
         readonly type: "uint256";
@@ -302,6 +302,10 @@ export declare const midasGatewayAbi: readonly [{
     readonly type: "error";
     readonly name: "CreditAccountNotEligibleException";
     readonly inputs: readonly [];
+}, {
+    readonly type: "error";
+    readonly name: "IncompatibleAccessControlsException";
+    readonly inputs: readonly [];
 }, {
     readonly type: "error";
     readonly name: "IncompatibleIssuanceAndRedemptionVaultsException";
@@ -333,6 +337,10 @@ export declare const midasRedeemerAbi: readonly [{
         readonly name: "_midasRedemptionVault";
         readonly type: "address";
         readonly internalType: "address";
+    }, {
+        readonly name: "_quoteToken";
+        readonly type: "address";
+        readonly internalType: "address";
     }];
     readonly stateMutability: "nonpayable";
 }, {
@@ -358,11 +366,7 @@ export declare const midasRedeemerAbi: readonly [{
 }, {
     readonly type: "function";
     readonly name: "claimableTokenOutAmount";
-    readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }];
+    readonly inputs: readonly [];
     readonly outputs: readonly [{
         readonly name: "";
         readonly type: "uint256";
@@ -432,17 +436,23 @@ export declare const midasRedeemerAbi: readonly [{
 }, {
     readonly type: "function";
     readonly name: "pendingTokenOutAmount";
-    readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }];
+    readonly inputs: readonly [];
     readonly outputs: readonly [{
         readonly name: "";
         readonly type: "uint256";
         readonly internalType: "uint256";
     }];
     readonly stateMutability: "view";
+}, {
+    readonly type: "function";
+    readonly name: "quoteToken";
+    readonly inputs: readonly [];
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly type: "address";
+        readonly internalType: "address";
+    }];
+    readonly stateMutability: "view";
 }, {
     readonly type: "function";
     readonly name: "redemptionStartTimestamp";
@@ -467,10 +477,6 @@ export declare const midasRedeemerAbi: readonly [{
     readonly type: "function";
     readonly name: "requestRedeem";
     readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }, {
         readonly name: "amountMTokenIn";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -491,10 +497,6 @@ export declare const midasRedeemerAbi: readonly [{
     readonly type: "function";
     readonly name: "withdraw";
     readonly inputs: readonly [{
-        readonly name: "tokenOut";
-        readonly type: "address";
-        readonly internalType: "address";
-    }, {
         readonly name: "amount";
         readonly type: "uint256";
         readonly internalType: "uint256";
@@ -529,7 +531,11 @@ export declare const midasRedemptionVaultPhantomTokenAbi: readonly [{
         readonly type: "address";
         readonly internalType: "address";
     }, {
-        readonly name: "_tokenOut";
+        readonly name: "_mToken";
+        readonly type: "address";
+        readonly internalType: "address";
+    }, {
+        readonly name: "_quoteToken";
         readonly type: "address";
         readonly internalType: "address";
     }];
@@ -658,16 +664,6 @@ export declare const midasRedemptionVaultPhantomTokenAbi: readonly [{
         readonly internalType: "string";
     }];
     readonly stateMutability: "view";
-}, {
-    readonly type: "function";
-    readonly name: "tokenOut";
-    readonly inputs: readonly [];
-    readonly outputs: readonly [{
-        readonly name: "";
-        readonly type: "address";
-        readonly internalType: "address";
-    }];
-    readonly stateMutability: "view";
 }, {
     readonly type: "function";
     readonly name: "totalSupply";