@haven-fi/solauto-sdk 1.0.667 → 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/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/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(