@haven-fi/solauto-sdk 1.0.677 → 1.0.679

package/dist/services/rebalance/rebalanceTxBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAS3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IATtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAS;gBAGhB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAyC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAS3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IATtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAS;gBAGhB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IA2C5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA2CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -29,12 +29,14 @@ class RebalanceTxBuilder {
     getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
         const insufficientLiquidity = (amountNeededUsd, liquidityAvailable, tokenMint) => {
-            return (amountNeededUsd >
-                (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
-                    ((0, utils_1.safeGetPrice)(tokenMint) ?? 0) *
-                    0.95);
+            const liquidityUsd = (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
+                ((0, utils_1.safeGetPrice)(tokenMint) ?? 0);
+            (0, utils_1.consoleLog)(liquidityUsd);
+            return amountNeededUsd > liquidityUsd * 0.95;
         };
+        (0, utils_1.consoleLog)("Supply liquidity available:", supplyLiquidityAvailable);
         const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint);
+        (0, utils_1.consoleLog)("Debt liquidity available:", debtLiquidityAvailable);
         const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint);
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
             insufficientSupplyLiquidity;
@@ -70,6 +72,7 @@ class RebalanceTxBuilder {
         }
         const stdFlLiquiditySource = this.getFlLiquiditySource(this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
         if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+            (0, utils_1.consoleLog)("Checking signer liquidity");
             const { supplyBalance, debtBalance } = await this.client.signerBalances();
             const signerFlLiquiditySource = this.getFlLiquiditySource(supplyBalance, debtBalance);
             if (signerFlLiquiditySource) {

package/dist/solautoPosition/solautoPositionEx.js

@@ -149,7 +149,7 @@ class SolautoPositionEx {
         return ((0, utils_1.currentUnixSeconds)() - Number(this.state.lastRefreshed) > 60 * 60 * 24 * 7);
     }
     canRefreshPositionState() {
-        if ((0, utils_1.currentUnixSeconds)() - Number(this.state.lastRefreshed) > 3 ||
+        if ((0, utils_1.currentUnixSeconds)() - Number(this.state.lastRefreshed) > 5 ||
             this.contextUpdates?.positionUpdates()) {
             return true;
         }

package/local/txSandbox.ts

@@ -1,32 +1,36 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
-  fetchBank,
+  fromBaseUnit,
   getBatches,
   getClient,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
-  isMarginfiPosition,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
-  safeFetchBank,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
+  tokenInfo,
   TransactionItem,
   TransactionsManager,
+  USDC,
+  deposit,
+  toBaseUnit,
+  RETARDIO,
 } from "../src";
 import { getSecretKey } from "./shared";
 
 const payForTransaction = true;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -50,53 +54,38 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 4,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 2,
+    supplyMint: new PublicKey(USDC),
+    debtMint: new PublicKey(RETARDIO),
+    lpPoolAccount: new PublicKey("EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm")
+    // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
   const transactionItems = [
-    new TransactionItem(
-      async () => ({ tx: client.refreshIx(PriceType.Realtime) }),
-      `refresh`
-    ),
+    openSolautoPosition(client, {
+      boostGap: 250,
+      boostToBps: 8681,
+      repayGap: 250,
+      repayToBps: 8681,
+    }),
+    deposit(client, toBaseUnit(4.5, tokenInfo(new PublicKey(USDC)).decimals)),
+    rebalance(client, 8500),
   ];
 
-  const bank = await fetchBank(
-    umi,
-    publicKey("E4td8i8PT2BZkMygzW4MGHCv2KPPs57dvz5W2ZXf9Twu")
-  );
-
-  console.log(
-    client.pos.supplyLiquidityDepositable,
-    client.pos.supplyLiquidityUsdDepositable
+  const txManager = new TransactionsManager(
+    client,
+    undefined,
+    payForTransaction ? "normal" : "only-simulate",
+    PriorityFeeSetting.High,
+    false,
+    undefined,
+    { totalRetries: 5 }
   );
-  console.log(client.pos.eligibleForRebalance());
-  console.log(client.pos.state.supply.amountCanBeUsed);
-
-  if (isMarginfiPosition(client.pos)) {
-    client.pos.updateSupplyLiquidityDepositable([bank]);
-  }
-  console.log(
-    client.pos.supplyLiquidityDepositable,
-    client.pos.supplyLiquidityUsdDepositable
-  );
-  console.log(client.pos.eligibleForRebalance());
-  console.log(client.pos.state.supply.amountCanBeUsed);
-
-  // const txManager = new TransactionsManager(
-  //   client,
-  //   undefined,
-  //   payForTransaction ? "normal" : "only-simulate",
-  //   PriorityFeeSetting.High,
-  //   true,
-  //   undefined,
-  //   { totalRetries: 5 }
-  // );
-  // const statuses = await txManager.clientSend(transactionItems);
-  // consoleLog(statuses);
+  const statuses = await txManager.clientSend(transactionItems);
+  consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -90,19 +90,21 @@ export class RebalanceTxBuilder {
       liquidityAvailable: bigint,
       tokenMint: PublicKey
     ) => {
-      return (
-        amountNeededUsd >
+      const liquidityUsd =
         fromBaseUnit(liquidityAvailable, tokenInfo(tokenMint).decimals) *
-          (safeGetPrice(tokenMint) ?? 0) *
-          0.95
-      );
+        (safeGetPrice(tokenMint) ?? 0);
+      consoleLog(liquidityUsd);
+      return amountNeededUsd > liquidityUsd * 0.95;
     };
 
+    consoleLog("Supply liquidity available:", supplyLiquidityAvailable);
     const insufficientSupplyLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       supplyLiquidityAvailable,
       this.client.pos.supplyMint
     );
+
+    consoleLog("Debt liquidity available:", debtLiquidityAvailable);
     const insufficientDebtLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       debtLiquidityAvailable,
@@ -172,6 +174,7 @@ export class RebalanceTxBuilder {
     );
 
     if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+      consoleLog("Checking signer liquidity");
       const { supplyBalance, debtBalance } = await this.client.signerBalances();
       const signerFlLiquiditySource = this.getFlLiquiditySource(
         supplyBalance,

package/src/solautoPosition/solautoPositionEx.ts

@@ -304,7 +304,7 @@ export abstract class SolautoPositionEx {
 
   protected canRefreshPositionState() {
     if (
-      currentUnixSeconds() - Number(this.state.lastRefreshed) > 3 ||
+      currentUnixSeconds() - Number(this.state.lastRefreshed) > 5 ||
       this.contextUpdates?.positionUpdates()
     ) {
       return true;