@defisaver/automation-sdk 2.0.2 → 2.0.3

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 (53) hide show
  1. package/.eslintrc.js +1 -0
  2. package/esm/abis/index.js +27 -15
  3. package/esm/automation/private/Automation.js +9 -6
  4. package/esm/automation/private/LegacyAutomation.d.ts +5 -5
  5. package/esm/automation/private/LegacyAutomation.js +30 -23
  6. package/esm/automation/private/LegacyProtocol.js +4 -1
  7. package/esm/automation/private/Protocol.js +4 -1
  8. package/esm/automation/private/StrategiesAutomation.d.ts +2 -2
  9. package/esm/automation/private/StrategiesAutomation.js +27 -21
  10. package/esm/automation/public/ArbitrumStrategies.js +10 -4
  11. package/esm/automation/public/EthereumStrategies.js +10 -4
  12. package/esm/automation/public/OptimismStrategies.js +10 -4
  13. package/esm/automation/public/legacy/LegacyAaveAutomation.js +13 -7
  14. package/esm/automation/public/legacy/LegacyCompoundAutomation.js +13 -7
  15. package/esm/automation/public/legacy/LegacyMakerAutomation.js +13 -7
  16. package/esm/configuration.js +8 -5
  17. package/esm/constants/index.js +281 -275
  18. package/esm/index.js +57 -17
  19. package/esm/services/contractService.js +22 -14
  20. package/esm/services/ethereumService.js +18 -10
  21. package/esm/services/strategiesService.js +130 -103
  22. package/esm/services/strategySubService.js +90 -61
  23. package/esm/services/subDataService.js +151 -145
  24. package/esm/services/triggerService.d.ts +5 -5
  25. package/esm/services/triggerService.js +124 -94
  26. package/esm/services/utils.js +82 -33
  27. package/esm/services/utils.test.d.ts +1 -0
  28. package/esm/services/utils.test.js +362 -0
  29. package/esm/types/contracts/generated/Erc20.js +2 -1
  30. package/esm/types/contracts/generated/Legacy_AaveV2Subscriptions.js +2 -1
  31. package/esm/types/contracts/generated/Legacy_AuthCheck.js +2 -1
  32. package/esm/types/contracts/generated/Legacy_CompoundV2Subscriptions.js +2 -1
  33. package/esm/types/contracts/generated/Legacy_MakerSubscriptions.js +2 -1
  34. package/esm/types/contracts/generated/SubStorage.js +2 -1
  35. package/esm/types/contracts/generated/UniMulticall.js +2 -1
  36. package/esm/types/contracts/generated/index.js +2 -1
  37. package/esm/types/contracts/generated/types.js +2 -1
  38. package/esm/types/enums.js +17 -14
  39. package/esm/types/index.js +2 -1
  40. package/package.json +11 -7
  41. package/src/automation/private/LegacyAutomation.ts +11 -10
  42. package/src/automation/private/StrategiesAutomation.ts +5 -6
  43. package/src/configuration.ts +0 -3
  44. package/src/index.ts +0 -1
  45. package/src/services/ethereumService.ts +6 -6
  46. package/src/services/subDataService.ts +75 -76
  47. package/src/services/triggerService.ts +83 -83
  48. package/src/services/utils.test.ts +414 -0
  49. package/src/services/utils.ts +6 -7
  50. package/tsconfig.json +1 -1
  51. package/umd/index.js +7016 -4105
  52. package/src/types/typings/process.d.ts +0 -9
  53. package/yarn-error.log +0 -7233
@@ -1,59 +1,59 @@
1
1
  import Dec from 'decimal.js';
2
+ import AbiCoder from 'web3-eth-abi';
3
+ import * as web3Utils from 'web3-utils';
2
4
 
3
5
  import type {
4
6
  EthereumAddress, TriggerData,
5
7
  } from '../types';
6
8
  import type { RatioState, OrderType } from '../types/enums';
7
9
 
8
- import { ratioPercentageToWei } from './utils';
9
-
10
- const { mockedWeb3 } = process;
10
+ import { ratioPercentageToWei, weiToRatioPercentage } from './utils';
11
11
 
