@defisaver/automation-sdk 3.1.4 → 3.1.6

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 (245) 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 +39 -39
  6. package/.mocharc.json +4 -4
  7. package/.nvmrc +1 -1
  8. package/README.md +46 -46
  9. package/cjs/abis/Erc20.json +223 -223
  10. package/cjs/abis/SubStorage.json +21 -21
  11. package/cjs/abis/UniMulticall.json +17 -17
  12. package/cjs/abis/index.d.ts +9 -9
  13. package/cjs/abis/index.js +30 -30
  14. package/cjs/abis/legacy_AaveV2Subscriptions.json +8 -8
  15. package/cjs/abis/legacy_AuthCheck.json +8 -8
  16. package/cjs/abis/legacy_CompoundV2Subscriptions.json +9 -9
  17. package/cjs/abis/legacy_MakerSubscriptions.json +9 -9
  18. package/cjs/automation/private/Automation.d.ts +12 -12
  19. package/cjs/automation/private/Automation.js +42 -42
  20. package/cjs/automation/private/LegacyAutomation.d.ts +25 -25
  21. package/cjs/automation/private/LegacyAutomation.js +118 -118
  22. package/cjs/automation/private/LegacyProtocol.d.ts +22 -22
  23. package/cjs/automation/private/LegacyProtocol.js +41 -41
  24. package/cjs/automation/private/LegacyProtocol.test.d.ts +1 -1
  25. package/cjs/automation/private/LegacyProtocol.test.js +25 -25
  26. package/cjs/automation/private/Protocol.d.ts +22 -22
  27. package/cjs/automation/private/Protocol.js +41 -41
  28. package/cjs/automation/private/Protocol.test.d.ts +1 -1
  29. package/cjs/automation/private/Protocol.test.js +25 -25
  30. package/cjs/automation/private/StrategiesAutomation.d.ts +33 -33
  31. package/cjs/automation/private/StrategiesAutomation.js +181 -181
  32. package/cjs/automation/private/StrategiesAutomation.test.d.ts +1 -1
  33. package/cjs/automation/private/StrategiesAutomation.test.js +671 -671
  34. package/cjs/automation/public/ArbitrumStrategies.d.ts +5 -5
  35. package/cjs/automation/public/ArbitrumStrategies.js +13 -13
  36. package/cjs/automation/public/BaseStrategies.d.ts +5 -5
  37. package/cjs/automation/public/BaseStrategies.js +13 -13
  38. package/cjs/automation/public/EthereumStrategies.d.ts +5 -5
  39. package/cjs/automation/public/EthereumStrategies.js +13 -13
  40. package/cjs/automation/public/OptimismStrategies.d.ts +5 -5
  41. package/cjs/automation/public/OptimismStrategies.js +13 -13
  42. package/cjs/automation/public/Strategies.test.d.ts +1 -0
  43. package/cjs/automation/public/Strategies.test.js +61 -0
  44. package/cjs/automation/public/legacy/LegacyAaveAutomation.d.ts +6 -6
  45. package/cjs/automation/public/legacy/LegacyAaveAutomation.js +20 -20
  46. package/cjs/automation/public/legacy/LegacyCompoundAutomation.d.ts +6 -6
  47. package/cjs/automation/public/legacy/LegacyCompoundAutomation.js +20 -20
  48. package/cjs/automation/public/legacy/LegacyMakerAutomation.d.ts +6 -6
  49. package/cjs/automation/public/legacy/LegacyMakerAutomation.js +20 -20
  50. package/cjs/configuration.d.ts +1 -1
  51. package/cjs/configuration.js +12 -12
  52. package/cjs/constants/index.d.ts +28 -28
  53. package/cjs/constants/index.js +529 -494
  54. package/cjs/index.d.ts +23 -23
  55. package/cjs/index.js +65 -65
  56. package/cjs/services/contractService.d.ts +12 -12
  57. package/cjs/services/contractService.js +54 -54
  58. package/cjs/services/ethereumService.d.ts +7 -7
  59. package/cjs/services/ethereumService.js +49 -49
  60. package/cjs/services/ethereumService.test.d.ts +1 -1
  61. package/cjs/services/ethereumService.test.js +242 -242
  62. package/cjs/services/strategiesService.d.ts +2 -2
  63. package/cjs/services/strategiesService.js +842 -724
  64. package/cjs/services/strategiesService.test.d.ts +1 -1
  65. package/cjs/services/strategiesService.test.js +110 -110
  66. package/cjs/services/strategySubService.d.ts +106 -100
  67. package/cjs/services/strategySubService.js +293 -267
  68. package/cjs/services/strategySubService.test.d.ts +1 -1
  69. package/cjs/services/strategySubService.test.js +936 -936
  70. package/cjs/services/subDataService.d.ts +235 -192
  71. package/cjs/services/subDataService.js +609 -475
  72. package/cjs/services/subDataService.test.d.ts +1 -1
  73. package/cjs/services/subDataService.test.js +1282 -1282
  74. package/cjs/services/triggerService.d.ts +226 -191
  75. package/cjs/services/triggerService.js +433 -367
  76. package/cjs/services/triggerService.test.d.ts +1 -1
  77. package/cjs/services/triggerService.test.js +926 -926
  78. package/cjs/services/utils.d.ts +30 -25
  79. package/cjs/services/utils.js +182 -131
  80. package/cjs/services/utils.test.d.ts +1 -1
  81. package/cjs/services/utils.test.js +376 -376
  82. package/cjs/types/contracts/generated/Erc20.d.ts +53 -53
  83. package/cjs/types/contracts/generated/Erc20.js +5 -5
  84. package/cjs/types/contracts/generated/Legacy_AaveV2Subscriptions.d.ts +129 -129
  85. package/cjs/types/contracts/generated/Legacy_AaveV2Subscriptions.js +5 -5
  86. package/cjs/types/contracts/generated/Legacy_AuthCheck.d.ts +20 -20
  87. package/cjs/types/contracts/generated/Legacy_AuthCheck.js +5 -5
  88. package/cjs/types/contracts/generated/Legacy_CompoundV2Subscriptions.d.ts +128 -128
  89. package/cjs/types/contracts/generated/Legacy_CompoundV2Subscriptions.js +5 -5
  90. package/cjs/types/contracts/generated/Legacy_MakerSubscriptions.d.ts +246 -246
  91. package/cjs/types/contracts/generated/Legacy_MakerSubscriptions.js +5 -5
  92. package/cjs/types/contracts/generated/SubStorage.d.ts +114 -114
  93. package/cjs/types/contracts/generated/SubStorage.js +5 -5
  94. package/cjs/types/contracts/generated/UniMulticall.d.ts +55 -55
  95. package/cjs/types/contracts/generated/UniMulticall.js +5 -5
  96. package/cjs/types/contracts/generated/index.d.ts +7 -7
  97. package/cjs/types/contracts/generated/index.js +2 -2
  98. package/cjs/types/contracts/generated/types.d.ts +54 -54
  99. package/cjs/types/contracts/generated/types.js +2 -2
  100. package/cjs/types/enums.d.ts +218 -186
  101. package/cjs/types/enums.js +244 -208
  102. package/cjs/types/index.d.ts +237 -224
  103. package/cjs/types/index.js +2 -2
  104. package/esm/abis/Erc20.json +223 -223
  105. package/esm/abis/SubStorage.json +21 -21
  106. package/esm/abis/UniMulticall.json +17 -17
  107. package/esm/abis/index.d.ts +9 -9
  108. package/esm/abis/index.js +18 -18
  109. package/esm/abis/legacy_AaveV2Subscriptions.json +8 -8
  110. package/esm/abis/legacy_AuthCheck.json +8 -8
  111. package/esm/abis/legacy_CompoundV2Subscriptions.json +9 -9
  112. package/esm/abis/legacy_MakerSubscriptions.json +9 -9
  113. package/esm/automation/private/Automation.d.ts +12 -12
  114. package/esm/automation/private/Automation.js +39 -39
  115. package/esm/automation/private/LegacyAutomation.d.ts +25 -25
  116. package/esm/automation/private/LegacyAutomation.js +112 -112
  117. package/esm/automation/private/LegacyProtocol.d.ts +22 -22
  118. package/esm/automation/private/LegacyProtocol.js +38 -38
  119. package/esm/automation/private/LegacyProtocol.test.d.ts +1 -1
  120. package/esm/automation/private/LegacyProtocol.test.js +20 -20
  121. package/esm/automation/private/Protocol.d.ts +22 -22
  122. package/esm/automation/private/Protocol.js +38 -38
  123. package/esm/automation/private/Protocol.test.d.ts +1 -1
  124. package/esm/automation/private/Protocol.test.js +20 -20
  125. package/esm/automation/private/StrategiesAutomation.d.ts +33 -33
  126. package/esm/automation/private/StrategiesAutomation.js +175 -175
  127. package/esm/automation/private/StrategiesAutomation.test.d.ts +1 -1
  128. package/esm/automation/private/StrategiesAutomation.test.js +666 -666
  129. package/esm/automation/public/ArbitrumStrategies.d.ts +5 -5
  130. package/esm/automation/public/ArbitrumStrategies.js +7 -7
  131. package/esm/automation/public/BaseStrategies.d.ts +5 -5
  132. package/esm/automation/public/BaseStrategies.js +7 -7
  133. package/esm/automation/public/EthereumStrategies.d.ts +5 -5
  134. package/esm/automation/public/EthereumStrategies.js +7 -7
  135. package/esm/automation/public/OptimismStrategies.d.ts +5 -5
  136. package/esm/automation/public/OptimismStrategies.js +7 -7
  137. package/esm/automation/public/Strategies.test.d.ts +1 -0
  138. package/esm/automation/public/Strategies.test.js +56 -0
  139. package/esm/automation/public/legacy/LegacyAaveAutomation.d.ts +6 -6
  140. package/esm/automation/public/legacy/LegacyAaveAutomation.js +14 -14
  141. package/esm/automation/public/legacy/LegacyCompoundAutomation.d.ts +6 -6
  142. package/esm/automation/public/legacy/LegacyCompoundAutomation.js +14 -14
  143. package/esm/automation/public/legacy/LegacyMakerAutomation.d.ts +6 -6
  144. package/esm/automation/public/legacy/LegacyMakerAutomation.js +14 -14
  145. package/esm/configuration.d.ts +1 -1
  146. package/esm/configuration.js +7 -7
  147. package/esm/constants/index.d.ts +28 -28
  148. package/esm/constants/index.js +523 -488
  149. package/esm/index.d.ts +23 -23
  150. package/esm/index.js +23 -23
  151. package/esm/services/contractService.d.ts +12 -12
  152. package/esm/services/contractService.js +45 -45
  153. package/esm/services/ethereumService.d.ts +7 -7
  154. package/esm/services/ethereumService.js +41 -41
  155. package/esm/services/ethereumService.test.d.ts +1 -1
  156. package/esm/services/ethereumService.test.js +237 -237
  157. package/esm/services/strategiesService.d.ts +2 -2
  158. package/esm/services/strategiesService.js +812 -697
  159. package/esm/services/strategiesService.test.d.ts +1 -1
  160. package/esm/services/strategiesService.test.js +108 -108
  161. package/esm/services/strategySubService.d.ts +106 -100
  162. package/esm/services/strategySubService.js +264 -238
  163. package/esm/services/strategySubService.test.d.ts +1 -1
  164. package/esm/services/strategySubService.test.js +908 -908
  165. package/esm/services/subDataService.d.ts +235 -192
  166. package/esm/services/subDataService.js +603 -469
  167. package/esm/services/subDataService.test.d.ts +1 -1
  168. package/esm/services/subDataService.test.js +1254 -1254
  169. package/esm/services/triggerService.d.ts +226 -191
  170. package/esm/services/triggerService.js +404 -338
  171. package/esm/services/triggerService.test.d.ts +1 -1
  172. package/esm/services/triggerService.test.js +901 -901
  173. package/esm/services/utils.d.ts +30 -25
  174. package/esm/services/utils.js +131 -82
  175. package/esm/services/utils.test.d.ts +1 -1
  176. package/esm/services/utils.test.js +348 -348
  177. package/esm/types/contracts/generated/Erc20.d.ts +53 -53
  178. package/esm/types/contracts/generated/Erc20.js +4 -4
  179. package/esm/types/contracts/generated/Legacy_AaveV2Subscriptions.d.ts +129 -129
  180. package/esm/types/contracts/generated/Legacy_AaveV2Subscriptions.js +4 -4
  181. package/esm/types/contracts/generated/Legacy_AuthCheck.d.ts +20 -20
  182. package/esm/types/contracts/generated/Legacy_AuthCheck.js +4 -4
  183. package/esm/types/contracts/generated/Legacy_CompoundV2Subscriptions.d.ts +128 -128
  184. package/esm/types/contracts/generated/Legacy_CompoundV2Subscriptions.js +4 -4
  185. package/esm/types/contracts/generated/Legacy_MakerSubscriptions.d.ts +246 -246
  186. package/esm/types/contracts/generated/Legacy_MakerSubscriptions.js +4 -4
  187. package/esm/types/contracts/generated/SubStorage.d.ts +114 -114
  188. package/esm/types/contracts/generated/SubStorage.js +4 -4
  189. package/esm/types/contracts/generated/UniMulticall.d.ts +55 -55
  190. package/esm/types/contracts/generated/UniMulticall.js +4 -4
  191. package/esm/types/contracts/generated/index.d.ts +7 -7
  192. package/esm/types/contracts/generated/index.js +1 -1
  193. package/esm/types/contracts/generated/types.d.ts +54 -54
  194. package/esm/types/contracts/generated/types.js +1 -1
  195. package/esm/types/enums.d.ts +218 -186
  196. package/esm/types/enums.js +241 -205
  197. package/esm/types/index.d.ts +237 -224
  198. package/esm/types/index.js +1 -1
  199. package/package.json +61 -61
  200. package/scripts/generateContractTypes.js +39 -39
  201. package/src/abis/Erc20.json +222 -222
  202. package/src/abis/SubStorage.json +21 -21
  203. package/src/abis/UniMulticall.json +17 -17
  204. package/src/abis/index.ts +28 -28
  205. package/src/abis/legacy_AaveV2Subscriptions.json +7 -7
  206. package/src/abis/legacy_AuthCheck.json +7 -7
  207. package/src/abis/legacy_CompoundV2Subscriptions.json +8 -8
  208. package/src/abis/legacy_MakerSubscriptions.json +8 -8
  209. package/src/automation/private/Automation.ts +44 -44
  210. package/src/automation/private/LegacyAutomation.ts +135 -135
  211. package/src/automation/private/LegacyProtocol.test.ts +23 -23
  212. package/src/automation/private/LegacyProtocol.ts +51 -51
  213. package/src/automation/private/Protocol.test.ts +23 -23
  214. package/src/automation/private/Protocol.ts +51 -51
  215. package/src/automation/private/StrategiesAutomation.test.ts +663 -663
  216. package/src/automation/private/StrategiesAutomation.ts +242 -242
  217. package/src/automation/public/ArbitrumStrategies.ts +10 -10
  218. package/src/automation/public/BaseStrategies.ts +10 -10
  219. package/src/automation/public/EthereumStrategies.ts +10 -10
  220. package/src/automation/public/OptimismStrategies.ts +10 -10
  221. package/src/automation/public/Strategies.test.ts +49 -0
  222. package/src/automation/public/legacy/LegacyAaveAutomation.ts +20 -20
  223. package/src/automation/public/legacy/LegacyCompoundAutomation.ts +20 -20
  224. package/src/automation/public/legacy/LegacyMakerAutomation.ts +20 -20
  225. package/src/configuration.ts +8 -8
  226. package/src/constants/index.ts +558 -523
  227. package/src/index.ts +39 -39
  228. package/src/services/contractService.ts +77 -77
  229. package/src/services/ethereumService.test.ts +257 -257
  230. package/src/services/ethereumService.ts +69 -69
  231. package/src/services/strategiesService.test.ts +105 -105
  232. package/src/services/strategiesService.ts +1086 -935
  233. package/src/services/strategySubService.test.ts +1122 -1122
  234. package/src/services/strategySubService.ts +601 -524
  235. package/src/services/subDataService.test.ts +1387 -1387
  236. package/src/services/subDataService.ts +835 -645
  237. package/src/services/triggerService.test.ts +1004 -1004
  238. package/src/services/triggerService.ts +553 -449
  239. package/src/services/utils.test.ts +430 -430
  240. package/src/services/utils.ts +162 -103
  241. package/src/types/enums.ts +238 -202
  242. package/src/types/index.ts +297 -279
  243. package/tsconfig.esm.json +8 -8
  244. package/tsconfig.json +22 -22
  245. package/umd/index.js +34103 -0
