@defisaver/automation-sdk 1.0.5 → 1.0.7

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 (12) hide show
  1. package/esm/automation/private/StrategiesAutomation.js +2 -2
  2. package/esm/services/ethereumService.js +1 -1
  3. package/esm/services/strategySubService.d.ts +1 -1
  4. package/esm/services/strategySubService.js +2 -2
  5. package/esm/services/subDataService.d.ts +1 -1
  6. package/esm/services/subDataService.js +5 -5
  7. package/package.json +1 -1
  8. package/src/automation/private/StrategiesAutomation.ts +1 -1
  9. package/src/services/ethereumService.ts +1 -1
  10. package/src/services/strategySubService.ts +5 -5
  11. package/src/services/subDataService.ts +8 -8
  12. package/umd/index.js +7 -7
package/esm/automation/private/StrategiesAutomation.js CHANGED
@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
- import { addToArrayIf, addToObjectIf, isDefined, } from '../../services/utils';
10
+ import { addToObjectIf, isDefined, } from '../../services/utils';
11
11
  import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
12
12
  import { getEventsFromContract, multicall } from '../../services/ethereumService';
13
13
  import Automation from './Automation';
@@ -81,7 +81,7 @@ export default class StrategiesAutomation extends Automation {
81
81
  if (mergePairIndex !== -1) {
82
82
  const mergePair = copyList[mergePairIndex];
83
83
  if (isDefined(mergePair)) {
84
- copyList[mergePairIndex] = Object.assign(Object.assign(Object.assign({}, mergePair), current), { isEnabled: mergePair.isEnabled || current.isEnabled, subId: mergePair.subId, subIds: [...addToArrayIf(isDefined(mergePair.subIds), mergePair.subIds), current.subId], specific: Object.assign(Object.assign(Object.assign({}, mergePair.specific), current.specific), { mergeWithSameId: false }) });
84
+ copyList[mergePairIndex] = Object.assign(Object.assign(Object.assign({}, mergePair), current), { subIds: isDefined(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined, isEnabled: mergePair.isEnabled || current.isEnabled, subId: mergePair.subId, specific: Object.assign(Object.assign(Object.assign({}, mergePair.specific), current.specific), { mergeWithSameId: false }) });
85
85
  return copyList;
86
86
  }
87
87
  }
package/esm/services/ethereumService.js CHANGED
@@ -30,5 +30,5 @@ export function multicall(web3, chainId, calls, block = 'latest') {
30
30
  });
31
31
  }
32
32
  export function getEventsFromContract(contractWithMeta, event, options) {
33
- return contractWithMeta.contract.getPastEvents(event, Object.assign(Object.assign({}, addToObjectIf(isDefined(options), options)), { fromBlock: contractWithMeta.createdBlock }));
33
+ return contractWithMeta.contract.getPastEvents(event, Object.assign({ fromBlock: contractWithMeta.createdBlock }, addToObjectIf(isDefined(options), options)));
34
34
  }
package/esm/services/strategySubService.d.ts CHANGED
@@ -28,5 +28,5 @@ export declare const aaveV3Encode: {
28
28
  }): (number | boolean | string[])[];
29
29
  };
30
30
  export declare const compoundV3Encode: {
31
- leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, repayFrom: number, boostFrom: number, boostTo: number, repayTo: number, boostEnabled: boolean, isEOA: boolean): string[];
31
+ leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
32
32
  };
package/esm/services/strategySubService.js CHANGED
@@ -85,7 +85,7 @@ export const aaveV3Encode = {
85
85
  },
86
86
  };
87
87
  export const compoundV3Encode = {
88
- leverageManagement(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
89
- return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
88
+ leverageManagement(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
89
+ return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
90
90
  },
91
91
  };
package/esm/services/subDataService.d.ts CHANGED
@@ -38,7 +38,7 @@ export declare const aaveV3QuotePriceSubData: {
38
38
  };
39
39
  };
