@defisaver/automation-sdk 3.3.19-sub-fetching.1-dev → 3.3.19-sub-fetching.2-dev

package/cjs/automation/private/StrategiesAutomation.js

@@ -21,18 +21,6 @@ const ethereumService_1 = require("../../services/ethereumService");
 const strategiesService_1 = require("../../services/strategiesService");
 const apiSubscriptionsService_1 = require("../../services/apiSubscriptionsService");
 const Automation_1 = __importDefault(require("./Automation"));
-/**
- * Adds the backend flags to a parsed position. A repay or boost half of a leverage management pair also gets its
- * own invalid flag in specific, next to repayEnabled and boostEnabled, so it survives merging.
- */
-const withApiFlags = (position, record) => {
-    const specific = Object.assign({}, position.specific);
-    if ((0, utils_1.isDefined)(specific.mergeWithId))
-        specific.repayInvalid = record.invalid;
-    if ((0, utils_1.isDefined)(specific.mergeId))
-        specific.boostInvalid = record.invalid;
-    return Object.assign(Object.assign({}, position), { invalid: record.invalid, specific: specific });
-};
 class StrategiesAutomation extends Automation_1.default {
     constructor(args) {
         super();
@@ -139,9 +127,9 @@ class StrategiesAutomation extends Automation_1.default {
             if (mergePairIndex !== -1) {
                 const mergePair = mergeExtension[mergePairIndex];
                 mergeExtension.splice(mergePairIndex, 1);
-                subscriptions.push(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                subscriptions.push(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
                     // @ts-ignore
-                    blockNumber: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled }), (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(current.invalid), { invalid: !!mergePair.invalid && !!current.invalid })), { specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
+                    blockNumber: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
             }
             else {
                 subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
@@ -207,10 +195,7 @@ class StrategiesAutomation extends Automation_1.default {
      */
     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) => {
-            const position = this.getParsedSubscriptions((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, this.chainId));
-            return position && withApiFlags(position, record);
-        });
+        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);
         }

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

@@ -712,8 +712,6 @@ describe('Feature: StrategiesAutomation.ts', () => {
             wallet: owner,
             wallet_type: 'safe',
             is_enabled: true,
-            invalid: false,
-            status: enums_1.SubscriptionStatus.Active,
             is_bundle: true,
             strategy_or_bundle_id: 8,
             strategy_ids: [34, 35],
@@ -723,25 +721,12 @@ describe('Feature: StrategiesAutomation.ts', () => {
             block_number: 18015756,
             additional_triggers: null,
         };
-        const boost = Object.assign(Object.assign({}, repay), { id: 380, is_enabled: false, status: enums_1.SubscriptionStatus.Disabled, strategy_or_bundle_id: 9, sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111', trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'] });
-        it('Given API records should return parsed positions carrying the invalid flags', () => {
-            var _a, _b;
-            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })]);
+        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]);
-            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.invalid)).to.eql([false, true]);
-            (0, chai_1.expect)(((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.specific).repayInvalid).to.equal(false);
-            (0, chai_1.expect)(((_b = positions[1]) === null || _b === void 0 ? void 0 : _b.specific).boostInvalid).to.equal(true);
-        });
-        it('Given a merged pair should keep each half\'s invalid flag and mark the pair invalid only when both are', () => {
-            var _a, _b, _c;
-            const oneInvalid = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
-            (0, chai_1.expect)(oneInvalid).to.have.length(1);
-            (0, chai_1.expect)((_a = oneInvalid[0]) === null || _a === void 0 ? void 0 : _a.invalid).to.equal(false);
-            (0, chai_1.expect)((_b = oneInvalid[0]) === null || _b === void 0 ? void 0 : _b.specific).to.include({ repayInvalid: false, boostInvalid: true });
-            const bothInvalid = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { invalid: true }), Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
-            (0, chai_1.expect)((_c = bothInvalid[0]) === null || _c === void 0 ? void 0 : _c.invalid).to.equal(true);
         });
         it('Given mergeSubs option should merge the repay and boost pair', () => {
             var _a, _b;

package/cjs/services/apiSubscriptionsService.test.js

@@ -13,8 +13,6 @@ describe('Feature: apiSubscriptionsService.ts', () => {
             wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
             wallet_type: 'safe',
             is_enabled: true,
-            invalid: false,
-            status: enums_1.SubscriptionStatus.Active,
             is_bundle: true,
             strategy_or_bundle_id: 8,
             strategy_ids: [34, 35],

package/cjs/types/enums.d.ts

@@ -4,12 +4,6 @@ export declare enum ChainId {
     Arbitrum = 42161,
     Base = 8453
 }
-export declare enum SubscriptionStatus {
-    Active = "active",
-    Disabled = "disabled",
-    Finished = "finished",
-    Invalid = "invalid"
-}
 export declare enum RatioState {
     OVER = 0,
     UNDER = 1

package/cjs/types/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.CloseToAssetType = exports.CloseStrategyType = exports.DebtActionType = exports.CollActionType = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.SubscriptionStatus = exports.ChainId = void 0;
+exports.Bundles = exports.Strategies = exports.ProtocolIdentifiers = exports.CloseToAssetType = exports.CloseStrategyType = exports.DebtActionType = exports.CollActionType = exports.BundleProtocols = exports.OrderType = exports.RatioState = exports.ChainId = void 0;
 var ChainId;
 (function (ChainId) {
     ChainId[ChainId["Ethereum"] = 1] = "Ethereum";
@@ -8,13 +8,6 @@ var ChainId;
     ChainId[ChainId["Arbitrum"] = 42161] = "Arbitrum";
     ChainId[ChainId["Base"] = 8453] = "Base";
 })(ChainId = exports.ChainId || (exports.ChainId = {}));
-var SubscriptionStatus;
-(function (SubscriptionStatus) {
-    SubscriptionStatus["Active"] = "active";
-    SubscriptionStatus["Disabled"] = "disabled";
-    SubscriptionStatus["Finished"] = "finished";
-    SubscriptionStatus["Invalid"] = "invalid";
-})(SubscriptionStatus = exports.SubscriptionStatus || (exports.SubscriptionStatus = {}));
 var RatioState;
 (function (RatioState) {
     RatioState[RatioState["OVER"] = 0] = "OVER";

package/cjs/types/index.d.ts

@@ -2,7 +2,7 @@ import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
 import type { StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType, SubscriptionStatus } from './enums';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -59,8 +59,6 @@ export interface ApiSubscriptionRecord {
     wallet: EthereumAddress;
     wallet_type: string;
     is_enabled: boolean;
-    invalid: boolean;
-    status: SubscriptionStatus;
     is_bundle: boolean;
     strategy_or_bundle_id: number;
     strategy_ids: number[];
@@ -122,9 +120,6 @@ export declare namespace Position {
             triggerBoostRatio?: number;
             targetBoostRatio?: number;
             boostEnabled?: boolean;
-            /** Set only for subscriptions parsed from the automation API: the backend marked that half invalid */
-            repayInvalid?: boolean;
-            boostInvalid?: boolean;
         }
         interface CloseOnPrice extends Base {
             price: string;
@@ -258,8 +253,6 @@ export declare namespace Position {
         subId: number;
         subIds?: number[];
         isEnabled?: boolean;
-        /** Set only for subscriptions parsed from the automation API: the backend will not execute this subscription */
-        invalid?: boolean;
         subHash: string;
         blockNumber: BlockNumber;
         protocol: Interfaces.Protocol;

package/esm/automation/private/StrategiesAutomation.js

@@ -16,18 +16,6 @@ import { getEventsFromContract, multicall } from '../../services/ethereumService
 import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
 import { parseDataFromApiSubscription } from '../../services/apiSubscriptionsService';
 import Automation from './Automation';
-/**
- * Adds the backend flags to a parsed position. A repay or boost half of a leverage management pair also gets its
- * own invalid flag in specific, next to repayEnabled and boostEnabled, so it survives merging.
- */
-const withApiFlags = (position, record) => {
-    const specific = Object.assign({}, position.specific);
-    if (isDefined(specific.mergeWithId))
-        specific.repayInvalid = record.invalid;
-    if (isDefined(specific.mergeId))
-        specific.boostInvalid = record.invalid;
-    return Object.assign(Object.assign({}, position), { invalid: record.invalid, specific: specific });
-};
 export default class StrategiesAutomation extends Automation {
     constructor(args) {
         super();
@@ -134,9 +122,9 @@ export default class StrategiesAutomation extends Automation {
             if (mergePairIndex !== -1) {
                 const mergePair = mergeExtension[mergePairIndex];
                 mergeExtension.splice(mergePairIndex, 1);
-                subscriptions.push(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                subscriptions.push(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
                     // @ts-ignore
-                    blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled }), addToObjectIf(isDefined(current.invalid), { invalid: !!mergePair.invalid && !!current.invalid })), { specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
+                    blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
             }
             else {
                 subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
@@ -202,10 +190,7 @@ export default class StrategiesAutomation extends Automation {
      */
     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) => {
-            const position = this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId));
-            return position && withApiFlags(position, record);
-        });
+        let subscriptions = filtered.map((record) => this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId)));
         if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
             subscriptions = this.mergeSubs(subscriptions);
         }

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Web3 from 'web3';
 import { expect } from 'chai';
-import { ChainId, SubscriptionStatus } from '../../types/enums';
+import { ChainId } from '../../types/enums';
 import '../../configuration';
 import StrategiesAutomation from './StrategiesAutomation';
 require('dotenv').config({ path: '.env' });
@@ -707,8 +707,6 @@ describe('Feature: StrategiesAutomation.ts', () => {
             wallet: owner,
             wallet_type: 'safe',
             is_enabled: true,
-            invalid: false,
-            status: SubscriptionStatus.Active,
             is_bundle: true,
             strategy_or_bundle_id: 8,
             strategy_ids: [34, 35],
@@ -718,25 +716,12 @@ describe('Feature: StrategiesAutomation.ts', () => {
             block_number: 18015756,
             additional_triggers: null,
         };
-        const boost = Object.assign(Object.assign({}, repay), { id: 380, is_enabled: false, status: SubscriptionStatus.Disabled, strategy_or_bundle_id: 9, sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111', trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'] });
-        it('Given API records should return parsed positions carrying the invalid flags', () => {
-            var _a, _b;
-            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })]);
+        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]);
             expect(positions).to.have.length(2);
             expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379, 380]);
             expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.isEnabled)).to.eql([true, false]);
-            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.invalid)).to.eql([false, true]);
-            expect(((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.specific).repayInvalid).to.equal(false);
-            expect(((_b = positions[1]) === null || _b === void 0 ? void 0 : _b.specific).boostInvalid).to.equal(true);
-        });
-        it('Given a merged pair should keep each half\'s invalid flag and mark the pair invalid only when both are', () => {
-            var _a, _b, _c;
-            const oneInvalid = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
-            expect(oneInvalid).to.have.length(1);
-            expect((_a = oneInvalid[0]) === null || _a === void 0 ? void 0 : _a.invalid).to.equal(false);
-            expect((_b = oneInvalid[0]) === null || _b === void 0 ? void 0 : _b.specific).to.include({ repayInvalid: false, boostInvalid: true });
-            const bothInvalid = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { invalid: true }), Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
-            expect((_c = bothInvalid[0]) === null || _c === void 0 ? void 0 : _c.invalid).to.equal(true);
         });
         it('Given mergeSubs option should merge the repay and boost pair', () => {
             var _a, _b;

package/esm/services/apiSubscriptionsService.test.js

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { ChainId, SubscriptionStatus } from '../types/enums';
+import { ChainId } from '../types/enums';
 import '../configuration';
 import { parseDataFromApiSubscription } from './apiSubscriptionsService';
 import { parseStrategiesAutomatedPosition } from './strategiesService';
@@ -11,8 +11,6 @@ describe('Feature: apiSubscriptionsService.ts', () => {
             wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
             wallet_type: 'safe',
             is_enabled: true,
-            invalid: false,
-            status: SubscriptionStatus.Active,
             is_bundle: true,
             strategy_or_bundle_id: 8,
             strategy_ids: [34, 35],

package/esm/types/enums.d.ts

@@ -4,12 +4,6 @@ export declare enum ChainId {
     Arbitrum = 42161,
     Base = 8453
 }
-export declare enum SubscriptionStatus {
-    Active = "active",
-    Disabled = "disabled",
-    Finished = "finished",
-    Invalid = "invalid"
-}
 export declare enum RatioState {
     OVER = 0,
     UNDER = 1

package/esm/types/enums.js

@@ -5,13 +5,6 @@ export var ChainId;
     ChainId[ChainId["Arbitrum"] = 42161] = "Arbitrum";
     ChainId[ChainId["Base"] = 8453] = "Base";
 })(ChainId || (ChainId = {}));
-export var SubscriptionStatus;
-(function (SubscriptionStatus) {
-    SubscriptionStatus["Active"] = "active";
-    SubscriptionStatus["Disabled"] = "disabled";
-    SubscriptionStatus["Finished"] = "finished";
-    SubscriptionStatus["Invalid"] = "invalid";
-})(SubscriptionStatus || (SubscriptionStatus = {}));
 export var RatioState;
 (function (RatioState) {
     RatioState[RatioState["OVER"] = 0] = "OVER";

package/esm/types/index.d.ts

@@ -2,7 +2,7 @@ import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
 import type { StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType, SubscriptionStatus } from './enums';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -59,8 +59,6 @@ export interface ApiSubscriptionRecord {
     wallet: EthereumAddress;
     wallet_type: string;
     is_enabled: boolean;
-    invalid: boolean;
-    status: SubscriptionStatus;
     is_bundle: boolean;
     strategy_or_bundle_id: number;
     strategy_ids: number[];
@@ -122,9 +120,6 @@ export declare namespace Position {
             triggerBoostRatio?: number;
             targetBoostRatio?: number;
             boostEnabled?: boolean;
-            /** Set only for subscriptions parsed from the automation API: the backend marked that half invalid */
-            repayInvalid?: boolean;
-            boostInvalid?: boolean;
         }
         interface CloseOnPrice extends Base {
             price: string;
@@ -258,8 +253,6 @@ export declare namespace Position {
         subId: number;
         subIds?: number[];
         isEnabled?: boolean;
-        /** Set only for subscriptions parsed from the automation API: the backend will not execute this subscription */
-        invalid?: boolean;
         subHash: string;
         blockNumber: BlockNumber;
         protocol: Interfaces.Protocol;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.19-sub-fetching.1-dev",
+  "version": "3.3.19-sub-fetching.2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/automation/private/StrategiesAutomation.test.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { expect } from 'chai';
 
-import { ChainId, SubscriptionStatus } from '../../types/enums';
+import { ChainId } from '../../types/enums';
 import type { ApiSubscriptionRecord } from '../../types';
 
 import '../../configuration';
@@ -722,8 +722,6 @@ describe('Feature: StrategiesAutomation.ts', () => {
       wallet: owner,
       wallet_type: 'safe',
       is_enabled: true,
-      invalid: false,
-      status: SubscriptionStatus.Active,
       is_bundle: true,
       strategy_or_bundle_id: 8,
       strategy_ids: [34, 35],
@@ -737,33 +735,16 @@ describe('Feature: StrategiesAutomation.ts', () => {
       ...repay,
       id: 380,
       is_enabled: false,
-      status: SubscriptionStatus.Disabled,
       strategy_or_bundle_id: 9,
       sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111',
       trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'],
     };
 
-    it('Given API records should return parsed positions carrying the invalid flags', () => {
-      const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, { ...boost, invalid: true }]);
+    it('Given API records should return parsed positions', () => {
+      const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost]);
       expect(positions).to.have.length(2);
       expect(positions.map((p) => p?.subId)).to.eql([379, 380]);
       expect(positions.map((p) => p?.isEnabled)).to.eql([true, false]);
-      expect(positions.map((p) => p?.invalid)).to.eql([false, true]);
-      expect((positions[0]?.specific as { repayInvalid?: boolean }).repayInvalid).to.equal(false);
-      expect((positions[1]?.specific as { boostInvalid?: boolean }).boostInvalid).to.equal(true);
-    });
-
-    it('Given a merged pair should keep each half\'s invalid flag and mark the pair invalid only when both are', () => {
-      const oneInvalid = strategiesAutomation.parseSubscriptionsFromApi([repay, { ...boost, invalid: true }], { mergeSubs: true });
-      expect(oneInvalid).to.have.length(1);
-      expect(oneInvalid[0]?.invalid).to.equal(false);
-      expect(oneInvalid[0]?.specific).to.include({ repayInvalid: false, boostInvalid: true });
-
-      const bothInvalid = strategiesAutomation.parseSubscriptionsFromApi(
-        [{ ...repay, invalid: true }, { ...boost, invalid: true }],
-        { mergeSubs: true },
-      );
-      expect(bothInvalid[0]?.invalid).to.equal(true);
     });
 
     it('Given mergeSubs option should merge the repay and boost pair', () => {

package/src/automation/private/StrategiesAutomation.ts

@@ -25,17 +25,6 @@ interface IStrategiesAutomation extends Interfaces.Automation {
   providerFork?: Web3,
 }
 
-/**
- * Adds the backend flags to a parsed position. A repay or boost half of a leverage management pair also gets its
- * own invalid flag in specific, next to repayEnabled and boostEnabled, so it survives merging.
- */
-const withApiFlags = (position: Position.Automated, record: ApiSubscriptionRecord): Position.Automated => {
-  const specific = { ...position.specific } as Position.Specific.RatioProtection;
-  if (isDefined(specific.mergeWithId)) specific.repayInvalid = record.invalid;
-  if (isDefined(specific.mergeId)) specific.boostInvalid = record.invalid;
-  return { ...position, invalid: record.invalid, specific: specific as Position.SpecificAny };
-};
-
 export default class StrategiesAutomation extends Automation {
   protected chainId: ChainId;
 
@@ -180,8 +169,6 @@ export default class StrategiesAutomation extends Automation {
           blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
           subIds: [current.subId, mergePair.subId],
           isEnabled: mergePair.isEnabled || current.isEnabled,
-          // set only for subscriptions parsed from the automation API, per half flags live in specific
-          ...addToObjectIf(isDefined(current.invalid), { invalid: !!mergePair.invalid && !!current.invalid }),
           specific: {
             ...mergePair.specific,
             ...current.specific,
@@ -280,10 +267,7 @@ export default class StrategiesAutomation extends Automation {
   public parseSubscriptionsFromApi(records: ApiSubscriptionRecord[], options?: SubscriptionOptions): (Position.Automated | null)[] {
     const filtered = options?.enabledOnly ? records.filter((record) => record.is_enabled) : records;
 
-    let subscriptions: (Position.Automated | null)[] = filtered.map((record) => {
-      const position = this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId));
-      return position && withApiFlags(position, record);
-    });
+    let subscriptions = filtered.map((record) => this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId)));
 
     if (options?.mergeSubs) {
       subscriptions = this.mergeSubs(subscriptions);

package/src/services/apiSubscriptionsService.test.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import type { ApiSubscriptionRecord, ParseData } from '../types';
-import { ChainId, SubscriptionStatus } from '../types/enums';
+import { ChainId } from '../types/enums';
 
 import '../configuration';
 import { parseDataFromApiSubscription } from './apiSubscriptionsService';
@@ -15,8 +15,6 @@ describe('Feature: apiSubscriptionsService.ts', () => {
       wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
       wallet_type: 'safe',
       is_enabled: true,
-      invalid: false,
-      status: SubscriptionStatus.Active,
       is_bundle: true,
       strategy_or_bundle_id: 8,
       strategy_ids: [34, 35],

package/src/types/enums.ts

@@ -5,13 +5,6 @@ export enum ChainId {
   Base = 8453,
 }
 
-export enum SubscriptionStatus {
-  Active = 'active',
-  Disabled = 'disabled',
-  Finished = 'finished',
-  Invalid = 'invalid',
-}
-
 export enum RatioState {
   OVER = 0,
   UNDER = 1,

package/src/types/index.ts

@@ -6,7 +6,6 @@ import type {
   ChainId, Strategies, Bundles, ProtocolIdentifiers,
   RatioState,
   CloseToAssetType,
-  SubscriptionStatus,
 } from './enums';
 
 export type PlaceholderType = any; // TODO - fix any types
@@ -79,8 +78,6 @@ export interface ApiSubscriptionRecord {
   wallet: EthereumAddress,
   wallet_type: string,
   is_enabled: boolean,
-  invalid: boolean,
-  status: SubscriptionStatus,
   is_bundle: boolean,
   strategy_or_bundle_id: number,
   strategy_ids: number[],
@@ -150,9 +147,6 @@ export declare namespace Position {
       triggerBoostRatio?: number,
       targetBoostRatio?: number,
       boostEnabled?: boolean,
-      /** Set only for subscriptions parsed from the automation API: the backend marked that half invalid */
-      repayInvalid?: boolean,
-      boostInvalid?: boolean,
     }
     interface CloseOnPrice extends Base {
       price: string,
@@ -323,8 +317,6 @@ export declare namespace Position {
     subId: number,
     subIds?: number[],
     isEnabled?: boolean,
-    /** Set only for subscriptions parsed from the automation API: the backend will not execute this subscription */
-    invalid?: boolean,
     subHash: string,
     blockNumber: BlockNumber,
     protocol: Interfaces.Protocol,