@defisaver/automation-sdk 3.2.2 → 3.2.4

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 +189 -189
  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 -1
  43. package/cjs/automation/public/Strategies.test.js +61 -61
  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 +564 -564
  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 +898 -898
  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 +110 -110
  67. package/cjs/services/strategySubService.js +308 -308
  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 +254 -254
  71. package/cjs/services/subDataService.js +669 -669
  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 +249 -234
  75. package/cjs/services/triggerService.js +473 -447
  76. package/cjs/services/triggerService.test.d.ts +1 -1
  77. package/cjs/services/triggerService.test.js +1045 -926
  78. package/cjs/services/utils.d.ts +30 -30
  79. package/cjs/services/utils.js +182 -182
  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 +226 -226
  101. package/cjs/types/enums.js +252 -252
  102. package/cjs/types/index.d.ts +248 -248
  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 +183 -183
  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 -1
  138. package/esm/automation/public/Strategies.test.js +56 -56
  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 +558 -558
  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 +868 -868
  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 +110 -110
  162. package/esm/services/strategySubService.js +279 -279
  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 +254 -254
  166. package/esm/services/subDataService.js +663 -663
  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 +249 -234
  170. package/esm/services/triggerService.js +444 -418
  171. package/esm/services/triggerService.test.d.ts +1 -1
  172. package/esm/services/triggerService.test.js +1020 -901
  173. package/esm/services/utils.d.ts +30 -30
  174. package/esm/services/utils.js +131 -131
  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 +226 -226
  196. package/esm/types/enums.js +249 -249
  197. package/esm/types/index.d.ts +248 -248
  198. package/esm/types/index.js +1 -1
  199. package/package.json +60 -60
  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 +254 -254
  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 -49
  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 +593 -593
  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 +1158 -1158
  233. package/src/services/strategySubService.test.ts +1122 -1122
  234. package/src/services/strategySubService.ts +634 -634
  235. package/src/services/subDataService.test.ts +1387 -1387
  236. package/src/services/subDataService.ts +914 -914
  237. package/src/services/triggerService.test.ts +1130 -1004
  238. package/src/services/triggerService.ts +602 -574
  239. package/src/services/utils.test.ts +430 -430
  240. package/src/services/utils.ts +162 -162
  241. package/src/types/enums.ts +246 -246
  242. package/src/types/index.ts +312 -312
  243. package/tsconfig.esm.json +8 -8
  244. package/tsconfig.json +22 -22
  245. package/.env +0 -4
