@defisaver/automation-sdk 1.0.4 → 1.0.6

package/esm/automation/private/LegacyProtocol.d.ts

@@ -4,6 +4,7 @@ export default class Protocol implements Interfaces.LegacyProtocol {
     #private;
     id: ProtocolIdentifiers.LegacyAutomation;
     name: string;
+    slug: string;
     version: string;
     fullName: string;
     constructor(args: {
@@ -16,5 +17,6 @@ export default class Protocol implements Interfaces.LegacyProtocol {
      */
     private getVersion;
     private getName;
+    private getSlug;
     private getFullName;
 }

package/esm/automation/private/LegacyProtocol.js

@@ -9,6 +9,7 @@ export default class Protocol {
         _Protocol_versionSeparator.set(this, '__');
         this.id = args.id;
         this.name = this.getName();
+        this.slug = this.getSlug();
         this.version = this.getVersion();
         this.fullName = this.getFullName();
     }
@@ -27,6 +28,9 @@ export default class Protocol {
     getName() {
         return this.hasVersion() ? this.splitId()[0] : this.id;
     }
+    getSlug() {
+        return this.name.split(' ').join('-').toLowerCase();
+    }
     getFullName() {
         return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
     }

package/esm/automation/private/Protocol.d.ts

@@ -4,6 +4,7 @@ export default class Protocol implements Interfaces.Protocol {
     #private;
     id: ProtocolIdentifiers.StrategiesAutomation;
     name: string;
+    slug: string;
     version: string;
     fullName: string;
     constructor(args: {
@@ -16,5 +17,6 @@ export default class Protocol implements Interfaces.Protocol {
      */
     private getVersion;
     private getName;
+    private getSlug;
     private getFullName;
 }

package/esm/automation/private/Protocol.js

@@ -9,6 +9,7 @@ export default class Protocol {
         _Protocol_versionSeparator.set(this, '__');
         this.id = args.id;
         this.name = this.getName();
+        this.slug = this.getSlug();
         this.version = this.getVersion();
         this.fullName = this.getFullName();
     }
@@ -27,6 +28,9 @@ export default class Protocol {
     getName() {
         return this.hasVersion() ? this.splitId()[0] : this.id;
     }
+    getSlug() {
+        return this.name.split(' ').join('-').toLowerCase();
+    }
     getFullName() {
         return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
     }

package/esm/automation/private/StrategiesAutomation.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { addToArrayIf, addToObjectIf, isDefined, } from '../../services/utils';
+import { addToObjectIf, isDefined, } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
 import Automation from './Automation';
@@ -81,7 +81,7 @@ export default class StrategiesAutomation extends Automation {
                                 if (mergePairIndex !== -1) {
                                     const mergePair = copyList[mergePairIndex];
                                     if (isDefined(mergePair)) {
-                                        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 }) });
+                                        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 }) });
                                         return copyList;
                                     }
                                 }

package/esm/services/strategiesService.js

@@ -213,7 +213,7 @@ function getParsingMethod(id, strategy) {
 }
 export function parseStrategiesAutomatedPosition(parseData) {
     const { chainId, subscriptionEventData, strategiesSubsData } = parseData;
-    const { subStruct, proxy, subId } = subscriptionEventData;
+    const { subStruct, proxy, subId, subHash, } = subscriptionEventData;
     const { isEnabled } = strategiesSubsData;
     const id = subStruct.strategyOrBundleId;
     const strategyOrBundleInfo = (subStruct.isBundle
@@ -224,6 +224,7 @@ export function parseStrategiesAutomatedPosition(parseData) {
     const position = {
         isEnabled,
         chainId,
+        subHash,
         subId: Number(subId),
         owner: proxy,
         protocol: Object.assign({}, strategyOrBundleInfo.protocol),

package/esm/services/strategySubService.d.ts

@@ -28,5 +28,5 @@ export declare const aaveV3Encode: {
     }): (number | boolean | string[])[];
 };
 export declare const compoundV3Encode: {
-    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, repayFrom: number, boostFrom: number, boostTo: number, repayTo: number, boostEnabled: boolean, isEOA: boolean): string[];
+    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
 };

package/esm/services/strategySubService.js

@@ -85,7 +85,7 @@ export const aaveV3Encode = {
     },
 };
 export const compoundV3Encode = {
-    leverageManagement(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
-        return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
+    leverageManagement(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
+        return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
     },
 };

package/esm/services/subDataService.d.ts

@@ -38,7 +38,7 @@ export declare const aaveV3QuotePriceSubData: {
     };
 };
 export declare const compoundV3LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, repayFrom: number, boostFrom: number, boostTo: number, repayTo: number, boostEnabled: boolean, isEOA: boolean): string[];