12
12
  export const chainlinkPriceTrigger = {
13
13
  encode(tokenAddr: EthereumAddress, price: string, state: RatioState) {
14
14
  const _price = new Dec(price).mul(1e8).floor().toString();
15
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [tokenAddr, _price, state])];
15
+ return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [tokenAddr, _price, state])];
16
16
  },
17
17
  decode(triggerData: TriggerData): { price: string, state: RatioState, tokenAddr: EthereumAddress } {
18
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
19
- return { tokenAddr: decodedData[0], price: new Dec(decodedData[1]).div(1e8).toString(), state: +decodedData[2] };
18
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
19
+ return { tokenAddr: decodedData[0] as EthereumAddress, price: new Dec(decodedData[1] as string).div(1e8).toString(), state: +decodedData[2]! };
20
20
  },
21
21
  };
22
22
 
23
23
  export const trailingStopTrigger = {
24
24
  encode(tokenAddr: EthereumAddress, percentage: number, roundId: number) {
25
25
  const _percentage = new Dec(percentage).mul(1e8).toString();
26
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint80'], [tokenAddr, _percentage, roundId])];
26
+ return [AbiCoder.encodeParameters(['address', 'uint256', 'uint80'], [tokenAddr, _percentage, roundId])];
27
27
  },
28
28
  decode(triggerData: TriggerData):{ triggerPercentage: number, tokenAddr: EthereumAddress, roundId: string } {
29
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint80'], triggerData[0]);
30
- const triggerPercentage = new Dec(decodedData[1]).div(1e8).toNumber();
31
- return { tokenAddr: decodedData[0], triggerPercentage, roundId: decodedData[2] };
29
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint80'], triggerData[0]);
30
+ const triggerPercentage = new Dec(decodedData[1] as string).div(1e8).toNumber();
31
+ return { tokenAddr: decodedData[0] as EthereumAddress, triggerPercentage, roundId: decodedData[2] as string };
32
32
  },
33
33
  };
34
34
 
35
35
  export const makerRatioTrigger = {
36
36
  encode(vaultId: number, ratioPercentage: number, ratioState: RatioState) {
37
37
  const ratioWei = ratioPercentageToWei(ratioPercentage);
38
- return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256', 'uint8'], [vaultId, ratioWei, ratioState])];
38
+ return [AbiCoder.encodeParameters(['uint256', 'uint256', 'uint8'], [vaultId, ratioWei, ratioState])];
39
39
  },
40
40
  decode(triggerData: TriggerData): { vaultId: number, ratioState: number, ratio: number } {
41
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
42
- return { vaultId: +decodedData[0], ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(), ratioState: +decodedData[2] };
41
+ const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
42
+ return { vaultId: +decodedData[0]!, ratio: weiToRatioPercentage(decodedData[1] as string), ratioState: +decodedData[2]! };
43
43
  },
44
44
  };
45
45
 
46
46
  export const aaveV3RatioTrigger = {
47
47
  encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
48
48
  const ratioWei = ratioPercentageToWei(ratioPercentage);
49
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
49
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
50
50
  },
51
51
  decode(triggerData: TriggerData) {
52
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as string[];
52
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
53
53
  return {
54
54
  owner: decodedData[0],
55
55
  market: decodedData[1],
56
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
56
+ ratio: weiToRatioPercentage(decodedData[2] as string),
57
57
  ratioState: Number(decodedData[3]),
58
58
  };
59
59
  },
@@ -62,13 +62,13 @@ export const aaveV3RatioTrigger = {
62
62
  export const morphoAaveV2RatioTrigger = {
63
63
  encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
64
64
  const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
65
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
65
+ return [AbiCoder.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
66
66
  },
67
67
  decode(triggerData: TriggerData) {
68
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]) as string[];
68
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
69
69
  return {
70
70
  owner: decodedData[0],
71
- ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
71
+ ratio: new Dec(decodedData[1] as string).div(1e16).toNumber(),
72
72
  ratioState: Number(decodedData[2]),
73
73
  };
74
74
  },
