@defisaver/automation-sdk 3.3.22-coll-switch-generic-dev → 3.3.22

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

@@ -1,6 +1,6 @@
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
-import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber } from '../../types';
+import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber, ApiSubscriptionRecord } from '../../types';
 import type { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
@@ -30,6 +30,10 @@ export default class StrategiesAutomation extends Automation {
     protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
     protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
     getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records: ApiSubscriptionRecord[], options?: SubscriptionOptions): (Position.Automated | null)[];
     getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
 }
 export {};

package/cjs/automation/private/StrategiesAutomation.js

@@ -19,6 +19,7 @@ const utils_1 = require("../../services/utils");
 const contractService_1 = require("../../services/contractService");
 const ethereumService_1 = require("../../services/ethereumService");
 const strategiesService_1 = require("../../services/strategiesService");
+const apiSubscriptionsService_1 = require("../../services/apiSubscriptionsService");
 const Automation_1 = __importDefault(require("./Automation"));
 class StrategiesAutomation extends Automation_1.default {
     constructor(args) {
@@ -189,6 +190,17 @@ class StrategiesAutomation extends Automation_1.default {
             return this._getSubscriptions(undefined, options);
         });
     }
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records, options) {
+        const filtered = (options === null || options === void 0 ? void 0 : options.enabledOnly) ? records.filter((record) => record.is_enabled) : records;
+        let subscriptions = filtered.map((record) => this.getParsedSubscriptions((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, this.chainId)));
+        if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
+            subscriptions = this.mergeSubs(subscriptions);
+        }
+        return (options === null || options === void 0 ? void 0 : options.unexpiredOnly) ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
+    }
     getSubscriptionsFor(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._getSubscriptions(addresses, options);

package/cjs/automation/private/StrategiesAutomation.test.js

@@ -693,4 +693,55 @@ describe('Feature: StrategiesAutomation.ts', () => {
             (0, chai_1.expect)(loneBoost === null || loneBoost === void 0 ? void 0 : loneBoost.subId).to.equal(1);
         });
     }));
+    describe('When testing StrategiesAutomation.parseSubscriptionsFromApi', () => {
+        const strategiesAutomation = new StrategiesAutomation_1.default({
+            chainId: enums_1.ChainId.Ethereum,
+            provider: Web3_1,
+            providerFork: null,
+        });
+        const owner = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
+        const subData = [
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+        ];
+        // Aave V3 leverage management: repay (bundle 8, ratio under) and boost (bundle 9, ratio over) for the same owner and market
+        const repay = {
+            id: 379,
+            wallet: owner,
+            wallet_type: 'safe',
+            is_enabled: true,
+            is_bundle: true,
+            strategy_or_bundle_id: 8,
+            strategy_ids: [34, 35],
+            sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001'],
+            sub_data: subData,
+            block_number: 18015756,
+            additional_triggers: null,
+        };
+        const boost = Object.assign(Object.assign({}, repay), { id: 380, is_enabled: false, strategy_or_bundle_id: 9, sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111', trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'] });
+        it('Given API records should return parsed positions', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost]);
+            (0, chai_1.expect)(positions).to.have.length(2);
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379, 380]);
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.isEnabled)).to.eql([true, false]);
+        });
+        it('Given mergeSubs option should merge the repay and boost pair', () => {
+            var _a, _b;
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { mergeSubs: true });
+            (0, chai_1.expect)(positions).to.have.length(1);
+            (0, chai_1.expect)((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.subIds).to.eql([379, 380]);
+            (0, chai_1.expect)((_b = positions[0]) === null || _b === void 0 ? void 0 : _b.isEnabled).to.equal(true);
+        });
+        it('Given enabledOnly option should drop disabled records before parsing', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { enabledOnly: true });
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379]);
+        });
+        it('Given a record of an unknown strategy should return null for it', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { strategy_or_bundle_id: 9999 })]);
+            (0, chai_1.expect)(positions).to.eql([null]);
+        });
+    });
 });

package/cjs/constants/index.js

