@haven-fi/solauto-sdk 1.0.664 → 1.0.666

package/local/logPositions.ts

@@ -7,7 +7,9 @@ import {
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LOCAL_IRONFORGE_API_URL,
+  ProgramEnv,
   SOLAUTO_PROD_PROGRAM,
+  SOLAUTO_TEST_PROGRAM,
 } from "../src";
 
 config({ path: path.join(__dirname, ".env") });
@@ -75,10 +77,10 @@ export function formatNumber(
   }
 }
 
-async function main(filterWhitelist: boolean) {
+async function main(filterWhitelist: boolean, programEnv: ProgramEnv = "Prod") {
   const [_, umi] = getSolanaRpcConnection(
     LOCAL_IRONFORGE_API_URL,
-    SOLAUTO_PROD_PROGRAM
+    programEnv === "Prod" ? SOLAUTO_PROD_PROGRAM : SOLAUTO_TEST_PROGRAM
   );
 
   let positions = await getSolautoManagedPositions(umi);
@@ -161,5 +163,21 @@ async function main(filterWhitelist: boolean) {
   console.log(`Total net worth: $${formatNumber(netWorth, 2, 10000, 2)}`);
 }
 
-const filterWhitelist = true;
-main(filterWhitelist).then((x) => x);
+const args = process.argv.slice(2); // Skip the first 2 (node + script path)
+
+const parsedArgs: Record<string, string | boolean> = {};
+for (const arg of args) {
+  if (arg.startsWith("--")) {
+    const [key, val] = arg.replace(/^--/, "").split("=");
+    parsedArgs[key] = val ?? true;
+  }
+}
+
+console.log("Parsed flags:", parsedArgs);
+
+const filterWhitelist =
+  "filter" in parsedArgs ? parsedArgs["filter"] === "true" : true;
+const programEnv =
+  "env" in parsedArgs ? (parsedArgs["env"] as ProgramEnv) : undefined;
+
+main(filterWhitelist, programEnv).then((x) => x);

package/local/txSandbox.ts

@@ -2,7 +2,6 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  borrow,
   consoleLog,
   getClient,
   getSolanaRpcConnection,
@@ -13,11 +12,7 @@ import {
   rebalance,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
-  toBaseUnit,
-  tokenInfo,
   TransactionsManager,
-  USDC,
-  WBTC,
 } from "../src";
 import { getSecretKey } from "./shared";
 
@@ -34,7 +29,7 @@ export async function main() {
 
   const signer = createSignerFromKeypair(
     umi,
-    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
+    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
   );
 
   const client = getClient(LendingPlatform.Marginfi, {
@@ -46,30 +41,27 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 2,
-    // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-    lpUserAccount: new PublicKey(
-      "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    ),
+    positionId: 1,
+    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    // lpUserAccount: new PublicKey(
+    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+    // ),
   });
 
+  const transactionItems = [rebalance(client)];
 
-  // const transactionItems = [
-  //   rebalance(client, 300),
-  // ];
-
-  // const txManager = new TransactionsManager(
-  //   client,
-  //   undefined,
-  //   payForTransaction ? "normal" : "only-simulate",
-  //   PriorityFeeSetting.Min,
-  //   true,
-  //   undefined,
-  //   { totalRetries: 5 }
-  // );
-  // const statuses = await txManager.clientSend(transactionItems);
+  const txManager = new TransactionsManager(
+    client,
+    undefined,
+    payForTransaction ? "normal" : "only-simulate",
+    PriorityFeeSetting.Min,
+    true,
+    undefined,
+    { totalRetries: 5 }
+  );
+  const statuses = await txManager.clientSend(transactionItems);
 
-  // consoleLog(statuses);
+  consoleLog(statuses);
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.664",
+  "version": "1.0.666",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -14,10 +14,10 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
     "@jup-ag/api": "=6.0.24",
-    "@metaplex-foundation/umi": "=0.9.1",
-    "@metaplex-foundation/umi-bundle-defaults": "=0.9.1",
-    "@metaplex-foundation/umi-signer-wallet-adapters": "=0.9.1",
-    "@metaplex-foundation/umi-web3js-adapters": "=0.9.1",
+    "@metaplex-foundation/umi": "^0.9.1",
+    "@metaplex-foundation/umi-bundle-defaults": "^0.9.1",
+    "@metaplex-foundation/umi-signer-wallet-adapters": "^0.9.1",
+    "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.95.8",
     "@switchboard-xyz/common": "=3.0.12",

package/src/constants/solautoConstants.ts

@@ -21,7 +21,6 @@ export const SOLAUTO_TEST_PROGRAM = new PublicKey(
 
 (globalThis as any).SHOW_LOGS = false;
 
-export const MIN_POSITION_STATE_FRESHNESS_SECS = 5;
 export const MIN_REPAY_GAP_BPS = 50;
 export const MIN_BOOST_GAP_BPS = 50;
 export const MIN_USD_SUPPORTED_POSITION = 1000;

package/src/services/solauto/solautoClient.ts

@@ -22,7 +22,6 @@ import {
   updatePosition,
 } from "../../generated";
 import {
-  getSolautoPositionAccount,
   getTokenAccount,
   getWalletSplBalances,
   getWrappedInstruction,

package/src/services/solauto/solautoMarginfiClient.ts

@@ -47,7 +47,6 @@ import {
   lendingAccountWithdraw,
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
-  safeFetchMarginfiAccount,
 } from "../../marginfi-sdk";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 

package/src/services/transactions/transactionsManager.ts

@@ -2,7 +2,6 @@ import bs58 from "bs58";
 import {
   PublicKey,
   TransactionExpiredBlockheightExceededError,
-  VersionedTransaction,
 } from "@solana/web3.js";
 import {
   AddressLookupTableInput,

package/src/solautoPosition/solautoPositionEx.ts

@@ -45,7 +45,7 @@ import {
   getRebalanceValues,
   SolautoFeesBps,
 } from "../services/rebalance";
-import { MIN_POSITION_STATE_FRESHNESS_SECS, TokenInfo } from "../constants";
+import { TokenInfo } from "../constants";
 
 export interface PositionCustomArgs {
   lendingPlatform: LendingPlatform;
@@ -285,9 +285,7 @@ export abstract class SolautoPositionEx {
   eligibleForRebalance(
     bpsDistanceThreshold: number = 0
   ): RebalanceAction | undefined {
-    return this.rebalanceHelper.eligibleForRebalance(
-      bpsDistanceThreshold
-    );
+    return this.rebalanceHelper.eligibleForRebalance(bpsDistanceThreshold);
   }
 
   eligibleForRefresh(): boolean {
@@ -477,7 +475,6 @@ class PositionRebalanceHelper {
     const realtimeLiqUtilRateBps = this.pos.liqUtilizationRateBps(
       PriceType.Realtime
     );
-    const emaLiqUtilRateBps = this.pos.liqUtilizationRateBps(PriceType.Ema);
 
     if (
       this.pos.repayFromBps - realtimeLiqUtilRateBps <=
@@ -485,12 +482,11 @@ class PositionRebalanceHelper {
     ) {
       return "repay";
     } else if (
-      (realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold ||
-        emaLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold) &&
-      this.validBoostFromHere()
+      realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold &&
+      this.validBoostFromHere() &&
+      this.sufficientLiquidityToBoost()
     ) {
-      const sufficientLiquidity = this.sufficientLiquidityToBoost();
-      return sufficientLiquidity ? "boost" : undefined;
+      return "boost";
     }
 
     return undefined;

package/local/createISMAccounts.ts

@@ -1,76 +0,0 @@
-import {
-  createSignerFromKeypair,
-  publicKey,
-  signerIdentity,
-  transactionBuilder,
-} from "@metaplex-foundation/umi";
-import {
-  getSolanaRpcConnection,
-  sendSingleOptimizedTransaction,
-  getAllMarginfiAccountsByAuthority,
-} from "../src/utils";
-import {
-  marginfiAccountInitialize,
-  safeFetchAllMarginfiAccount,
-} from "../src/marginfi-sdk";
-import {
-  LOCAL_IRONFORGE_API_URL,
-  MARGINFI_ACCOUNTS,
-  SOLAUTO_MANAGER,
-} from "../src/constants";
-import { updateSolautoLut } from "./updateSolautoLUT";
-import { getSecretKey } from "./shared";
-
-async function createIntermediarySolautoManagerAccounts() {
-  let [connection, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
-
-  const secretKey = getSecretKey("solauto-manager");
-  const signerKeypair = umi.eddsa.createKeypairFromSecretKey(secretKey);
-  const signer = createSignerFromKeypair(umi, signerKeypair);
-
-  umi = umi.use(signerIdentity(signer));
-
-  const accounts = await getAllMarginfiAccountsByAuthority(
-    umi,
-    SOLAUTO_MANAGER,
-    undefined,
-    false
-  );
-  const data = await safeFetchAllMarginfiAccount(
-    umi,
-    accounts.map((x) => publicKey(x.marginfiAccount))
-  );
-  const existingMarginfiGroups = data.map((x) => x.group.toString());
-
-  for (const group of Object.keys(MARGINFI_ACCOUNTS)) {
-    if (existingMarginfiGroups.includes(group.toString())) {
-      console.log(
-        "Already have Solauto Manager Marginfi Account for group:",
-        group
-      );
-      continue;
-    }
-
-    const marginfiAccount = createSignerFromKeypair(
-      umi,
-      umi.eddsa.generateKeypair()
-    );
-
-    const tx = marginfiAccountInitialize(umi, {
-      marginfiAccount,
-      marginfiGroup: publicKey(group),
-      authority: signer,
-      feePayer: signer,
-    });
-
-    await sendSingleOptimizedTransaction(
-      umi,
-      connection,
-      transactionBuilder().add(tx)
-    );
-
-    await updateSolautoLut([marginfiAccount.publicKey.toString()]);
-  }
-}
-
-createIntermediarySolautoManagerAccounts();