@defisaver/automation-sdk 1.0.11 → 1.0.14

package/esm/automation/private/LegacyAutomation.js

@@ -77,16 +77,19 @@ export default class LegacyAutomation extends Automation {
     }
     getParsedSubscriptions(addresses) {
         return __awaiter(this, void 0, void 0, function* () {
-            let subscriptions = yield this._getSubscriptions(addresses);
+            const subscriptions = yield this._getSubscriptions(addresses);
             // @ts-ignore
-            subscriptions = subscriptions.map(sub => ({
+            return subscriptions.map((sub) => ({
                 chainId: this.chainId,
                 owner: sub[this.getOwnerPropName()],
                 isEnabled: true,
                 protocol: this.protocol,
                 specific: Object.assign({}, sub),
+                strategy: {
+                    strategyId: 'legacy',
+                    protocol: this.protocol,
+                },
             }));
-            return subscriptions;
         });
     }
     getSubscriptions() {

package/esm/automation/private/StrategiesAutomation.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import Dec from 'decimal.js';
 import { addToObjectIf, isDefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
@@ -54,20 +55,21 @@ export default class StrategiesAutomation extends Automation {
     _getSubscriptions(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const _options = Object.assign(Object.assign({}, addToObjectIf(isDefined(options), options)), addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }));
-            const subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)).map(e => e.returnValues); // TODO PlaceholderType
+            const subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
             let subscriptions = [];
             if (subscriptionEvents) {
                 // @ts-ignore
-                const strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.subId));
+                const strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId));
                 subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    let latestUpdate = subscriptionEvents[index];
+                    let latestUpdate = subscriptionEvents[index].returnValues;
                     if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
                         const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, addToObjectIf(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
                         latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
                     }
                     return this.getParsedSubscriptions({
                         chainId: this.chainId,
+                        blockNumber: subscriptionEvents[index].blockNumber,
                         subscriptionEventData: latestUpdate,
                         strategiesSubsData: sub,
                     });
@@ -78,12 +80,15 @@ export default class StrategiesAutomation extends Automation {
                         if (isDefined(current)) {
                             if (current.specific.mergeWithSameId) {
                                 const mergePairIndex = copyList.findIndex(s => (s && s.specific.mergeWithSameId
+                                    && s.owner === current.owner
                                     && s.strategy.strategyId === current.strategy.strategyId
                                     && s.protocol.id === current.protocol.id));
                                 if (mergePairIndex !== -1) {
                                     const mergePair = copyList[mergePairIndex];
                                     if (isDefined(mergePair)) {
-                                        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 }) });
+                                        copyList[mergePairIndex] = Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                                            // @ts-ignore
+                                            blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(), 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 }) });
                                         return copyList;
                                     }
                                 }

package/esm/services/strategiesService.js

