@haven-fi/solauto-sdk 1.0.206 → 1.0.208

package/dist/clients/solautoMarginfiClient.js

@@ -429,7 +429,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (state) {
             return state;
         }
-        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, this.marginfiGroup, !this.selfManaged && this.solautoPositionData === null
+        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.marginfiAccountPk }, this.marginfiGroup, !this.selfManaged && this.solautoPositionData === null
             ? { mint: this.supplyMint }
             : undefined, !this.selfManaged && this.solautoPositionData === null
             ? { mint: this.debtMint }

package/dist/transactions/transactionUtils.d.ts

@@ -1,7 +1,7 @@
-import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { ReferralState } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
+import { ReferralStateManager } from "../clients";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
 export declare function requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
@@ -9,7 +9,7 @@ export declare function buildSolautoRebalanceTransaction(client: SolautoClient,
     tx: TransactionBuilder;
     lookupTableAddresses: string[];
 } | undefined>;
-export declare function convertReferralFeesToDestination(umi: Umi, referralState: ReferralState, tokenAccount: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
+export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
 export declare function getErrorInfo(tx: TransactionBuilder, error: any): {
     errorName: string | undefined;
     errorInfo: undefined;

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqOzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAwCzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAsBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAgM7D,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAwCzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}

package/dist/transactions/transactionUtils.js

@@ -400,26 +400,26 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         lookupTableAddresses,
     };
 }
