@defisaver/automation-sdk 3.2.0 → 3.2.1

package/cjs/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV3LeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.fluidLeverageManagementSubData = exports.liquityV2PaybackSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -473,3 +473,197 @@ exports.aaveV3LeverageManagementOnPriceSubData = {
         };
     },
 };
+exports.liquityV2LeverageManagementSubData = {
+    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collTokenEncoded,
+            boldTokenEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[4]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, ratioState, targetRatio,
+        };
+    },
+};
+exports.liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const collAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const wethAddress = (0, tokens_1.getAssetInfo)('WETH').address;
+        const wethAddressEncoded = web3_eth_abi_1.default.encodeParameter('address', wethAddress);
+        const gasCompensation = new decimal_js_1.default('0.0375').mul(1e18).toString();
+        const gasCompensationEncoded = web3_eth_abi_1.default.encodeParameter('uint256', gasCompensation);
+        const closeTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', closeType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collAddrEncoded,
+            boldTokenEncoded,
+            wethAddressEncoded,
+            gasCompensationEncoded,
+            closeTypeEncoded,
+        ];
+    },
+    decode(subData) {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        // skip wethAddress and gasCompensation
+        const closeType = web3_eth_abi_1.default.decodeParameter('uint8', subData[6]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};
+exports.liquityV2LeverageManagementOnPriceSubData = {
+    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
+        const encodedTroveId = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const encodedCollToken = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const encodedBoldToken = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const collActionType = isRepayOnPrice ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepayOnPrice ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const encodedCollActionType = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const encodedDebtActionType = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [
+            encodedMarket,
+            encodedTroveId,
+            encodedCollToken,
+            encodedBoldToken,
+            encodedTargetRatio,
+            encodedCollActionType,
+            encodedDebtActionType,
+        ];
+    },
+    decode(subData) {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, targetRatio,
+        };
+    },
+};
+exports.morphoBlueLeverageManagementOnPriceSubData = {
+    encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
+        const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const oracleEncoded = web3_eth_abi_1.default.encodeParameter('address', oracle);
+        const irmEncoded = web3_eth_abi_1.default.encodeParameter('address', irm);
+        const lltvEncoded = web3_eth_abi_1.default.encodeParameter('uint256', lltv);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const userEncoded = web3_eth_abi_1.default.encodeParameter('address', user);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, targetRatioEncoded, userEncoded];
+    },
+    decode(subData) {
+        const loanToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const oracle = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const irm = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const lltv = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[5]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[6]);
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            targetRatio,
+            user,
+        };
+    },
+};
+exports.liquityV2PaybackSubData = {
+    encode: (market, troveId, boldToken, targetRatio, ratioState) => {
+        const marketEncoded = web3_eth_abi_1.default.encodeParameter('address', market);
+        const troveIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', troveId);
+        const boldTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', boldToken);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            boldTokenEncoded,
+            targetRatioEncoded,
+            ratioStateEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const troveId = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const boldToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[4]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            market, troveId, boldToken, ratioState, targetRatio,
+        };
+    },
+};
+exports.fluidLeverageManagementSubData = {
+    encode: (nftId, vault, ratioState, targetRatio) => {
+        const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
+        const vaultEncoded = web3_eth_abi_1.default.encodeParameter('address', vault);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const wrapEthEncoded = web3_eth_abi_1.default.encodeParameter('bool', true);
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
+        const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
+        return [
+            nftIdEncoded,
+            vaultEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            wrapEthEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const nftId = web3_eth_abi_1.default.decodeParameter('uint256', subData[0]);
+        const vault = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            nftId, vault, ratioState, targetRatio,
+        };
+    },
+};

package/cjs/services/triggerService.d.ts

@@ -189,3 +189,46 @@ export declare const morphoBlueRatioTrigger: {
         ratioState: number;
     };
 };
+export declare const liquityV2RatioTrigger: {
+    encode(market: EthereumAddress, troveId: string, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        market: string;
+        troveId: string;
+        ratio: number;
+        ratioState: number;
+    };
+};
+export declare const liquityV2QuotePriceTrigger: {
+    encode(market: EthereumAddress, price: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        market: string;
+        price: string;
+        ratioState: number;
+    };
+};
+export declare const closePriceTrigger: {
+    encode(tokenAddr: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        tokenAddr: EthereumAddress;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};
+export declare const morphoBluePriceTrigger: {
+    encode(oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, price: number, priceState: RatioState): string[];
+    decode(triggerData: string[]): {
+        oracle: string;
+        collateralToken: string;
+        loanToken: string;
+        price: string;
+        priceState: number;
+    };
+};
+export declare const fluidRatioTrigger: {
+    encode(nftId: string, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        nftId: string;
+        ratio: number;
+        ratioState: number;
+    };
+};

package/cjs/services/triggerService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.fluidRatioTrigger = exports.morphoBluePriceTrigger = exports.closePriceTrigger = exports.liquityV2QuotePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -365,3 +365,83 @@ exports.morphoBlueRatioTrigger = {
         };
     },
 };