@@ -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 BaseStrategies extends StrategiesAutomation {
7
- constructor(args: Interfaces.Automation) {
8
- super({ ...args, chainId: ChainId.Base });
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 BaseStrategies extends StrategiesAutomation {
7
+ constructor(args: Interfaces.Automation) {
8
+ super({ ...args, chainId: ChainId.Base });
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
+ }
@@ -0,0 +1,49 @@
1
+ import Web3 from 'web3';
2
+ import { expect } from 'chai';
3
+
4
+ import {ChainId} from '../../types/enums';
5
+
6
+ import '../../configuration';
7
+ import EthereumStrategies from './EthereumStrategies';
8
+ import ArbitrumStrategies from './ArbitrumStrategies';
9
+ import OptimismStrategies from './OptimismStrategies';
10
+ import BaseStrategies from './BaseStrategies';
11
+
12
+ require('dotenv').config({ path: '.env' });
13
+
14
+ const Web3_1 = new Web3(process.env.RPC_1!);
15
+ const Web3_42161 = new Web3(process.env.RPC_42161!);
16
+ const Web3_10 = new Web3(process.env.RPC_10!);
17
+ const Web3_8453 = new Web3(process.env.RPC_8453!);
18
+
19
+ describe('Feature: StrategiesAutomation.ts', () => {
20
+ describe('Fetching subscriptions', () => {
21
+ it('can fetch subscriptions on Mainnet', async function () {
22
+ this.timeout(120000);
23
+ const ethStrategies = new EthereumStrategies({provider: Web3_1});
24
+ const subs = await ethStrategies.getSubscriptions({mergeSubs: true})
25
+ console.log(subs.length);
26
+ });
27
+
28
+ it('can fetch subscriptions on Arbitrum', async function () {
29
+ this.timeout(120000);
30
+ const arbiStrategies = new ArbitrumStrategies({provider: Web3_42161});
31
+ const subs = await arbiStrategies.getSubscriptions({mergeSubs: true})
32
+ console.log(subs.length);
33
+ });
34
+
35
+ it('can fetch subscriptions on Optimism', async function () {
36
+ this.timeout(120000);
37
+ const optimismStrategies = new OptimismStrategies({provider: Web3_10});
38
+ const subs = await optimismStrategies.getSubscriptions({mergeSubs: true})
39
+ console.log(subs.length);
40
+ });
41
+
42
+ it('can fetch subscriptions on Base', async function () {
43
+ this.timeout(120000);
44
+ const baseStrategies = new BaseStrategies({provider: Web3_8453});
45
+ const subs = await baseStrategies.getSubscriptions({mergeSubs: true})
46
+ console.log(subs.length);
47
+ });
48
+ });
49
+ });