@gearbox-protocol/sdk 14.12.0-next.56 → 14.12.0-next.58

package/dist/cjs/plugins/adapters/contracts/MidasRedemptionVaultAdapterContract.js

@@ -9,6 +9,7 @@ let viem = require("viem");
 const abi = require_plugins_adapters_abi_adapters_iMidasRedemptionVaultAdapterV310.iMidasRedemptionVaultAdapterV310Abi;
 const protocolAbi = require_plugins_adapters_abi_adapters_iMidasRedemptionVaultAdapterV310.iMidasRedemptionVaultGatewayV310Abi;
 var MidasRedemptionVaultAdapterContract = class extends require_plugins_adapters_contracts_AbstractAdapter.AbstractAdapterContract {
+	#version;
 	#gateway;
 	#mToken;
 	#allowedTokens;
@@ -19,41 +20,68 @@ var MidasRedemptionVaultAdapterContract = class extends require_plugins_adapters
 			protocolAbi
 		});
 		if (args.baseParams.serializedParams) {
-			const decoded = (0, viem.decodeAbiParameters)([
-				{
-					type: "address",
-					name: "creditManager"
-				},
-				{
-					type: "address",
-					name: "targetContract"
-				},
-				{
-					type: "address",
-					name: "gateway"
-				},
-				{
-					type: "address",
-					name: "mToken"
-				},
-				{
-					type: "address[]",
-					name: "allowedTokens"
-				},
-				{
-					type: "address[]",
-					name: "allowedPhantomTokens"
-				}
-			], args.baseParams.serializedParams);
-			this.#gateway = decoded[2];
-			this.#mToken = decoded[3];
-			this.#allowedTokens = decoded[4].map((token, index) => ({
-				token,
-				phantomToken: decoded[5][index]
-			}));
+			const version = Number(args.baseParams.version);
+			this.#version = version;
+			if (version <= 310) {
+				const decoded = (0, viem.decodeAbiParameters)([
+					{
+						type: "address",
+						name: "creditManager"
+					},
+					{
+						type: "address",
+						name: "targetContract"
+					},
+					{
+						type: "address",
+						name: "gateway"
+					},
+					{
+						type: "address",
+						name: "mToken"
+					},
+					{
+						type: "address[]",
+						name: "allowedTokens"
+					},
+					{
+						type: "address[]",
+						name: "allowedPhantomTokens"
+					}
+				], args.baseParams.serializedParams);
+				this.#gateway = decoded[2];
+				this.#mToken = decoded[3];
+				this.#allowedTokens = decoded[4].map((token, index) => ({
+					token,
+					phantomToken: decoded[5][index]
+				}));
+			} else {
+				const decoded = (0, viem.decodeAbiParameters)([
+					{
+						type: "address",
+						name: "creditManager"
+					},
+					{
+						type: "address",
+						name: "targetContract"
+					},
+					{
+						type: "address",
+						name: "mToken"
+					},
+					{
+						type: "address[]",
+						name: "supportedInputTokens"
+					}
+				], args.baseParams.serializedParams);
+				this.#mToken = decoded[2];
+				this.#allowedTokens = [...decoded[3]];
+			}
 		}
 	}
 	get gateway() {
+		if (!this.#version) throw new require_sdk_base_errors.MissingSerializedParamsError("version");
+		if (this.#version > 310) return void 0;
 		if (!this.#gateway) throw new require_sdk_base_errors.MissingSerializedParamsError("gateway");
 		return this.#gateway;
 	}
@@ -70,10 +98,13 @@ var MidasRedemptionVaultAdapterContract = class extends require_plugins_adapters
 			...super.stateHuman(raw),
 			gateway: this.#gateway ? this.labelAddress(this.#gateway) : void 0,
 			mToken: this.#mToken ? this.labelAddress(this.#mToken) : void 0,
-			allowedTokens: this.#allowedTokens?.map((t) => ({
-				token: this.labelAddress(t.token),
-				phantomToken: this.labelAddress(t.phantomToken)
-			}))
+			allowedTokens: this.#allowedTokens?.map((t) => {
+				if (typeof t === "object") return {
+					token: this.labelAddress(t.token),
+					phantomToken: this.labelAddress(t.phantomToken)
+				};
+				return { token: this.labelAddress(t) };
+			})
 		};
 	}
 	async applyBalanceChanges(balances, decoded) {

package/dist/cjs/sdk/accounts/liquidations/LiquidationsService.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_abi_ILiquidationCompressorV313 = require("../../../abi/ILiquidationCompressorV313.js");
-const require_abi_iPhantomToken = require("../../../abi/iPhantomToken.js");
 const require_sdk_utils_AddressSet = require("../../utils/AddressSet.js");
+const require_sdk_utils_bytes32ToString = require("../../utils/bytes32ToString.js");
 const require_sdk_constants_addresses = require("../../constants/addresses.js");
 const require_sdk_constants_math = require("../../constants/math.js");
 require("../../constants/index.js");
@@ -16,7 +16,6 @@ const require_sdk_market_rwa_securitize_constants = require("../../market/rwa/se
 const require_sdk_market_rwa_securitize_SecuritizeLiquidatorContract = require("../../market/rwa/securitize/SecuritizeLiquidatorContract.js");
 require("../../market/rwa/securitize/index.js");
 const require_sdk_accounts_liquidations_constants = require("./constants.js");
-const require_abi_rwa_iRWAGateway = require("../../../abi/rwa/iRWAGateway.js");
 const require_sdk_accounts_liquidations_helpers = require("./helpers.js");
 //#region src/sdk/accounts/liquidations/LiquidationsService.ts
 /**
@@ -66,20 +65,21 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 		return {
 			...account,
 			repaymentAmount: {
-				token: account.totalValue.token,
-				balance: data.requiredUnderlyingAmount
+				token: require_sdk_utils_hex.hexEq(data.requiredToken, "0x0000000000000000000000000000000000000000") ? account.totalValue.token : data.requiredToken,
+				balance: data.requiredAmount
 			},
 			isDelayed: data.expectedOutputs.some((o) => o.delayed),
 			receivedAssets: require_sdk_accounts_liquidations_helpers.toReceivedAssets(data.expectedOutputs),
 			isLiquidatorEligible: data.isLiquidatorEligible,
+			isCreditAccountFrozen: data.isCreditAccountFrozen,
 			kycProtocol: data.kycProtocol || void 0,
 			kycToken: require_sdk_utils_hex.hexEq(data.kycToken, "0x0000000000000000000000000000000000000000") ? void 0 : data.kycToken,
 			approve: require_sdk_accounts_liquidations_helpers.toLiquidationApproval({
 				target: data.liquidationCall.target,
 				creditFacade: suite.creditFacade.address,
 				creditManager: ca.creditManager,
-				token: suite.underlying,
-				amount: data.requiredUnderlyingAmount
+				token: data.requiredToken,
+				amount: data.requiredAmount
 			})
 		};
 	}
@@ -107,56 +107,39 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 	* {@inheritDoc ILiquidationsService.loadRWALiquidators}
 	**/
 	async loadRWALiquidators() {
-		await this.sdk.tokensMeta.loadTokenData();
-		const phantomTokens = [];
-		for (const meta of this.sdk.tokensMeta.phantomTokens.values()) switch (meta.contractType) {
-			case require_sdk_market_rwa_securitize_constants.PHANTOM_TOKEN_SECURITIZE_REDEMPTION:
-			case require_sdk_market_rwa_midas_constants.PHANTOM_TOKEN_MIDAS_REDEMPTION: phantomTokens.push(meta);
-		}
-		if (phantomTokens.length === 0) return;
-		const ptResp = await this.client.multicall({
-			contracts: phantomTokens.map(({ addr }) => ({
-				address: addr,
-				abi: require_abi_iPhantomToken.iPhantomTokenAbi,
-				functionName: "getPhantomTokenInfo"
-			})),
-			allowFailure: false,
-			batchSize: 0
-		});
-		const gateways = phantomTokens.map(({ contractType }, i) => ({
-			gateway: ptResp[i][0],
-			contractType
-		}));
-		const gwResp = await this.client.multicall({
-			contracts: gateways.map(({ gateway }) => ({
-				address: gateway,
-				abi: require_abi_rwa_iRWAGateway.iRWAGatewayAbi,
-				functionName: "transferMaster"
+		const configurators = this.sdk.marketRegister.marketConfigurators;
+		if (configurators.length === 0) return;
+		const resp = await this.client.multicall({
+			contracts: configurators.map((mc) => ({
+				address: require_sdk_accounts_liquidations_constants.LIQUIDATION_COMPRESSOR_V313_ADDRESS,
+				abi: require_abi_ILiquidationCompressorV313.iLiquidationCompressorV313Abi,
+				functionName: "getRWALiquidators",
+				args: [mc.address]
 			})),
 			allowFailure: false,
 			batchSize: 0
 		});
-		const refs = gateways.map(({ contractType }, i) => ({
-			liquidator: gwResp[i],
-			contractType
-		}));
-		for (const ref of refs) this.#createRWALiquidator(ref);
+		for (const info of resp.flat()) this.#createRWALiquidator(info);
 	}
 	/**
 	* Instantiates the liquidator contract, which registers it and labels its
 	* address (see `BaseContract`).
 	*
-	* @param ref - Discovered liquidator address and its phantom token type
+	* @param info - Liquidator discovered by the compressor. The same gateway
+	* can be configured in several credit managers, so duplicates are expected
+	* and skipped.
 	**/
-	#createRWALiquidator(ref) {
-		const { liquidator, contractType } = ref;
+	#createRWALiquidator(info) {
+		const liquidator = info.liquidatorAddress;
 		if (this.sdk.getContract(liquidator)) return;
-		switch (contractType) {
-			case require_sdk_market_rwa_securitize_constants.PHANTOM_TOKEN_SECURITIZE_REDEMPTION:
+		switch (require_sdk_utils_bytes32ToString.bytes32ToString(info.contractType)) {
+			case require_sdk_market_rwa_securitize_constants.RWA_LIQUIDATOR_SECURITIZE:
 				new require_sdk_market_rwa_securitize_SecuritizeLiquidatorContract.SecuritizeLiquidatorContract(this.sdk, liquidator);
+				this.logger?.debug(`registered Securitize liquidator ${liquidator}`);
 				return;
-			case require_sdk_market_rwa_midas_constants.PHANTOM_TOKEN_MIDAS_REDEMPTION:
+			case require_sdk_market_rwa_midas_constants.RWA_LIQUIDATOR_MIDAS:
 				new require_sdk_market_rwa_midas_MidasLiquidatorContract.MidasLiquidatorContract(this.sdk, liquidator);
+				this.logger?.debug(`registered Midas liquidator ${liquidator}`);
 				return;
 		}
 	}
@@ -251,7 +234,8 @@ var LiquidationsService = class extends require_sdk_base_SDKConstruct.SDKConstru
 				token: unwrappedUnderlying,
 				balance: require_sdk_accounts_liquidations_helpers.calcEstimatedProfit(ca.totalValue, liquidationDiscount)
 			},
-			isDelayed: ca.tokens.some((t) => t.balance > 10n && !!compressor?.getWithdrawalSourceToken(t.token))
+			isDelayed: ca.tokens.some((t) => t.balance > 10n && !!compressor?.getWithdrawalSourceToken(t.token)),
+			paused: suite.creditFacade.isPaused
 		};
 	}
 };

package/dist/cjs/sdk/accounts/liquidations/constants.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/sdk/accounts/liquidations/constants.ts
-const LIQUIDATION_COMPRESSOR_V313_ADDRESS = "0x04c5c47c3b9e29ce98fdd27103fbb6a0815b1712";
+const LIQUIDATION_COMPRESSOR_V313_ADDRESS = "0xB70C4500a0afF02107eB983a348F22492fB6dC94";
 //#endregion
 exports.LIQUIDATION_COMPRESSOR_V313_ADDRESS = LIQUIDATION_COMPRESSOR_V313_ADDRESS;

package/dist/cjs/sdk/accounts/liquidations/helpers.js

@@ -76,14 +76,16 @@ function toLiquidatorWithdrawals(current, network) {
 		network,
 		sourceToken: w.token,
 		token: o.token,
-		amount: o.amount
+		amount: o.amount,
+		redeemer: w.redeemer
 	});
 	for (const w of current.pending) for (const o of w.expectedOutputs) rows.push({
 		network,
 		sourceToken: w.token,
 		token: o.token,
 		amount: o.amount,
-		claimableAt: w.claimableAt
+		claimableAt: w.claimableAt,
+		redeemer: w.redeemer
 	});
 	return rows;
 }

package/dist/cjs/sdk/accounts/withdrawal-compressor/AbstractWithdrawalCompressorContract.js

@@ -1,5 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../../utils/AddressMap.js");
+require("../../constants/addresses.js");
+require("../../constants/index.js");
+const require_sdk_utils_hex = require("../../utils/hex.js");
 require("../../utils/index.js");
 const require_sdk_base_BaseContract = require("../../base/BaseContract.js");
 require("../../base/index.js");
@@ -201,6 +204,13 @@ function toRequestableWithdrawal(resp) {
 	};
 }
 /**
+* Normalizes the redeemer of a withdrawal: legacy compressors do not report
+* one, and v313+ uses the zero address for "not applicable".
+**/
+function toRedeemer(redeemer) {
+	return !redeemer || require_sdk_utils_hex.hexEq(redeemer, "0x0000000000000000000000000000000000000000") ? void 0 : redeemer;
+}
+/**
 * Normalizes a claimable withdrawal. The intent is decoded from `extraData`
 * only when `creditManager` is provided (it is required to build
 * {@link DelayedIntentExtended} and is only meaningful for credit account
@@ -218,6 +228,7 @@ function toClaimableWithdrawal(w, creditManager) {
 		withdrawalTokenSpent: w.withdrawalTokenSpent,
 		outputs: [...w.outputs],
 		claimCalls: [...w.claimCalls],
+		redeemer: toRedeemer(w.redeemer),
 		intent
 	};
 }
@@ -236,6 +247,7 @@ function toPendingWithdrawal(w, creditManager) {
 		withdrawalPhantomToken: w.withdrawalPhantomToken,
 		expectedOutputs: [...w.expectedOutputs],
 		claimableAt: w.claimableAt,
+		redeemer: toRedeemer(w.redeemer),
 		intent
 	};
 }

package/dist/cjs/sdk/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.js

@@ -79,6 +79,11 @@ const iExternalWithdrawalsBatchAbi = [{
 					internalType: "bytes"
 				}]
 			},
+			{
+				name: "redeemer",
+				type: "address",
+				internalType: "address"
+			},
 			{
 				name: "extraData",
 				type: "bytes",
@@ -127,6 +132,11 @@ const iExternalWithdrawalsBatchAbi = [{
 				type: "uint256",
 				internalType: "uint256"
 			},
+			{
+				name: "redeemer",
+				type: "address",
+				internalType: "address"
+			},
 			{
 				name: "extraData",
 				type: "bytes",

package/dist/cjs/sdk/accounts/withdrawal-compressor/addresses.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/sdk/accounts/withdrawal-compressor/addresses.ts
 const WITHDRAWAL_COMPRESSORS = {
 	Mainnet: {
-		address: "0x5c80d7e7b18eCb00Cc9FAd57c59eEC4eF7516597",
+		address: "0x6FA0c5404C31D0161bb39Cc1311aac998A38ecD5",
 		version: 313
 	},
 	Monad: {

package/dist/esm/abi/ILiquidationCompressorV313.js

@@ -46,7 +46,12 @@ const iLiquidationCompressorV313Abi = [
 			internalType: "struct LiquidationData",
 			components: [
 				{
-					name: "requiredUnderlyingAmount",
+					name: "requiredToken",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "requiredAmount",
 					type: "uint256",
 					internalType: "uint256"
 				},
@@ -101,6 +106,11 @@ const iLiquidationCompressorV313Abi = [
 					type: "bool",
 					internalType: "bool"
 				},
+				{
+					name: "isCreditAccountFrozen",
+					type: "bool",
+					internalType: "bool"
+				},
 				{
 					name: "kycProtocol",
 					type: "string",
@@ -115,6 +125,38 @@ const iLiquidationCompressorV313Abi = [
 		}],
 		stateMutability: "nonpayable"
 	},
+	{
+		type: "function",
+		name: "getRWALiquidators",
+		inputs: [{
+			name: "marketConfigurator",
+			type: "address",
+			internalType: "address"
+		}],
+		outputs: [{
+			name: "",
+			type: "tuple[]",
+			internalType: "struct RWALiquidatorInfo[]",
+			components: [
+				{
+					name: "gateway",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "liquidatorAddress",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "contractType",
+					type: "bytes32",
+					internalType: "bytes32"
+				}
+			]
+		}],
+		stateMutability: "view"
+	},
 	{
 		type: "function",
 		name: "version",

package/dist/esm/abi/IWithdrawalCompressorV313.js

@@ -75,6 +75,11 @@ const iWithdrawalCompressorV313Abi = [
 						internalType: "bytes"
 					}]
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -123,6 +128,11 @@ const iWithdrawalCompressorV313Abi = [
 					type: "uint256",
 					internalType: "uint256"
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -136,9 +146,9 @@ const iWithdrawalCompressorV313Abi = [
 		type: "function",
 		name: "getExternalAccountCurrentWithdrawals",
 		inputs: [{
-			name: "withdrawalToken",
-			type: "address",
-			internalType: "address"
+			name: "withdrawalTokens",
+			type: "address[]",
+			internalType: "address[]"
 		}, {
 			name: "account",
 			type: "address",
@@ -200,6 +210,11 @@ const iWithdrawalCompressorV313Abi = [
 						internalType: "bytes"
 					}]
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -248,6 +263,11 @@ const iWithdrawalCompressorV313Abi = [
 					type: "uint256",
 					internalType: "uint256"
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -261,9 +281,9 @@ const iWithdrawalCompressorV313Abi = [
 		type: "function",
 		name: "getExternalAccountCurrentWithdrawals",
 		inputs: [{
-			name: "withdrawalTokens",
-			type: "address[]",
-			internalType: "address[]"
+			name: "withdrawalToken",
+			type: "address",
+			internalType: "address"
 		}, {
 			name: "account",
 			type: "address",
@@ -325,6 +345,11 @@ const iWithdrawalCompressorV313Abi = [
 						internalType: "bytes"
 					}]
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -373,6 +398,11 @@ const iWithdrawalCompressorV313Abi = [
 					type: "uint256",
 					internalType: "uint256"
 				},
+				{
+					name: "redeemer",
+					type: "address",
+					internalType: "address"
+				},
 				{
 					name: "extraData",
 					type: "bytes",
@@ -382,36 +412,6 @@ const iWithdrawalCompressorV313Abi = [
 		}],
 		stateMutability: "view"
 	},
-	{
-		type: "function",
-		name: "getWithdrawalStatus",
-		inputs: [{
-			name: "redeemer",
-			type: "address",
-			internalType: "address"
-		}],
-		outputs: [{
-			name: "",
-			type: "uint8",
-			internalType: "enum WithdrawalStatus"
-		}],
-		stateMutability: "view"
-	},
-	{
-		type: "function",
-		name: "getWithdrawalStatus",
-		inputs: [{
-			name: "redeemers",
-			type: "address[]",
-			internalType: "address[]"
-		}],
-		outputs: [{
-			name: "",
-			type: "uint8[]",
-			internalType: "enum WithdrawalStatus[]"
-		}],
-		stateMutability: "view"
-	},
 	{
 		type: "function",
 		name: "getWithdrawableAssets",
@@ -558,11 +558,6 @@ const iWithdrawalCompressorV313Abi = [
 				type: "address",
 				internalType: "address"
 			},
-			{
-				name: "withdrawalToken",
-				type: "address",
-				internalType: "address"
-			},
 			{
 				name: "amount",
 				type: "uint256",
@@ -643,6 +638,11 @@ const iWithdrawalCompressorV313Abi = [
 				type: "address",
 				internalType: "address"
 			},
+			{
+				name: "withdrawalToken",
+				type: "address",
+				internalType: "address"
+			},
 			{
 				name: "amount",
 				type: "uint256",
@@ -709,6 +709,36 @@ const iWithdrawalCompressorV313Abi = [
 		}],
 		stateMutability: "view"
 	},
+	{
+		type: "function",
+		name: "getWithdrawalStatus",
+		inputs: [{
+			name: "redeemers",
+			type: "address[]",
+			internalType: "address[]"
+		}],
+		outputs: [{
+			name: "",
+			type: "uint8[]",
+			internalType: "enum WithdrawalStatus[]"
+		}],
+		stateMutability: "view"
+	},
+	{
+		type: "function",
+		name: "getWithdrawalStatus",
+		inputs: [{
+			name: "redeemer",
+			type: "address",
+			internalType: "address"
+		}],
+		outputs: [{
+			name: "",
+			type: "uint8",
+			internalType: "enum WithdrawalStatus"
+		}],
+		stateMutability: "view"
+	},
 	{
 		type: "function",
 		name: "version",

package/dist/esm/abi/compressors/liquidationCompressor.js

@@ -89,7 +89,12 @@ const liquidationCompressorAbi = [
 			internalType: "struct LiquidationData",
 			components: [
 				{
-					name: "requiredUnderlyingAmount",
+					name: "requiredToken",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "requiredAmount",
 					type: "uint256",
 					internalType: "uint256"
 				},
@@ -144,6 +149,11 @@ const liquidationCompressorAbi = [
 					type: "bool",
 					internalType: "bool"
 				},
+				{
+					name: "isCreditAccountFrozen",
+					type: "bool",
+					internalType: "bool"
+				},
 				{
 					name: "kycProtocol",
 					type: "string",
@@ -158,6 +168,38 @@ const liquidationCompressorAbi = [
 		}],
 		stateMutability: "nonpayable"
 	},
+	{
+		type: "function",
+		name: "getRWALiquidators",
+		inputs: [{
+			name: "marketConfigurator",
+			type: "address",
+			internalType: "address"
+		}],
+		outputs: [{
+			name: "liquidators",
+			type: "tuple[]",
+			internalType: "struct RWALiquidatorInfo[]",
+			components: [
+				{
+					name: "gateway",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "liquidatorAddress",
+					type: "address",
+					internalType: "address"
+				},
+				{
+					name: "contractType",
+					type: "bytes32",
+					internalType: "bytes32"
+				}
+			]
+		}],
+		stateMutability: "view"
+	},
 	{
 		type: "function",
 		name: "liquidatableTypeToCompressorType",