@@ -107,11 +107,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
     [enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH]: {
         strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V4_COLLATERAL_SWITCH,
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
@@ -132,16 +127,6 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
         protocol: exports.PROTOCOLS.Spark,
     },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -159,21 +144,6 @@ exports.OPTIMISM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.OptimismIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.BASE_STRATEGIES_INFO = {
     [enums_1.Strategies.BaseIds.EXCHANGE_DCA]: {
@@ -191,21 +161,6 @@ exports.BASE_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.BaseIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.ARBITRUM_STRATEGIES_INFO = {
     [enums_1.Strategies.ArbitrumIds.EXCHANGE_DCA]: {
@@ -223,21 +178,6 @@ exports.ARBITRUM_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH,
-        strategyId: enums_1.Strategies.Identifiers.DebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
-    [enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA]: {
-        strategyOrBundleId: enums_1.Strategies.ArbitrumIds.AAVE_V3_DEBT_SWITCH_EOA,
-        strategyId: enums_1.Strategies.Identifiers.EoaDebtSwitch,
-        protocol: exports.PROTOCOLS.AaveV3,
-    },
 };
 exports.STRATEGIES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_STRATEGIES_INFO,

package/cjs/services/apiSubscriptionsService.d.ts

@@ -0,0 +1,7 @@
+import type { ApiSubscriptionRecord, ParseData } from '../types';
+import type { ChainId } from '../types/enums';
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+export declare function parseDataFromApiSubscription(record: ApiSubscriptionRecord, chainId: ChainId): ParseData;

package/cjs/services/apiSubscriptionsService.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDataFromApiSubscription = void 0;
+function addHexPrefix(value) {
+    return value.startsWith('0x') ? value : `0x${value}`;
+}
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+function parseDataFromApiSubscription(record, chainId) {
+    return {
+        chainId,
+        blockNumber: record.block_number,
+        subscriptionEventData: {
+            subId: record.id.toString(),
+            proxy: record.wallet,
+            subHash: record.sub_data_hash,
+            subStruct: {
+                strategyOrBundleId: record.strategy_or_bundle_id.toString(),
+                isBundle: record.is_bundle,
+                triggerData: record.trigger_data.map(addHexPrefix),
+                subData: record.sub_data.map(addHexPrefix),
+            },
+        },
+        strategiesSubsData: {
+            userProxy: record.wallet,
+            isEnabled: record.is_enabled,
+            strategySubHash: record.sub_data_hash,
+        },
+    };
+}
+exports.parseDataFromApiSubscription = parseDataFromApiSubscription;

package/cjs/services/apiSubscriptionsService.test.d.ts

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

package/cjs/services/apiSubscriptionsService.test.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const enums_1 = require("../types/enums");
+require("../configuration");
+const apiSubscriptionsService_1 = require("./apiSubscriptionsService");
+const strategiesService_1 = require("./strategiesService");
+describe('Feature: apiSubscriptionsService.ts', () => {
+    describe('When testing apiSubscriptionsService.parseDataFromApiSubscription', () => {
+        // same subscription as in strategiesService.test.ts, in the shape the automation API returns it
+        const record = {
+            id: 379,
+            wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+            wallet_type: 'safe',
+            is_enabled: true,
+            is_bundle: true,
+            strategy_or_bundle_id: 8,
+            strategy_ids: [34, 35],
+            sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            trigger_data: [
+                '0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+            ],
+            sub_data: [
+                '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+            block_number: 18015756,
+            additional_triggers: null,
+        };
+        const fromEvents = {
+            chainId: enums_1.ChainId.Ethereum,
+            blockNumber: 18015756,
+            subscriptionEventData: {
+                subId: '379',
+                proxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+                subStruct: {
+                    strategyOrBundleId: '8',
+                    isBundle: true,
+                    triggerData: [
+                        '0x0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+                    ],
+                    subData: record.sub_data,
+                },
+            },
+            strategiesSubsData: {
+                userProxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                isEnabled: true,
+                strategySubHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            },
+        };
+        it('Given an API record should return the same parse data as Subscribe event and SubStorage would', () => {
+            (0, chai_1.expect)((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, enums_1.ChainId.Ethereum)).to.eql(fromEvents);
+        });
+        it('Given an API record the parsed position should match the one parsed from events', () => {
+            const fromApi = (0, strategiesService_1.parseStrategiesAutomatedPosition)((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, enums_1.ChainId.Ethereum));
+            (0, chai_1.expect)(fromApi).to.not.equal(null);
+            (0, chai_1.expect)(fromApi).to.eql((0, strategiesService_1.parseStrategiesAutomatedPosition)(fromEvents));
+        });
+        it('Given a disabled record should keep it disabled', () => {
+            const parseData = (0, apiSubscriptionsService_1.parseDataFromApiSubscription)(Object.assign(Object.assign({}, record), { is_enabled: false }), enums_1.ChainId.Ethereum);
+            (0, chai_1.expect)(parseData.strategiesSubsData.isEnabled).to.equal(false);
+        });
+    });
+});

package/cjs/services/strategiesService.js

@@ -347,29 +347,12 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     return _position;
 }
 function parseAaveV3CollateralSwitch(position, parseData) {
-    const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct } = parseData.subscriptionEventData;
-    const isEOA = _position.strategy.strategyId.includes('eoa');
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = isEOA
-        ? subDataService.aaveV3GenericFLCollateralSwitchSubData.decode(subStruct.subData)
-        : subDataService.aaveV3CollateralSwitchSubData.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.marketAddr);
-    _position.strategy.strategyId = isEOA
-        ? enums_1.Strategies.Identifiers.EoaCollateralSwitch
-        : enums_1.Strategies.Identifiers.CollateralSwitch;
-    return _position;
-}
-function parseAaveV3DebtSwitch(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3DebtSwitchSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV3CollateralSwitchSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    // TODO -> This isn't enough for ID
     _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     return _position;
 }
@@ -1263,9 +1246,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
-        [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV3CollateralSwitch,
-        [enums_1.Strategies.Identifiers.DebtSwitch]: parseAaveV3DebtSwitch,
-        [enums_1.Strategies.Identifiers.EoaDebtSwitch]: parseAaveV3DebtSwitch,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
         [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },

package/cjs/services/strategiesService.test.js

@@ -14,98 +14,6 @@ const enums_1 = require("../types/enums");
 require("../configuration");
 const strategiesService_1 = require("./strategiesService");
 describe('Feature: strategiesService.ts', () => {
-    describe('When parsing Aave V3 collateral switch subscriptions', () => {
-        const proxy = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
-        const user = '0x1234567890123456789012345678901234567890';
-        const fromAsset = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-        const toAsset = '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf';
-        const marketAddr = '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e';
-        const amountToSwitch = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
-        const subHash = `0x${'ab'.repeat(32)}`;
-        const triggerData = [
-            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
-                + '000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf'
-                + '0000000000000000000000000000000000000000000000000000000000989680'
-                + '0000000000000000000000000000000000000000000000000000000000000001',
-        ];
-        function getParseData(strategyId, isGeneric, chainId = enums_1.ChainId.Ethereum) {
-            const subData = [
-                '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                isGeneric
-                    ? '0x0000000000000000000000000000000000000000000000000000000000000100'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-                '0x000000000000000000000000cbb7c0000ab88b473b1f5afd9ef808440eed33bf',
-                isGeneric
-                    ? '0x000000000000000000000000000000000000000000000000000000000000ffff'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000007',
-                '0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e',
-                '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                isGeneric
-                    ? '0x0000000000000000000000001234567890123456789012345678901234567890'
-                    : '0x0000000000000000000000000000000000000000000000000000000000000000',
-            ];
-            const subStruct = Object.assign([String(strategyId), false, triggerData, subData], { strategyOrBundleId: String(strategyId), isBundle: false, triggerData, subData });
-            return {
-                chainId,
-                blockNumber: 18015756,
-                subscriptionEventData: {
-                    subId: '379', proxy, subHash, subStruct,
-                    0: '379', 1: proxy, 2: subHash, 3: subStruct,
-                },
-                strategiesSubsData: {
-                    userProxy: proxy, isEnabled: true, strategySubHash: subHash,
-                },
-            };
-        }
-        const genericStrategies = [
-            [enums_1.ChainId.Ethereum, enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Optimism, enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Arbitrum, enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-            [enums_1.ChainId.Base, enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH_EOA],
-        ];
-        genericStrategies.forEach(([chainId, strategyId]) => {
-            it(`decodes generic collateral switches with the user and uint16 reserve IDs on chain ${chainId}`, () => {
-                const parseData = getParseData(strategyId, true, chainId);
-                const position = (0, strategiesService_1.parseStrategiesAutomatedPosition)(parseData);
-                (0, chai_1.expect)(position).not.to.equal(null);
-                (0, chai_1.expect)(position.protocol.id).to.equal(enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV3);
-                (0, chai_1.expect)(position.strategy.strategyId).to.equal(enums_1.Strategies.Identifiers.EoaCollateralSwitch);
-                (0, chai_1.expect)(position.strategy.isBundle).to.equal(false);
-                (0, chai_1.expect)(position.strategyData.encoded).to.eql({
-                    triggerData,
-                    subData: parseData.subscriptionEventData.subStruct.subData,
-                });
-                (0, chai_1.expect)(position.strategyData.decoded.triggerData).to.eql({
-                    baseTokenAddress: fromAsset,
-                    quoteTokenAddress: toAsset,
-                    price: '0.1',
-                    ratioState: enums_1.RatioState.UNDER,
-                });
-                (0, chai_1.expect)(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 256, toAsset, toAssetId: 65535, marketAddr, amountToSwitch, user,
-                });
-                (0, chai_1.expect)(position.owner).to.equal(proxy.toLowerCase());
-                (0, chai_1.expect)(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-        const legacyStrategies = [
-            [enums_1.ChainId.Ethereum, enums_1.Strategies.MainnetIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Optimism, enums_1.Strategies.OptimismIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Arbitrum, enums_1.Strategies.ArbitrumIds.AAVE_V3_COLLATERAL_SWITCH],
-            [enums_1.ChainId.Base, enums_1.Strategies.BaseIds.AAVE_V3_COLLATERAL_SWITCH],
-        ];
-        legacyStrategies.forEach(([chainId, strategyId]) => {
-            it(`continues to decode legacy collateral switches on chain ${chainId}`, () => {
-                const position = (0, strategiesService_1.parseStrategiesAutomatedPosition)(getParseData(strategyId, false, chainId));
-                (0, chai_1.expect)(position).not.to.equal(null);
-                (0, chai_1.expect)(position.strategy.strategyId).to.equal(enums_1.Strategies.Identifiers.CollateralSwitch);
-                (0, chai_1.expect)(position.strategyData.decoded.subData).to.eql({
-                    fromAsset, fromAssetId: 0, toAsset, toAssetId: 7, marketAddr, amountToSwitch,
-                });
-                (0, chai_1.expect)(position.positionId).to.equal(`${chainId}-aave__v3-${proxy.toLowerCase()}-${marketAddr.toLowerCase()}`);
-            });
-        });
-    });
     describe('When testing strategiesService.parseStrategiesAutomatedPosition', () => __awaiter(void 0, void 0, void 0, function* () {
         // TODO: we should probably write this for every strategy?
         const examples = [
@@ -175,7 +83,6 @@ describe('Feature: strategiesService.ts', () => {
                         subId: '379',
                         proxy: '0x9cb7e19861665366011899d74e75d4f2a419aeed',
                         subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
-                        // @ts-ignore
                         subStruct: {
                             strategyOrBundleId: '8',
                             isBundle: true,

package/cjs/services/strategySubService.d.ts

@@ -62,8 +62,6 @@ export declare const aaveV3Encode: {
     leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
-    collateralSwitchGeneric(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
-    debtSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(strategyOrBundleId: number, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];

package/cjs/services/strategySubService.js

@@ -196,18 +196,6 @@ exports.aaveV3Encode = {
         const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
-    collateralSwitchGeneric(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3GenericFLCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
-    debtSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
-        const isBundle = false;
-        const subDataEncoded = subDataService.aaveV3DebtSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
-        const triggerDataEncoded = triggerService.aaveV3QuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
-        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
-    },
 };
 exports.compoundV2Encode = {
     leverageManagement(strategyOrBundleId, user, ratioState, targetRatio, triggerRatio) {

package/cjs/services/strategySubService.test.js

@@ -856,113 +856,6 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
-        describe('collateralSwitchGeneric()', () => {
-            const strategyId = 12345;
-            const fromAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address);
-            const toAsset = web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address);
-            const marketAddr = web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39');
-            const user = web3Utils.toChecksumAddress('0x1234567890abcdef1234567890abcdef12345678');
-            const examples = [
-                [
-                    enums_1.RatioState.UNDER,
-                    '10000000000000000000',
-                    '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                    '0000000000000000000000000000000000000000000000000000000000000001',
-                ],
-                [
-                    enums_1.RatioState.OVER,
-                    tokens_1.MAXUINT,
-                    '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                    '0000000000000000000000000000000000000000000000000000000000000000',
-                ],
-            ];
-            examples.forEach(([state, amountToSwitch, encodedAmount, encodedState]) => {
-                it(`encodes a generic collateral switch with the supplied quote pair and state ${state}`, () => {
-                    const expectedTrigger = `0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000000003e8${encodedState}`;
-                    const expectedSubData = [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                        '0x0000000000000000000000000000000000000000000000000000000000000100',
-                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                        '0x000000000000000000000000000000000000000000000000000000000000ffff',
-                        '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                        encodedAmount,
-                        '0x0000000000000000000000001234567890abcdef1234567890abcdef12345678',
-                    ];
-                    (0, chai_1.expect)(strategySubService_1.aaveV3Encode.collateralSwitchGeneric(strategyId, fromAsset, 256, toAsset, 65535, marketAddr, amountToSwitch, user, toAsset, fromAsset, 0.00001, state)).to.eql([strategyId, false, [expectedTrigger], expectedSubData]);
-                });
-            });
-        });
-        describe('debtSwitch()', () => {
-            const examples = [
-                // USDC -> DAI, price 100000, state UNDER
-                [
-                    [
-                        enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000009184e72a0000000000000000000000000000000000000000000000000000000000000000001'],
-                        [
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0x0000000000000000000000000000000000000000000000008ac7230489e80000',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        '10000000000000000000',
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        100000,
-                        enums_1.RatioState.UNDER,
-                    ]
-                ],
-                // DAI -> USDC (MaxUint256), price 1, state OVER
-                [
-                    [
-                        enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        false,
-                        ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
-                            '0x0000000000000000000000000000000000000000000000000000000000000003',
-                            '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-                            '0x0000000000000000000000000000000000000000000000000000000000000001',
-                            '0x00000000000000000000000087870bca3f3fd6335c3f4ce8392d69d0b4161d39',
-                            '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-                            '0x000000000000000000000000dd6ecd6c9b9f7e29e0f14bb9d5f0d0a3c6cb6c6a',
-                        ],
-                    ],
-                    [
-                        enums_1.Strategies.MainnetIds.AAVE_V3_DEBT_SWITCH,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        3,
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1,
-                        web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        tokens_1.MAXUINT,
-                        web3Utils.toChecksumAddress('0xDd6ecD6c9b9F7e29E0f14bb9D5F0D0A3C6cB6c6A'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        1,
-                        enums_1.RatioState.OVER,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(strategySubService_1.aaveV3Encode.debtSwitch(...actual)).to.eql(expected);
-                });
-            });
-        });
     });
     describe('When testing strategySubService.compoundV3Encode', () => {
         describe('leverageManagementOnPrice()', () => {

package/cjs/services/subDataService.d.ts

@@ -259,30 +259,6 @@ export declare const aaveV3CollateralSwitchSubData: {
         amountToSwitch: string;
     };
 };
-export declare const aaveV3GenericFLCollateralSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
-    decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
-        marketAddr: EthereumAddress;
-        amountToSwitch: string;
-        user: EthereumAddress;
-    };
-};
-export declare const aaveV3DebtSwitchSubData: {
-    encode(fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress): string[];
-    decode(subData: string[]): {
-        fromAsset: EthereumAddress;
-        fromAssetId: number;
-        toAsset: EthereumAddress;
-        toAssetId: number;
-        marketAddr: EthereumAddress;
-        amountToSwitch: string;
-        user: EthereumAddress;
-    };
-};
 export declare const aaveV3QuotePriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
     decode(subData: string[]): {