40
40
  export declare const compoundV3LeverageManagementSubData: {
41
- encode(market: EthereumAddress, baseToken: EthereumAddress, repayFrom: number, boostFrom: number, boostTo: number, repayTo: number, boostEnabled: boolean, isEOA: boolean): string[];
41
+ encode(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
42
42
  decode(subData: string[]): {
43
43
  targetRatio: number;
44
44
  };
package/esm/services/subDataService.js CHANGED
@@ -100,14 +100,14 @@ export const aaveV3QuotePriceSubData = {
100
100
  },
101
101
  };
102
102
  export const compoundV3LeverageManagementSubData = {
103
- encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
103
+ encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
104
104
  return [
105
105
  market,
106
106
  baseToken,
107
- new Dec(repayFrom).mul(1e16).toString(),
108
- new Dec(boostFrom).mul(1e16).toString(),
109
- new Dec(boostTo).mul(1e16).toString(),
110
- new Dec(repayTo).mul(1e16).toString(),
107
+ new Dec(minRatio).mul(1e16).toString(),
108
+ new Dec(maxRatio).mul(1e16).toString(),
109
+ new Dec(maxOptimalRatio).mul(1e16).toString(),
110
+ new Dec(minOptimalRatio).mul(1e16).toString(),
111
111
  // @ts-ignore // TODO
112
112
  boostEnabled, isEOA,
113
113
  ];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/automation-sdk",
3
- "version": "1.0.5",
3
+ "version": "1.0.7",
4
4
  "description": "",
5
5
  "main": "./umd/index.js",
6
6
  "module": "./esm/index.js",
package/src/automation/private/StrategiesAutomation.ts CHANGED
@@ -117,9 +117,9 @@ export default class StrategiesAutomation extends Automation {
117
117
  copyList[mergePairIndex] = {
118
118
  ...mergePair,
119
119
  ...current,
120
+ subIds: isDefined(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
120
121
  isEnabled: mergePair.isEnabled || current.isEnabled,
121
122
  subId: mergePair.subId,
122
- subIds: [...addToArrayIf(isDefined(mergePair.subIds), mergePair.subIds), current.subId],
123
123
  specific: {
124
124
  ...mergePair.specific,
125
125
  ...current.specific,
package/src/services/ethereumService.ts CHANGED
@@ -48,8 +48,8 @@ export function getEventsFromContract<T extends BaseContract>(
48
48
  return contractWithMeta.contract.getPastEvents(
49
49
  event,
50
50
  {
51
- ...addToObjectIf(isDefined(options), options),
52
51
  fromBlock: contractWithMeta.createdBlock,
52
+ ...addToObjectIf(isDefined(options), options),
53
53
  },
54
54
  );
55
55
  }
package/src/services/strategySubService.ts CHANGED
@@ -190,13 +190,13 @@ export const compoundV3Encode = {
190
190
  leverageManagement(
191
191
  market: EthereumAddress,
192
192
  baseToken: EthereumAddress,
193
- repayFrom: number,
194
- boostFrom: number,
195
- boostTo: number,
196
- repayTo: number,
193
+ minRatio: number,
194
+ maxRatio: number,
195
+ maxOptimalRatio: number,
196
+ minOptimalRatio: number,
197
197
  boostEnabled: boolean,
198
198
  isEOA: boolean,
199
199
  ) {
200
- return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
200
+ return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
201
201
  },
202
202
  };
package/src/services/subDataService.ts CHANGED
@@ -153,20 +153,20 @@ export const compoundV3LeverageManagementSubData = {
153
153
  encode(
154
154
  market: EthereumAddress,
155
155
  baseToken: EthereumAddress,
156
- repayFrom: number,
157
- boostFrom: number,
158
- boostTo: number,
159
- repayTo: number,
156
+ minRatio: number,
157
+ maxRatio: number,
158
+ maxOptimalRatio: number,
159
+ minOptimalRatio: number,
160
160
  boostEnabled: boolean,
161
161
  isEOA: boolean,
162
162
  ): SubData {
163
163
  return [
164
164
  market,
165
165
  baseToken,
166
- new Dec(repayFrom).mul(1e16).toString(),
167
- new Dec(boostFrom).mul(1e16).toString(),
168
- new Dec(boostTo).mul(1e16).toString(),
169
- new Dec(repayTo).mul(1e16).toString(),
166
+ new Dec(minRatio).mul(1e16).toString(),
167
+ new Dec(maxRatio).mul(1e16).toString(),
168
+ new Dec(maxOptimalRatio).mul(1e16).toString(),
169
+ new Dec(minOptimalRatio).mul(1e16).toString(),
170
170
  // @ts-ignore // TODO
171
171
  boostEnabled, isEOA,
172
172
  ];
package/umd/index.js CHANGED
@@ -991,9 +991,9 @@ function _multicall() {
991
991
  return _multicall.apply(this, arguments);
992
992
  }
993
993
  function getEventsFromContract(contractWithMeta, event, options) {
994
- return contractWithMeta.contract.getPastEvents(event, _objectSpread(_objectSpread({}, (0,_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(options), options)), {}, {
994
+ return contractWithMeta.contract.getPastEvents(event, _objectSpread({
995
995
  fromBlock: contractWithMeta.createdBlock
996
- }));
996
+ }, (0,_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(options), options)));
997
997
  }
998
998
 
999
999
  /***/ }),
@@ -1246,9 +1246,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
1246
1246
  var mergePair = copyList[mergePairIndex];
1247
1247
  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair)) {
1248
1248
  copyList[mergePairIndex] = _objectSpread(_objectSpread(_objectSpread({}, mergePair), current), {}, {
1249
+ subIds: (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
1249
1250
  isEnabled: mergePair.isEnabled || current.isEnabled,
1250
1251
  subId: mergePair.subId,
1251
- subIds: [...(0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToArrayIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair.subIds), mergePair.subIds), current.subId],
1252
1252
  specific: _objectSpread(_objectSpread(_objectSpread({}, mergePair.specific), current.specific), {}, {
1253
1253
  mergeWithSameId: false
1254
1254
  })
@@ -18942,8 +18942,8 @@ var aaveV3QuotePriceSubData = {
18942
18942
  }
18943
18943
  };
18944
18944
  var compoundV3LeverageManagementSubData = {
18945
- encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
18946
- return [market, baseToken, new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(repayFrom).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(boostFrom).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(boostTo).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(repayTo).mul(1e16).toString(),
18945
+ encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
18946
+ return [market, baseToken, new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minRatio).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxRatio).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxOptimalRatio).mul(1e16).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minOptimalRatio).mul(1e16).toString(),
18947
18947
  // @ts-ignore // TODO
18948
18948
  boostEnabled, isEOA];
18949
18949
  },
@@ -28847,8 +28847,8 @@ var aaveV3Encode = {
28847
28847
  }
28848
28848
  };
28849
28849
  var compoundV3Encode = {
28850
- leverageManagement(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
28851
- return _subDataService__WEBPACK_IMPORTED_MODULE_3__.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
28850
+ leverageManagement(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
28851
+ return _subDataService__WEBPACK_IMPORTED_MODULE_3__.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
28852
28852
  }
28853
28853
  };
28854
28854