@haven-fi/solauto-sdk 1.0.215 → 1.0.217

package/src/transactions/transactionUtils.ts

@@ -57,7 +57,11 @@ import {
   eligibleForRebalance,
   positionStateWithLatestPrices,
 } from "../utils/solauto/generalUtils";
-import { getReferralState, getTokenAccount, getTokenAccountData } from "../utils/accountUtils";
+import {
+  getReferralState,
+  getTokenAccount,
+  getTokenAccountData,
+} from "../utils/accountUtils";
 import {
   createMarginfiProgram,
   getLendingAccountBorrowInstructionDataSerializer,
@@ -139,19 +143,15 @@ async function transactionChoresBefore(
   let chores = transactionBuilder();
 
   if (
-    client.referralStateManager.referralStateData === null ||
-    (client.referralStateManager.referredBy !== undefined &&
-      client.referralStateManager.referralStateData?.referredByState ===
+    client.referralStateData === null ||
+    (client.referredBy !== undefined &&
+      client.referralStateData?.referredByState ===
         publicKey(PublicKey.default)) ||
     (client.authorityLutAddress !== undefined &&
-      client.referralStateManager.referralStateData!.lookupTable ==
-        publicKey(PublicKey.default))
+      client.referralStateData!.lookupTable == publicKey(PublicKey.default))
   ) {
     chores = chores.add(
-      client.referralStateManager.updateReferralStatesIx(
-        undefined,
-        client.authorityLutAddress
-      )
+      client.updateReferralStatesIx(undefined, client.authorityLutAddress)
     );
   }
 
@@ -275,7 +275,7 @@ export async function rebalanceChoresBefore(
       .some((t) => t.keys.some((k) => toWeb3JsPublicKey(k.pubkey).equals(key)));
 
   const checkReferralSupplyTa =
-    client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
+    client.referredBySupplyTa() && usesAccount(client.referredBySupplyTa()!);
   const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
   const checkIntermediaryMfiAccount =
     client.lendingPlatform === LendingPlatform.Marginfi &&
@@ -286,7 +286,9 @@ export async function rebalanceChoresBefore(
   const checkSignerDebtTa = usesAccount(client.signerDebtTa);
 
   const accountsNeeded = [
-    ...[checkReferralSupplyTa ? client.referredBySupplyTa : PublicKey.default],
+    ...[
+      checkReferralSupplyTa ? client.referredBySupplyTa() : PublicKey.default,
+    ],
     ...[checkSolautoFeesTa ? client.solautoFeesSupplyTa : PublicKey.default],
     ...[
       checkIntermediaryMfiAccount
@@ -314,7 +316,7 @@ export async function rebalanceChoresBefore(
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
-        client.referralStateManager.referredByState!,
+        client.referredByState!,
         client.supplyMint
       )
     );
@@ -704,6 +706,7 @@ export async function buildSolautoRebalanceTransaction(
               "A",
               jupQuote,
               rebalanceType,
+              values,
               flashLoan,
               targetLiqUtilizationRateBps
             ),
@@ -714,6 +717,7 @@ export async function buildSolautoRebalanceTransaction(
         "B",
         jupQuote,
         rebalanceType,
+        values,
         flashLoan,
         targetLiqUtilizationRateBps
       ),
@@ -728,6 +732,7 @@ export async function buildSolautoRebalanceTransaction(
         "A",
         jupQuote,
         rebalanceType,
+        values,
         undefined,
         targetLiqUtilizationRateBps
       ),
@@ -736,6 +741,7 @@ export async function buildSolautoRebalanceTransaction(
         "B",
         jupQuote,
         rebalanceType,
+        values,
         undefined,
         targetLiqUtilizationRateBps
       ),

package/src/utils/solauto/rebalanceUtils.ts

@@ -27,6 +27,7 @@ import {
   toBaseUnit,
 } from "../numberUtils";
 import { USD_DECIMALS } from "../../constants/generalAccounts";
+import { RebalanceAction } from "../../types";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
   if (dca.dcaInBaseUnit === BigInt(0)) {
@@ -163,6 +164,7 @@ export interface RebalanceValues {
   amountToDcaIn: number;
   amountUsdToDcaIn: number;
   dcaTokenType?: TokenType;
+  rebalanceAction: RebalanceAction;
 }
 
 export function getRebalanceValues(
@@ -221,6 +223,8 @@ export function getRebalanceValues(
     amountToDcaIn: amountToDcaIn ?? 0,
     amountUsdToDcaIn,
     dcaTokenType: dca?.tokenType,
+    rebalanceAction:
+      (amountToDcaIn ?? 0) > 0 ? "dca" : increasingLeverage ? "boost" : "repay",
   };
 }
 

package/tests/transactions/solautoMarginfi.ts

@@ -25,10 +25,10 @@ import { buildHeliusApiUrl } from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
 
 describe("Solauto Marginfi tests", async () => {
-  const signer = setupTest();
-  // const signer = setupTest("solauto-manager");
+  // const signer = setupTest();
+  const signer = setupTest("solauto-manager");
 
-  const payForTransactions = true;
+  const payForTransactions = false;
   const useJitoBundle = false;
   const positionId = 1;
 
@@ -128,7 +128,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 7000, attemptNum),
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
         "rebalance"
       )
     );