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

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

@@ -5,7 +5,7 @@ import {
   ERROR_UNPRICEABLE_TOKEN,
   PREVIEW_DUST
 } from "./types.js";
-function buildDelayedPreview(afterInstant, before, detected, convert) {
+function buildDelayedPreview(afterInstant, before, detected, convert, receivedToken) {
   const { request, intent } = detected;
   const post = afterInstant.clone();
   const converter = makeSafeConverter(convert);
@@ -13,7 +13,7 @@ function buildDelayedPreview(afterInstant, before, detected, convert) {
   const collateralWithdrawn = new AssetsMap();
   switch (intent?.type) {
     case "CLOSE_ACCOUNT":
-      return buildClosePreview(post, converter);
+      return buildClosePreview(post, converter, receivedToken);
     case "DECREASE_LEVERAGE":
       repayFromClaim(post, request.claimToken, converter.convert, claimed);
       break;
@@ -84,14 +84,19 @@ function totalValueInUnderlying(post, convert, dust) {
     (token, balance) => balance > dust ? convert(token, post.underlying, balance) : 0n
   );
 }
-function buildClosePreview(post, converter) {
+function buildClosePreview(post, converter, receivedToken) {
   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),
+    // Oracle estimate computed in the underlying; RWA underlyings convert
+    // 1:1 with their vault asset, so the amount holds for `receivedToken`
+    receivedAmount: {
+      token: receivedToken,
+      balance: BigIntMath.max(totalValue - post.totalDebt, 0n)
+    },
     error: converter.error
   };
 }

package/dist/esm/preview/preview/detectCloseOrRepay.js

@@ -9,12 +9,12 @@ function isCloseOrRepay(multicall) {
   );
   return repaysFullDebt && withdrawsEverything;
 }
-function classifyCloseOrRepay(multicall, underlying) {
+function classifyCloseOrRepay(multicall, exitTokens) {
   for (const op of multicall) {
     if (op.operation === "AddCollateral") {
       return "repay";
     }
-    if (op.operation === "WithdrawCollateral" && !isAddressEqual(op.token, underlying)) {
+    if (op.operation === "WithdrawCollateral" && !exitTokens.some((token) => isAddressEqual(op.token, token))) {
       return "repay";
     }
   }

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/preview/preview/previewOperation.js

@@ -56,6 +56,8 @@ async function previewMulticallOperation(input, operation, options) {
     operation.creditManager
   );
   const convert = (token, to, amount) => market.priceOracle.convert(token, to, amount);
+  const meta = sdk.tokensMeta.get(market.underlying);
+  const receivedToken = meta && sdk.tokensMeta.isRWAUnderlying(meta) ? meta.asset : market.underlying;
   return {
     operation: "DelayedCreditAccountOperation",
     creditAccount: operation.creditAccount,
@@ -66,7 +68,8 @@ async function previewMulticallOperation(input, operation, options) {
       after.account,
       before,
       delayed,
-      convert
+      convert,
+      receivedToken
     )
   };
 }

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";