@defisaver/automation-sdk 3.0.2-dev → 3.0.3

package/esm/automation/private/StrategiesAutomation.js

@@ -32,7 +32,9 @@ class StrategiesAutomation extends Automation_1.default {
     getEventFromSubStorage(event, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || 0)) {
+            // only used for backfilling, so in case options?.fromBlock in undefined
+            // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || this.subStorageContract.createdBlock.toString())) {
                 return [];
             }
             return (0, ethereumService_1.getEventsFromContract)(this.subStorageContract, this.subStorageContractFork, event, options);

package/esm/constants/index.js

@@ -90,6 +90,11 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.DebtInFrontRepay,
         protocol: exports.PROTOCOLS.Liquity,
     },
+    [enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK,
+        strategyId: enums_1.Strategies.Identifiers.Payback,
+        protocol: exports.PROTOCOLS.CrvUSD,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {

package/esm/services/strategiesService.js

@@ -520,6 +520,7 @@ function parseCrvUSDLeverageManagement(position, parseData) {
     const subData = subDataService.crvUSDLeverageManagementSubData.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.controller);
     const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
     if (isRepay) {
         _position.specific = {
@@ -541,10 +542,20 @@ function parseCrvUSDLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseCrvUSDPayback(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.crvUsdHealthRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.crvUSDPaybackSubData.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.controller, Math.random());
+    _position.strategy.strategyId = enums_1.Strategies.Identifiers.Payback;
+    return _position;
+}
 function parseMorphoBlueLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
@@ -553,6 +564,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const subData = subDataService.morphoBlueLeverageManagementSubData.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.marketId);
     const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
     if (isRepay) {
         _position.specific = {
@@ -574,7 +586,6 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
@@ -640,6 +651,7 @@ const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
+        [enums_1.Strategies.Identifiers.Payback]: parseCrvUSDPayback,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
         [enums_1.Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -80,6 +80,7 @@ export declare const sparkEncode: {
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
+    payback(proxyAddress: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
 };
 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): (boolean | string[] | Bundles.MainnetIds)[];

package/esm/services/strategySubService.js

@@ -232,6 +232,13 @@ exports.crvUSDEncode = {
         const isBundle = true;
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    payback(proxyAddress, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr, controllerAddr, minHealthRatio) {
+        const subData = subDataService.crvUSDPaybackSubData.encode(controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr);
+        const triggerData = triggerService.crvUsdHealthRatioTrigger.encode(proxyAddress, controllerAddr, minHealthRatio);
+        const strategyId = enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK;
+        const isBundle = false;
+        return [strategyId, isBundle, triggerData, subData];
+    },
 };
 exports.morphoBlueEncode = {
     leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user) {

package/esm/services/strategySubService.test.js

@@ -750,6 +750,40 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('payback()', () => {
+            const examples = [
+                [
+                    [
+                        enums_1.Strategies.MainnetIds.CURVEUSD_PAYBACK,
+                        false,
+                        [
+                            '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
+                        ],
+                        [
+                            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+                            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+                            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
+                        ],
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
+                        web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+                        web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+                        '20000',
+                        '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+                        web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
+                        20,
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(strategySubService_1.crvUSDEncode.payback(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.morphoBlueEncode', () => {
         describe('leverageManagement()', () => {

package/esm/services/subDataService.d.ts

@@ -158,6 +158,15 @@ export declare const crvUSDLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const crvUSDPaybackSubData: {
+    encode: (controllerAddr: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress) => string[];
+    decode: (subData: string[]) => {
+        controller: string;
+        addressToPullTokensFrom: string;
+        positionOwner: string;
+        paybackAmount: string;
+    };
+};
 export declare const morphoBlueLeverageManagementSubData: {
     encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress) => string[];
     decode: (subData: string[]) => {

package/esm/services/subDataService.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morphoBlueLeverageManagementSubData = 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.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");
 const tokens_1 = require("@defisaver/tokens");
 const sdk_1 = require("@defisaver/sdk");
 const enums_1 = require("../types/enums");
@@ -378,6 +379,35 @@ exports.crvUSDLeverageManagementSubData = {
         return { controller, targetRatio };
     },
 };
+exports.crvUSDPaybackSubData = {
+    encode: (controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr) => {
+        const controllerAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', controllerAddr);
+        const addressToPullTokensFromEncoded = web3_eth_abi_1.default.encodeParameter('address', addressToPullTokensFrom);
+        const positionOwnerEncoded = web3_eth_abi_1.default.encodeParameter('address', positionOwner);
+        const paybackAmountEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, web3_utils_1.toWei)(paybackAmount, 'ether'));
+        const crvUSDAddrEncoded = web3_eth_abi_1.default.encodeParameter('address', crvUSDAddr);
+        return [
+            controllerAddrEncoded,
+            addressToPullTokensFromEncoded,
+            positionOwnerEncoded,
+            paybackAmountEncoded,
+            crvUSDAddrEncoded,
+        ];
+    },
+    decode: (subData) => {
+        const controller = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const addressToPullTokensFrom = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const positionOwner = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const weiPaybackAmount = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
+        const paybackAmount = (0, web3_utils_1.fromWei)(weiPaybackAmount, 'ether');
+        return {
+            controller,
+            addressToPullTokensFrom,
+            positionOwner,
+            paybackAmount,
+        };
+    },
+};
 exports.morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user) => {
         const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);

package/esm/services/subDataService.test.js

@@ -1045,6 +1045,51 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.crvUSDPaybackSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+                        '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+                    ],
+                    ['0xa920de414ea4ab66b97da1bfe9e6eca7d4219635', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '20000', '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E'],
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService_1.crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        controller: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
+                        addressToPullTokensFrom: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+                        positionOwner: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+                        paybackAmount: '20000'
+                    },
+                    [
+                        '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+                        '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+                        '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+                    ]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(subDataService_1.crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/services/triggerService.d.ts

@@ -172,6 +172,14 @@ export declare const crvUSDRatioTrigger: {
         ratioState: number;
     };
 };
+export declare const crvUsdHealthRatioTrigger: {
+    encode(owner: EthereumAddress, controller: EthereumAddress, ratioPercentage: number): string[];
+    decode(triggerData: string[]): {
+        owner: string;
+        controller: string;
+        ratio: number;
+    };
+};
 export declare const morphoBlueRatioTrigger: {
     encode(marketId: string, owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
     decode(triggerData: string[]): {

package/esm/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.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.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"));
@@ -335,6 +335,20 @@ exports.crvUSDRatioTrigger = {
         };
     },
 };
+exports.crvUsdHealthRatioTrigger = {
+    encode(owner, controller, ratioPercentage) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256'], [owner, controller, ratioWei])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
+        return {
+            owner: decodedData[0],
+            controller: decodedData[1],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
+        };
+    },
+};
 exports.morphoBlueRatioTrigger = {
     encode(marketId, // bytes32
     owner, ratioPercentage, ratioState) {

package/esm/services/triggerService.test.js

@@ -859,6 +859,34 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.crvUsdHealthRatioTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000'],
+                    [web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'), web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), 20]
+                ]
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.crvUsdHealthRatioTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { owner: web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'), controller: web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), ratio: 20 },
+                    ['0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.crvUsdHealthRatioTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing triggerService.morphoBlueRatioTrigger', () => {
         describe('encode()', () => {
             const examples = [

package/esm/types/enums.d.ts

@@ -58,7 +58,8 @@ export declare namespace Strategies {
         EXCHANGE_LIMIT_ORDER = 51,
         LIQUITY_DSR_PAYBACK = 69,
         LIQUITY_DSR_SUPPLY = 70,
-        LIQUITY_DEBT_IN_FRONT_REPAY = 75
+        LIQUITY_DEBT_IN_FRONT_REPAY = 75,
+        CURVEUSD_PAYBACK = 92
     }
     enum OptimismIds {
         EXCHANGE_DCA = 8,
@@ -85,6 +86,7 @@ export declare namespace Strategies {
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
+        Payback = "payback",
         BondProtection = "bond-protection",
         Dca = "dca",
         LimitOrder = "limit-order",

package/esm/types/enums.js

@@ -71,6 +71,7 @@ var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DSR_PAYBACK"] = 69] = "LIQUITY_DSR_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_DSR_SUPPLY"] = 70] = "LIQUITY_DSR_SUPPLY";
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
+        MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -100,6 +101,7 @@ var Strategies;
         Identifiers["TrailingStopToColl"] = "trailing-stop-to-collateral";
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
+        Identifiers["Payback"] = "payback";
         Identifiers["BondProtection"] = "bond-protection";
         Identifiers["Dca"] = "dca";
         Identifiers["LimitOrder"] = "limit-order";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.0.2-dev",
+  "version": "3.0.3",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/automation/private/StrategiesAutomation.ts

@@ -46,7 +46,9 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getEventFromSubStorage(event: string, options?: PastEventOptions) {
-    if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || 0)) {
+    // only used for backfilling, so in case options?.fromBlock in undefined
+    // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+    if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || this.subStorageContract.createdBlock.toString())) {
       return [];
     }
     return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);

package/src/constants/index.ts

@@ -95,6 +95,11 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.DebtInFrontRepay,
     protocol: PROTOCOLS.Liquity,
   },
+  [Strategies.MainnetIds.CURVEUSD_PAYBACK]: {
+    strategyOrBundleId: Strategies.MainnetIds.CURVEUSD_PAYBACK,
+    strategyId: Strategies.Identifiers.Payback,
+    protocol: PROTOCOLS.CrvUSD,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO = {

package/src/services/ethereumService.ts

@@ -66,4 +66,4 @@ export async function getEventsFromContract<T extends BaseContract>(
   }
 
   return [...events, ...eventsFork];
-}
+}

package/src/services/strategiesService.ts

@@ -692,7 +692,10 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
 
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
+
   const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
@@ -713,12 +716,26 @@ function parseCrvUSDLeverageManagement(position: Position.Automated, parseData:
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller);
   _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;
 }
 
+function parseCrvUSDPayback(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+  const triggerData = triggerService.crvUsdHealthRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.crvUSDPaybackSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.controller, Math.random());
+  _position.strategy.strategyId = Strategies.Identifiers.Payback;
+
+  return _position;
+}
+
 function parseMorphoBlueLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -729,6 +746,9 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
+
+  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
+
   const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
 
   if (isRepay) {
@@ -751,7 +771,6 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
     };
   }
 
-  _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
   _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
 
   return _position;
@@ -819,6 +838,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
     [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
     [Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
+    [Strategies.Identifiers.Payback]: parseCrvUSDPayback,
   },
   [ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
     [Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,

package/src/services/strategySubService.test.ts

@@ -899,6 +899,44 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+    describe('payback()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [owner: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number],
+      ]> = [
+        [
+          [
+            Strategies.MainnetIds.CURVEUSD_PAYBACK,
+            false,
+            [
+              '0x0000000000000000000000007a2af22ba3276108cd331c8985ef9528e10a871a000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000002c68af0bb140000',
+            ],
+            [
+              '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+              '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+              '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e'
+            ],
+          ],
+          [
+            web3Utils.toChecksumAddress('0x7a2af22ba3276108cd331c8985ef9528e10a871a'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            web3Utils.toChecksumAddress('0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280'),
+            '20000',
+            '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E',
+            web3Utils.toChecksumAddress('0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635'),
+            20,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDEncode.payback(...actual)).to.eql(expected);
+        });
+      });
+    });
   });
   describe('When testing strategySubService.morphoBlueEncode', () => {
     describe('leverageManagement()', () => {

package/src/services/strategySubService.ts

@@ -447,6 +447,23 @@ export const crvUSDEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  payback(
+    proxyAddress: EthereumAddress,
+    addressToPullTokensFrom: EthereumAddress,
+    positionOwner: EthereumAddress,
+    paybackAmount: string,
+    crvUSDAddr: EthereumAddress,
+    controllerAddr: EthereumAddress,
+    minHealthRatio: number,
+  ) {
+    const subData = subDataService.crvUSDPaybackSubData.encode(controllerAddr, addressToPullTokensFrom, positionOwner, paybackAmount, crvUSDAddr);
+    const triggerData = triggerService.crvUsdHealthRatioTrigger.encode(proxyAddress, controllerAddr, minHealthRatio);
+
+    const strategyId = Strategies.MainnetIds.CURVEUSD_PAYBACK;
+    const isBundle = false;
+
+    return [strategyId, isBundle, triggerData, subData];
+  },
 };
 
 export const morphoBlueEncode = {

package/src/services/subDataService.test.ts

@@ -30,7 +30,7 @@ import {
   sparkLeverageManagementSubData,
   sparkQuotePriceSubData,
   crvUSDLeverageManagementSubData,
-  compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData,
+  compoundV3L2LeverageManagementSubData, morphoBlueLeverageManagementSubData, crvUSDPaybackSubData,
 } from './subDataService';
 
 describe('Feature: subDataService.ts', () => {
@@ -1125,6 +1125,58 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.crvUSDPaybackSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [controller: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress]]> = [
+        [
+          [
+            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+          ],
+          ['0xa920de414ea4ab66b97da1bfe9e6eca7d4219635', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280', '20000', '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E'],
+        ]
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(crvUSDPaybackSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{
+        controller: EthereumAddress,
+        addressToPullTokensFrom: EthereumAddress,
+        positionOwner: EthereumAddress,
+        paybackAmount: string,
+      }, SubData]> = [
+        [
+          {
+            controller: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
+            addressToPullTokensFrom: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+            positionOwner: '0xDc0Ad7a48088f1AA55d26f8b36F7C1E827DdD280',
+            paybackAmount: '20000'
+          },
+          [
+            '0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x000000000000000000000000dc0ad7a48088f1aa55d26f8b36f7c1e827ddd280',
+            '0x00000000000000000000000000000000000000000000043c33c1937564800000',
+            '0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e',
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDPaybackSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[