@@ -1,257 +1,257 @@
1
- import Web3 from 'web3';
2
- import { expect } from 'chai';
3
- import { getAssetInfo } from '@defisaver/tokens';
4
- import { PastEventOptions } from 'web3-eth-contract';
5
-
6
- import { ChainId } from '../types/enums';
7
- import type { BlockNumber, Multicall } from '../types';
8
- import { Contract } from '../types';
9
- import type { Erc20 } from '../types/contracts/generated';
10
-
11
- import '../configuration';
12
- import { getEventsFromContract, multicall, } from './ethereumService';
13
-
14
- import { makeErc20Contract } from './contractService';
15
-
16
- require('dotenv').config({ path: '.env' });
17
-
18
- const Web3_1 = new Web3(process.env.RPC_1!);
19
- const Web3_10 = new Web3(process.env.RPC_10!);
20
- const Web3_42161 = new Web3(process.env.RPC_42161!);
21
-
22
- describe('Feature: ethereumService.ts', () => {
23
- describe('When testing ethereumService.multicall', () => {
24
- const examples: Array<[
25
- Multicall.Payload,
26
- [
27
- web3: Web3,
28
- chainId: ChainId,
29
- calls: Multicall.Calls[],
30
- block: BlockNumber,
31
- ]
32
- ]> = [
33
- [
34
- [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
35
- [
36
- Web3_1,
37
- ChainId.Ethereum,
38
- [
39
- {
40
- abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
41
- target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
42
- params: [],
43
- },
44
- {
45
- abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
46
- target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
47
- params: [],
48
- }
49
- ],
50
- 'latest',
51
- ]
52
- ],
53
- [
54
- [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
55
- [
56
- Web3_10,
57
- ChainId.Optimism,
58
- [
59
- {
60
- abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
61
- target: '0x4200000000000000000000000000000000000006',
62
- params: [],
63
- },
64
- {
65
- abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
66
- target: '0x4200000000000000000000000000000000000006',
67
- params: [],
68
- }
69
- ],
70
- 'latest',
71
- ]
72
- ],
73
- [
74
- [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
75
- [
76
- Web3_42161,
77
- ChainId.Arbitrum,
78
- [
79
- {
80
- abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
81
- target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
82
- params: [],
83
- },
84
- {
85
- abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
86
- target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
87
- params: [],
88
- }
89
- ],
90
- 'latest',
91
- ]
92
- ],
93
- ];
94
-
95
- examples.forEach(([expected, actual]) => {
96
- it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
97
- expect(await multicall(...actual)).to.eql(expected);
98
- });
99
- });
100
- });
101
-
102
- describe('When testing ethereumService.getEventsFromContract', () => {
103
- const examples: Array<[
104
- any[],
105
- [
106
- contractWithMeta: Contract.WithMeta<Erc20>,
107
- contractWithMetaFork: Contract.WithMeta<Erc20> | null,
108
- event: string,
109
- options?: PastEventOptions,
110
- ]
111
- ]> = [
112
- [
113
- [
114
- {
115
- 'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
116
- 'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
117
- 'blockNumber': 15166163,
118
- 'event': 'Transfer',
119
- 'id': 'log_e2258e3a',
120
- 'logIndex': 385,
121
- 'raw': {
122
- 'data': '0x0000000000000000000000000000000000000000000001b58c2186829983fca9',
123
- 'topics': [
124
- '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
125
- '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
126
- '0x0000000000000000000000009ccf93089cb14f94baeb8822f8ceffd91bd71649',
127
- ],
128
- },
129
- 'removed': false,
130
- 'returnValues': {
131
- '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
132
- '1': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
133
- '2': '8071324659946094853289',
134
- 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
135
- 'to': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
136
- 'value': '8071324659946094853289',
137
- },
138
- 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
139
- 'transactionHash': '0x95b28d8f71719c219e09b428e6ff781d717088784fbf63681446da13de6b0c4a',
140
- 'transactionIndex': 187,
141
- },
142
- ],
143
- [
144
- makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum),
145
- null,
146
- 'Transfer',
147
- {
148
- fromBlock: 15166163,
149
- toBlock: 15166163,
150
- filter: {
151
- from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
152
- to: '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
153
- }
154
- },
155
- ]
156
- ],
157
- [
158
- [
159
- {
160
- 'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
161
- 'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
162
- 'blockNumber': 5353002,
163
- 'event': 'Transfer',
164
- 'id': 'log_f49645b8',
165
- 'logIndex': 1,
166
- 'raw': {
167
- 'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
168
- 'topics': [
169
- '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
170
- '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
171
- '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
172
- ],
173
- },
174
- 'removed': false,
175
- 'returnValues': {
176
- '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
177
- '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
178
- '2': '20000000000000000000',
179
- 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
180
- 'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
181
- 'value': '20000000000000000000',
182
- },
183
- 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
184
- 'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
185
- 'transactionIndex': 0,
186
- },
187
- ],
188
- [
189
- makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Optimism).address, ChainId.Optimism),
190
- null,
191
- 'Transfer',
192
- {
193
- fromBlock: 5353002,
194
- toBlock: 5353002,
195
- filter: {
196
- from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
197
- to: '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
198
- }
199
- },
200
- ]
201
- ],
202
- [
203
- [
204
- {
205
- 'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
206
- 'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
207
- 'blockNumber': 5353002,
208
- 'event': 'Transfer',
209
- 'id': 'log_f49645b8',
210
- 'logIndex': 1,
211
- 'raw': {
212
- 'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
213
- 'topics': [
214
- '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
215
- '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
216
- '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
217
- ],
218
- },
219
- 'removed': false,
220
- 'returnValues': {
221
- '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
222
- '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
223
- '2': '20000000000000000000',
224
- 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
225
- 'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
226
- 'value': '20000000000000000000',
227
- },
228
- 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
229
- 'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
230
- 'transactionIndex': 0,
231
- },
232
- ],
233
- [
234
- makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Arbitrum).address, ChainId.Arbitrum),
235
- null,
236
- 'Transfer',
237
- {
238
- fromBlock: 5353002,
239
- toBlock: 5353002,
240
- filter: {
241
- from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
242
- to: '0x13a22f1bba428eaaf56960530ec11118da916c11',
243
- }
244
- },
245
- ]
246
- ],
247
- ];
248
-
249
- examples.forEach(([expected, actual]) => {
250
- it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
251
- const data = await getEventsFromContract(...actual);
252
- console.log(data);
253
- expect(await getEventsFromContract(...actual)).to.eql(expected);
254
- });
255
- });
256
- });
257
- });
1
+ import Web3 from 'web3';
2
+ import { expect } from 'chai';
3
+ import { getAssetInfo } from '@defisaver/tokens';
4
+ import { PastEventOptions } from 'web3-eth-contract';
5
+
6
+ import { ChainId } from '../types/enums';
7
+ import type { BlockNumber, Multicall } from '../types';
8
+ import { Contract } from '../types';
9
+ import type { Erc20 } from '../types/contracts/generated';
10
+
11
+ import '../configuration';
12
+ import { getEventsFromContract, multicall, } from './ethereumService';
13
+
14
+ import { makeErc20Contract } from './contractService';
15
+
16
+ require('dotenv').config({ path: '.env' });
17
+
18
+ const Web3_1 = new Web3(process.env.RPC_1!);
19
+ const Web3_10 = new Web3(process.env.RPC_10!);
20
+ const Web3_42161 = new Web3(process.env.RPC_42161!);
21
+
22
+ describe('Feature: ethereumService.ts', () => {
23
+ describe('When testing ethereumService.multicall', () => {
24
+ const examples: Array<[
25
+ Multicall.Payload,
26
+ [
27
+ web3: Web3,
28
+ chainId: ChainId,
29
+ calls: Multicall.Calls[],
30
+ block: BlockNumber,
31
+ ]
32
+ ]> = [
33
+ [
34
+ [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
35
+ [
36
+ Web3_1,
37
+ ChainId.Ethereum,
38
+ [
39
+ {
40
+ abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
41
+ target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
42
+ params: [],
43
+ },
44
+ {
45
+ abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
46
+ target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
47
+ params: [],
48
+ }
49
+ ],
50
+ 'latest',
51
+ ]
52
+ ],
53
+ [
54
+ [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
55
+ [
56
+ Web3_10,
57
+ ChainId.Optimism,
58
+ [
59
+ {
60
+ abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
61
+ target: '0x4200000000000000000000000000000000000006',
62
+ params: [],
63
+ },
64
+ {
65
+ abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
66
+ target: '0x4200000000000000000000000000000000000006',
67
+ params: [],
68
+ }
69
+ ],
70
+ 'latest',
71
+ ]
72
+ ],
73
+ [
74
+ [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
75
+ [
76
+ Web3_42161,
77
+ ChainId.Arbitrum,
78
+ [
79
+ {
80
+ abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
81
+ target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
82
+ params: [],
83
+ },
84
+ {
85
+ abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
86
+ target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
87
+ params: [],
88
+ }
89
+ ],
90
+ 'latest',
91
+ ]
92
+ ],
93
+ ];
94
+
95
+ examples.forEach(([expected, actual]) => {
96
+ it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
97
+ expect(await multicall(...actual)).to.eql(expected);
98
+ });
99
+ });
100
+ });
101
+
102
+ describe('When testing ethereumService.getEventsFromContract', () => {
103
+ const examples: Array<[
104
+ any[],
105
+ [
106
+ contractWithMeta: Contract.WithMeta<Erc20>,
107
+ contractWithMetaFork: Contract.WithMeta<Erc20> | null,
108
+ event: string,
109
+ options?: PastEventOptions,
110
+ ]
111
+ ]> = [
112
+ [
113
+ [
114
+ {
115
+ 'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
116
+ 'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
117
+ 'blockNumber': 15166163,
118
+ 'event': 'Transfer',
119
+ 'id': 'log_e2258e3a',
120
+ 'logIndex': 385,
121
+ 'raw': {
122
+ 'data': '0x0000000000000000000000000000000000000000000001b58c2186829983fca9',
123
+ 'topics': [
124
+ '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
125
+ '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
126
+ '0x0000000000000000000000009ccf93089cb14f94baeb8822f8ceffd91bd71649',
127
+ ],
128
+ },
129
+ 'removed': false,
130
+ 'returnValues': {
131
+ '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
132
+ '1': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
133
+ '2': '8071324659946094853289',
134
+ 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
135
+ 'to': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
136
+ 'value': '8071324659946094853289',
137
+ },
138
+ 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
139
+ 'transactionHash': '0x95b28d8f71719c219e09b428e6ff781d717088784fbf63681446da13de6b0c4a',
140
+ 'transactionIndex': 187,
141
+ },
142
+ ],
143
+ [
144
+ makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum),
145
+ null,
146
+ 'Transfer',
147
+ {
148
+ fromBlock: 15166163,
149
+ toBlock: 15166163,
150
+ filter: {
151
+ from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
152
+ to: '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
153
+ }
154
+ },
155
+ ]
156
+ ],
157
+ [
158
+ [
159
+ {
160
+ 'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
161
+ 'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
162
+ 'blockNumber': 5353002,
163
+ 'event': 'Transfer',
164
+ 'id': 'log_f49645b8',
165
+ 'logIndex': 1,
166
+ 'raw': {
167
+ 'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
168
+ 'topics': [
169
+ '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
170
+ '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
171
+ '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
172
+ ],
173
+ },
174
+ 'removed': false,
175
+ 'returnValues': {
176
+ '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
177
+ '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
178
+ '2': '20000000000000000000',
179
+ 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
180
+ 'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
181
+ 'value': '20000000000000000000',
182
+ },
183
+ 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
184
+ 'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
185
+ 'transactionIndex': 0,
186
+ },
187
+ ],
188
+ [
189
+ makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Optimism).address, ChainId.Optimism),
190
+ null,
191
+ 'Transfer',
192
+ {
193
+ fromBlock: 5353002,
194
+ toBlock: 5353002,
195
+ filter: {
196
+ from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
197
+ to: '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
198
+ }
199
+ },
200
+ ]
201
+ ],
202
+ [
203
+ [
204
+ {
205
+ 'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
206
+ 'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
207
+ 'blockNumber': 5353002,
208
+ 'event': 'Transfer',
209
+ 'id': 'log_f49645b8',
210
+ 'logIndex': 1,
211
+ 'raw': {
212
+ 'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
213
+ 'topics': [
214
+ '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
215
+ '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
216
+ '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
217
+ ],
218
+ },
219
+ 'removed': false,
220
+ 'returnValues': {
221
+ '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
222
+ '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
223
+ '2': '20000000000000000000',
224
+ 'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
225
+ 'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
226
+ 'value': '20000000000000000000',
227
+ },
228
+ 'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
229
+ 'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
230
+ 'transactionIndex': 0,
231
+ },
232
+ ],
233
+ [
234
+ makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Arbitrum).address, ChainId.Arbitrum),
235
+ null,
236
+ 'Transfer',
237
+ {
238
+ fromBlock: 5353002,
239
+ toBlock: 5353002,
240
+ filter: {
241
+ from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
242
+ to: '0x13a22f1bba428eaaf56960530ec11118da916c11',
243
+ }
244
+ },
245
+ ]
246
+ ],
247
+ ];
248
+
249
+ examples.forEach(([expected, actual]) => {
250
+ it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
251
+ const data = await getEventsFromContract(...actual);
252
+ console.log(data);
253
+ expect(await getEventsFromContract(...actual)).to.eql(expected);
254
+ });
255
+ });
256
+ });
257
+ });
@@ -1,69 +1,69 @@
1
- import AbiCoder from 'web3-eth-abi';
2
-
3
- import type Web3 from 'web3';
4
- import type { PastEventOptions } from 'web3-eth-contract';
5
- import type {
6
- BlockNumber, Multicall, Contract, PlaceholderType,
7
- } from '../types';
8
-
9
- import { makeUniMulticallContract } from './contractService';
10
- import { addToObjectIf, isDefined } from './utils';
11
- import type { BaseContract } from '../types/contracts/generated/types';
12
- import type { ChainId } from '../types/enums';
13
-
14
- export async function multicall(
15
- web3: Web3,
16
- chainId: ChainId,
17
- calls: Multicall.Calls[],
18
- block: BlockNumber = 'latest',
19
- ): Promise<Multicall.Payload> {
20
- const multicallContract = makeUniMulticallContract(web3, chainId).contract;
21
-
22
- const formattedCalls: Multicall.FormattedCalls[] = calls.map((call) => ({
23
- callData: AbiCoder.encodeFunctionCall(call.abiItem, call.params),
24
- target: call.target || '0x0',
25
- gasLimit: call.gasLimit || 1e6,
26
- }));
27
-
28
- const callResult = await multicallContract.methods.multicall(
29
- formattedCalls.filter(item => item.target !== '0x0'),
30
- ).call({}, block);
31
-
32
- let formattedResult: Multicall.Payload = [];
33
-
34
- callResult.returnData.forEach(([success, gasUsed, result], i) => {
35
- const formattedRes = (result !== '0x'
36
- ? AbiCoder.decodeParameters(calls[i].abiItem.outputs!, result)
37
- : undefined);
38
- formattedResult = [...formattedResult, formattedRes];
39
- });
40
-
41
- return formattedResult as Multicall.Payload;
42
- }
43
-
44
- export async function getEventsFromContract<T extends BaseContract>(
45
- contractWithMeta: Contract.WithMeta<T>,
46
- contractWithMetaFork: Contract.WithMeta<T> | null,
47
- event: string,
48
- options?: PastEventOptions,
49
- ) {
50
- const events = await contractWithMeta.contract.getPastEvents(
51
- event,
52
- {
53
- ...addToObjectIf(isDefined(options), { ...options, fromBlock: contractWithMeta.createdBlock }),
54
- },
55
- );
56
-
57
- let eventsFork : PlaceholderType = [];
58
-
59
- if (contractWithMetaFork) {
60
- eventsFork = await contractWithMetaFork.contract.getPastEvents(
61
- event,
62
- {
63
- ...addToObjectIf(isDefined(options), { ...options, toBlock: 'latest' }),
64
- },
65
- );
66
- }
67
-
68
- return [...events, ...eventsFork];
69
- }
1
+ import AbiCoder from 'web3-eth-abi';
2
+
3
+ import type Web3 from 'web3';
4
+ import type { PastEventOptions } from 'web3-eth-contract';
5
+ import type {
6
+ BlockNumber, Multicall, Contract, PlaceholderType,
7
+ } from '../types';
8
+
9
+ import { makeUniMulticallContract } from './contractService';
10
+ import { addToObjectIf, isDefined } from './utils';
11
+ import type { BaseContract } from '../types/contracts/generated/types';
12
+ import type { ChainId } from '../types/enums';
13
+
14
+ export async function multicall(
15
+ web3: Web3,
16
+ chainId: ChainId,
17
+ calls: Multicall.Calls[],
18
+ block: BlockNumber = 'latest',
19
+ ): Promise<Multicall.Payload> {
20
+ const multicallContract = makeUniMulticallContract(web3, chainId).contract;
21
+
22
+ const formattedCalls: Multicall.FormattedCalls[] = calls.map((call) => ({
23
+ callData: AbiCoder.encodeFunctionCall(call.abiItem, call.params),
24
+ target: call.target || '0x0',
25
+ gasLimit: call.gasLimit || 1e6,
26
+ }));
27
+
28
+ const callResult = await multicallContract.methods.multicall(
29
+ formattedCalls.filter(item => item.target !== '0x0'),
30
+ ).call({}, block);
31
+
32
+ let formattedResult: Multicall.Payload = [];
33
+
34
+ callResult.returnData.forEach(([success, gasUsed, result], i) => {
35
+ const formattedRes = (result !== '0x'
36
+ ? AbiCoder.decodeParameters(calls[i].abiItem.outputs!, result)
37
+ : undefined);
38
+ formattedResult = [...formattedResult, formattedRes];
39
+ });
40
+
41
+ return formattedResult as Multicall.Payload;
42
+ }
43
+
44
+ export async function getEventsFromContract<T extends BaseContract>(
45
+ contractWithMeta: Contract.WithMeta<T>,
46
+ contractWithMetaFork: Contract.WithMeta<T> | null,
47
+ event: string,
48
+ options?: PastEventOptions,
49
+ ) {
50
+ const events = await contractWithMeta.contract.getPastEvents(
51
+ event,
52
+ {
53
+ ...addToObjectIf(isDefined(options), { ...options, fromBlock: contractWithMeta.createdBlock }),
54
+ },
55
+ );
56
+
57
+ let eventsFork : PlaceholderType = [];
58
+
59
+ if (contractWithMetaFork) {
60
+ eventsFork = await contractWithMetaFork.contract.getPastEvents(
61
+ event,
62
+ {
63
+ ...addToObjectIf(isDefined(options), { ...options, toBlock: 'latest' }),
64
+ },
65
+ );
66
+ }
67
+
68
+ return [...events, ...eventsFork];
69
+ }