@@ -212,7 +212,7 @@ function getParsingMethod(id, strategy) {
     return parsingMethodsMapping[id][strategy.strategyId];
 }
 export function parseStrategiesAutomatedPosition(parseData) {
-    const { chainId, subscriptionEventData, strategiesSubsData } = parseData;
+    const { chainId, blockNumber, subscriptionEventData, strategiesSubsData, } = parseData;
     const { subStruct, proxy, subId, subHash, } = subscriptionEventData;
     const { isEnabled } = strategiesSubsData;
     const id = subStruct.strategyOrBundleId;
@@ -225,6 +225,7 @@ export function parseStrategiesAutomatedPosition(parseData) {
         isEnabled,
         chainId,
         subHash,
+        blockNumber,
         subId: Number(subId),
         owner: proxy,
         protocol: Object.assign({}, strategyOrBundleInfo.protocol),

package/esm/services/strategySubService.js

@@ -24,7 +24,7 @@ export const makerEncode = {
         requireAddresses([closeToAssetAddr, chainlinkCollAddress]);
         const subData = subDataService.makerCloseSubData.encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr);
         const triggerData = triggerService.trailingStopTrigger.encode(chainlinkCollAddress, triggerPercentage, roundId);
-        const strategyOrBundleId = compareAddresses(closeToAssetAddr, getAssetInfo('DAI').address)
+        const strategyOrBundleId = compareAddresses(closeToAssetAddr, getAssetInfo('DAI', chainId).address)
             ? Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_DAI
             : Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_COLL;
         const isBundle = false;

package/esm/services/subDataService.d.ts

@@ -53,8 +53,9 @@ export declare const liquityPaybackUsingChickenBondSubData: {
     /**
      * @param sourceId bondId or subId
      * @param sourceType 0 for bond, 1 for subId
+     * @param chainId
      */
-    encode: (sourceId: string, sourceType: number) => string[];
+    encode: (sourceId: string, sourceType: number, chainId?: ChainId) => string[];
     decode: (subData: string[]) => {
         sourceId: string;
         sourceType: string;

package/esm/services/subDataService.js

@@ -132,12 +132,13 @@ export const liquityPaybackUsingChickenBondSubData = {
     /**
      * @param sourceId bondId or subId
      * @param sourceType 0 for bond, 1 for subId
+     * @param chainId
      */
-    encode: (sourceId, sourceType) => {
+    encode: (sourceId, sourceType, chainId = ChainId.Ethereum) => {
         const sourceIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceId);
         const sourceTypeEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceType);
-        const lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('LUSD').address);
-        const bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('bLUSD').address);
+        const lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
+        const bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
         return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
     },
     decode: (subData) => {

package/esm/types/enums.d.ts

@@ -21,14 +21,14 @@ export declare enum BundleProtocols {
  */
 export declare namespace ProtocolIdentifiers {
     enum StrategiesAutomation {
-        MakerDAO = "MakerDAO__MCD",
+        MakerDAO = "MakerDAO",
         Liquity = "Liquity",
-        ChickenBonds = "ChickenBonds",
+        ChickenBonds = "Chicken Bonds",
         CompoundV3 = "Compound__V3",
         AaveV3 = "Aave__V3"
     }
     enum LegacyAutomation {
-        MakerDAO = "MakerDAO__MCD",
+        MakerDAO = "MakerDAO",
         CompoundV2 = "Compound__V2",
         AaveV2 = "Aave__V2"
     }

package/esm/types/enums.js

@@ -26,15 +26,15 @@ export var ProtocolIdentifiers;
 (function (ProtocolIdentifiers) {
     let StrategiesAutomation;
     (function (StrategiesAutomation) {
-        StrategiesAutomation["MakerDAO"] = "MakerDAO__MCD";
+        StrategiesAutomation["MakerDAO"] = "MakerDAO";
         StrategiesAutomation["Liquity"] = "Liquity";
-        StrategiesAutomation["ChickenBonds"] = "ChickenBonds";
+        StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
         StrategiesAutomation["AaveV3"] = "Aave__V3";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
-        LegacyAutomation["MakerDAO"] = "MakerDAO__MCD";
+        LegacyAutomation["MakerDAO"] = "MakerDAO";
         LegacyAutomation["CompoundV2"] = "Compound__V2";
         LegacyAutomation["AaveV2"] = "Aave__V2";
     })(LegacyAutomation = ProtocolIdentifiers.LegacyAutomation || (ProtocolIdentifiers.LegacyAutomation = {}));

package/esm/types/index.d.ts

@@ -128,6 +128,7 @@ export declare namespace Position {
         subIds?: number[];
         isEnabled?: boolean;
         subHash: string;
+        blockNumber: BlockNumber;
         protocol: Interfaces.Protocol;
         strategy: BundleOrStrategy;
         strategyData: {
@@ -147,6 +148,10 @@ export declare namespace Position {
         owner: EthereumAddress;
         isEnabled: boolean;
         protocol: Interfaces.LegacyProtocol;
+        strategy: {
+            strategyId: string;
+            protocol: Interfaces.Protocol;
+        };
         specific: any;
     }
 }
@@ -171,6 +176,7 @@ export interface BundlesInfo {
 export type StrategyOrBundleIds = Strategies.MainnetIds & Strategies.OptimismIds & Strategies.ArbitrumIds & Bundles.MainnetIds & Bundles.OptimismIds & Bundles.ArbitrumIds;
 export interface ParseData {
     chainId: ChainId;
+    blockNumber: BlockNumber;
     subscriptionEventData: Subscribe['returnValues'];
     strategiesSubsData: StrategyModel.StoredSubDataStructOutputStruct;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "license": "ISC",
   "dependencies": {
     "@defisaver/sdk": "^1.0.5",
-    "@defisaver/tokens": "^1.4.18",
+    "@defisaver/tokens": "^1.4.25",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",

package/src/automation/private/LegacyAutomation.ts

@@ -80,7 +80,6 @@ export default class LegacyAutomation extends Automation {
     return (await multicall(this.web3, this.chainId, multicallCalls)).map(res => res[0]);
   }
 
-
   // Aave and Compound use 'user' for property name
   private getOwnerPropName() {
     return this.protocol.id === ProtocolIdentifiers.LegacyAutomation.MakerDAO ? 'owner' : 'user';
@@ -100,18 +99,20 @@ export default class LegacyAutomation extends Automation {
   }
 
   protected async getParsedSubscriptions(addresses?: EthereumAddress[]): Promise<Position.LegacyAutomated[]> {
-    let subscriptions = await this._getSubscriptions(addresses);
+    const subscriptions = await this._getSubscriptions(addresses);
 
     // @ts-ignore
-    subscriptions = subscriptions.map(sub => ({
+    return subscriptions.map((sub) => ({
       chainId: this.chainId,
       owner: sub[this.getOwnerPropName()],
       isEnabled: true,
       protocol: this.protocol,
       specific: { ...sub },
+      strategy: {
+        strategyId: 'legacy',
+        protocol: this.protocol,
+      },
     }));
-
-    return subscriptions;
   }
 
   public async getSubscriptions(): Promise<Position.LegacyAutomated[]> {

package/src/automation/private/StrategiesAutomation.ts

@@ -1,3 +1,4 @@
+import Dec from 'decimal.js';
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
 import type {
@@ -74,16 +75,16 @@ export default class StrategiesAutomation extends Automation {
       ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
     };
 
-    const subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)).map(e => e.returnValues) as PlaceholderType; // TODO PlaceholderType
+    const subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
 
     let subscriptions: (Position.Automated | null)[] = [];
 
     if (subscriptionEvents) {
       // @ts-ignore
-      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.subId));
+      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId));
 
       subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
-        let latestUpdate = subscriptionEvents[index];
+        let latestUpdate = subscriptionEvents[index].returnValues;
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
           const updates = await this.getUpdateDataEventsFromSubStorage({
@@ -97,6 +98,7 @@ export default class StrategiesAutomation extends Automation {
         }
         return this.getParsedSubscriptions({
           chainId: this.chainId,
+          blockNumber: subscriptionEvents[index].blockNumber,
           subscriptionEventData: latestUpdate,
           strategiesSubsData: sub,
         });
@@ -110,6 +112,7 @@ export default class StrategiesAutomation extends Automation {
             if (current.specific.mergeWithSameId) {
               const mergePairIndex = copyList.findIndex(s => (
                 s && s.specific.mergeWithSameId
+                && s.owner === current.owner
                 && s.strategy.strategyId === current.strategy.strategyId
                 && s.protocol.id === current.protocol.id
               ));
@@ -120,6 +123,8 @@ export default class StrategiesAutomation extends Automation {
                   copyList[mergePairIndex] = {
                     ...mergePair,
                     ...current,
+                    // @ts-ignore
+                    blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(),
                     subIds: isDefined(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
                     isEnabled: mergePair.isEnabled || current.isEnabled,
                     subId: mergePair.subId,

package/src/services/strategiesService.ts

@@ -293,7 +293,9 @@ function getParsingMethod(id: ProtocolIdentifiers.StrategiesAutomation, strategy
 }
 
 export function parseStrategiesAutomatedPosition(parseData: ParseData): Position.Automated | null {
-  const { chainId, subscriptionEventData, strategiesSubsData } = parseData;
+  const {
+    chainId, blockNumber, subscriptionEventData, strategiesSubsData,
+  } = parseData;
   const {
     subStruct, proxy, subId, subHash,
   } = subscriptionEventData;
@@ -313,6 +315,7 @@ export function parseStrategiesAutomatedPosition(parseData: ParseData): Position
     isEnabled,
     chainId,
     subHash,
+    blockNumber,
     subId: Number(subId),
     owner: proxy,
     protocol: {

package/src/services/strategySubService.ts

@@ -64,7 +64,7 @@ export const makerEncode = {
     const subData = subDataService.makerCloseSubData.encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr);
     const triggerData = triggerService.trailingStopTrigger.encode(chainlinkCollAddress, triggerPercentage, roundId);
 
-    const strategyOrBundleId = compareAddresses(closeToAssetAddr, getAssetInfo('DAI').address)
+    const strategyOrBundleId = compareAddresses(closeToAssetAddr, getAssetInfo('DAI', chainId).address)
       ? Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_DAI
       : Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_COLL;
 

package/src/services/subDataService.ts

@@ -194,12 +194,13 @@ export const liquityPaybackUsingChickenBondSubData = {
   /**
    * @param sourceId bondId or subId
    * @param sourceType 0 for bond, 1 for subId
+   * @param chainId
    */
-  encode: (sourceId: string, sourceType: number): SubData => {
+  encode: (sourceId: string, sourceType: number, chainId: ChainId = ChainId.Ethereum): SubData => {
     const sourceIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceId);
     const sourceTypeEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceType);
-    const lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('LUSD').address);
-    const bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('bLUSD').address);
+    const lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
+    const bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
 
     return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
   },

package/src/types/enums.ts

@@ -24,15 +24,15 @@ export enum BundleProtocols {
  */
 export namespace ProtocolIdentifiers {
   export enum StrategiesAutomation {
-    MakerDAO = 'MakerDAO__MCD',
+    MakerDAO = 'MakerDAO',
     Liquity = 'Liquity',
-    ChickenBonds = 'ChickenBonds',
+    ChickenBonds = 'Chicken Bonds',
     CompoundV3 = 'Compound__V3',
     AaveV3 = 'Aave__V3',
   }
 
   export enum LegacyAutomation {
-    MakerDAO = 'MakerDAO__MCD',
+    MakerDAO = 'MakerDAO',
     CompoundV2 = 'Compound__V2',
     AaveV2 = 'Aave__V2',
   }

package/src/types/index.ts

@@ -153,6 +153,7 @@ export declare namespace Position {
     subIds?: number[],
     isEnabled?: boolean,
     subHash: string,
+    blockNumber: BlockNumber,
     protocol: Interfaces.Protocol,
     strategy: BundleOrStrategy,
     strategyData: {
@@ -168,16 +169,19 @@ export declare namespace Position {
     specific: Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave,
   }
 
-  interface LegacyAutomated {
+  export interface LegacyAutomated {
     chainId: ChainId,
     owner: EthereumAddress,
     isEnabled: boolean,
     protocol: Interfaces.LegacyProtocol,
+    strategy: {
+      strategyId: string,
+      protocol: Interfaces.Protocol,
+    },
     specific: any,
   }
 }
 
-
 type StrategyInfo<T extends number> = Record<T, Strategy<T>>;
 export type MainnetStrategiesInfo = StrategyInfo<Strategies.MainnetIds>;
 export type OptimismStrategiesInfo = StrategyInfo<Strategies.OptimismIds>;
@@ -204,9 +208,9 @@ export type StrategyOrBundleIds =
   Strategies.MainnetIds & Strategies.OptimismIds & Strategies.ArbitrumIds
   & Bundles.MainnetIds & Bundles.OptimismIds & Bundles.ArbitrumIds;
 
-
 export interface ParseData {
   chainId: ChainId,
+  blockNumber: BlockNumber,
   subscriptionEventData: Subscribe['returnValues']
   strategiesSubsData: StrategyModel.StoredSubDataStructOutputStruct,
 }

package/umd/index.js

@@ -326,16 +326,16 @@ var ProtocolIdentifiers;
 (function (_ProtocolIdentifiers) {
   var StrategiesAutomation;
   (function (StrategiesAutomation) {
-    StrategiesAutomation["MakerDAO"] = "MakerDAO__MCD";
+    StrategiesAutomation["MakerDAO"] = "MakerDAO";
     StrategiesAutomation["Liquity"] = "Liquity";
-    StrategiesAutomation["ChickenBonds"] = "ChickenBonds";
+    StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
     StrategiesAutomation["CompoundV3"] = "Compound__V3";
     StrategiesAutomation["AaveV3"] = "Aave__V3";
   })(StrategiesAutomation || (StrategiesAutomation = {}));
   _ProtocolIdentifiers.StrategiesAutomation = StrategiesAutomation;
   var LegacyAutomation;
   (function (LegacyAutomation) {
-    LegacyAutomation["MakerDAO"] = "MakerDAO__MCD";
+    LegacyAutomation["MakerDAO"] = "MakerDAO";
     LegacyAutomation["CompoundV2"] = "Compound__V2";
     LegacyAutomation["AaveV2"] = "Aave__V2";
   })(LegacyAutomation || (LegacyAutomation = {}));
@@ -919,14 +919,17 @@ class LegacyAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["default
       var subscriptions = yield _this4._getSubscriptions(addresses);
 
       // @ts-ignore
-      subscriptions = subscriptions.map(sub => ({
+      return subscriptions.map(sub => ({
         chainId: _this4.chainId,
         owner: sub[_this4.getOwnerPropName()],
         isEnabled: true,
         protocol: _this4.protocol,
-        specific: _objectSpread({}, sub)
+        specific: _objectSpread({}, sub),
+        strategy: {
+          strategyId: 'legacy',
+          protocol: _this4.protocol
+        }
       }));
-      return subscriptions;
     })();
   }
   getSubscriptions() {
@@ -1139,11 +1142,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (/* binding */ StrategiesAutomation)
 /* harmony export */ });
-/* harmony import */ var _services_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _services_contractService__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17);
-/* harmony import */ var _services_ethereumService__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21);
-/* harmony import */ var _Automation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(22);
-/* harmony import */ var _services_strategiesService__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(27);
+/* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
+/* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _services_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18);
+/* harmony import */ var _services_contractService__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(17);
+/* harmony import */ var _services_ethereumService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(21);
+/* harmony import */ var _Automation__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(22);
+/* harmony import */ var _services_strategiesService__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(27);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -1156,7 +1161,8 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 
 
 
-class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["default"] {
+
+class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_4__["default"] {
   constructor(args) {
     super();
     _defineProperty(this, "chainId", void 0);
@@ -1164,13 +1170,13 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
     _defineProperty(this, "subStorageContract", void 0);
     this.web3 = args.provider;
     this.chainId = args.chainId;
-    this.subStorageContract = (0,_services_contractService__WEBPACK_IMPORTED_MODULE_1__.makeSubStorageContract)(this.web3, this.chainId);
+    this.subStorageContract = (0,_services_contractService__WEBPACK_IMPORTED_MODULE_2__.makeSubStorageContract)(this.web3, this.chainId);
     this.assert();
   }
   getEventFromSubStorage(event, options) {
     var _this = this;
     return _asyncToGenerator(function* () {
-      return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_2__.getEventsFromContract)(_this.subStorageContract, event, options);
+      return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_3__.getEventsFromContract)(_this.subStorageContract, event, options);
     })();
   }
   getStrategiesSubs(subIds) {
@@ -1179,12 +1185,12 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
       var subStorageContract = _this2.subStorageContract;
       var defaultOptions = {
         target: subStorageContract.address,
-        abiItem: (0,_services_contractService__WEBPACK_IMPORTED_MODULE_1__.getAbiItem)(subStorageContract.abi, 'strategiesSubs')
+        abiItem: (0,_services_contractService__WEBPACK_IMPORTED_MODULE_2__.getAbiItem)(subStorageContract.abi, 'strategiesSubs')
       };
       var multicallCalls = subIds.map(subId => _objectSpread(_objectSpread({}, defaultOptions), {}, {
         params: [subId]
       }));
-      return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_2__.multicall)(_this2.web3, _this2.chainId, multicallCalls);
+      return (0,_services_ethereumService__WEBPACK_IMPORTED_MODULE_3__.multicall)(_this2.web3, _this2.chainId, multicallCalls);
     })();
   }
   getSubscriptionEventsFromSubStorage(options) {
@@ -1202,28 +1208,28 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
     })();
   }
   getParsedSubscriptions(parseData) {
-    return (0,_services_strategiesService__WEBPACK_IMPORTED_MODULE_4__.parseStrategiesAutomatedPosition)(parseData);
+    return (0,_services_strategiesService__WEBPACK_IMPORTED_MODULE_5__.parseStrategiesAutomatedPosition)(parseData);
   }
   _getSubscriptions(addresses, options) {
     var _this5 = this;
     return _asyncToGenerator(function* () {
-      var _options = _objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToObjectIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(options), options)), (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToObjectIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(addresses), {
+      var _options = _objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(options), options)), (0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(addresses), {
         filter: {
           proxy: addresses
         }
       }));
-      var subscriptionEvents = (yield _this5.getSubscriptionEventsFromSubStorage(_options)).map(e => e.returnValues); // TODO PlaceholderType
+      var subscriptionEvents = yield _this5.getSubscriptionEventsFromSubStorage(_options); // TODO PlaceholderType
 
       var subscriptions = [];
       if (subscriptionEvents) {
         // @ts-ignore
-        var strategiesSubs = yield _this5.getStrategiesSubs(subscriptionEvents.map(e => e.subId));
+        var strategiesSubs = yield _this5.getStrategiesSubs(subscriptionEvents.map(e => e.returnValues.subId));
         subscriptions = yield Promise.all(strategiesSubs.map( /*#__PURE__*/function () {
           var _ref = _asyncToGenerator(function* (sub, index) {
-            var latestUpdate = subscriptionEvents[index];
+            var latestUpdate = subscriptionEvents[index].returnValues;
             if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
               var _updates;
-              var updates = yield _this5.getUpdateDataEventsFromSubStorage(_objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToObjectIf)(!!_options, _options)), {}, {
+              var updates = yield _this5.getUpdateDataEventsFromSubStorage(_objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)(!!_options, _options)), {}, {
                 filter: {
                   subId: latestUpdate.subId
                 }
@@ -1232,6 +1238,7 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
             }
             return _this5.getParsedSubscriptions({
               chainId: _this5.chainId,
+              blockNumber: subscriptionEvents[index].blockNumber,
               subscriptionEventData: latestUpdate,
               strategiesSubsData: sub
             });
@@ -1243,14 +1250,16 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
         if (options !== null && options !== void 0 && options.mergeWithSameId) {
           subscriptions = subscriptions.reduce((list, current) => {
             var copyList = [...list];
-            if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(current)) {
+            if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(current)) {
               if (current.specific.mergeWithSameId) {
-                var mergePairIndex = copyList.findIndex(s => s && s.specific.mergeWithSameId && s.strategy.strategyId === current.strategy.strategyId && s.protocol.id === current.protocol.id);
+                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);
                 if (mergePairIndex !== -1) {
                   var mergePair = copyList[mergePairIndex];
-                  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair)) {
+                  if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(mergePair)) {
                     copyList[mergePairIndex] = _objectSpread(_objectSpread(_objectSpread({}, mergePair), current), {}, {
-                      subIds: (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
+                      // @ts-ignore
+                      blockNumber: decimal_js__WEBPACK_IMPORTED_MODULE_0___default().max(mergePair.blockNumber, current.blockNumber).toNumber(),
+                      subIds: (0,_services_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
                       isEnabled: mergePair.isEnabled || current.isEnabled,
                       subId: mergePair.subId,
                       specific: _objectSpread(_objectSpread(_objectSpread({}, mergePair.specific), current.specific), {}, {
@@ -1553,6 +1562,7 @@ function getParsingMethod(id, strategy) {
 function parseStrategiesAutomatedPosition(parseData) {
   var {
     chainId,
+    blockNumber,
     subscriptionEventData,
     strategiesSubsData
   } = parseData;
@@ -1572,6 +1582,7 @@ function parseStrategiesAutomatedPosition(parseData) {
     isEnabled,
     chainId,
     subHash,
+    blockNumber,
     subId: Number(subId),
     owner: proxy,
     protocol: _objectSpread({}, strategyOrBundleInfo.protocol),
@@ -18975,12 +18986,14 @@ var liquityPaybackUsingChickenBondSubData = {
   /**
    * @param sourceId bondId or subId
    * @param sourceType 0 for bond, 1 for subId
+   * @param chainId
    */
-  encode: (sourceId, sourceType) => {
+  encode: function encode(sourceId, sourceType) {
+    var chainId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _types_enums__WEBPACK_IMPORTED_MODULE_3__.ChainId.Ethereum;
     var sourceIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceId);
     var sourceTypeEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceType);
-    var lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('LUSD').address);
-    var bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('bLUSD').address);
+    var lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('LUSD', chainId).address);
+    var bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('bLUSD', chainId).address);
     return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
   },
   decode: subData => {
@@ -28776,7 +28789,7 @@ var makerEncode = {
     (0,_utils__WEBPACK_IMPORTED_MODULE_5__.requireAddresses)([closeToAssetAddr, chainlinkCollAddress]);
     var subData = _subDataService__WEBPACK_IMPORTED_MODULE_3__.makerCloseSubData.encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr);
     var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_4__.trailingStopTrigger.encode(chainlinkCollAddress, triggerPercentage, roundId);
-    var strategyOrBundleId = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.compareAddresses)(closeToAssetAddr, (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('DAI').address) ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_DAI : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_COLL;
+    var strategyOrBundleId = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.compareAddresses)(closeToAssetAddr, (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfo)('DAI', chainId).address) ? _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_DAI : _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.MAKER_TRAILING_STOP_LOSS_TO_COLL;
     var isBundle = false;
     return [strategyOrBundleId, isBundle, triggerData, subData];
   }