@haven-fi/solauto-sdk 1.0.132 → 1.0.134

package/dist/utils/numberUtils.js

@@ -74,7 +74,7 @@ function getSolautoFeesBps(isReferred, targetLiqUtilizationRateBps, positionNetW
     const k = 1.5;
     let feeBps = 0;
     if (targetLiqUtilizationRateBps !== undefined) {
-        feeBps = 10;
+        feeBps = 25;
     }
     else if (positionNetWorthUsd <= minSize) {
         feeBps = maxFeeBps;

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

@@ -27,7 +27,8 @@ const marginfiUtils_1 = require("../marginfiUtils");
 function findMintByTicker(ticker) {
     for (const key in constants_1.TOKEN_INFO) {
         const account = constants_1.TOKEN_INFO[key];
-        if (account.ticker.toString().toLowerCase() === ticker.toString().toLowerCase()) {
+        if (account.ticker.toString().toLowerCase() ===
+            ticker.toString().toLowerCase()) {
             return new web3_js_1.PublicKey(key);
         }
     }
@@ -102,13 +103,17 @@ async function getSolautoManagedPositions(umi, authority) {
     // position_id: [u8; 1]
     // self_managed: u8 - (1 for true, 0 for false)
     // padding: [u8; 5]
-    // authority: Pubkey
+    // authority: pubkey
     // lending_platform: u8
+    // padding: [u8; 7]
+    // protocol account: pubkey
+    // supply mint: pubkey
+    // debt mint: pubkey
     const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "confirmed",
         dataSlice: {
             offset: 0,
-            length: 1 + 1 + 1 + 5 + 32 + 1, // bump + position_id + self_managed + padding + authority (pubkey) + lending_platform
+            length: 1 + 1 + 1 + 5 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + padding (5) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
         },
         filters: [
             {
@@ -142,6 +147,9 @@ async function getSolautoManagedPositions(umi, authority) {
             authority: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.authority),
             positionId: position.positionId[0],
             lendingPlatform: position.position.lendingPlatform,
+            protocolAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolAccount),
+            supplyMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.supplyMint),
+            debtMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.debtMint),
         };
     });
 }