@@ -83,19 +83,19 @@ export const aaveV3QuotePriceTrigger = {
83
83
  ) {
84
84
  // Price is always in 8 decimals
85
85
  const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
86
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
86
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
87
87
  },
88
88
  decode(
89
89
  triggerData: TriggerData,
90
90
  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState } {
91
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as Array<string>;
91
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
92
92
  // Price is always in 8 decimals
93
- const price = new Dec(decodedData[2]).div(10 ** 8).toDP(8).toString();
93
+ const price = new Dec(decodedData[2] as string).div(10 ** 8).toDP(8).toString();
94
94
  return {
95
95
  price,
96
- baseTokenAddress: decodedData[0],
97
- quoteTokenAddress: decodedData[1],
98
- ratioState: +decodedData[3],
96
+ baseTokenAddress: decodedData[0] as EthereumAddress,
97
+ quoteTokenAddress: decodedData[1] as EthereumAddress,
98
+ ratioState: +decodedData[3]!,
99
99
  };
100
100
  },
101
101
  };
@@ -103,14 +103,14 @@ export const aaveV3QuotePriceTrigger = {
103
103
  export const compoundV2RatioTrigger = {
104
104
  encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
105
105
  const ratioWei = ratioPercentageToWei(ratioPercentage);
106
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
106
+ return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
107
107
  },
108
108
  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: number } {
109
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
109
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
110
110
  return {
111
- owner: decodedData[0],
112
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
113
- ratioState: +decodedData[2],
111
+ owner: decodedData[0] as EthereumAddress,
112
+ ratio: weiToRatioPercentage(decodedData[1] as string),
113
+ ratioState: +decodedData[2]!,
114
114
  };
115
115
  },
116
116
  };
@@ -118,27 +118,27 @@ export const compoundV2RatioTrigger = {
118
118
  export const liquityRatioTrigger = {
119
119
  encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
120
120
  const ratioWei = ratioPercentageToWei(ratioPercentage);
121
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
121
+ return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
122
122
  },
123
123
  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: number } {
124
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
124
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
125
125
  return {
126
- owner: decodedData[0],
127
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
128
- ratioState: +decodedData[2],
126
+ owner: decodedData[0] as EthereumAddress,
127
+ ratio: weiToRatioPercentage(decodedData[1] as string),
128
+ ratioState: +decodedData[2]!,
129
129
  };
130
130
  },
131
131
  };
132
132
 
133
133
  export const liquityDebtInFrontTrigger = {
134
134
  encode(owner: EthereumAddress, debtInFrontMin: string) {
135
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256'], [owner, debtInFrontMin])];
135
+ return [AbiCoder.encodeParameters(['address', 'uint256'], [owner, debtInFrontMin])];
136
136
  },
137
137
  decode(triggerData: TriggerData): { owner: EthereumAddress, debtInFrontMin: string } {
138
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256'], triggerData[0]);
138
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256'], triggerData[0]);
139
139
  return {
140
- owner: decodedData[0],
141
- debtInFrontMin: decodedData[1],
140
+ owner: decodedData[0] as EthereumAddress,
141
+ debtInFrontMin: decodedData[1] as string,
142
142
  };
143
143
  },
144
144
  };
