@haven-fi/solauto-sdk 1.0.722 → 1.0.724

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -78,7 +78,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     get supplyUsdWithdrawable() {
         const deposits = (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityUsedBaseUnit)(this.supplyBank, true), this.supplyMintInfo.decimals);
-        const borrows = (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.supplyMintInfo.decimals);
+        const borrows = (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityUsedBaseUnit)(this.supplyBank, false), this.supplyMintInfo.decimals);
         return Math.min((deposits - borrows), this.totalSupply) * this.supplyPrice();
     }
     async refreshPositionState(priceType) {

package/dist/solautoPosition/positionUtils.js

@@ -37,7 +37,7 @@ async function getPositionExBulk(umi, publicKeys) {
 }
 async function getOrCreatePositionEx(umi, authority, positionId, programId, customArgs, contextUpdates) {
     const publicKey = (0, utils_1.getSolautoPositionAccount)(authority, positionId, programId);
-    const data = await (0, generated_1.safeFetchSolautoPosition)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(publicKey));
+    const data = await (0, utils_1.retryWithExponentialBackoff)(async () => await (0, generated_1.safeFetchSolautoPosition)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(publicKey)));
     const lendingPlatform = data
         ? data.position.lendingPlatform
         : customArgs.lendingPlatform;

package/local/logPositions.ts

@@ -92,12 +92,10 @@ async function main(filterWhitelist: boolean, programEnv: ProgramEnv = "Prod") {
     );
   }
 
-  const positionsEx = (
-    await getPositionExBulk(
-      umi,
-      positions.map((x) => new PublicKey(x.publicKey!))
-    )
-  ).sort((a, b) => a.netWorthUsd() - b.netWorthUsd());
+  const positionsEx = await getPositionExBulk(
+    umi,
+    positions.map((x) => new PublicKey(x.publicKey!))
+  );
 
   const tokensUsed = Array.from(
     new Set(
@@ -114,7 +112,10 @@ async function main(filterWhitelist: boolean, programEnv: ProgramEnv = "Prod") {
   let unhealthyPositions = 0;
   let awaitingBoostPositions = 0;
 
-  for (const pos of positionsEx) {
+  const sortedPositions = positionsEx.sort(
+    (a, b) => a.netWorthUsd() - b.netWorthUsd()
+  );
+  for (const pos of sortedPositions) {
     const actionToTake = pos.eligibleForRebalance(0);
 
     const repayFrom = pos.settings!.repayToBps + pos.settings!.repayGap;

package/local/txSandbox.ts

@@ -54,16 +54,20 @@ export async function main() {
     // ),
   });
 
-  const transactionItems = [rebalance(client, undefined, 300)];
+  await client.pos.refreshPositionState();
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 2 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  console.log(client.pos.supplyUsdWithdrawable);
+
+  // const transactionItems = [rebalance(client)];
+
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 2 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -135,7 +135,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       this.supplyMintInfo.decimals
     );
     const borrows = fromBaseUnit(
-      getBankLiquidityAvailableBaseUnit(this.supplyBank, false),
+      getBankLiquidityUsedBaseUnit(this.supplyBank, false),
       this.supplyMintInfo.decimals
     );
     return Math.min((deposits - borrows), this.totalSupply) * this.supplyPrice()!;

package/src/solautoPosition/positionUtils.ts

@@ -84,9 +84,9 @@ export async function getOrCreatePositionEx(
   contextUpdates?: ContextUpdates
 ): Promise<SolautoPositionEx> {
   const publicKey = getSolautoPositionAccount(authority, positionId, programId);
-  const data = await safeFetchSolautoPosition(
-    umi,
-    fromWeb3JsPublicKey(publicKey)
+  const data = await retryWithExponentialBackoff(
+    async () =>
+      await safeFetchSolautoPosition(umi, fromWeb3JsPublicKey(publicKey))
   );
 
   const lendingPlatform = data