-async function convertReferralFeesToDestination(umi, referralState, tokenAccount) {
-    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(umi, tokenAccount);
+async function convertReferralFeesToDestination(referralManager, tokenAccount, destinationMint) {
+    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
     if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
         return undefined;
     }
-    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(umi.identity, {
+    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(referralManager.umi.identity, {
         amount: tokenAccountData.amount,
-        destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.publicKey),
+        destinationWallet: referralManager.referralState,
         inputMint: tokenAccountData.mint,
-        outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.destFeesMint),
+        outputMint: destinationMint,
         exactIn: true,
         slippageIncFactor: 0.25,
     });
     let tx = (0, umi_1.transactionBuilder)()
         .add(setupInstructions)
-        .add((0, generated_1.convertReferralFees)(umi, {
-        signer: umi.identity,
-        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(umi.identity.publicKey), tokenAccountData.mint)),
+        .add((0, generated_1.convertReferralFees)(referralManager.umi, {
+        signer: referralManager.umi.identity,
+        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: (0, umi_1.publicKey)(referralManager.referralState),
         referralFeesTa: (0, umi_1.publicKey)(tokenAccount),
     }))
         .add(swapIx);

package/dist/utils/marginfiUtils.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { Bank } from "../marginfi-sdk";
+import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
@@ -27,7 +27,10 @@ type BanksCache = {
         [mint: string]: Bank;
     };
 };
-export declare function getMarginfiAccountPositionState(umi: Umi, marginfiAccountPk: PublicKey, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
+export declare function getMarginfiAccountPositionState(umi: Umi, protocolAccount: {
+    pk: PublicKey;
+    data?: MarginfiAccount;
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
 export declare function calculateAnnualAPYs(bank: Bank): [number, number];
 export declare function getUpToDateShareValues(bank: Bank): Promise<[number, number]>;
 export {};

package/dist/utils/marginfiUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AA6DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AA6DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}

package/dist/utils/marginfiUtils.js

@@ -86,7 +86,7 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
     if (compatibleWithSolauto) {
         const positionStates = await Promise.all(marginfiAccounts.map(async (x) => ({
             publicKey: x.publicKey,
-            state: await getMarginfiAccountPositionState(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey)),
+            state: await getMarginfiAccountPositionState(umi, { pk: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey) }),
         })));
         return positionStates
             .sort((a, b) => (0, numberUtils_1.fromBaseUnit)(b.state?.netWorth.baseAmountUsdValue ?? BigInt(0), generalAccounts_1.USD_DECIMALS) -
@@ -143,8 +143,11 @@ async function getTokenUsage(bank, isAsset, shares, amountUsedAdjustment) {
         padding: new Uint8Array([]),
     };
 }
-async function getMarginfiAccountPositionState(umi, marginfiAccountPk, marginfiGroup, supply, debt, livePositionUpdates) {
-    let marginfiAccount = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(marginfiAccountPk), { commitment: "confirmed" });
+async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGroup, supply, debt, livePositionUpdates) {
+    let marginfiAccount = protocolAccount.data ??
+        (await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(protocolAccount.pk), {
+            commitment: "confirmed",
+        }));
     if (!supply) {
         supply = {};
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.206",
+  "version": "1.0.208",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -22,7 +22,6 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.92.1",
-    "@sqds/multisig": "^2.1.3",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "rpc-websockets": "7.11.0"

package/src/clients/solautoMarginfiClient.ts

@@ -649,7 +649,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     const freshState = await getMarginfiAccountPositionState(
       this.umi,
-      this.marginfiAccountPk,
+      { pk: this.marginfiAccountPk },
       this.marginfiGroup,
       !this.selfManaged && this.solautoPositionData === null
         ? { mint: this.supplyMint }

package/src/transactions/transactionUtils.ts

@@ -26,6 +26,7 @@ import {
   getMarginfiRebalanceInstructionDataSerializer,
   getSolautoErrorFromCode,
   isSolautoAction,
+  safeFetchReferralState,
   solautoAction,
 } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
@@ -65,7 +66,7 @@ import {
   getMarginfiErrorFromName,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
-import { TxHandler } from "../clients";
+import { ReferralStateManager, TxHandler } from "../clients";
 import {
   createJupiterProgram,
   getJupiterErrorFromName,
@@ -750,21 +751,21 @@ export async function buildSolautoRebalanceTransaction(
 }
 
 export async function convertReferralFeesToDestination(
-  umi: Umi,
-  referralState: ReferralState,
-  tokenAccount: PublicKey
+  referralManager: ReferralStateManager,
+  tokenAccount: PublicKey,
+  destinationMint: PublicKey
 ): Promise<[TransactionBuilder, string[]] | undefined> {
-  const tokenAccountData = await getTokenAccountData(umi, tokenAccount);
+  const tokenAccountData = await getTokenAccountData(referralManager.umi, tokenAccount);
   if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
     return undefined;
   }
 
   const { lookupTableAddresses, setupInstructions, swapIx } =
-    await getJupSwapTransaction(umi.identity, {
+    await getJupSwapTransaction(referralManager.umi.identity, {
       amount: tokenAccountData.amount,
-      destinationWallet: toWeb3JsPublicKey(referralState.publicKey),
+      destinationWallet: referralManager.referralState,
       inputMint: tokenAccountData.mint,
-      outputMint: toWeb3JsPublicKey(referralState.destFeesMint),
+      outputMint: destinationMint,
       exactIn: true,
       slippageIncFactor: 0.25,
     });
@@ -772,16 +773,16 @@ export async function convertReferralFeesToDestination(
   let tx = transactionBuilder()
     .add(setupInstructions)
     .add(
-      convertReferralFees(umi, {
-        signer: umi.identity,
+      convertReferralFees(referralManager.umi, {
+        signer: referralManager.umi.identity,
         intermediaryTa: publicKey(
           getTokenAccount(
-            toWeb3JsPublicKey(umi.identity.publicKey),
+            toWeb3JsPublicKey(referralManager.umi.identity.publicKey),
             tokenAccountData.mint
           )
         ),
         ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: publicKey(referralManager.referralState),
         referralFeesTa: publicKey(tokenAccount),
       })
     )

package/src/utils/marginfiUtils.ts

@@ -5,6 +5,7 @@ import {
   Bank,
   getMarginfiAccountSize,
   MARGINFI_PROGRAM_ID,
+  MarginfiAccount,
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
@@ -168,7 +169,7 @@ export async function getAllMarginfiAccountsByAuthority(
         publicKey: x.publicKey,
         state: await getMarginfiAccountPositionState(
           umi,
-          toWeb3JsPublicKey(x.publicKey)
+          { pk: toWeb3JsPublicKey(x.publicKey) }
         ),
       }))
     );
@@ -265,17 +266,17 @@ type BanksCache = { [group: string]: { [mint: string]: Bank } };
 
 export async function getMarginfiAccountPositionState(
   umi: Umi,
-  marginfiAccountPk: PublicKey,
+  protocolAccount: { pk: PublicKey; data?: MarginfiAccount },
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
   livePositionUpdates?: LivePositionUpdates
 ): Promise<PositionState | undefined> {
-  let marginfiAccount = await safeFetchMarginfiAccount(
-    umi,
-    publicKey(marginfiAccountPk),
-    { commitment: "confirmed" }
-  );
+  let marginfiAccount =
+    protocolAccount.data ??
+    (await safeFetchMarginfiAccount(umi, publicKey(protocolAccount.pk), {
+      commitment: "confirmed",
+    }));
 
   if (!supply) {
     supply = {};

package/tests/transactions/solautoMarginfi.ts

@@ -3,8 +3,6 @@ import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
-  PositionType,
-  safeFetchAllSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
@@ -15,7 +13,7 @@ import {
   maxRepayToBps,
   toBaseUnit,
 } from "../../src/utils/numberUtils";
-import { getAssociatedTokenAddress, NATIVE_MINT } from "@solana/spl-token";
+import { NATIVE_MINT } from "@solana/spl-token";
 import { fetchTokenPrices } from "../../src/utils/generalUtils";
 import {
   TransactionItem,
@@ -23,13 +21,7 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import { USDC } from "../../src/constants";
-import {
-  buildHeliusApiUrl,
-  getAllPositionsByAuthority,
-  getMarginfiAccountPositionState,
-  getSolautoManagedPositions,
-} from "../../src/utils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { buildHeliusApiUrl } from "../../src/utils";
 
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();