@defisaver/automation-sdk 3.0.4 → 3.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (143) hide show
  1. package/.babelrc +3 -3
  2. package/.editorconfig +9 -9
  3. package/.env.dev +4 -4
  4. package/.eslintignore +6 -6
  5. package/.eslintrc.js +41 -41
  6. package/.tests.sh +2 -2
  7. package/README.md +41 -41
  8. package/esm/abis/Erc20.json +223 -223
  9. package/esm/abis/SubStorage.json +17 -17
  10. package/esm/abis/UniMulticall.json +14 -14
  11. package/esm/abis/index.d.ts +9 -9
  12. package/esm/abis/index.js +30 -30
  13. package/esm/abis/legacy_AaveV2Subscriptions.json +8 -8
  14. package/esm/abis/legacy_AuthCheck.json +8 -8
  15. package/esm/abis/legacy_CompoundV2Subscriptions.json +9 -9
  16. package/esm/abis/legacy_MakerSubscriptions.json +9 -9
  17. package/esm/automation/private/Automation.d.ts +12 -12
  18. package/esm/automation/private/Automation.js +42 -42
  19. package/esm/automation/private/LegacyAutomation.d.ts +25 -25
  20. package/esm/automation/private/LegacyAutomation.js +118 -118
  21. package/esm/automation/private/LegacyProtocol.d.ts +22 -22
  22. package/esm/automation/private/LegacyProtocol.js +41 -41
  23. package/esm/automation/private/LegacyProtocol.test.d.ts +1 -1
  24. package/esm/automation/private/LegacyProtocol.test.js +25 -25
  25. package/esm/automation/private/Protocol.d.ts +22 -22
  26. package/esm/automation/private/Protocol.js +41 -41
  27. package/esm/automation/private/Protocol.test.d.ts +1 -1
  28. package/esm/automation/private/Protocol.test.js +25 -25
  29. package/esm/automation/private/StrategiesAutomation.d.ts +33 -33
  30. package/esm/automation/private/StrategiesAutomation.js +181 -181
  31. package/esm/automation/private/StrategiesAutomation.test.d.ts +1 -1
  32. package/esm/automation/private/StrategiesAutomation.test.js +671 -671
  33. package/esm/automation/public/ArbitrumStrategies.d.ts +5 -5
  34. package/esm/automation/public/ArbitrumStrategies.js +13 -13
  35. package/esm/automation/public/EthereumStrategies.d.ts +5 -5
  36. package/esm/automation/public/EthereumStrategies.js +13 -13
  37. package/esm/automation/public/OptimismStrategies.d.ts +5 -5
  38. package/esm/automation/public/OptimismStrategies.js +13 -13
  39. package/esm/automation/public/legacy/LegacyAaveAutomation.d.ts +6 -6
  40. package/esm/automation/public/legacy/LegacyAaveAutomation.js +20 -20
  41. package/esm/automation/public/legacy/LegacyCompoundAutomation.d.ts +6 -6
  42. package/esm/automation/public/legacy/LegacyCompoundAutomation.js +20 -20
  43. package/esm/automation/public/legacy/LegacyMakerAutomation.d.ts +6 -6
  44. package/esm/automation/public/legacy/LegacyMakerAutomation.js +20 -20
  45. package/esm/configuration.d.ts +1 -1
  46. package/esm/configuration.js +12 -12
  47. package/esm/constants/index.d.ts +45 -45
  48. package/esm/constants/index.js +395 -385
  49. package/esm/index.d.ts +22 -22
  50. package/esm/index.js +63 -63
  51. package/esm/services/contractService.d.ts +12 -12
  52. package/esm/services/contractService.js +54 -54
  53. package/esm/services/ethereumService.d.ts +7 -7
  54. package/esm/services/ethereumService.js +49 -49
  55. package/esm/services/ethereumService.test.d.ts +1 -1
  56. package/esm/services/ethereumService.test.js +242 -242
  57. package/esm/services/strategiesService.d.ts +2 -2
  58. package/esm/services/strategiesService.js +701 -698
  59. package/esm/services/strategiesService.test.d.ts +1 -1
  60. package/esm/services/strategiesService.test.js +110 -110
  61. package/esm/services/strategySubService.d.ts +87 -87
  62. package/esm/services/strategySubService.js +257 -252
  63. package/esm/services/strategySubService.test.d.ts +1 -1
  64. package/esm/services/strategySubService.test.js +892 -890
  65. package/esm/services/subDataService.d.ts +181 -181
  66. package/esm/services/subDataService.js +442 -442
  67. package/esm/services/subDataService.test.d.ts +1 -1
  68. package/esm/services/subDataService.test.js +1223 -1223
  69. package/esm/services/triggerService.d.ts +191 -191
  70. package/esm/services/triggerService.js +367 -367
  71. package/esm/services/triggerService.test.d.ts +1 -1
  72. package/esm/services/triggerService.test.js +926 -926
  73. package/esm/services/utils.d.ts +25 -25
  74. package/esm/services/utils.js +131 -131
  75. package/esm/services/utils.test.d.ts +1 -1
  76. package/esm/services/utils.test.js +376 -376
  77. package/esm/types/contracts/generated/Erc20.d.ts +53 -53
  78. package/esm/types/contracts/generated/Erc20.js +5 -5
  79. package/esm/types/contracts/generated/Legacy_AaveV2Subscriptions.d.ts +129 -129
  80. package/esm/types/contracts/generated/Legacy_AaveV2Subscriptions.js +5 -5
  81. package/esm/types/contracts/generated/Legacy_AuthCheck.d.ts +20 -20
  82. package/esm/types/contracts/generated/Legacy_AuthCheck.js +5 -5
  83. package/esm/types/contracts/generated/Legacy_CompoundV2Subscriptions.d.ts +128 -128
  84. package/esm/types/contracts/generated/Legacy_CompoundV2Subscriptions.js +5 -5
  85. package/esm/types/contracts/generated/Legacy_MakerSubscriptions.d.ts +246 -246
  86. package/esm/types/contracts/generated/Legacy_MakerSubscriptions.js +5 -5
  87. package/esm/types/contracts/generated/SubStorage.d.ts +114 -114
  88. package/esm/types/contracts/generated/SubStorage.js +5 -5
  89. package/esm/types/contracts/generated/UniMulticall.d.ts +55 -55
  90. package/esm/types/contracts/generated/UniMulticall.js +5 -5
  91. package/esm/types/contracts/generated/index.d.ts +7 -7
  92. package/esm/types/contracts/generated/index.js +2 -2
  93. package/esm/types/contracts/generated/types.d.ts +54 -54
  94. package/esm/types/contracts/generated/types.js +2 -2
  95. package/esm/types/enums.d.ts +160 -158
  96. package/esm/types/enums.js +180 -178
  97. package/esm/types/index.d.ts +217 -217
  98. package/esm/types/index.js +2 -2
  99. package/package.json +71 -71
  100. package/scripts/generateContractTypes.js +39 -39
  101. package/src/abis/Erc20.json +222 -222
  102. package/src/abis/SubStorage.json +17 -17
  103. package/src/abis/UniMulticall.json +14 -14
  104. package/src/abis/index.ts +28 -28
  105. package/src/abis/legacy_AaveV2Subscriptions.json +7 -7
  106. package/src/abis/legacy_AuthCheck.json +7 -7
  107. package/src/abis/legacy_CompoundV2Subscriptions.json +8 -8
  108. package/src/abis/legacy_MakerSubscriptions.json +8 -8
  109. package/src/automation/private/Automation.ts +44 -44
  110. package/src/automation/private/LegacyAutomation.ts +135 -135
  111. package/src/automation/private/LegacyProtocol.test.ts +23 -23
  112. package/src/automation/private/LegacyProtocol.ts +51 -51
  113. package/src/automation/private/Protocol.test.ts +23 -23
  114. package/src/automation/private/Protocol.ts +51 -51
  115. package/src/automation/private/StrategiesAutomation.test.ts +663 -663
  116. package/src/automation/private/StrategiesAutomation.ts +242 -242
  117. package/src/automation/public/ArbitrumStrategies.ts +10 -10
  118. package/src/automation/public/EthereumStrategies.ts +10 -10
  119. package/src/automation/public/OptimismStrategies.ts +10 -10
  120. package/src/automation/public/legacy/LegacyAaveAutomation.ts +20 -20
  121. package/src/automation/public/legacy/LegacyCompoundAutomation.ts +20 -20
  122. package/src/automation/public/legacy/LegacyMakerAutomation.ts +20 -20
  123. package/src/configuration.ts +8 -8
  124. package/src/constants/index.ts +409 -399
  125. package/src/index.ts +38 -38
  126. package/src/services/contractService.ts +77 -77
  127. package/src/services/ethereumService.test.ts +257 -257
  128. package/src/services/ethereumService.ts +69 -69
  129. package/src/services/strategiesService.test.ts +105 -105
  130. package/src/services/strategiesService.ts +905 -901
  131. package/src/services/strategySubService.test.ts +1063 -1060
  132. package/src/services/strategySubService.ts +496 -492
  133. package/src/services/subDataService.test.ts +1324 -1324
  134. package/src/services/subDataService.ts +594 -593
  135. package/src/services/triggerService.test.ts +1004 -1004
  136. package/src/services/triggerService.ts +449 -449
  137. package/src/services/utils.test.ts +430 -430
  138. package/src/services/utils.ts +103 -103
  139. package/src/types/enums.ts +174 -172
  140. package/src/types/index.ts +262 -262
  141. package/tsconfig.json +79 -79
  142. package/umd/index.js +41 -24
  143. package/webpack.umd.js +52 -52