+exports.liquityV2RatioTrigger = {
+    encode(market, troveId, ratioPercentage, ratioState) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint256', 'uint8'], [market, troveId, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            market: decodedData[0],
+            troveId: decodedData[1],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};
+exports.liquityV2QuotePriceTrigger = {
+    encode(market, price, ratioState) {
+        // Price is always in 18 decimals
+        const _price = new decimal_js_1.default(price.toString()).mul(Math.pow(10, 18)).floor().toString();
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const price = new decimal_js_1.default(decodedData[1]).div(Math.pow(10, 18)).toDP(18).toString();
+        return {
+            market: decodedData[0],
+            price,
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};
+exports.closePriceTrigger = {
+    encode(tokenAddr, lowerPrice, upperPrice) {
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'uint256', 'uint256'], [tokenAddr, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            tokenAddr: decodedData[0],
+            lowerPrice: new decimal_js_1.default(decodedData[1]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[2]).div(1e8).toString(),
+        };
+    },
+};
+exports.morphoBluePriceTrigger = {
+    encode(oracle, collateralToken, loanToken, price, priceState) {
+        const _price = new decimal_js_1.default(price.toString()).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'address', 'address', 'uint256', 'uint8'], [oracle, collateralToken, loanToken, _price, priceState]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'address', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            oracle: decodedData[0],
+            collateralToken: decodedData[1],
+            loanToken: decodedData[2],
+            price: new decimal_js_1.default(decodedData[3]).div(1e8).toString(),
+            priceState: Number(decodedData[4]),
+        };
+    },
+};
+exports.fluidRatioTrigger = {
+    encode(nftId, ratioPercentage, ratioState) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['uint256', 'uint256', 'uint8'], [nftId, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            nftId: decodedData[0],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[1]),
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};

package/cjs/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -23,3 +23,8 @@ export declare function getRatioStateInfoForAaveCloseStrategy(currentRatioState:
     ratioState: RatioState;
 };
 export declare function getPositionId(...args: (number | string)[]): string;
+export declare function getCloseStrategyType(stopLossPrice: number, stopLossType: CloseToAssetType, takeProfitPrice: number, takeProfitType: CloseToAssetType): CloseStrategyType;
+export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType: CloseStrategyType): {
+    stopLossType: CloseToAssetType | undefined;
+    takeProfitType: CloseToAssetType | undefined;
+};

package/cjs/services/utils.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
+exports.getStopLossAndTakeProfitTypeByCloseStrategyType = exports.getCloseStrategyType = exports.getPositionId = exports.getRatioStateInfoForAaveCloseStrategy = exports.requireAddresses = exports.requireAddress = exports.isEmptyBytes = exports.isRatioStateUnder = exports.isRatioStateOver = exports.weiToRatioPercentage = exports.ratioPercentageToWei = exports.encodeSubId = exports.compareSubHashes = exports.wethToEthByAddress = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.addToArrayIf = exports.isAddress = exports.compareAddresses = exports.isUndefined = exports.isDefined = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3Utils = __importStar(require("web3-utils"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -129,3 +129,54 @@ function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
 exports.getPositionId = getPositionId;
+function getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType) {
+    const isStopLoss = stopLossPrice > 0;
+    const isTakeProfit = takeProfitPrice > 0;
+    if (!isStopLoss && !isTakeProfit) {
+        throw new Error('CloseOnPrice: At least one price must be defined');
+    }
+    if (isStopLoss && isTakeProfit) {
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL && takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (stopLossType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (takeProfitType === enums_1.CloseToAssetType.COLLATERAL) {
+            return enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+        }
+        return enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+    }
+    if (isStopLoss) {
+        return stopLossType === enums_1.CloseToAssetType.COLLATERAL
+            ? enums_1.CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+            : enums_1.CloseStrategyType.STOP_LOSS_IN_DEBT;
+    }
+    return takeProfitType === enums_1.CloseToAssetType.COLLATERAL
+        ? enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+        : enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}
+exports.getCloseStrategyType = getCloseStrategyType;
+function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType) {
+    switch (closeStrategyType) {
+        case enums_1.CloseStrategyType.STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: undefined };
+        case enums_1.CloseStrategyType.STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: undefined };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL:
+            return { stopLossType: undefined, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT:
+            return { stopLossType: undefined, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: enums_1.CloseToAssetType.DEBT, takeProfitType: enums_1.CloseToAssetType.DEBT };
+        case enums_1.CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: enums_1.CloseToAssetType.COLLATERAL, takeProfitType: enums_1.CloseToAssetType.COLLATERAL };
+        default:
+            throw new Error('CloseStrategyType not supported');
+    }
+}
+exports.getStopLossAndTakeProfitTypeByCloseStrategyType = getStopLossAndTakeProfitTypeByCloseStrategyType;

