@haven-fi/solauto-sdk 1.0.666 → 1.0.668

package/src/marginfi-sdk/instructions/lendingAccountDeposit.ts

@@ -8,6 +8,8 @@
 
 import {
   Context,
+  Option,
+  OptionOrNullable,
   Pda,
   PublicKey,
   Signer,
@@ -17,7 +19,9 @@ import {
 import {
   Serializer,
   array,
+  bool,
   mapSerializer,
+  option,
   struct,
   u64,
   u8,
@@ -43,10 +47,12 @@ export type LendingAccountDepositInstructionAccounts = {
 export type LendingAccountDepositInstructionData = {
   discriminator: Array<number>;
   amount: bigint;
+  depositUpToLimit: Option<boolean>;
 };
 
 export type LendingAccountDepositInstructionDataArgs = {
   amount: number | bigint;
+  depositUpToLimit: OptionOrNullable<boolean>;
 };
 
 export function getLendingAccountDepositInstructionDataSerializer(): Serializer<
@@ -62,6 +68,7 @@ export function getLendingAccountDepositInstructionDataSerializer(): Serializer<
       [
         ['discriminator', array(u8(), { size: 8 })],
         ['amount', u64()],
+        ['depositUpToLimit', option(bool())],
       ],
       { description: 'LendingAccountDepositInstructionData' }
     ),

package/src/services/solauto/solautoMarginfiClient.ts

@@ -259,7 +259,6 @@ export class SolautoMarginfiClient extends SolautoClient {
     switch (args.__kind) {
       case "Deposit": {
         return lendingAccountDeposit(this.umi, {
-          amount: args.fields[0],
           signer: this.signer,
           signerTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -268,6 +267,8 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVault: publicKey(
             this.marginfiSupplyAccounts.liquidityVault
           ),
+          amount: args.fields[0],
+          depositUpToLimit: true,
         });
       }
       case "Borrow": {

package/src/services/transactions/transactionUtils.ts

@@ -417,6 +417,7 @@ function getSolautoActions(umi: Umi, tx: TransactionBuilder): SolautoAction[] {
           serializer
             .serialize({
               amount: 0,
+              depositUpToLimit: true
             })
             .slice(0, 8)
         );

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -14,6 +14,7 @@ import {
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
   getMarginfiPriceOracle,
+  validPubkey,
 } from "../utils";
 import { getMarginfiAccounts } from "../constants";
 import { SolautoPositionEx } from "./solautoPositionEx";
@@ -31,14 +32,10 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       return this.lp;
     }
 
-    if (
-      !this.marginfiAccountData &&
-      this.lpUserAccount &&
-      !this.lpUserAccount.equals(PublicKey.default)
-    ) {
+    if (!this.marginfiAccountData && validPubkey(this.lpUserAccount)) {
       this.marginfiAccountData = await fetchMarginfiAccount(
         this.umi,
-        publicKey(this.lpUserAccount),
+        publicKey(this.lpUserAccount!),
         { commitment: "confirmed" }
       );
       this.lp = toWeb3JsPublicKey(this.marginfiAccountData.group);
@@ -97,7 +94,11 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   }
 
   async refreshPositionState(priceType?: PriceType): Promise<void> {
-    const useDesignatedMint = !this._data.position || !this.selfManaged;
+    const useDesignatedMint =
+      !this.exists ||
+      !this.selfManaged ||
+      (this.selfManaged && !validPubkey(this.lpUserAccount));
+
     const resp = await getMarginfiAccountPositionState(
       this.umi,
       { pk: this.lpUserAccount },

package/src/solautoPosition/solautoPositionEx.ts

@@ -83,10 +83,13 @@ export abstract class SolautoPositionEx {
   protected lp?: PublicKey = undefined;
   public lpUserAccount?: PublicKey = undefined;
   protected lpEnv!: ProgramEnv;
+  private _supplyMint?: PublicKey;
+  private _debtMint?: PublicKey;
 
   private readonly firstState!: PositionState;
-  protected _supplyPrice?: number;
-  protected _debtPrice?: number;
+
+  private _supplyPrice?: number;
+  private _debtPrice?: number;
 
   public rebalanceHelper!: PositionRebalanceHelper;
 
@@ -104,6 +107,8 @@ export abstract class SolautoPositionEx {
     this.positionId = args.positionId ?? args.data.positionId![0];
     this.authority = args.authority ?? toWeb3JsPublicKey(args.data.authority!);
 
+    this._supplyMint = args.customArgs?.supplyMint;
+    this._debtMint = args.customArgs?.debtMint;
     this.lp = args.customArgs?.lendingPool;
     this.lpUserAccount =
       args.customArgs?.lpUserAccount ??
@@ -169,7 +174,7 @@ export abstract class SolautoPositionEx {
   }
 
   get supplyMint(): PublicKey {
-    return toWeb3JsPublicKey(this.state.supply.mint);
+    return this._supplyMint ?? toWeb3JsPublicKey(this.state.supply.mint);
   }
 
   get supplyMintInfo(): TokenInfo {
@@ -177,7 +182,7 @@ export abstract class SolautoPositionEx {
   }
 
   get debtMint(): PublicKey {
-    return toWeb3JsPublicKey(this.state.debt.mint);
+    return this._debtMint ?? toWeb3JsPublicKey(this.state.debt.mint);
   }
 
   get debtMintInfo(): TokenInfo {

package/src/utils/generalUtils.ts

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { PublicKey } from "@solana/web3.js";
-import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
+import { MaybeRpcAccount, publicKey, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import { TOKEN_INFO, TokenInfo } from "../constants";
 
 export function buildHeliusApiUrl(heliusApiKey: string) {
@@ -195,4 +195,8 @@ export function u16ToArrayBufferLE(value: number): Uint8Array {
 
   // Return the buffer
   return new Uint8Array(buffer);
+}
+
+export function validPubkey(pubkey?: PublicKey | UmiPublicKey | string) {
+  return Boolean(pubkey) && pubkey!.toString() !== PublicKey.default.toString();
 }

package/src/utils/marginfiUtils.ts

@@ -31,7 +31,7 @@ import {
 } from "../marginfi-sdk";
 import { ContextUpdates } from "./solautoUtils";
 import { fetchTokenPrices, safeGetPrice } from "./priceUtils";
-import { currentUnixSeconds } from "./generalUtils";
+import { currentUnixSeconds, validPubkey } from "./generalUtils";
 import {
   bytesToI80F48,
   calcNetWorthUsd,
@@ -245,7 +245,7 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
   },
   supplyPrice?: number
 ): Promise<[number, number]> {
-  if (!supply.bank && supply.mint.equals(PublicKey.default)) {
+  if (!supply.bank && !validPubkey(supply.mint)) {
     return [0, 0];
   }
 
@@ -264,10 +264,7 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
     );
   }
 
-  if (
-    (!debt.bank || debt.bank === null) &&
-    !debt.mint.equals(PublicKey.default)
-  ) {
+  if ((!debt.bank || debt.bank === null) && !validPubkey(debt.mint)) {
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
@@ -488,10 +485,7 @@ async function getBank(
   data: BankSelection,
   marginfiGroup: PublicKey
 ) {
-  const mint =
-    data?.mint && !data.mint.equals(PublicKey.default)
-      ? data.mint.toString()
-      : undefined;
+  const mint = validPubkey(data.mint) ? data.mint!.toString() : undefined;
 
   return data?.banksCache && mint
     ? data.banksCache[marginfiGroup.toString()][mint]
@@ -523,8 +517,8 @@ export async function getMarginfiAccountPositionState(
 > {
   let marginfiAccount =
     lpUserAccount.data ??
-    (lpUserAccount.pk
-      ? await safeFetchMarginfiAccount(umi, publicKey(lpUserAccount.pk), {
+    (validPubkey(lpUserAccount.pk)
+      ? await safeFetchMarginfiAccount(umi, publicKey(lpUserAccount.pk!), {
           commitment: "confirmed",
         })
       : null);

package/src/utils/solanaUtils.ts

@@ -223,11 +223,14 @@ export function addTxOptimizations(
     : transactionBuilder();
 
   const allOptimizations = tx.prepend(computePriceIx).prepend(computeLimitIx);
-  const oneOptimization = tx.prepend(computePriceIx);
+  const withCuPrice = tx.prepend(computePriceIx);
+  const withCuLimit = tx.prepend(computeLimitIx);
   if (allOptimizations.fitsInOneTransaction(umi)) {
     return allOptimizations;
-  } else if (oneOptimization.fitsInOneTransaction(umi)) {
-    return oneOptimization;
+  } else if (withCuPrice.fitsInOneTransaction(umi)) {
+    return withCuPrice;
+  } else if (withCuLimit.fitsInOneTransaction(umi)) {
+    return withCuLimit;
   } else {
     return tx;
   }
@@ -448,7 +451,7 @@ export async function sendSingleOptimizedTransaction(
 
   const blockhash = await connection.getLatestBlockhash("confirmed");
 
-  let computeUnitLimit = undefined;
+  let cuLimit = undefined;
   if (txType !== "skip-simulation") {
     const simulationResult = await retryWithExponentialBackoff(
       async () =>
@@ -461,28 +464,20 @@ export async function sendSingleOptimizedTransaction(
         ),
       3
     );
-    computeUnitLimit = Math.round(simulationResult.value.unitsConsumed! * 1.15);
-    consoleLog("Compute unit limit: ", computeUnitLimit);
+    cuLimit = Math.round(simulationResult.value.unitsConsumed! * 1.15);
+    consoleLog("Compute unit limit: ", cuLimit);
   }
 
   let cuPrice: number | undefined;
   if (prioritySetting !== PriorityFeeSetting.None) {
     cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
-    if (!cuPrice) {
-      cuPrice = 1_000_000;
-    }
-    cuPrice = Math.min(cuPrice, 100 * 1_000_000);
+    cuPrice = Math.min(cuPrice ?? 0, 100 * 1_000_000);
     consoleLog("Compute unit price: ", cuPrice);
   }
 
   if (txType !== "only-simulate") {
     onAwaitingSign?.();
-    const signedTx = await assembleFinalTransaction(
-      umi,
-      tx,
-      cuPrice,
-      computeUnitLimit
-    )
+    const signedTx = await assembleFinalTransaction(umi, tx, cuPrice, cuLimit)
       .setBlockhash(blockhash)
       .buildAndSign(umi);
     const txSig = await spamSendTransactionUntilConfirmed(

package/src/utils/solautoUtils.ts

@@ -41,6 +41,7 @@ import {
   findMarginfiAccounts,
   getAllMarginfiAccountsByAuthority,
 } from "./marginfiUtils";
+import { validPubkey } from "./generalUtils";
 
 export function createDynamicSolautoProgram(programId?: PublicKey): Program {
   return {
@@ -179,9 +180,8 @@ export async function getSolautoManagedPositions(
         findMarginfiAccounts(
           toWeb3JsPublicKey(position.position.lpSupplyAccount)
         ).mint,
-        findMarginfiAccounts(
-          toWeb3JsPublicKey(position.position.lpDebtAccount)
-        ).mint,
+        findMarginfiAccounts(toWeb3JsPublicKey(position.position.lpDebtAccount))
+          .mint,
       ];
     }
     // TODO: PF
@@ -285,10 +285,7 @@ export async function getAllPositionsByAuthority(
           true
         );
         marginfiPositions = marginfiPositions.filter(
-          (x) =>
-            x.supplyMint &&
-            (x.debtMint!.equals(PublicKey.default) ||
-              ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
+          (x) => validPubkey(x.supplyMint) && validPubkey(x.debtMint)
         );
         return marginfiPositions.map((x) => ({
           publicKey: x.marginfiAccount,

package/tests/transactions/solautoMarginfi.ts

@@ -5,7 +5,7 @@ import { e2eTransactionTest } from "./shared";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
-  const testProgram = true;
+  const testProgram = false;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     await e2eTransactionTest(

package/tests/unit/rebalanceCalculations.ts

@@ -92,16 +92,19 @@ async function getFakePosition(
     liqThresholdBps
   );
 
+  const defaultPk = publicKey(PublicKey.default);
   client.pos = new MarginfiSolautoPositionEx({
     umi: client.umi,
     publicKey: PublicKey.default,
     data: {
       state: fakeState,
+      positionId: [1],
+      authority: defaultPk,
       position: {
         lendingPlatform: LendingPlatform.Marginfi,
-        lpUserAccount: publicKey(PublicKey.default),
-        lpSupplyAccount: publicKey(PublicKey.default),
-        lpDebtAccount: publicKey(PublicKey.default),
+        lpUserAccount: defaultPk,
+        lpSupplyAccount: defaultPk,
+        lpDebtAccount: defaultPk,
         settings,
         dca: null,
         padding: [],