@@ -146,26 +146,26 @@ export const liquityDebtInFrontTrigger = {
146
146
  export const aaveV2RatioTrigger = {
147
147
  encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
148
148
  const ratioWei = ratioPercentageToWei(ratioPercentage);
149
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
149
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
150
150
  },
151
- decode(triggerData: TriggerData): { owner: EthereumAddress, market:EthereumAddress, ratioState: RatioState, ratio: number } {
152
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
151
+ decode(triggerData: TriggerData): { owner: EthereumAddress, market: EthereumAddress, ratioState: RatioState, ratio: number } {
152
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
153
153
  return {
154
- owner: decodedData[0],
155
- market: decodedData[1],
156
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
157
- ratioState: +decodedData[3],
154
+ owner: decodedData[0] as EthereumAddress,
155
+ market: decodedData[1] as EthereumAddress,
156
+ ratio: weiToRatioPercentage(decodedData[1] as string),
157
+ ratioState: +decodedData[3]!,
158
158
  };
159
159
  },
160
160
  };
161
161
 
162
162
  export const cBondsRebondTrigger = {
163
163
  encode(bondId: number | string) {
164
- return [mockedWeb3.eth.abi.encodeParameters(['uint256'], [bondId])];
164
+ return [AbiCoder.encodeParameters(['uint256'], [bondId])];
165
165
  },
166
166
  decode(triggerData: TriggerData): { bondId: string } {
167
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256'], triggerData[0]);
168
- return { bondId: decodedData[0] };
167
+ const decodedData = AbiCoder.decodeParameters(['uint256'], triggerData[0]);
168
+ return { bondId: decodedData[0] as string };
169
169
  },
170
170
  };
171
171
 
@@ -177,17 +177,17 @@ export const compoundV3RatioTrigger = {
177
177
  ratioState: RatioState,
178
178
  ) {
179
179
  const ratioWei = ratioPercentageToWei(ratioPercentage);
180
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
180
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
181
181
  },
182
182
  decode(
183
183
  triggerData: TriggerData,
184
184
  ): { owner: EthereumAddress, market: EthereumAddress, ratioState: RatioState, ratio: number } {
185
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
185
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
186
186
  return {
187
- owner: decodedData[0],
188
- market: decodedData[1],
189
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
190
- ratioState: +decodedData[3],
187
+ owner: decodedData[0] as EthereumAddress,
188
+ market: decodedData[1] as EthereumAddress,
189
+ ratio: weiToRatioPercentage(decodedData[1] as string),
190
+ ratioState: +decodedData[3]!,
191
191
  };
192
192
  },
193
193
  };
@@ -199,15 +199,15 @@ export const exchangeTimestampTrigger = {
199
199
  ) {
200
200
  const timestampWei = new Dec(timestamp).toString();
201
201
  const intervalWei = new Dec(interval).toString();
202
- return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
202
+ return [AbiCoder.encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
203
203
  },
204
204
  decode(
205
205
  triggerData: TriggerData,
206
206
  ): { timestamp: number, interval: number } {
207
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
207
+ const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256'], triggerData[0]);
208
208
  return {
209
- timestamp: decodedData[0],
210
- interval: decodedData[1],
209
+ timestamp: decodedData[0] as number,
210
+ interval: decodedData[1] as number,
211
211
  };
212
212
  },
213
213
  };
@@ -219,21 +219,21 @@ export const exchangeOffchainPriceTrigger = {
219
219
  fromTokenDecimals: number,
220
220
  ) {
221
221
  const price = new Dec(targetPrice.toString()).mul(10 ** fromTokenDecimals).floor().toString();
222
- const goodUntilWei = mockedWeb3.utils.toWei(new Dec(goodUntil).toString());
223
- return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
222
+ const goodUntilWei = web3Utils.toWei(new Dec(goodUntil).toString(), 'ether');
223
+ return [AbiCoder.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
224
224
  },
225
225
  decode(
226
226
  triggerData: TriggerData,
227
227
  fromTokenDecimals: number,
228
228
  toTokenDecimals: number,
229
229
  ): { orderType: OrderType; targetPrice: string; goodUntil: any } {
230
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
230
+ const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
231
231
  const decimals = new Dec(toTokenDecimals).plus(18).minus(fromTokenDecimals).toString();
232
- const price = new Dec(decodedData[0]).div(new Dec(10).pow(decimals)).toDP(fromTokenDecimals).toString();
232
+ const price = new Dec(decodedData[0] as string).div(new Dec(10).pow(decimals)).toDP(fromTokenDecimals).toString();
233
233
  return {
234
234
  targetPrice: price,
235
235
  goodUntil: decodedData[1],
236
- orderType: +decodedData[2],
236
+ orderType: +decodedData[2]!,
237
237
  };
238
238
  },
239
239
  };
