@haven-fi/solauto-sdk 1.0.75 → 1.0.76

package/dist/utils/solauto/generalUtils.d.ts

@@ -19,6 +19,7 @@ interface AssetProps {
     amountUsed?: number;
 }
 export declare function createFakePositionState(supply: AssetProps, debt: AssetProps, maxLtvBps: number, liqThresholdBps: number): PositionState;
+export declare function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters;
 type PositionAdjustment = {
     type: "supply";
     value: bigint;

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -13,6 +13,7 @@ exports.getReferralsByUser = getReferralsByUser;
 exports.getAllPositionsByAuthority = getAllPositionsByAuthority;
 exports.positionStateWithLatestPrices = positionStateWithLatestPrices;
 exports.createFakePositionState = createFakePositionState;
+exports.createSolautoSettings = createSolautoSettings;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const generated_1 = require("../../generated");
@@ -198,15 +199,7 @@ async function getAllPositionsByAuthority(umi, user) {
         debtMint: x.debtMint,
     })));
     // TODO support other platforms
-    return allPositions.sort((a, b) => {
-        if (a.positionId === 0 && b.positionId !== 0) {
-            return 1;
-        }
-        if (b.positionId === 0 && a.positionId !== 0) {
-            return -1;
-        }
-        return a.positionId - b.positionId;
-    });
+    return allPositions;
 }
 async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
@@ -299,6 +292,36 @@ function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
         padding: [],
     };
 }
+function createSolautoSettings(settings) {
+    return {
+        automation: (0, umi_1.isOption)(settings.automation) && (0, umi_1.isSome)(settings.automation)
+            ? {
+                ...settings.automation.value,
+                intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
+                unixStartDate: BigInt(settings.automation.value.unixStartDate),
+                padding: new Uint8Array([]),
+                padding1: [],
+            }
+            : {
+                targetPeriods: 0,
+                periodsPassed: 0,
+                intervalSeconds: BigInt(0),
+                unixStartDate: BigInt(0),
+                padding: new Uint8Array([]),
+                padding1: [],
+            },
+        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) &&
+            (0, umi_1.isSome)(settings.targetBoostToBps)
+            ? settings.targetBoostToBps.value
+            : 0,
+        boostGap: settings.boostGap,
+        boostToBps: settings.boostToBps,
+        repayGap: settings.repayGap,
+        repayToBps: settings.repayToBps,
+        padding: new Uint8Array([]),
+        padding1: [],
+    };
+}
 class LivePositionUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);
@@ -319,34 +342,7 @@ class LivePositionUpdates {
         }
         else if (update.type === "settings") {
             const settings = update.value;
-            this.settings = {
-                automation: (0, umi_1.isOption)(settings.automation) && (0, umi_1.isSome)(settings.automation)
-                    ? {
-                        ...settings.automation.value,
-                        intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
-                        unixStartDate: BigInt(settings.automation.value.unixStartDate),
-                        padding: new Uint8Array([]),
-                        padding1: [],
-                    }
-                    : {
-                        targetPeriods: 0,
-                        periodsPassed: 0,
-                        intervalSeconds: BigInt(0),
-                        unixStartDate: BigInt(0),
-                        padding: new Uint8Array([]),
-                        padding1: [],
-                    },
-                targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) &&
-                    (0, umi_1.isSome)(settings.targetBoostToBps)
-                    ? settings.targetBoostToBps.value
-                    : 0,
-                boostGap: settings.boostGap,
-                boostToBps: settings.boostToBps,
-                repayGap: settings.repayGap,
-                repayToBps: settings.repayToBps,
-                padding: new Uint8Array([]),
-                padding1: [],
-            };
+            this.settings = createSolautoSettings(settings);
         }
         else if (update.type === "dca") {
             const dca = update.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.75",
+  "version": "1.0.76",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/utils/solauto/generalUtils.ts

@@ -302,15 +302,7 @@ export async function getAllPositionsByAuthority(
 
   // TODO support other platforms
 
-  return allPositions.sort((a, b) => {
-    if (a.positionId === 0 && b.positionId !== 0) {
-      return 1;
-    }
-    if (b.positionId === 0 && a.positionId !== 0) {
-      return -1;
-    }
-    return a.positionId - b.positionId;
-  });
+  return allPositions;
 }
 
 export async function positionStateWithLatestPrices(
@@ -437,6 +429,41 @@ export function createFakePositionState(
   };
 }
 
+export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters {
+  return {
+    automation:
+      isOption(settings.automation) && isSome(settings.automation)
+        ? {
+            ...settings.automation.value,
+            intervalSeconds: BigInt(
+              settings.automation.value.intervalSeconds
+            ),
+            unixStartDate: BigInt(settings.automation.value.unixStartDate),
+            padding: new Uint8Array([]),
+            padding1: [],
+          }
+        : {
+            targetPeriods: 0,
+            periodsPassed: 0,
+            intervalSeconds: BigInt(0),
+            unixStartDate: BigInt(0),
+            padding: new Uint8Array([]),
+            padding1: [],
+          },
+    targetBoostToBps:
+      isOption(settings.targetBoostToBps) &&
+      isSome(settings.targetBoostToBps)
+        ? settings.targetBoostToBps.value
+        : 0,
+    boostGap: settings.boostGap,
+    boostToBps: settings.boostToBps,
+    repayGap: settings.repayGap,
+    repayToBps: settings.repayToBps,
+    padding: new Uint8Array([]),
+    padding1: [],
+  };
+}
+
 type PositionAdjustment =
   | { type: "supply"; value: bigint }
   | { type: "debt"; value: bigint }
@@ -460,38 +487,7 @@ export class LivePositionUpdates {
       this.debtTaBalanceAdjustment += update.value;
     } else if (update.type === "settings") {
       const settings = update.value;
-      this.settings = {
-        automation:
-          isOption(settings.automation) && isSome(settings.automation)
-            ? {
-                ...settings.automation.value,
-                intervalSeconds: BigInt(
-                  settings.automation.value.intervalSeconds
-                ),
-                unixStartDate: BigInt(settings.automation.value.unixStartDate),
-                padding: new Uint8Array([]),
-                padding1: [],
-              }
-            : {
-                targetPeriods: 0,
-                periodsPassed: 0,
-                intervalSeconds: BigInt(0),
-                unixStartDate: BigInt(0),
-                padding: new Uint8Array([]),
-                padding1: [],
-              },
-        targetBoostToBps:
-          isOption(settings.targetBoostToBps) &&
-          isSome(settings.targetBoostToBps)
-            ? settings.targetBoostToBps.value
-            : 0,
-        boostGap: settings.boostGap,
-        boostToBps: settings.boostToBps,
-        repayGap: settings.repayGap,
-        repayToBps: settings.repayToBps,
-        padding: new Uint8Array([]),
-        padding1: [],
-      };
+      this.settings = createSolautoSettings(settings);
     } else if (update.type === "dca") {
       const dca = update.value;
       this.activeDca = {