@haven-fi/solauto-sdk 1.0.688 → 1.0.689

package/local/txSandbox.ts

@@ -1,16 +1,21 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
+  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
+  fetchBank,
+  fetchMarginfiAccount,
   getBatches,
   getClient,
+  getLiqUtilzationRateBps,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  marginfiAccountEmpty,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -23,7 +28,7 @@ import {
 import { getSecretKey } from "./shared";
 
 const payForTransaction = false;
-const testProgram = false;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -47,23 +52,72 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    positionId: 2,
+    authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [rebalance(client)];
+  const supplyBank = await fetchBank(
+    umi,
+    publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  );
+  const debtBank = await fetchBank(
+    umi,
+    publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  );
+  const supplyWeight = bytesToI80F48(supplyBank.config.assetWeightInit.value);
+  const debtWeight = bytesToI80F48(debtBank.config.liabilityWeightInit.value);
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 5 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  console.log(
+    getLiqUtilzationRateBps(
+      34.36833665228071,
+      23.61750715267401,
+      client.pos.state.liqThresholdBps
+    ),
+    34.36833665228071 * supplyWeight,
+    23.61750715267401 * debtWeight
+  );
+  console.log(
+    getLiqUtilzationRateBps(
+      34.328721976,
+      23.575158311,
+      client.pos.state.liqThresholdBps
+    ),
+    34.328721976 * supplyWeight,
+    23.575158311 * debtWeight
+  );
+  console.log(client.pos.maxBoostToBps);
+
+  // const debtBank = await fetchBank(
+  //   umi,
+  //   publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM")
+  // );
+  // const supplyBank = await fetchBank(
+  //   umi,
+  //   publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5")
+  // );
+
+  // console.log(
+  //   bytesToI80F48(supplyBank.config.assetWeightInit.value),
+  //   bytesToI80F48(debtBank.config.liabilityWeightInit.value)
+  // );
+
+  // await client.pos.refreshPositionState();
+
+  // console.log(await client.pos.utilizationRateBpsDrift());
+
+  // const transactionItems = [rebalance(client)];
+
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 5 },
+  // });
+  // 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.688",
+  "version": "1.0.689",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -4,7 +4,7 @@ import { FlashLoanRequirements } from "../../types";
 import { SolautoClient } from "../solauto";
 import { JupSwapManager, SwapParams, SwapInput } from "../swap";
 import { RebalanceValues } from "./rebalanceValues";
-import { RebalanceDirection, TokenType } from "../../generated";
+import { PriceType, RebalanceDirection, TokenType } from "../../generated";
 import {
   consoleLog,
   fromBaseUnit,
@@ -25,7 +25,8 @@ export class RebalanceSwapManager {
     private client: SolautoClient,
     private values: RebalanceValues,
     private flRequirements?: FlashLoanRequirements,
-    private targetLiqUtilizationRateBps?: number
+    private targetLiqUtilizationRateBps?: number,
+    private priceType?: PriceType
   ) {
     this.jupSwapManager = new JupSwapManager(client.signer);
   }
@@ -39,16 +40,16 @@ export class RebalanceSwapManager {
   }
 
   private postRebalanceLiqUtilizationRateBps(swapOutputAmount?: bigint) {
-    let supplyUsd = this.client.pos.supplyUsd();
+    let supplyUsd = this.client.pos.supplyUsd(this.priceType);
     // TODO: add token balance change
-    let debtUsd = this.client.pos.debtUsd();
+    let debtUsd = this.client.pos.debtUsd(this.priceType);
 
     const outputToken = this.isBoost()
       ? this.client.pos.supplyMint
       : this.client.pos.debtMint;
     const swapOutputUsd = swapOutputAmount
       ? fromBaseUnit(swapOutputAmount, tokenInfo(outputToken).decimals) *
-        (safeGetPrice(outputToken) ?? 0)
+        (safeGetPrice(outputToken, this.priceType) ?? 0)
       : this.usdToSwap();
 
     supplyUsd = this.isBoost()
@@ -110,7 +111,7 @@ export class RebalanceSwapManager {
       : this.client.pos.state.debt;
 
     let inputAmount = toBaseUnit(
-      this.usdToSwap() / safeGetPrice(input.mint)!,
+      this.usdToSwap() / safeGetPrice(input.mint, this.priceType)!,
       input.decimals
     );
 
@@ -139,7 +140,7 @@ export class RebalanceSwapManager {
           )
         )
       : toBaseUnit(
-          this.usdToSwap() / safeGetPrice(output.mint)!,
+          this.usdToSwap() / safeGetPrice(output.mint, this.priceType)!,
           output.decimals
         );
 

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -287,7 +287,8 @@ export class RebalanceTxBuilder {
       this.client,
       this.values,
       this.flRequirements,
-      this.targetLiqUtilizationRateBps
+      this.targetLiqUtilizationRateBps,
+      this.priceType
     );
     await this.swapManager.setSwapParams(attemptNum);
 

package/src/services/solauto/solautoClient.ts

@@ -179,6 +179,7 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.log("Position state: ", this.pos.state);
     this.log("Position settings: ", this.pos.settings);
+    this.log("Public key:", this.pos.publicKey.toString());
     this.log("Supply mint:", this.pos.supplyMint.toString());
     this.log("Debt mint:", this.pos.debtMint.toString());
     this.log("LP pool:", this.pos.lpPoolAccount.toString());

package/src/services/transactions/manager/transactionsManager.ts

@@ -48,7 +48,7 @@ interface RetryConfig {
   retryDelay?: number;
 }
 
-export interface TransactionManagerArgs<T extends TxHandler> {
+export interface TransactionsManagerArgs<T extends TxHandler> {
   txHandler: T;
   statusCallback?: (statuses: TransactionManagerStatuses) => void;
   txRunType?: TransactionRunType;
@@ -73,7 +73,7 @@ export class TransactionsManager<T extends TxHandler> {
 
   updateOracleTxName = "update oracle";
 
-  constructor(args: TransactionManagerArgs<T>) {
+  constructor(args: TransactionsManagerArgs<T>) {
     this.txHandler = args.txHandler;
     this.statusCallback = args.statusCallback;
     this.txRunType = args.txRunType;

package/src/utils/switchboardUtils.ts

@@ -53,12 +53,17 @@ export async function buildSwbSubmitResponseTx(
 ): Promise<TransactionItemInputs | undefined> {
   const feed = getPullFeed(conn, mint, toWeb3JsPublicKey(signer.publicKey));
   const [pullIx, responses] = await retryWithExponentialBackoff(
-    async () =>
-      await feed.fetchUpdateIx({
+    async () => {
+      const res = await feed.fetchUpdateIx({
         chain: "solana",
         network: "mainnet-beta",
-      }),
-    2,
+      });
+      if (!res[1] || !res[1][0].value) {
+        throw new Error("Unable to fetch Switchboard pull IX");
+      }
+      return res;
+    },
+    3,
     200
   );
 
@@ -111,4 +116,4 @@ export async function getSwitchboardFeedData(
 
 export function isSwitchboardMint(mint: PublicKey | string) {
   return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
-}
+}