@@ -241,14 +241,14 @@ export const exchangeOffchainPriceTrigger = {
241
241
  export const sparkRatioTrigger = {
242
242
  encode(owner: EthereumAddress, market: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
243
243
  const ratioWei = ratioPercentageToWei(ratioPercentage);
244
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
244
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
245
245
  },
246
246
  decode(triggerData: TriggerData) {
247
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as string[];
247
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
248
248
  return {
249
249
  owner: decodedData[0],
250
250
  market: decodedData[1],
251
- ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
251
+ ratio: weiToRatioPercentage(decodedData[2] as string),
252
252
  ratioState: Number(decodedData[3]),
253
253
  };
254
254
  },
@@ -263,19 +263,19 @@ export const sparkQuotePriceTrigger = {
263
263
  ) {
264
264
  // Price is always in 8 decimals
265
265
  const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
266
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
266
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
267
267
  },
268
268
  decode(
269
269
  triggerData: TriggerData,
270
270
  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState } {
271
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]) as Array<string>;
271
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
272
272
  // Price is always in 8 decimals
273
- const price = new Dec(decodedData[2]).div(10 ** 8).toDP(8).toString();
273
+ const price = new Dec(decodedData[2] as string).div(10 ** 8).toDP(8).toString();
274
274
  return {
275
275
  price,
276
- baseTokenAddress: decodedData[0],
277
- quoteTokenAddress: decodedData[1],
278
- ratioState: +decodedData[3],
276
+ baseTokenAddress: decodedData[0] as EthereumAddress,
277
+ quoteTokenAddress: decodedData[1] as EthereumAddress,
278
+ ratioState: +decodedData[3]!,
279
279
  };
280
280
  },
281
281
  };
@@ -292,22 +292,22 @@ export const curveUsdBorrowRateTrigger = {
292
292
  .toString();
293
293
  const rateWei = new Dec(rate).mul(10 ** 18).floor().toString(); // 18 decimals
294
294
 
295
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [market, rateWei, rateState])];
295
+ return [AbiCoder.encodeParameters(['address', 'uint256', 'uint8'], [market, rateWei, rateState])];
296
296
  },
297
297
  decode(
298
298
  triggerData: TriggerData,
299
299
  ): { market: EthereumAddress, targetRate: string, rateState: RatioState } {
300
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]) as Array<string>;
301
- const rateEth = mockedWeb3.utils.fromWei(decodedData[1]);
300
+ const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
301
+ const rateEth = weiToRatioPercentage(decodedData[1] as string);
302
302
 
303
303
  // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
304
304
  const exponentRate = new Dec(rateEth).mul(365).mul(86400);
305
305
  const targetRate = new Dec(new Dec(2.718281828459).pow(exponentRate).minus(1)).mul(100)
306
306
  .toString();
307
307
  return {
308
- market: decodedData[0],
308
+ market: decodedData[0] as EthereumAddress,
309
309
  targetRate,
310
- rateState: +decodedData[2],
310
+ rateState: +decodedData[2]!,
311
311
  };
312
312
  },
313
313
  };
@@ -320,17 +320,17 @@ export const curveUsdSoftLiquidationTrigger = {
320
320
  ) {
321
321
  // 100% = 1e18 => 1% = 1e16
322
322
  const _percentage = new Dec(percentage).mul(10 ** 16).floor().toString();
323
- return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256'], [market, owner, _percentage])];
323
+ return [AbiCoder.encodeParameters(['address', 'address', 'uint256'], [market, owner, _percentage])];
324
324
  },
325
325
  decode(
326
326
  triggerData: TriggerData,
327
327
  ): { market: EthereumAddress, owner: EthereumAddress, percentage: string } {
328
- const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256'], triggerData[0]) as Array<string>;
328
+ const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256'], triggerData[0]);
329
329
 
330
330
  return {
331
- market: decodedData[0],
332
- owner: decodedData[1],
333
- percentage: new Dec(decodedData[2]).div(10 ** 16).toString(),
331
+ market: decodedData[0] as EthereumAddress,
332
+ owner: decodedData[1] as EthereumAddress,
333
+ percentage: new Dec(decodedData[2] as string).div(10 ** 16).toString(),
334
334
  };
335
335
  },
336
336
  };