@defisaver/automation-sdk 2.1.1 → 2.1.2

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 (6) hide show
  1. package/.yarn/releases/yarn-1.22.1.cjs +147386 -0
  2. package/.yarnrc.yml +3 -0
  3. package/esm/automation/private/StrategiesAutomation.js +3 -1
  4. package/package.json +1 -1
  5. package/src/automation/private/StrategiesAutomation.ts +5 -1
  6. package/umd/index.js +2 -1
package/.yarnrc.yml ADDED
@@ -0,0 +1,3 @@
1
+ nodeLinker: node-modules
2
+
3
+ yarnPath: .yarn/releases/yarn-1.22.1.cjs
package/esm/automation/private/StrategiesAutomation.js CHANGED
@@ -125,7 +125,9 @@ class StrategiesAutomation extends Automation_1.default {
125
125
  const mergePairIndex = copyList.findIndex(s => (s && s.specific.mergeWithSameId
126
126
  && s.owner === current.owner
127
127
  && s.strategy.strategyId === current.strategy.strategyId
128
- && s.protocol.id === current.protocol.id));
128
+ && s.protocol.id === current.protocol.id
129
+ && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
130
+ || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId)));
129
131
  if (mergePairIndex !== -1) {
130
132
  const mergePair = copyList[mergePairIndex];
131
133
  if ((0, utils_1.isDefined)(mergePair)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/automation-sdk",
3
- "version": "2.1.1",
3
+ "version": "2.1.2",
4
4
  "description": "",
5
5
  "main": "./umd/index.js",
6
6
  "module": "./esm/index.js",
package/src/automation/private/StrategiesAutomation.ts CHANGED
@@ -165,6 +165,10 @@ export default class StrategiesAutomation extends Automation {
165
165
  && s.owner === current.owner
166
166
  && s.strategy.strategyId === current.strategy.strategyId
167
167
  && s.protocol.id === current.protocol.id
168
+ && (
169
+ s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
170
+ || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId
171
+ )
168
172
  ));
169
173
 
170
174
  if (mergePairIndex !== -1) {
@@ -212,4 +216,4 @@ export default class StrategiesAutomation extends Automation {
212
216
  public async getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
213
217
  return this._getSubscriptions(addresses, options);
214
218
  }
215
- }
219
+ }
package/umd/index.js CHANGED
@@ -1541,7 +1541,8 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_6__["def
1541
1541
  var copyList = [...list];
1542
1542
  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(current)) {
1543
1543
  if (current.specific.mergeWithSameId) {
1544
- var mergePairIndex = copyList.findIndex(s => s && s.specific.mergeWithSameId && s.owner === current.owner && s.strategy.strategyId === current.strategy.strategyId && s.protocol.id === current.protocol.id);
1544
+ var mergePairIndex = copyList.findIndex(s => s && s.specific.mergeWithSameId && s.owner === current.owner && s.strategy.strategyId === current.strategy.strategyId && s.protocol.id === current.protocol.id && (s.protocol.id !== _types_enums__WEBPACK_IMPORTED_MODULE_1__.ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
1545
+ || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId));
1545
1546
  if (mergePairIndex !== -1) {
1546
1547
  var mergePair = copyList[mergePairIndex];
1547
1548
  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_2__.isDefined)(mergePair)) {