@defisaver/automation-sdk 3.1.5 → 3.1.6-fluid-dev

package/esm/services/strategySubService.js

@@ -1,10 +1,10 @@
 import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
+import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
 import { STRATEGY_IDS } from '../constants';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
-import { compareAddresses, requireAddress, requireAddresses } from './utils';
+import { compareAddresses, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
 export const makerEncode = {
     repayFromSavings(bundleId, vaultId, triggerRepayRatio, targetRepayRatio, isBundle = true, chainId = ChainId.Ethereum, daiAddr, mcdCdpManagerAddr) {
         const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, targetRepayRatio, chainId, daiAddr, mcdCdpManagerAddr);
@@ -241,3 +241,32 @@ export const morphoBlueEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
+export const liquityV2Encode = {
+    leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.liquityV2LeverageManagementSubData.encode(market, troveId, collToken, boldToken, ratioState, targetRatio);
+        const triggerData = triggerService.liquityV2RatioTrigger.encode(market, troveId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    closeOnPrice(strategyOrBundleId, market, troveId, collToken, boldToken, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subData = subDataService.liquityV2CloseSubData.encode(market, troveId, collToken, boldToken, closeType);
+        const triggerData = triggerService.closePriceTrigger.encode(collToken, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    leverageManagementOnPrice(strategyOrBundleId, market, price, state, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const subDataEncoded = subDataService.liquityV2LeverageManagementOnPriceSubData.encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice);
+        const triggerDataEncoded = triggerService.liquityV2QuotePriceTrigger.encode(market, price, state);
+        const isBundle = true;
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
+};
+export const fluidEncode = {
+    leverageManagement(nftId, vault, collToken, debtToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {
+        const isBundle = true;
+        const subData = subDataService.fluidLeverageManagementSubData.encode(nftId, vault, collToken, debtToken, ratioState, targetRatio);
+        const triggerData = triggerService.fluidRatioTrigger.encode(nftId, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};

package/esm/services/subDataService.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import type { OrderType } from '../types/enums';
+import type { CloseStrategyType, OrderType } from '../types/enums';
 import { ChainId, RatioState } from '../types/enums';
 export declare const makerRepayFromSavingsSubData: {
     encode(vaultId: number, targetRatioPercentage: number, chainId: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): string[];
@@ -190,6 +190,37 @@ export declare const aaveV3LeverageManagementOnPriceSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityV2LeverageManagementSubData: {
+    encode: (market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        market: string;
+        troveId: string;
+        collToken: string;
+        boldToken: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
+export declare const liquityV2CloseSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        closeType: CloseStrategyType;
+    };
+};
+export declare const liquityV2LeverageManagementOnPriceSubData: {
+    encode(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): string[];
+    decode(subData: string[]): {
+        market: EthereumAddress;
+        troveId: string;
+        collToken: EthereumAddress;
+        boldToken: EthereumAddress;
+        targetRatio: number;
+    };
+};
 export declare const morphoBlueLeverageManagementOnPriceSubData: {
     encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -202,3 +233,14 @@ export declare const morphoBlueLeverageManagementOnPriceSubData: {
         user: string;
     };
 };
+export declare const fluidLeverageManagementSubData: {
+    encode: (nftId: string, vault: EthereumAddress, collToken: EthereumAddress, debtToken: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        nftId: string;
+        vault: string;
+        collToken: string;
+        debtToken: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -3,7 +3,7 @@ import AbiCoder from 'web3-eth-abi';
 import { fromWei, toWei } from 'web3-utils';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { otherAddresses } from '@defisaver/sdk';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CollActionType, DebtActionType, RatioState, } from '../types/enums';
 import { ZERO_ADDRESS } from '../constants';
 import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './utils';
 export const makerRepayFromSavingsSubData = {
@@ -467,6 +467,109 @@ export const aaveV3LeverageManagementOnPriceSubData = {
         };
     },
 };
+export const liquityV2LeverageManagementSubData = {
+    encode: (market, troveId, collToken, boldToken, ratioState, targetRatio) => {
+        const marketEncoded = AbiCoder.encodeParameter('address', market);
+        const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+        const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+        const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+        const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const isRepay = ratioState === RatioState.UNDER;
+        const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+        const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collTokenEncoded,
+            boldTokenEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, ratioState, targetRatio,
+        };
+    },
+};
+export const liquityV2CloseSubData = {
+    encode(market, troveId, collToken, boldToken, closeType) {
+        const marketEncoded = AbiCoder.encodeParameter('address', market);
+        const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
+        const collAddrEncoded = AbiCoder.encodeParameter('address', collToken);
+        const boldTokenEncoded = AbiCoder.encodeParameter('address', boldToken);
+        const wethAddress = getAssetInfo('WETH').address;
+        const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+        const gasCompensation = new Dec('0.0375').mul(1e18).toString();
+        const gasCompensationEncoded = AbiCoder.encodeParameter('uint256', gasCompensation);
+        const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+        return [
+            marketEncoded,
+            troveIdEncoded,
+            collAddrEncoded,
+            boldTokenEncoded,
+            wethAddressEncoded,
+            gasCompensationEncoded,
+            closeTypeEncoded,
+        ];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        // skip wethAddress and gasCompensation
+        const closeType = AbiCoder.decodeParameter('uint8', subData[6]);
+        return {
+            market, troveId, collToken, boldToken, closeType,
+        };
+    },
+};
+export const liquityV2LeverageManagementOnPriceSubData = {
+    encode(market, troveId, collToken, boldToken, targetRatio, isRepayOnPrice) {
+        const encodedMarket = AbiCoder.encodeParameter('address', market);
+        const encodedTroveId = AbiCoder.encodeParameter('uint256', troveId);
+        const encodedCollToken = AbiCoder.encodeParameter('address', collToken);
+        const encodedBoldToken = AbiCoder.encodeParameter('address', boldToken);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const collActionType = isRepayOnPrice ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+        const debtActionType = isRepayOnPrice ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const encodedCollActionType = AbiCoder.encodeParameter('uint8', collActionType);
+        const encodedDebtActionType = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [
+            encodedMarket,
+            encodedTroveId,
+            encodedCollToken,
+            encodedBoldToken,
+            encodedTargetRatio,
+            encodedCollActionType,
+            encodedDebtActionType,
+        ];
+    },
+    decode(subData) {
+        const market = AbiCoder.decodeParameter('address', subData[0]);
+        const troveId = AbiCoder.decodeParameter('uint256', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const boldToken = AbiCoder.decodeParameter('address', subData[3]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[4]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            market, troveId, collToken, boldToken, targetRatio,
+        };
+    },
+};
 export const morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -498,3 +601,42 @@ export const morphoBlueLeverageManagementOnPriceSubData = {
         };
     },
 };
+export const fluidLeverageManagementSubData = {
+    encode: (nftId, vault, collToken, debtToken, ratioState, targetRatio) => {
+        const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
+        const vaultEncoded = AbiCoder.encodeParameter('address', vault);
+        const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+        const debtTokenEncoded = AbiCoder.encodeParameter('address', debtToken);
+        const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
+        const isRepay = ratioState === RatioState.UNDER;
+        const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+        const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+        const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+        return [
+            nftIdEncoded,
+            vaultEncoded,
+            collTokenEncoded,
+            debtTokenEncoded,
+            ratioStateEncoded,
+            targetRatioEncoded,
+            wrapEthEncoded,
+            collActionTypeEncoded,
+            debtActionTypeEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const nftId = AbiCoder.decodeParameter('uint256', subData[0]);
+        const vault = AbiCoder.decodeParameter('address', subData[1]);
+        const collToken = AbiCoder.decodeParameter('address', subData[2]);
+        const debtToken = AbiCoder.decodeParameter('address', subData[3]);
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[4]);
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return {
+            nftId, vault, collToken, debtToken, ratioState, targetRatio,
+        };
+    },
+};

package/esm/services/triggerService.d.ts

@@ -189,6 +189,31 @@ 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[]): {
@@ -199,3 +224,11 @@ export declare const morphoBluePriceTrigger: {
         priceState: number;
     };
 };
+export declare const fluidRatioTrigger: {
+    encode(nftId: string, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        nftId: string;
+        ratio: number;
+        ratioState: number;
+    };
+};

package/esm/services/triggerService.js

@@ -336,6 +336,54 @@ export const morphoBlueRatioTrigger = {
         };
     },
 };
+export const liquityV2RatioTrigger = {
+    encode(market, troveId, ratioPercentage, ratioState) {
+        const ratioWei = ratioPercentageToWei(ratioPercentage);
+        return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint8'], [market, troveId, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            market: decodedData[0],
+            troveId: decodedData[1],
+            ratio: weiToRatioPercentage(decodedData[2]),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};
+export const liquityV2QuotePriceTrigger = {
+    encode(market, price, ratioState) {
+        // Price is always in 18 decimals
+        const _price = new Dec(price.toString()).mul(Math.pow(10, 18)).floor().toString();
+        return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [market, _price, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const price = new Dec(decodedData[1]).div(Math.pow(10, 18)).toDP(18).toString();
+        return {
+            market: decodedData[0],
+            price,
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};
+export const closePriceTrigger = {
+    encode(tokenAddr, lowerPrice, upperPrice) {
+        const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+        return [
+            AbiCoder.encodeParameters(['address', 'uint256', 'uint256'], [tokenAddr, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            tokenAddr: decodedData[0],
+            lowerPrice: new Dec(decodedData[1]).div(1e8).toString(),
+            upperPrice: new Dec(decodedData[2]).div(1e8).toString(),
+        };
+    },
+};
 export const morphoBluePriceTrigger = {
     encode(oracle, collateralToken, loanToken, price, priceState) {
         const _price = new Dec(price.toString()).mul(1e8).floor().toString();
@@ -354,3 +402,17 @@ export const morphoBluePriceTrigger = {
         };
     },
 };
+export const fluidRatioTrigger = {
+    encode(nftId, ratioPercentage, ratioState) {
+        const ratioWei = ratioPercentageToWei(ratioPercentage);
+        return [AbiCoder.encodeParameters(['uint256', 'uint256', 'uint8'], [nftId, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            nftId: decodedData[0],
+            ratio: weiToRatioPercentage(decodedData[1]),
+            ratioState: Number(decodedData[2]),
+        };
+    },
+};

package/esm/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/esm/services/utils.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { ChainId, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -80,3 +80,52 @@ export function getRatioStateInfoForAaveCloseStrategy(currentRatioState, collAss
 export function getPositionId(...args) {
     return args.map(arg => arg.toString().toLowerCase().split(' ').join('_')).join('-');
 }
+export 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 === CloseToAssetType.COLLATERAL && takeProfitType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (stopLossType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL;
+        }
+        if (takeProfitType === CloseToAssetType.COLLATERAL) {
+            return CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT;
+        }
+        return CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT;
+    }
+    if (isStopLoss) {
+        return stopLossType === CloseToAssetType.COLLATERAL
+            ? CloseStrategyType.STOP_LOSS_IN_COLLATERAL
+            : CloseStrategyType.STOP_LOSS_IN_DEBT;
+    }
+    return takeProfitType === CloseToAssetType.COLLATERAL
+        ? CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL
+        : CloseStrategyType.TAKE_PROFIT_IN_DEBT;
+}
+export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType) {
+    switch (closeStrategyType) {
+        case CloseStrategyType.STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: undefined };
+        case CloseStrategyType.STOP_LOSS_IN_DEBT:
+            return { stopLossType: CloseToAssetType.DEBT, takeProfitType: undefined };
+        case CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL:
+            return { stopLossType: undefined, takeProfitType: CloseToAssetType.COLLATERAL };
+        case CloseStrategyType.TAKE_PROFIT_IN_DEBT:
+            return { stopLossType: undefined, takeProfitType: CloseToAssetType.DEBT };
+        case CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: CloseToAssetType.DEBT, takeProfitType: CloseToAssetType.COLLATERAL };
+        case CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: CloseToAssetType.DEBT };
+        case CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT:
+            return { stopLossType: CloseToAssetType.DEBT, takeProfitType: CloseToAssetType.DEBT };
+        case CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL:
+            return { stopLossType: CloseToAssetType.COLLATERAL, takeProfitType: CloseToAssetType.COLLATERAL };
+        default:
+            throw new Error('CloseStrategyType not supported');
+    }
+}

package/esm/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",
@@ -88,6 +112,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",
@@ -153,7 +178,14 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_BOOST = 35,
         AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 36,
         AAVE_V3_REPAY_ON_PRICE = 37,
-        MORPHO_BLUE_BOOST_ON_PRICE = 38
+        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_T2_BOOST = 45
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -21,6 +21,32 @@ export var BundleProtocols;
     BundleProtocols["Yearn"] = "yearn";
     BundleProtocols["Rari"] = "rari";
 })(BundleProtocols || (BundleProtocols = {}));
+export var CollActionType;
+(function (CollActionType) {
+    CollActionType[CollActionType["SUPPLY"] = 0] = "SUPPLY";
+    CollActionType[CollActionType["WITHDRAW"] = 1] = "WITHDRAW";
+})(CollActionType || (CollActionType = {}));
+export var DebtActionType;
+(function (DebtActionType) {
+    DebtActionType[DebtActionType["PAYBACK"] = 0] = "PAYBACK";
+    DebtActionType[DebtActionType["BORROW"] = 1] = "BORROW";
+})(DebtActionType || (DebtActionType = {}));
+export var CloseStrategyType;
+(function (CloseStrategyType) {
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL"] = 0] = "TAKE_PROFIT_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_COLLATERAL"] = 1] = "STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT"] = 2] = "TAKE_PROFIT_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["STOP_LOSS_IN_DEBT"] = 3] = "STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL"] = 4] = "TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT"] = 5] = "TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT"] = 6] = "TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT";
+    CloseStrategyType[CloseStrategyType["TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL"] = 7] = "TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL";
+})(CloseStrategyType || (CloseStrategyType = {}));
+export var CloseToAssetType;
+(function (CloseToAssetType) {
+    CloseToAssetType[CloseToAssetType["COLLATERAL"] = 0] = "COLLATERAL";
+    CloseToAssetType[CloseToAssetType["DEBT"] = 1] = "DEBT";
+})(CloseToAssetType || (CloseToAssetType = {}));
 /**
  * @dev Follow the naming convention:
  *      - Enum name consists of two parts, name and version
@@ -34,6 +60,7 @@ export var ProtocolIdentifiers;
     (function (StrategiesAutomation) {
         StrategiesAutomation["MakerDAO"] = "MakerDAO";
         StrategiesAutomation["Liquity"] = "Liquity";
+        StrategiesAutomation["LiquityV2"] = "Liquity__V2";
         StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
         StrategiesAutomation["CompoundV2"] = "Compound__V2";
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
@@ -44,6 +71,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["Spark"] = "Spark";
         StrategiesAutomation["CrvUSD"] = "CurveUSD";
         StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
+        StrategiesAutomation["FluidT1"] = "FluidT1";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -101,6 +129,7 @@ export var Strategies;
         Identifiers["CloseToCollateralWithGasPrice"] = "close-to-collateral-with-gas-price";
         Identifiers["CloseOnPriceToDebt"] = "close-on-price-to-debt";
         Identifiers["CloseOnPriceToColl"] = "close-on-price-to-collateral";
+        Identifiers["CloseOnPrice"] = "close-on-price";
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
@@ -170,6 +199,13 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 36] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V3_REPAY_ON_PRICE"] = 37] = "AAVE_V3_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 38] = "MORPHO_BLUE_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["LIQUITY_V2_REPAY"] = 39] = "LIQUITY_V2_REPAY";
+        MainnetIds[MainnetIds["LIQUITY_V2_BOOST"] = 40] = "LIQUITY_V2_BOOST";
+        MainnetIds[MainnetIds["LIQUITY_V2_CLOSE"] = 41] = "LIQUITY_V2_CLOSE";
+        MainnetIds[MainnetIds["LIQUITY_V2_REPAY_ON_PRICE"] = 42] = "LIQUITY_V2_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["LIQUITY_V2_BOOST_ON_PRICE"] = 43] = "LIQUITY_V2_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["FLUID_T1_REPAY"] = 44] = "FLUID_T1_REPAY";
+        MainnetIds[MainnetIds["FLUID_T2_BOOST"] = 45] = "FLUID_T2_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/types/index.d.ts

@@ -2,7 +2,7 @@ import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
 import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState } from './enums';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -69,7 +69,7 @@ export declare namespace Interfaces {
     }
     interface Automation {
         provider: Web3;
-        providerFork: Web3;
+        providerFork?: Web3;
     }
     interface LegacyAutomation<T extends BaseContract> {
         provider: Web3;
@@ -138,6 +138,15 @@ export declare namespace Position {
             maximumGasPrice: string;
             ratioState: RatioState;
         }
+        interface CloseOnPriceLiquityV2 extends Base {
+            market: EthereumAddress;
+            troveId: string;
+            stopLossPrice: string;
+            takeProfitPrice: string;
+            closeToAssetAddr: EthereumAddress;
+            stopLossType: CloseToAssetType | undefined;
+            takeProfitType: CloseToAssetType | undefined;
+        }
         interface TrailingStop extends Base {
             roundId: number;
             triggerPercentage: number;
@@ -152,7 +161,7 @@ export declare namespace Position {
             subHashRepay?: string;
         }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.BoostOnPriceMorpho;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.1.5",
+  "version": "3.1.6-fluid-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -24,8 +24,8 @@
   "license": "ISC",
   "dependencies": {
     "@defisaver/eslint-config": "^1.0.1",
-    "@defisaver/sdk": "^1.0.61",
-    "@defisaver/tokens": "^1.5.50",
+    "@defisaver/sdk": "^1.2.17",
+    "@defisaver/tokens": "^1.5.54",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",