+    encode(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
     decode(subData: string[]): {
         targetRatio: number;
     };

package/esm/services/subDataService.js

@@ -100,14 +100,14 @@ export const aaveV3QuotePriceSubData = {
     },
 };
 export const compoundV3LeverageManagementSubData = {
-    encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
+    encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
         return [
             market,
             baseToken,
-            new Dec(repayFrom).mul(1e16).toString(),
-            new Dec(boostFrom).mul(1e16).toString(),
-            new Dec(boostTo).mul(1e16).toString(),
-            new Dec(repayTo).mul(1e16).toString(),
+            new Dec(minRatio).mul(1e16).toString(),
+            new Dec(maxRatio).mul(1e16).toString(),
+            new Dec(maxOptimalRatio).mul(1e16).toString(),
+            new Dec(minOptimalRatio).mul(1e16).toString(),
             // @ts-ignore // TODO
             boostEnabled, isEOA,
         ];

package/esm/types/index.d.ts

@@ -54,6 +54,7 @@ export declare namespace Interfaces {
     interface ProtocolBase {
         id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation;
         name: string;
+        slug: string;
         fullName: string;
         version: string;
     }
@@ -126,6 +127,7 @@ export declare namespace Position {
         subId: number;
         subIds?: number[];
         isEnabled?: boolean;
+        subHash: string;
         protocol: Interfaces.Protocol;
         strategy: BundleOrStrategy;
         strategyData: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/automation/private/LegacyProtocol.ts

@@ -6,6 +6,8 @@ export default class Protocol implements Interfaces.LegacyProtocol {
 
   name: string;
 
+  slug: string;
+
   version: string;
 
   fullName: string;
@@ -16,6 +18,7 @@ export default class Protocol implements Interfaces.LegacyProtocol {
     this.id = args.id;
 
     this.name = this.getName();
+    this.slug = this.getSlug();
     this.version = this.getVersion();
     this.fullName = this.getFullName();
   }
@@ -39,6 +42,10 @@ export default class Protocol implements Interfaces.LegacyProtocol {
     return this.hasVersion() ? this.splitId()[0] : this.id;
   }
 
+  private getSlug() {
+    return this.name.split(' ').join('-').toLowerCase();
+  }
+
   private getFullName() {
     return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
   }

package/src/automation/private/Protocol.ts

@@ -6,6 +6,8 @@ export default class Protocol implements Interfaces.Protocol {
 
   name: string;
 
+  slug: string;
+
   version: string;
 
   fullName: string;
@@ -16,6 +18,7 @@ export default class Protocol implements Interfaces.Protocol {
     this.id = args.id;
 
     this.name = this.getName();
+    this.slug = this.getSlug();
     this.version = this.getVersion();
     this.fullName = this.getFullName();
   }
@@ -39,6 +42,10 @@ export default class Protocol implements Interfaces.Protocol {
     return this.hasVersion() ? this.splitId()[0] : this.id;
   }
 
+  private getSlug() {
+    return this.name.split(' ').join('-').toLowerCase();
+  }
+
   private getFullName() {
     return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
   }

package/src/automation/private/StrategiesAutomation.ts

@@ -117,9 +117,9 @@ export default class StrategiesAutomation extends Automation {
                   copyList[mergePairIndex] = {
                     ...mergePair,
                     ...current,
+                    subIds: isDefined(mergePair.subIds) ? [...mergePair.subIds, current.subId] : undefined,
                     isEnabled: mergePair.isEnabled || current.isEnabled,
                     subId: mergePair.subId,
-                    subIds: [...addToArrayIf(isDefined(mergePair.subIds), mergePair.subIds), current.subId],
                     specific: {
                       ...mergePair.specific,
                       ...current.specific,

package/src/services/strategiesService.ts

@@ -294,7 +294,9 @@ function getParsingMethod(id: ProtocolIdentifiers.StrategiesAutomation, strategy
 
 export function parseStrategiesAutomatedPosition(parseData: ParseData): Position.Automated | null {
   const { chainId, subscriptionEventData, strategiesSubsData } = parseData;
-  const { subStruct, proxy, subId } = subscriptionEventData;
+  const {
+    subStruct, proxy, subId, subHash,
+  } = subscriptionEventData;
   const { isEnabled } = strategiesSubsData;
 
   const id = subStruct.strategyOrBundleId as StrategyOrBundleIds;
@@ -310,6 +312,7 @@ export function parseStrategiesAutomatedPosition(parseData: ParseData): Position
   const position: Position.Automated = {
     isEnabled,
     chainId,
+    subHash,
     subId: Number(subId),
     owner: proxy,
     protocol: {

package/src/services/strategySubService.ts

@@ -190,13 +190,13 @@ export const compoundV3Encode = {
   leverageManagement(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    repayFrom: number,
-    boostFrom: number,
-    boostTo: number,
-    repayTo: number,
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
     boostEnabled: boolean,
     isEOA: boolean,
   ) {
-    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
+    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
   },
 };

package/src/services/subDataService.ts

@@ -153,20 +153,20 @@ export const compoundV3LeverageManagementSubData = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    repayFrom: number,
-    boostFrom: number,
-    boostTo: number,
-    repayTo: number,
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
     boostEnabled: boolean,
     isEOA: boolean,
   ): SubData {
     return [
       market,
       baseToken,
-      new Dec(repayFrom).mul(1e16).toString(),
-      new Dec(boostFrom).mul(1e16).toString(),
-      new Dec(boostTo).mul(1e16).toString(),
-      new Dec(repayTo).mul(1e16).toString(),
+      new Dec(minRatio).mul(1e16).toString(),
+      new Dec(maxRatio).mul(1e16).toString(),
+      new Dec(maxOptimalRatio).mul(1e16).toString(),
+      new Dec(minOptimalRatio).mul(1e16).toString(),
       // @ts-ignore // TODO
       boostEnabled, isEOA,
     ];

package/src/types/index.ts

@@ -71,6 +71,7 @@ export declare namespace Interfaces {
   interface ProtocolBase {
     id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation,
     name: string,
+    slug: string,
     fullName: string,
     version: string,
   }
@@ -151,6 +152,7 @@ export declare namespace Position {
     subId: number,
     subIds?: number[],
     isEnabled?: boolean,
+    subHash: string,
     protocol: Interfaces.Protocol,
     strategy: BundleOrStrategy,
     strategyData: {

package/umd/index.js

@@ -442,6 +442,7 @@ class Protocol {
   constructor(args) {
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "name", void 0);
+    _defineProperty(this, "slug", void 0);
     _defineProperty(this, "version", void 0);
     _defineProperty(this, "fullName", void 0);
     _classPrivateFieldInitSpec(this, _versionSeparator, {
@@ -450,6 +451,7 @@ class Protocol {
     });
     this.id = args.id;
     this.name = this.getName();
+    this.slug = this.getSlug();
     this.version = this.getVersion();
     this.fullName = this.getFullName();
   }
@@ -469,6 +471,9 @@ class Protocol {
   getName() {
     return this.hasVersion() ? this.splitId()[0] : this.id;
   }
+  getSlug() {
+    return this.name.split(' ').join('-').toLowerCase();
+  }
   getFullName() {
     return this.hasVersion() ? "".concat(this.name, " ").concat(this.version) : this.name;
   }
@@ -496,6 +501,7 @@ class Protocol {
   constructor(args) {
     _defineProperty(this, "id", void 0);
     _defineProperty(this, "name", void 0);
+    _defineProperty(this, "slug", void 0);
     _defineProperty(this, "version", void 0);
     _defineProperty(this, "fullName", void 0);
     _classPrivateFieldInitSpec(this, _versionSeparator, {
@@ -504,6 +510,7 @@ class Protocol {
     });
     this.id = args.id;
     this.name = this.getName();
+    this.slug = this.getSlug();
     this.version = this.getVersion();
     this.fullName = this.getFullName();
   }
@@ -523,6 +530,9 @@ class Protocol {
   getName() {
     return this.hasVersion() ? this.splitId()[0] : this.id;
   }
+  getSlug() {
+    return this.name.split(' ').join('-').toLowerCase();
+  }
   getFullName() {
     return this.hasVersion() ? "".concat(this.name, " ").concat(this.version) : this.name;
   }
@@ -1236,9 +1246,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
                   var mergePair = copyList[mergePairIndex];
                   if ((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.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,
                       isEnabled: mergePair.isEnabled || current.isEnabled,
                       subId: mergePair.subId,
-                      subIds: [...(0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToArrayIf)((0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.isDefined)(mergePair.subIds), mergePair.subIds), current.subId],
                       specific: _objectSpread(_objectSpread(_objectSpread({}, mergePair.specific), current.specific), {}, {
                         mergeWithSameId: false
                       })
@@ -1545,7 +1555,8 @@ function parseStrategiesAutomatedPosition(parseData) {
   var {
     subStruct,
     proxy,
-    subId
+    subId,
+    subHash
   } = subscriptionEventData;
   var {
     isEnabled
@@ -1556,6 +1567,7 @@ function parseStrategiesAutomatedPosition(parseData) {
   var position = {
     isEnabled,
     chainId,
+    subHash,
     subId: Number(subId),
     owner: proxy,
     protocol: _objectSpread({}, strategyOrBundleInfo.protocol),
@@ -18930,8 +18942,8 @@ var aaveV3QuotePriceSubData = {
   }
 };
 var compoundV3LeverageManagementSubData = {
-  encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
-    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(),
+  encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
+    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(),
     // @ts-ignore // TODO
     boostEnabled, isEOA];
   },
@@ -28835,8 +28847,8 @@ var aaveV3Encode = {
   }
 };
 var compoundV3Encode = {
-  leverageManagement(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA) {
-    return _subDataService__WEBPACK_IMPORTED_MODULE_3__.compoundV3LeverageManagementSubData.encode(market, baseToken, repayFrom, boostFrom, boostTo, repayTo, boostEnabled, isEOA);
+  leverageManagement(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
+    return _subDataService__WEBPACK_IMPORTED_MODULE_3__.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
   }
 };