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

package/cjs/automation/private/StrategiesAutomation.d.ts

@@ -6,12 +6,12 @@ import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
 interface IStrategiesAutomation extends Interfaces.Automation {
     chainId: ChainId;
-    providerFork: Web3;
+    providerFork?: Web3;
 }
 export default class StrategiesAutomation extends Automation {
     protected chainId: ChainId;
     protected web3: Web3;
-    protected web3Fork: Web3;
+    protected web3Fork?: Web3;
     protected subStorageContract: Contract.WithMeta<SubStorage>;
     protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
     constructor(args: IStrategiesAutomation);

package/cjs/automation/public/Strategies.test.d.ts

@@ -0,0 +1 @@
+import '../../configuration';

package/cjs/automation/public/Strategies.test.js

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const web3_1 = __importDefault(require("web3"));
+require("../../configuration");
+const EthereumStrategies_1 = __importDefault(require("./EthereumStrategies"));
+const ArbitrumStrategies_1 = __importDefault(require("./ArbitrumStrategies"));
+const OptimismStrategies_1 = __importDefault(require("./OptimismStrategies"));
+const BaseStrategies_1 = __importDefault(require("./BaseStrategies"));
+require('dotenv').config({ path: '.env' });
+const Web3_1 = new web3_1.default(process.env.RPC_1);
+const Web3_42161 = new web3_1.default(process.env.RPC_42161);
+const Web3_10 = new web3_1.default(process.env.RPC_10);
+const Web3_8453 = new web3_1.default(process.env.RPC_8453);
+describe('Feature: StrategiesAutomation.ts', () => {
+    describe('Fetching subscriptions', () => {
+        it('can fetch subscriptions on Mainnet', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const ethStrategies = new EthereumStrategies_1.default({ provider: Web3_1 });
+                const subs = yield ethStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Arbitrum', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const arbiStrategies = new ArbitrumStrategies_1.default({ provider: Web3_42161 });
+                const subs = yield arbiStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Optimism', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const optimismStrategies = new OptimismStrategies_1.default({ provider: Web3_10 });
+                const subs = yield optimismStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+        it('can fetch subscriptions on Base', function () {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.timeout(120000);
+                const baseStrategies = new BaseStrategies_1.default({ provider: Web3_8453 });
+                const subs = yield baseStrategies.getSubscriptions({ mergeSubs: true });
+                console.log(subs.length);
+            });
+        });
+    });
+});

package/cjs/constants/index.js

@@ -353,11 +353,46 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.OpenOrderFromCollateral,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
+    [enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.LIQUITY_V2_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.RepayOnPrice,
+        protocol: exports.PROTOCOLS.LiquityV2,
+    },
     [enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
         strategyId: enums_1.Strategies.Identifiers.BoostOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.MainnetIds.FLUID_T1_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
+    [enums_1.Bundles.MainnetIds.FLUID_T2_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T2_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.FluidT1,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/cjs/services/strategiesService.js

@@ -434,6 +434,39 @@ function parseLiquityLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseLiquityV2LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.liquityV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2LeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -642,6 +675,85 @@ function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
+function parseLiquityV2CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.closePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2CloseSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.troveId, subData.market);
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    // User can have:
+    // - Only TakeProfit
+    // - Only StopLoss
+    // - Both
+    // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
+    _position.strategy.strategyId = enums_1.Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {
+        market: subData.market,
+        troveId: subData.troveId,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        closeToAssetAddr: triggerData.tokenAddr,
+        takeProfitType,
+        stopLossType,
+    };
+    return _position;
+}
+function parseLiquityV2LeverageManagementOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.liquityV2QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityV2LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    /// @TODO: what does even go here
+    /*
+    _position.specific = {
+      market: subData.market,
+      troveId: subData.troveId,
+      ratio: subData.targetRatio,
+      price: triggerData.price,
+      ratioState: triggerData.ratioState,
+    };
+    */
+    return _position;
+}
+function parseFluidT1LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.fluidRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.fluidLeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.nftId, subData.vault);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -662,6 +774,13 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
         [enums_1.Strategies.Identifiers.DebtInFrontRepay]: parseLiquityDebtInFrontRepay,
     },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.LiquityV2]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseLiquityV2LeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseLiquityV2LeverageManagement,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseLiquityV2CloseOnPrice,
+        [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseLiquityV2LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
+    },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
@@ -715,6 +834,10 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseFluidT1LeverageManagement,
+    },
 };
 function getParsingMethod(id, strategy) {
     return parsingMethodsMapping[id][strategy.strategyId];

package/cjs/services/strategySubService.d.ts

@@ -1,5 +1,5 @@
 import type { OrderType } from '../types/enums';
-import { Bundles, ChainId, RatioState, Strategies } from '../types/enums';
+import { CloseToAssetType, Bundles, ChainId, RatioState, Strategies } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 export declare const makerEncode: {
     repayFromSavings(bundleId: StrategyOrBundleIds, vaultId: number, triggerRepayRatio: number, targetRepayRatio: number, isBundle?: boolean, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds | Strategies.BaseIds | Bundles.MainnetIds | Bundles.OptimismIds | Bundles.ArbitrumIds | Bundles.BaseIds)[];
@@ -99,3 +99,11 @@ export declare const morphoBlueEncode: {
     leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (boolean | string[] | Bundles.MainnetIds)[] | (boolean | string[] | Bundles.BaseIds)[];
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
 };
+export declare const liquityV2Encode: {
+    leverageManagement(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, price: number, state: RatioState, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, targetRatio: number, isRepayOnPrice: boolean): (number | boolean | string[])[];
+};
+export declare const fluidEncode: {
+    leverageManagement(nftId: string, vault: EthereumAddress, collToken: EthereumAddress, debtToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
+};

package/cjs/services/strategySubService.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.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.fluidEncode = exports.liquityV2Encode = exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
@@ -270,3 +270,32 @@ exports.morphoBlueEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
+exports.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 = enums_1.CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = enums_1.CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = (0, utils_1.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];
+    },
+};
+exports.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/cjs/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/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.morphoBlueLeverageManagementOnPriceSubData = 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.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,6 +473,109 @@ 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);
@@ -504,3 +607,42 @@ exports.morphoBlueLeverageManagementOnPriceSubData = {
         };
     },
 };
+exports.fluidLeverageManagementSubData = {
+    encode: (nftId, vault, collToken, debtToken, ratioState, targetRatio) => {
+        const nftIdEncoded = web3_eth_abi_1.default.encodeParameter('uint256', nftId);
+        const vaultEncoded = web3_eth_abi_1.default.encodeParameter('address', vault);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const debtTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', debtToken);
+        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,
+            collTokenEncoded,
+            debtTokenEncoded,
+            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 collToken = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const debtToken = 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 {
+            nftId, vault, collToken, debtToken, ratioState, targetRatio,
+        };
+    },
+};

package/cjs/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;
+    };
+};