@@ -1,242 +1,242 @@
1
- import Dec from 'decimal.js';
2
- import type Web3 from 'web3';
3
- import type { PastEventOptions } from 'web3-eth-contract';
4
- import type {
5
- Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
6
- } from '../../types';
7
- import type {
8
- StrategyModel, SubStorage,
9
- } from '../../types/contracts/generated/SubStorage';
10
- import type { ChainId } from '../../types/enums';
11
- import { Strategies, ProtocolIdentifiers } from '../../types/enums';
12
-
13
- import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
14
- import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
15
- import { getEventsFromContract, multicall } from '../../services/ethereumService';
16
- import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
17
-
18
- import Automation from './Automation';
19
-
20
- interface IStrategiesAutomation extends Interfaces.Automation {
21
- chainId: ChainId,
22
- providerFork: Web3,
23
- }
24
-
25
- export default class StrategiesAutomation extends Automation {
26
- protected chainId: ChainId;
27
-
28
- protected web3: Web3;
29
-
30
- protected web3Fork: Web3;
31
-
32
- protected subStorageContract: Contract.WithMeta<SubStorage>;
33
-
34
- protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
35
-
36
- constructor(args: IStrategiesAutomation) {
37
- super();
38
-
39
- this.web3 = args.provider;
40
- this.web3Fork = args.providerFork;
41
- this.chainId = args.chainId;
42
- this.subStorageContract = makeSubStorageContract(this.web3, this.chainId);
43
- this.subStorageContractFork = this.web3Fork ? makeSubStorageContract(this.web3Fork, this.chainId) : null;
44
-
45
- this.assert();
46
- }
47
-
48
- protected async getEventFromSubStorage(event: string, options?: PastEventOptions) {
49
- // only used for backfilling, so in case options?.fromBlock in undefined
50
- // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
51
- if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || this.subStorageContract.createdBlock.toString())) {
52
- return [];
53
- }
54
- return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);
55
- }
56
-
57
- protected async getStrategiesSubs(subIds: number[], fromBlock: BlockNumber = 'latest'): Promise<StrategyModel.StoredSubDataStructOutputStruct[]> {
58
- let options : any;
59
- let web3: Web3;
60
-
61
- if (this.web3Fork && this.subStorageContractFork) {
62
- options = {
63
- target: this.subStorageContractFork.address,
64
- abiItem: getAbiItem(this.subStorageContractFork.abi, 'strategiesSubs'),
65
- };
66
- web3 = this.web3Fork;
67
- } else {
68
- options = {
69
- target: this.subStorageContract.address,
70
- abiItem: getAbiItem(this.subStorageContract.abi, 'strategiesSubs'),
71
- };
72
- web3 = this.web3;
73
- }
74
-
75
- const multicallCalls = subIds.map((subId) => ({ ...options, params: [subId] }));
76
- return multicall(web3, this.chainId, multicallCalls, fromBlock);
77
- }
78
-
79
- protected async getSubscriptionEventsFromSubStorage(options?: PastEventOptions) {
80
- return this.getEventFromSubStorage('Subscribe', options);
81
- }
82
-
83
- protected async getUpdateDataEventsFromSubStorage(options?: PastEventOptions) {
84
- const events = await this.getEventFromSubStorage('UpdateData', options);
85
- /** @dev - Some RPCs sort events differently */
86
- return events.sort((a, b) => a.blockNumber - b.blockNumber);
87
- }
88
-
89
- protected getParsedSubscriptions(parseData: ParseData) {
90
- return parseStrategiesAutomatedPosition(parseData);
91
- }
92
-
93
- /**
94
- * @description Removes expired Limit Order subscriptions
95
- */
96
- protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]) {
97
- return subscriptions.filter((subscription: Position.Automated | null) => {
98
- if (!subscription) {
99
- return true;
100
- }
101
-
102
- const { protocol, strategy, strategyData } = subscription;
103
-
104
- if (
105
- protocol.id === ProtocolIdentifiers.StrategiesAutomation.Exchange
106
- && strategy.strategyId === Strategies.Identifiers.LimitOrder
107
- ) {
108
- return new Dec(strategyData.decoded.triggerData.goodUntil).gt(new Dec(Date.now()).div(1000));
109
- }
110
-
111
- return true;
112
- });
113
- }
114
-
115
- private _mergeCheck(s:Position.Automated, current:Position.Automated) {
116
- return s.owner === current.owner
117
- && s.strategy.strategyId === current.strategy.strategyId
118
- && s.protocol.id === current.protocol.id
119
- && s.specific.mergeId === current.specific.mergeWithId
120
- && (
121
- s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
122
- || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId
123
- )
124
- && (
125
- s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
126
- || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase()
127
- )
128
- && (
129
- s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
130
- || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase()
131
- );
132
- }
133
-
134
- protected mergeSubs(_subscriptions:(Position.Automated | null)[]) {
135
- const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId)) as Position.Automated[];
136
- const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId)) as Position.Automated[];
137
-
138
- let subscriptions:Position.Automated[] = (_subscriptions.filter(s => isDefined(s) && isUndefined(s.specific.mergeWithId) && isUndefined(s.specific.mergeId)) as Position.Automated[]).map((s) => ({
139
- ...s,
140
- subIds: [s.subId],
141
- }));
142
- mergeBase.forEach((current) => {
143
- const mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
144
- const mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
145
-
146
- const mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
147
-
148
- if (mergePairIndex !== -1) {
149
- const mergePair = mergeExtension[mergePairIndex];
150
- mergeExtension.splice(mergePairIndex, 1);
151
- subscriptions.push({
152
- ...mergePair,
153
- ...current,
154
- // @ts-ignore
155
- blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
156
- subIds: [current.subId, mergePair.subId],
157
- isEnabled: mergePair.isEnabled || current.isEnabled,
158
- specific: {
159
- ...mergePair.specific,
160
- ...current.specific,
161
- },
162
- });
163
- } else {
164
- subscriptions.push({
165
- ...current,
166
- subIds: [current.subId],
167
- });
168
- }
169
- });
170
- if (mergeExtension.length > 0) {
171
- console.error('Not all merge-able extensions were used', mergeExtension);
172
- subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
173
- ...s,
174
- subIds: [s.subId],
175
- }))];
176
- }
177
- return subscriptions;
178
- }
179
-
180
- protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
181
- const _options = {
182
- ...addToObjectIf(isDefined(options), options),
183
- ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
184
- } as SubscriptionOptions & PastEventOptions;
185
-
186
- let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
187
-
188
- let subscriptions: (Position.Automated | null)[] = [];
189
-
190
- if (subscriptionEvents) {
191
- let strategiesSubs = await this.getStrategiesSubs(
192
- subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
193
- );
194
-
195
- if (_options.enabledOnly) {
196
- const filteredSubscriptionEvents = [] as PlaceholderType;
197
-
198
- strategiesSubs = strategiesSubs.filter((sub, index) => {
199
- if (sub?.isEnabled) filteredSubscriptionEvents.push(subscriptionEvents[index]);
200
- return sub?.isEnabled;
201
- });
202
-
203
- subscriptionEvents = filteredSubscriptionEvents;
204
- }
205
-
206
- subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
207
- let latestUpdate = subscriptionEvents[index].returnValues;
208
-
209
- if (latestUpdate.subHash !== sub?.strategySubHash) {
210
- const updates = await this.getUpdateDataEventsFromSubStorage({
211
- ...addToObjectIf(!!_options, _options),
212
- filter: { subId: latestUpdate.subId },
213
- });
214
- latestUpdate = {
215
- ...latestUpdate, // Update is missing proxy, hence this
216
- ...updates?.[updates.length - 1]?.returnValues,
217
- };
218
- }
219
- return this.getParsedSubscriptions({
220
- chainId: this.chainId,
221
- blockNumber: subscriptionEvents[index].blockNumber,
222
- subscriptionEventData: latestUpdate,
223
- strategiesSubsData: sub,
224
- });
225
- }));
226
-
227
- if (options?.mergeSubs) {
228
- subscriptions = this.mergeSubs(subscriptions);
229
- }
230
- }
231
-
232
- return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
233
- }
234
-
235
- public async getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
236
- return this._getSubscriptions(undefined, options);
237
- }
238
-
239
- public async getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
240
- return this._getSubscriptions(addresses, options);
241
- }
242
- }
1
+ import Dec from 'decimal.js';
2
+ import type Web3 from 'web3';
3
+ import type { PastEventOptions } from 'web3-eth-contract';
4
+ import type {
5
+ Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
6
+ } from '../../types';
7
+ import type {
8
+ StrategyModel, SubStorage,
9
+ } from '../../types/contracts/generated/SubStorage';
10
+ import type { ChainId } from '../../types/enums';
11
+ import { Strategies, ProtocolIdentifiers } from '../../types/enums';
12
+
13
+ import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
14
+ import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
15
+ import { getEventsFromContract, multicall } from '../../services/ethereumService';
16
+ import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
17
+
18
+ import Automation from './Automation';
19
+
20
+ interface IStrategiesAutomation extends Interfaces.Automation {
21
+ chainId: ChainId,
22
+ providerFork: Web3,
23
+ }
24
+
25
+ export default class StrategiesAutomation extends Automation {
26
+ protected chainId: ChainId;
27
+
28
+ protected web3: Web3;
29
+
30
+ protected web3Fork: Web3;
31
+
32
+ protected subStorageContract: Contract.WithMeta<SubStorage>;
33
+
34
+ protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
35
+
36
+ constructor(args: IStrategiesAutomation) {
37
+ super();
38
+
39
+ this.web3 = args.provider;
40
+ this.web3Fork = args.providerFork;
41
+ this.chainId = args.chainId;
42
+ this.subStorageContract = makeSubStorageContract(this.web3, this.chainId);
43
+ this.subStorageContractFork = this.web3Fork ? makeSubStorageContract(this.web3Fork, this.chainId) : null;
44
+
45
+ this.assert();
46
+ }
47
+
48
+ protected async getEventFromSubStorage(event: string, options?: PastEventOptions) {
49
+ // only used for backfilling, so in case options?.fromBlock in undefined
50
+ // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
51
+ if (new Dec(this.subStorageContract.createdBlock.toString()).gt(options?.fromBlock?.toString() || this.subStorageContract.createdBlock.toString())) {
52
+ return [];
53
+ }
54
+ return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);
55
+ }
56
+
57
+ protected async getStrategiesSubs(subIds: number[], fromBlock: BlockNumber = 'latest'): Promise<StrategyModel.StoredSubDataStructOutputStruct[]> {
58
+ let options : any;
59
+ let web3: Web3;
60
+
61
+ if (this.web3Fork && this.subStorageContractFork) {
62
+ options = {
63
+ target: this.subStorageContractFork.address,
64
+ abiItem: getAbiItem(this.subStorageContractFork.abi, 'strategiesSubs'),
65
+ };
66
+ web3 = this.web3Fork;
67
+ } else {
68
+ options = {
69
+ target: this.subStorageContract.address,
70
+ abiItem: getAbiItem(this.subStorageContract.abi, 'strategiesSubs'),
71
+ };
72
+ web3 = this.web3;
73
+ }
74
+
75
+ const multicallCalls = subIds.map((subId) => ({ ...options, params: [subId] }));
76
+ return multicall(web3, this.chainId, multicallCalls, fromBlock);
77
+ }
78
+
79
+ protected async getSubscriptionEventsFromSubStorage(options?: PastEventOptions) {
80
+ return this.getEventFromSubStorage('Subscribe', options);
81
+ }
82
+
83
+ protected async getUpdateDataEventsFromSubStorage(options?: PastEventOptions) {
84
+ const events = await this.getEventFromSubStorage('UpdateData', options);
85
+ /** @dev - Some RPCs sort events differently */
86
+ return events.sort((a, b) => a.blockNumber - b.blockNumber);
87
+ }
88
+
89
+ protected getParsedSubscriptions(parseData: ParseData) {
90
+ return parseStrategiesAutomatedPosition(parseData);
91
+ }
92
+
93
+ /**
94
+ * @description Removes expired Limit Order subscriptions
95
+ */
96
+ protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]) {
97
+ return subscriptions.filter((subscription: Position.Automated | null) => {
98
+ if (!subscription) {
99
+ return true;
100
+ }
101
+
102
+ const { protocol, strategy, strategyData } = subscription;
103
+
104
+ if (
105
+ protocol.id === ProtocolIdentifiers.StrategiesAutomation.Exchange
106
+ && strategy.strategyId === Strategies.Identifiers.LimitOrder
107
+ ) {
108
+ return new Dec(strategyData.decoded.triggerData.goodUntil).gt(new Dec(Date.now()).div(1000));
109
+ }
110
+
111
+ return true;
112
+ });
113
+ }
114
+
115
+ private _mergeCheck(s:Position.Automated, current:Position.Automated) {
116
+ return s.owner === current.owner
117
+ && s.strategy.strategyId === current.strategy.strategyId
118
+ && s.protocol.id === current.protocol.id
119
+ && s.specific.mergeId === current.specific.mergeWithId
120
+ && (
121
+ s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
122
+ || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId
123
+ )
124
+ && (
125
+ s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
126
+ || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase()
127
+ )
128
+ && (
129
+ s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
130
+ || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase()
131
+ );
132
+ }
133
+
134
+ protected mergeSubs(_subscriptions:(Position.Automated | null)[]) {
135
+ const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId)) as Position.Automated[];
136
+ const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId)) as Position.Automated[];
137
+
138
+ let subscriptions:Position.Automated[] = (_subscriptions.filter(s => isDefined(s) && isUndefined(s.specific.mergeWithId) && isUndefined(s.specific.mergeId)) as Position.Automated[]).map((s) => ({
139
+ ...s,
140
+ subIds: [s.subId],
141
+ }));
142
+ mergeBase.forEach((current) => {
143
+ const mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
144
+ const mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
145
+
146
+ const mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
147
+
148
+ if (mergePairIndex !== -1) {
149
+ const mergePair = mergeExtension[mergePairIndex];
150
+ mergeExtension.splice(mergePairIndex, 1);
151
+ subscriptions.push({
152
+ ...mergePair,
153
+ ...current,
154
+ // @ts-ignore
155
+ blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
156
+ subIds: [current.subId, mergePair.subId],
157
+ isEnabled: mergePair.isEnabled || current.isEnabled,
158
+ specific: {
159
+ ...mergePair.specific,
160
+ ...current.specific,
161
+ },
162
+ });
163
+ } else {
164
+ subscriptions.push({
165
+ ...current,
166
+ subIds: [current.subId],
167
+ });
168
+ }
169
+ });
170
+ if (mergeExtension.length > 0) {
171
+ console.error('Not all merge-able extensions were used', mergeExtension);
172
+ subscriptions = [...subscriptions, ...mergeExtension.map((s) => ({
173
+ ...s,
174
+ subIds: [s.subId],
175
+ }))];
176
+ }
177
+ return subscriptions;
178
+ }
179
+
180
+ protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
181
+ const _options = {
182
+ ...addToObjectIf(isDefined(options), options),
183
+ ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
184
+ } as SubscriptionOptions & PastEventOptions;
185
+
186
+ let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
187
+
188
+ let subscriptions: (Position.Automated | null)[] = [];
189
+
190
+ if (subscriptionEvents) {
191
+ let strategiesSubs = await this.getStrategiesSubs(
192
+ subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
193
+ );
194
+
195
+ if (_options.enabledOnly) {
196
+ const filteredSubscriptionEvents = [] as PlaceholderType;
197
+
198
+ strategiesSubs = strategiesSubs.filter((sub, index) => {
199
+ if (sub?.isEnabled) filteredSubscriptionEvents.push(subscriptionEvents[index]);
200
+ return sub?.isEnabled;
201
+ });
202
+
203
+ subscriptionEvents = filteredSubscriptionEvents;
204
+ }
205
+
206
+ subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
207
+ let latestUpdate = subscriptionEvents[index].returnValues;
208
+
209
+ if (latestUpdate.subHash !== sub?.strategySubHash) {
210
+ const updates = await this.getUpdateDataEventsFromSubStorage({
211
+ ...addToObjectIf(!!_options, _options),
212
+ filter: { subId: latestUpdate.subId },
213
+ });
214
+ latestUpdate = {
215
+ ...latestUpdate, // Update is missing proxy, hence this
216
+ ...updates?.[updates.length - 1]?.returnValues,
217
+ };
218
+ }
219
+ return this.getParsedSubscriptions({
220
+ chainId: this.chainId,
221
+ blockNumber: subscriptionEvents[index].blockNumber,
222
+ subscriptionEventData: latestUpdate,
223
+ strategiesSubsData: sub,
224
+ });
225
+ }));
226
+
227
+ if (options?.mergeSubs) {
228
+ subscriptions = this.mergeSubs(subscriptions);
229
+ }
230
+ }
231
+
232
+ return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
233
+ }
234
+
235
+ public async getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
236
+ return this._getSubscriptions(undefined, options);
237
+ }
238
+
239
+ public async getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
240
+ return this._getSubscriptions(addresses, options);
241
+ }
242
+ }
@@ -1,10 +1,10 @@
1
- import type { Interfaces } from '../../types';
2
-
3
- import StrategiesAutomation from '../private/StrategiesAutomation';
4
- import { ChainId } from '../../types/enums';
5
-
6
- export default class ArbitrumStrategies extends StrategiesAutomation {
7
- constructor(args: Interfaces.Automation) {
8
- super({ ...args, chainId: ChainId.Arbitrum });
9
- }
10
- }
1
+ import type { Interfaces } from '../../types';
2
+
3
+ import StrategiesAutomation from '../private/StrategiesAutomation';
4
+ import { ChainId } from '../../types/enums';
5
+
6
+ export default class ArbitrumStrategies extends StrategiesAutomation {
7
+ constructor(args: Interfaces.Automation) {
8
+ super({ ...args, chainId: ChainId.Arbitrum });
9
+ }
10
+ }
@@ -1,10 +1,10 @@
1
- import type { Interfaces } from '../../types';
2
-
3
- import StrategiesAutomation from '../private/StrategiesAutomation';
4
- import { ChainId } from '../../types/enums';
5
-
6
- export default class EthereumStrategies extends StrategiesAutomation {
7
- constructor(args: Interfaces.Automation) {
8
- super({ ...args, chainId: ChainId.Ethereum });
9
- }
10
- }
1
+ import type { Interfaces } from '../../types';
2
+
3
+ import StrategiesAutomation from '../private/StrategiesAutomation';
4
+ import { ChainId } from '../../types/enums';
5
+
6
+ export default class EthereumStrategies extends StrategiesAutomation {
7
+ constructor(args: Interfaces.Automation) {
8
+ super({ ...args, chainId: ChainId.Ethereum });
9
+ }
10
+ }
@@ -1,10 +1,10 @@
1
- import type { Interfaces } from '../../types';
2
-
3
- import StrategiesAutomation from '../private/StrategiesAutomation';
4
- import { ChainId } from '../../types/enums';
5
-
6
- export default class OptimismStrategies extends StrategiesAutomation {
7
- constructor(args: Interfaces.Automation) {
8
- super({ ...args, chainId: ChainId.Optimism });
9
- }
10
- }
1
+ import type { Interfaces } from '../../types';
2
+
3
+ import StrategiesAutomation from '../private/StrategiesAutomation';
4
+ import { ChainId } from '../../types/enums';
5
+
6
+ export default class OptimismStrategies extends StrategiesAutomation {
7
+ constructor(args: Interfaces.Automation) {
8
+ super({ ...args, chainId: ChainId.Optimism });
9
+ }
10
+ }
@@ -1,20 +1,20 @@
1
- import type { Interfaces } from '../../../types';
2
- import type { Legacy_AaveV2Subscriptions } from '../../../types/contracts/generated';
3
-
4
- import { LEGACY_PROTOCOLS } from '../../../constants';
5
- import { AaveV2SubscriptionsJson } from '../../../abis';
6
-
7
- import { makeLegacySubscriptionContract } from '../../../services/contractService';
8
-
9
- import LegacyAutomation from '../../private/LegacyAutomation';
10
-
11
- export default class LegacyAaveAutomation extends LegacyAutomation {
12
- constructor(args: Interfaces.LegacyAutomation<Legacy_AaveV2Subscriptions>) {
13
- super({
14
- provider: args.provider,
15
- subscriptionsJson: makeLegacySubscriptionContract(args.provider, AaveV2SubscriptionsJson),
16
- monitorAddress: '0x380982902872836ceC629171DaeAF42EcC02226e',
17
- protocol: LEGACY_PROTOCOLS.AaveV2,
18
- });
19
- }
20
- }
1
+ import type { Interfaces } from '../../../types';
2
+ import type { Legacy_AaveV2Subscriptions } from '../../../types/contracts/generated';
3
+
4
+ import { LEGACY_PROTOCOLS } from '../../../constants';
5
+ import { AaveV2SubscriptionsJson } from '../../../abis';
6
+
7
+ import { makeLegacySubscriptionContract } from '../../../services/contractService';
8
+
9
+ import LegacyAutomation from '../../private/LegacyAutomation';
10
+
11
+ export default class LegacyAaveAutomation extends LegacyAutomation {
12
+ constructor(args: Interfaces.LegacyAutomation<Legacy_AaveV2Subscriptions>) {
13
+ super({
14
+ provider: args.provider,
15
+ subscriptionsJson: makeLegacySubscriptionContract(args.provider, AaveV2SubscriptionsJson),
16
+ monitorAddress: '0x380982902872836ceC629171DaeAF42EcC02226e',
17
+ protocol: LEGACY_PROTOCOLS.AaveV2,
18
+ });
19
+ }
20
+ }
@@ -1,20 +1,20 @@
1
- import type { Interfaces } from '../../../types';
2
- import type { Legacy_CompoundV2Subscriptions } from '../../../types/contracts/generated';
3
-
4
- import { LEGACY_PROTOCOLS } from '../../../constants';
5
- import { CompoundV2SubscriptionsJson } from '../../../abis';
6
-
7
- import { makeLegacySubscriptionContract } from '../../../services/contractService';
8
-
9
- import LegacyAutomation from '../../private/LegacyAutomation';
10
-
11
- export default class LegacyAaveAutomation extends LegacyAutomation {
12
- constructor(args: Interfaces.LegacyAutomation<Legacy_CompoundV2Subscriptions>) {
13
- super({
14
- provider: args.provider,
15
- subscriptionsJson: makeLegacySubscriptionContract(args.provider, CompoundV2SubscriptionsJson),
16
- monitorAddress: '0xB1cF8DE8e791E4Ed1Bd86c03E2fc1f14389Cb10a',
17
- protocol: LEGACY_PROTOCOLS.CompoundV2,
18
- });
19
- }
20
- }
1
+ import type { Interfaces } from '../../../types';
2
+ import type { Legacy_CompoundV2Subscriptions } from '../../../types/contracts/generated';
3
+
4
+ import { LEGACY_PROTOCOLS } from '../../../constants';
5
+ import { CompoundV2SubscriptionsJson } from '../../../abis';
6
+
7
+ import { makeLegacySubscriptionContract } from '../../../services/contractService';
8
+
9
+ import LegacyAutomation from '../../private/LegacyAutomation';
10
+
11
+ export default class LegacyAaveAutomation extends LegacyAutomation {
12
+ constructor(args: Interfaces.LegacyAutomation<Legacy_CompoundV2Subscriptions>) {
13
+ super({
14
+ provider: args.provider,
15
+ subscriptionsJson: makeLegacySubscriptionContract(args.provider, CompoundV2SubscriptionsJson),
16
+ monitorAddress: '0xB1cF8DE8e791E4Ed1Bd86c03E2fc1f14389Cb10a',
17
+ protocol: LEGACY_PROTOCOLS.CompoundV2,
18
+ });
19
+ }
20
+ }