package/cjs/types/contracts/generated/SubStorage.d.ts

@@ -55,6 +55,10 @@ export type Subscribe = ContractEventLog<{
     proxy: string;
     subHash: string;
     subStruct: StrategyModel.StrategySubStructOutput;
+    0: string;
+    1: string;
+    2: string;
+    3: StrategyModel.StrategySubStructOutput;
 }>;
 export type UpdateData = ContractEventLog<{
     subId: string;

package/cjs/types/enums.d.ts

@@ -17,6 +17,28 @@ export declare enum BundleProtocols {
     Yearn = "yearn",
     Rari = "rari"
 }
+export declare enum CollActionType {
+    SUPPLY = 0,
+    WITHDRAW = 1
+}
+export declare enum DebtActionType {
+    PAYBACK = 0,
+    BORROW = 1
+}
+export declare enum CloseStrategyType {
+    TAKE_PROFIT_IN_COLLATERAL = 0,
+    STOP_LOSS_IN_COLLATERAL = 1,
+    TAKE_PROFIT_IN_DEBT = 2,
+    STOP_LOSS_IN_DEBT = 3,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL = 4,
+    TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT = 5,
+    TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT = 6,
+    TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL = 7
+}
+export declare enum CloseToAssetType {
+    COLLATERAL = 0,
+    DEBT = 1
+}
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -28,6 +50,7 @@ export declare namespace ProtocolIdentifiers {
     enum StrategiesAutomation {
         MakerDAO = "MakerDAO",
         Liquity = "Liquity",
+        LiquityV2 = "Liquity__V2",
         ChickenBonds = "Chicken Bonds",
         CompoundV2 = "Compound__V2",
         CompoundV3 = "Compound__V3",
@@ -37,7 +60,8 @@ export declare namespace ProtocolIdentifiers {
         Exchange = "Exchange",
         Spark = "Spark",
         CrvUSD = "CurveUSD",
-        MorphoBlue = "MorphoBlue"
+        MorphoBlue = "MorphoBlue",
+        FluidT1 = "FluidT1"
     }
     enum LegacyAutomation {
         MakerDAO = "MakerDAO",
@@ -60,7 +84,8 @@ export declare namespace Strategies {
         LIQUITY_DSR_PAYBACK = 69,
         LIQUITY_DSR_SUPPLY = 70,
         LIQUITY_DEBT_IN_FRONT_REPAY = 75,
-        CURVEUSD_PAYBACK = 92
+        CURVEUSD_PAYBACK = 92,
+        LIQUITY_V2_PAYBACK = 113
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
@@ -88,6 +113,7 @@ export declare namespace Strategies {
         CloseToCollateralWithGasPrice = "close-to-collateral-with-gas-price",
         CloseOnPriceToDebt = "close-on-price-to-debt",
         CloseOnPriceToColl = "close-on-price-to-collateral",
+        CloseOnPrice = "close-on-price",
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
@@ -98,6 +124,7 @@ export declare namespace Strategies {
         DebtInFrontRepay = "debt-in-front-repay",
         OpenOrderFromCollateral = "open-order-from-collateral",
         OpenOrderFromDebt = "open-order-from-debt",
+        BoostOnPrice = "boost-on-price",
         RepayOnPrice = "repay-on-price"
     }
     enum IdOverrides {
@@ -151,7 +178,15 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_REPAY = 34,
         MORPHO_BLUE_EOA_BOOST = 35,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
-        AAVE_V3_REPAY_ON_PRICE = 37
+        AAVE_V3_REPAY_ON_PRICE = 37,
+        MORPHO_BLUE_BOOST_ON_PRICE = 38,
+        LIQUITY_V2_REPAY = 39,
+        LIQUITY_V2_BOOST = 40,
+        LIQUITY_V2_CLOSE = 41,
+        LIQUITY_V2_REPAY_ON_PRICE = 42,
+        LIQUITY_V2_BOOST_ON_PRICE = 43,
+        FLUID_T1_REPAY = 44,
+        FLUID_T1_BOOST = 45
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -171,7 +206,10 @@ export declare namespace Bundles {
         MORPHO_BLUE_REPAY = 8,
         MORPHO_BLUE_BOOST = 9,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 10,
-        AAVE_V3_REPAY_ON_PRICE = 11
+        AAVE_V3_REPAY_ON_PRICE = 11,
+        MORPHO_BLUE_BOOST_ON_PRICE = 12,
+        FLUID_T1_REPAY = 13,
+        FLUID_T1_BOOST = 14
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -181,6 +219,8 @@ export declare namespace Bundles {
         COMP_V3_SW_REPAY_BUNDLE = 4,
         COMP_V3_SW_BOOST_BUNDLE = 5,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 6,
-        AAVE_V3_REPAY_ON_PRICE = 7
+        AAVE_V3_REPAY_ON_PRICE = 7,
+        FLUID_T1_REPAY = 8,
+        FLUID_T1_BOOST = 9
     }
 }