@haven-fi/solauto-sdk 1.0.667 → 1.0.669

package/src/utils/solanaUtils.ts

@@ -47,7 +47,7 @@ import {
   retryWithExponentialBackoff,
 } from "./generalUtils";
 import { createDynamicSolautoProgram } from "./solautoUtils";
-import { createDynamicMarginfiProgram } from "./marginfiUtils";
+import { createDynamicMarginfiProgram } from "./marginfi";
 
 export function getSolanaRpcConnection(
   rpcUrl: string,
@@ -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_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

@@ -37,11 +37,8 @@ import {
   toRoundedUsdValue,
 } from "./numberUtils";
 import { fetchTokenPrices } from "./priceUtils";
-import {
-  findMarginfiAccounts,
-  getAllMarginfiAccountsByAuthority,
-} from "./marginfiUtils";
 import { validPubkey } from "./generalUtils";
+import { findMarginfiAccounts, getAllMarginfiAccountsByAuthority } from "./marginfi";
 
 export function createDynamicSolautoProgram(programId?: PublicKey): Program {
   return {

package/tests/transactions/shared.ts

@@ -27,10 +27,12 @@ export async function e2eTransactionTest(
   signer: Signer,
   testProgram: boolean,
   lendingPlatform: LendingPlatform,
-  withFlashLoan: boolean
+  withFlashLoan: boolean,
+  showLogs?: boolean
 ) {
   const client = getClient(lendingPlatform, {
     signer,
+    showLogs,
     rpcUrl: LOCAL_IRONFORGE_API_URL,
     programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
   });

package/tests/transactions/solautoMarginfi.ts

@@ -5,13 +5,14 @@ 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(
       signer,
       testProgram,
       LendingPlatform.Marginfi,
+      false,
       false
     );
   });
@@ -21,7 +22,8 @@ describe("Solauto Marginfi tests", async () => {
       signer,
       testProgram,
       LendingPlatform.Marginfi,
-      true
+      true,
+      false
     );
   });
 });

package/dist/utils/marginfiUtils.d.ts

@@ -1,62 +0,0 @@
-import { PublicKey } from "@solana/web3.js";
-import { AccountMeta, Program, Umi } from "@metaplex-foundation/umi";
-import { ProgramEnv, MarginfiAssetAccounts } from "../types";
-import { PositionState, PriceType } from "../generated";
-import { MarginfiBankAccountsMap } from "../constants";
-import { Balance, Bank, MarginfiAccount } from "../marginfi-sdk";
-import { ContextUpdates } from "./solautoUtils";
-export declare function createDynamicMarginfiProgram(env?: ProgramEnv): Program;
-export declare function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv): Umi;
-export declare function getAllBankRelatedAccounts(umi: Umi, bankAccountsMap: MarginfiBankAccountsMap): Promise<PublicKey[]>;
-export declare function fetchBankAddresses(umi: Umi, bankPk: PublicKey): Promise<{
-    bank: PublicKey;
-    liquidityVault: PublicKey;
-    vaultAuthority: PublicKey | undefined;
-    priceOracle: PublicKey;
-}>;
-export declare function getMarginfiPriceOracle(umi: Umi, bank: {
-    pk?: PublicKey;
-    data?: Bank;
-}): Promise<PublicKey>;
-interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
-    mint: PublicKey;
-}
-export declare function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetAccounts;
-export declare function getRemainingAccountsForMarginfiHealthCheck(umi: Umi, balance: Balance): Promise<AccountMeta[]>;
-export declare function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
-export declare function getMarginfiMaxLtvAndLiqThresholdBps(umi: Umi, marginfiGroup: PublicKey, supply: {
-    mint: PublicKey;
-    bank?: Bank | null;
-}, debt: {
-    mint: PublicKey;
-    bank?: Bank | null;
-}, supplyPrice?: number): Promise<[number, number]>;
-export declare function getEmptyMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey): Promise<MarginfiAccount[]>;
-export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, group?: PublicKey, compatibleWithSolauto?: boolean): Promise<{
-    marginfiAccount: PublicKey;
-    supplyMint?: PublicKey;
-    debtMint?: PublicKey;
-}[]>;
-export declare function getBankLiquidityAvailableBaseUnit(bank: Bank | null, availableToDeposit: boolean): bigint;
-interface BankSelection {
-    mint?: PublicKey;
-    banksCache?: BanksCache;
-}
-type BanksCache = {
-    [group: string]: {
-        [mint: string]: Bank;
-    };
-};
-export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
-    pk?: PublicKey;
-    data?: MarginfiAccount | null;
-}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates, priceType?: PriceType): Promise<{
-    supplyBank: Bank | null;
-    debtBank: Bank | null;
-    state: PositionState;
-} | undefined>;
-export declare function calculateAnnualAPYs(bank: Bank): [number, number];
-export declare function getUpToDateShareValues(bank: Bank): [number, number];
-export declare function marginfiAccountEmpty(marginfiAccount: MarginfiAccount): boolean;
-export {};
-//# sourceMappingURL=marginfiUtils.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"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"}