@@ -187,29 +195,32 @@ async function getReferralsByUser(umi, user) {
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
 async function getAllPositionsByAuthority(umi, user) {
-    const allPositions = [];
-    const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
-    allPositions.push(...solautoManagedPositions.map((x) => ({
-        publicKey: x.publicKey,
-        authority: user,
-        positionId: x.positionId,
-        lendingPlatform: x.lendingPlatform,
-    })));
-    let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
-    marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
-        (x.debtMint.equals(web3_js_1.PublicKey.default) ||
-            constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
-    allPositions.push(...marginfiPositions.map((x) => ({
-        publicKey: x.marginfiAccount,
-        authority: user,
-        positionId: 0,
-        lendingPlatform: generated_1.LendingPlatform.Marginfi,
-        protocolAccount: x.marginfiAccount,
-        supplyMint: x.supplyMint,
-        debtMint: x.debtMint,
-    })));
-    // TODO support other platforms
-    return allPositions;
+    const solautoCompatiblePositions = await Promise.all([
+        (async () => {
+            const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
+            return solautoManagedPositions.map((x) => ({
+                ...x,
+                authority: user,
+            }));
+        })(),
+        (async () => {
+            let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
+            marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
+                (x.debtMint.equals(web3_js_1.PublicKey.default) ||
+                    constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
+            return marginfiPositions.map((x) => ({
+                publicKey: x.marginfiAccount,
+                authority: user,
+                positionId: 0,
+                lendingPlatform: generated_1.LendingPlatform.Marginfi,
+                protocolAccount: x.marginfiAccount,
+                supplyMint: x.supplyMint,
+                debtMint: x.debtMint,
+            }));
+        })(),
+        // TODO support other platforms
+    ]);
+    return solautoCompatiblePositions.flat();
 }
 async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
@@ -320,8 +331,7 @@ function createSolautoSettings(settings) {
                 padding: new Uint8Array([]),
                 padding1: [],
             },
-        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) &&
-            (0, umi_1.isSome)(settings.targetBoostToBps)
+        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) && (0, umi_1.isSome)(settings.targetBoostToBps)
             ? settings.targetBoostToBps.value
             : 0,
         boostGap: settings.boostGap,

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CA0EjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAgEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -80,11 +80,6 @@ function getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, target
     }
 }
 function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice, debtPrice, targetLiqUtilizationRateBps, limitGapBps) {
-    if (state === undefined ||
-        state.lastUpdated <
-            BigInt(Math.round((0, generalUtils_2.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS))) {
-        console.warn("Requires a fresh position state to get rebalance details");
-    }
     const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
     const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
         debtPrice;

package/package.json

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

package/src/utils/numberUtils.ts

@@ -104,7 +104,7 @@ export function getSolautoFeesBps(
   let feeBps: number = 0;
 
   if (targetLiqUtilizationRateBps !== undefined) {
-    feeBps = 10;
+    feeBps = 25;
   } else if (positionNetWorthUsd <= minSize) {
     feeBps = maxFeeBps;
   } else if (positionNetWorthUsd >= maxSize) {

package/src/utils/solauto/generalUtils.ts

@@ -12,6 +12,7 @@ import {
   getReferralStateSize,
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
+  safeFetchAllSolautoPosition,
 } from "../../generated";
 import { currentUnixSeconds, fetchTokenPrices } from "../generalUtils";
 import {
@@ -33,7 +34,8 @@ export function findMintByTicker(ticker: string): PublicKey {
   for (const key in TOKEN_INFO) {
     const account = TOKEN_INFO[key];
     if (
-      account.ticker.toString().toLowerCase() === ticker.toString().toLowerCase()
+      account.ticker.toString().toLowerCase() ===
+      ticker.toString().toLowerCase()
     ) {
       return new PublicKey(key);
     }
@@ -176,14 +178,18 @@ export async function getSolautoManagedPositions(
   // position_id: [u8; 1]
   // self_managed: u8 - (1 for true, 0 for false)
   // padding: [u8; 5]
-  // authority: Pubkey
+  // authority: pubkey
   // lending_platform: u8
+  // padding: [u8; 7]
+  // protocol account: pubkey
+  // supply mint: pubkey
+  // debt mint: pubkey
 
   const accounts = await umi.rpc.getProgramAccounts(SOLAUTO_PROGRAM_ID, {
     commitment: "confirmed",
     dataSlice: {
       offset: 0,
-      length: 1 + 1 + 1 + 5 + 32 + 1, // bump + position_id + self_managed + padding + authority (pubkey) + lending_platform
+      length: 1 + 1 + 1 + 5 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + padding (5) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
     },
     filters: [
       {
@@ -220,6 +226,9 @@ export async function getSolautoManagedPositions(
       authority: toWeb3JsPublicKey(position.authority),
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
+      protocolAccount: toWeb3JsPublicKey(position.position.protocolAccount),
+      supplyMint: toWeb3JsPublicKey(position.position.supplyMint),
+      debtMint: toWeb3JsPublicKey(position.position.debtMint),
     };
   });
 }
@@ -277,44 +286,44 @@ export async function getAllPositionsByAuthority(
   umi: Umi,
   user: PublicKey
 ): Promise<SolautoPositionDetails[]> {
-  const allPositions: SolautoPositionDetails[] = [];
-
-  const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
-  allPositions.push(
-    ...solautoManagedPositions.map((x) => ({
-      publicKey: x.publicKey,
-      authority: user,
-      positionId: x.positionId,
-      lendingPlatform: x.lendingPlatform,
-    }))
-  );
-
-  let marginfiPositions = await getAllMarginfiAccountsByAuthority(
-    umi,
-    user,
-    true
-  );
-  marginfiPositions = marginfiPositions.filter(
-    (x) =>
-      x.supplyMint &&
-      (x.debtMint!.equals(PublicKey.default) ||
-        ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
-  );
-  allPositions.push(
-    ...marginfiPositions.map((x) => ({
-      publicKey: x.marginfiAccount,
-      authority: user,
-      positionId: 0,
-      lendingPlatform: LendingPlatform.Marginfi,
-      protocolAccount: x.marginfiAccount,
-      supplyMint: x.supplyMint,
-      debtMint: x.debtMint,
-    }))
-  );
-
-  // TODO support other platforms
+  const solautoCompatiblePositions: SolautoPositionDetails[][] =
+    await Promise.all([
+      (async () => {
+        const solautoManagedPositions = await getSolautoManagedPositions(
+          umi,
+          user
+        );
+        return solautoManagedPositions.map((x) => ({
+          ...x,
+          authority: user,
+        }));
+      })(),
+      (async () => {
+        let marginfiPositions = await getAllMarginfiAccountsByAuthority(
+          umi,
+          user,
+          true
+        );
+        marginfiPositions = marginfiPositions.filter(
+          (x) =>
+            x.supplyMint &&
+            (x.debtMint!.equals(PublicKey.default) ||
+              ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
+        );
+        return marginfiPositions.map((x) => ({
+          publicKey: x.marginfiAccount,
+          authority: user,
+          positionId: 0,
+          lendingPlatform: LendingPlatform.Marginfi,
+          protocolAccount: x.marginfiAccount,
+          supplyMint: x.supplyMint,
+          debtMint: x.debtMint,
+        }));
+      })(),
+      // TODO support other platforms
+    ]);
 
-  return allPositions;
+  return solautoCompatiblePositions.flat();
 }
 
 export async function positionStateWithLatestPrices(
@@ -441,15 +450,15 @@ export function createFakePositionState(
   };
 }
 
-export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters {
+export function createSolautoSettings(
+  settings: SolautoSettingsParametersInpArgs
+): SolautoSettingsParameters {
   return {
     automation:
       isOption(settings.automation) && isSome(settings.automation)
         ? {
             ...settings.automation.value,
-            intervalSeconds: BigInt(
-              settings.automation.value.intervalSeconds
-            ),
+            intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
             unixStartDate: BigInt(settings.automation.value.unixStartDate),
             padding: new Uint8Array([]),
             padding1: [],
@@ -463,8 +472,7 @@ export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs
             padding1: [],
           },
     targetBoostToBps:
-      isOption(settings.targetBoostToBps) &&
-      isSome(settings.targetBoostToBps)
+      isOption(settings.targetBoostToBps) && isSome(settings.targetBoostToBps)
         ? settings.targetBoostToBps.value
         : 0,
     boostGap: settings.boostGap,

package/src/utils/solauto/rebalanceUtils.ts

@@ -176,16 +176,6 @@ export function getRebalanceValues(
   targetLiqUtilizationRateBps?: number,
   limitGapBps?: number
 ): RebalanceValues {
-  if (
-    state === undefined ||
-    state.lastUpdated <
-      BigInt(
-        Math.round(currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS)
-      )
-  ) {
-    console.warn("Requires a fresh position state to get rebalance details");
-  }
-
   const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(
     state,
     settings,