@haven-fi/solauto-sdk 1.0.24 → 1.0.26

package/src/generated/instructions/marginfiRebalance.ts

@@ -52,11 +52,13 @@ export type MarginfiRebalanceInstructionAccounts = {
   supplyBank: PublicKey | Pda;
   supplyPriceOracle?: PublicKey | Pda;
   positionSupplyTa: PublicKey | Pda;
+  signerSupplyTa?: PublicKey | Pda;
   vaultSupplyTa?: PublicKey | Pda;
   supplyVaultAuthority?: PublicKey | Pda;
   debtBank: PublicKey | Pda;
   debtPriceOracle?: PublicKey | Pda;
   positionDebtTa: PublicKey | Pda;
+  signerDebtTa?: PublicKey | Pda;
   vaultDebtTa?: PublicKey | Pda;
   debtVaultAuthority?: PublicKey | Pda;
 };
@@ -192,38 +194,48 @@ export function marginfiRebalance(
       isWritable: true as boolean,
       value: input.positionSupplyTa ?? null,
     },
-    vaultSupplyTa: {
+    signerSupplyTa: {
       index: 15,
       isWritable: true as boolean,
+      value: input.signerSupplyTa ?? null,
+    },
+    vaultSupplyTa: {
+      index: 16,
+      isWritable: true as boolean,
       value: input.vaultSupplyTa ?? null,
     },
     supplyVaultAuthority: {
-      index: 16,
+      index: 17,
       isWritable: true as boolean,
       value: input.supplyVaultAuthority ?? null,
     },
     debtBank: {
-      index: 17,
+      index: 18,
       isWritable: true as boolean,
       value: input.debtBank ?? null,
     },
     debtPriceOracle: {
-      index: 18,
+      index: 19,
       isWritable: false as boolean,
       value: input.debtPriceOracle ?? null,
     },
     positionDebtTa: {
-      index: 19,
+      index: 20,
       isWritable: true as boolean,
       value: input.positionDebtTa ?? null,
     },
+    signerDebtTa: {
+      index: 21,
+      isWritable: true as boolean,
+      value: input.signerDebtTa ?? null,
+    },
     vaultDebtTa: {
-      index: 20,
+      index: 22,
       isWritable: true as boolean,
       value: input.vaultDebtTa ?? null,
     },
     debtVaultAuthority: {
-      index: 21,
+      index: 23,
       isWritable: true as boolean,
       value: input.debtVaultAuthority ?? null,
     },

package/src/transactions/transactionUtils.ts

@@ -76,12 +76,12 @@ function getWSolUsage(
   );
   if (supplyIsWsol && usingSupplyTaAction) {
     return {
-      wSolTokenAccount: client.signerSupplyLiquidityTa,
+      wSolTokenAccount: client.signerSupplyTa,
       solautoAction: usingSupplyTaAction,
     };
   } else if (debtIsWsol && usingDebtTaAction) {
     return {
-      wSolTokenAccount: client.signerDebtLiquidityTa,
+      wSolTokenAccount: client.signerDebtTa,
       solautoAction: usingDebtTaAction,
     };
   } else {
@@ -120,7 +120,7 @@ async function transactionChoresBefore(
     undefined
   );
   if (wSolUsage !== undefined) {
-    if (!getSolanaAccountCreated(client.umi, wSolUsage.wSolTokenAccount)) {
+    if (await getSolanaAccountCreated(client.umi, wSolUsage.wSolTokenAccount)) {
       client.log(`Closing signer wSol TA`);
       chores = chores.add(
         closeTokenAccountUmiIx(
@@ -133,17 +133,17 @@ async function transactionChoresBefore(
 
     let amountToTransfer = BigInt(0);
     if (isSolautoAction("Deposit", wSolUsage.solautoAction)) {
-      amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0]);
+      amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0]);
     } else if (
       isSolautoAction("Repay", wSolUsage.solautoAction) &&
       wSolUsage.solautoAction.fields[0].__kind === "Some"
     ) {
-      amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
+      amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
     } else if (
       initiatingDcaIn &&
       client.debtMint.toString() === NATIVE_MINT.toString()
     ) {
-      amountToTransfer += initiatingDcaIn;
+      amountToTransfer = initiatingDcaIn;
     }
 
     if (amountToTransfer > 0) {
@@ -176,8 +176,8 @@ async function transactionChoresBefore(
     }
 
     const tokenAccount = isSolautoAction("Withdraw", solautoAction)
-      ? client.signerSupplyLiquidityTa
-      : client.signerDebtLiquidityTa;
+      ? client.signerSupplyTa
+      : client.signerDebtTa;
     if (accountsGettingCreated.includes(tokenAccount.toString())) {
       continue;
     }

package/src/transactions/transactionsManager.ts

@@ -282,16 +282,18 @@ export class TransactionsManager {
       choresBefore.prepend(updateLookupTable.updateLutTx);
     }
     if (choresBefore.getInstructions().length > 0) {
-      this.items.unshift(
-        new TransactionItem(
-          async () => ({ tx: choresBefore }),
-          "create account(s)"
-        )
+      const chore = new TransactionItem(
+        async () => ({ tx: choresBefore }),
+        "create account(s)"
       );
+      await chore.initialize();
+      this.items.unshift(chore);
       this.client.log("Chores before: ", choresBefore.getInstructions().length);
     }
     if (choresAfter.getInstructions().length > 0) {
-      this.items.push(new TransactionItem(async () => ({ tx: choresAfter })));
+      const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+      await chore.initialize();
+      this.items.push(chore);
       this.client.log("Chores after: ", choresAfter.getInstructions().length);
     }
 

package/src/types/solauto.ts

@@ -0,0 +1,14 @@
+import { PublicKey } from "@solana/web3.js";
+import { LendingPlatform } from "../generated";
+
+export interface SolautoPositionDetails {
+    positionId: number;
+    selfManaged: boolean;
+    lendingPlatform: LendingPlatform;
+}
+
+export interface SelfManagedPositionDetails extends SolautoPositionDetails {
+    protocolAccount: PublicKey;
+    supplyMint: PublicKey;
+    debtMint: PublicKey;
+}

package/src/utils/marginfiUtils.ts

@@ -88,7 +88,9 @@ export async function getAllMarginfiAccountsByAuthority(
   umi: Umi,
   authority: PublicKey,
   compatibleWithSolauto?: boolean
-): Promise<PublicKey[]> {
+): Promise<
+  { marginfiAccount: PublicKey; supplyMint?: PublicKey; debtMint?: PublicKey }[]
+> {
   const marginfiAccounts = await umi.rpc.getProgramAccounts(
     MARGINFI_PROGRAM_ID,
     {
@@ -123,9 +125,15 @@ export async function getAllMarginfiAccountsByAuthority(
     );
     return positionStates
       .filter((x) => x.state !== undefined)
-      .map((x) => toWeb3JsPublicKey(x.publicKey));
+      .map((x) => ({
+        marginfiAccount: toWeb3JsPublicKey(x.publicKey),
+        supplyMint: toWeb3JsPublicKey(x.state!.supply.mint),
+        debtMint: toWeb3JsPublicKey(x.state!.debt.mint),
+      }));
   } else {
-    return marginfiAccounts.map((x) => toWeb3JsPublicKey(x.publicKey));
+    return marginfiAccounts.map((x) => ({
+      marginfiAccount: toWeb3JsPublicKey(x.publicKey),
+    }));
   }
 }
 

package/src/utils/solauto/generalUtils.ts

@@ -27,6 +27,10 @@ import {
   getAllMarginfiAccountsByAuthority,
   getMarginfiAccountPositionState,
 } from "../marginfiUtils";
+import {
+  SelfManagedPositionDetails,
+  SolautoPositionDetails,
+} from "../../types/solauto";
 
 function newPeriodsPassed(
   automation: AutomationSettings,
@@ -278,12 +282,6 @@ export async function getReferralsByUser(
   return accounts.map((x) => toWeb3JsPublicKey(x.publicKey));
 }
 
-export interface SolautoPositionDetails {
-  positionId: number;
-  lendingPlatform: LendingPlatform;
-  protocolAccount?: PublicKey;
-}
-
 export async function getAllPositionsByAuthority(
   umi: Umi,
   user: PublicKey
@@ -295,16 +293,27 @@ export async function getAllPositionsByAuthority(
     ...solautoManagedPositions.map((x) => ({
       positionId: x.positionId,
       lendingPlatform: x.lendingPlatform,
+      selfManaged: false,
     }))
   );
 
-  const marginfiPositions = await getAllMarginfiAccountsByAuthority(umi, user, true);
+  const marginfiPositions = await getAllMarginfiAccountsByAuthority(
+    umi,
+    user,
+    true
+  );
   allPositions.push(
-    ...marginfiPositions.map((pubkey) => ({
-      positionId: 0,
-      lendingPlatform: LendingPlatform.Marginfi,
-      protocolAccount: pubkey,
-    }))
+    ...marginfiPositions.map(
+      (x) =>
+        ({
+          positionId: 0,
+          selfManaged: true,
+          lendingPlatform: LendingPlatform.Marginfi,
+          protocolAccount: x.marginfiAccount,
+          supplyMint: x.supplyMint,
+          debtMint: x.debtMint,
+        }) as SelfManagedPositionDetails
+    )
   );
 
   // TODO support other platforms

package/src/utils/solauto/rebalanceUtils.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
-import { PositionTokenUsage } from "../../generated";
+import { FeeType, PositionTokenUsage } from "../../generated";
 import {
   eligibleForNextAutomationPeriod,
   getAdjustedSettingsFromAutomation,
@@ -188,7 +188,7 @@ export function getRebalanceValues(
   if (increasingLeverage) {
     adjustmentFeeBps = getSolautoFeesBps(
       client.referredByState !== undefined,
-      client.solautoPositionData!.feeType
+      client.solautoPositionData?.feeType ?? FeeType.Small
     ).total;
   }
 
@@ -208,7 +208,6 @@ export function getRebalanceValues(
     targetRateBps,
     adjustmentFeeBps
   );
-  debtAdjustmentUsd *= 500;
 
   const input = increasingLeverage
     ? client.solautoPositionState!.debt

package/tests/transactions/solautoMarginfi.ts

@@ -25,7 +25,7 @@ describe("Solauto Marginfi tests", async () => {
 
   const payForTransactions = false;
   const useJitoBundle = false;
-  const positionId = 1;
+  const positionId = 0;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
@@ -45,6 +45,9 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
+        marginfiAccount: new PublicKey("4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"),
+        supplyMint: NATIVE_MINT,
+        debtMint: new PublicKey(USDC_MINT)
       }
     );
 
@@ -58,29 +61,29 @@ describe("Solauto Marginfi tests", async () => {
       targetBoostToBps: none(),
     };
 
-    if (client.solautoPositionData === null) {
-      transactionItems.push(
-        new TransactionItem(async () => {
-          return {
-            tx: client.openPosition(settingParams),
-          };
-        }, "open position")
-      );
+    // if (client.solautoPositionData === null) {
+    //   transactionItems.push(
+    //     new TransactionItem(async () => {
+    //       return {
+    //         tx: client.openPosition(),
+    //       };
+    //     }, "open position")
+    //   );
 
-      const initialSupplyUsd = 50;
-      transactionItems.push(
-        new TransactionItem(async () => {
-          const [supplyPrice] = await getTokenPrices([supply]);
-          return {
-            tx: client.protocolInteraction(
-              solautoAction("Deposit", [
-                toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
-              ])
-            ),
-          };
-        }, "deposit")
-      );
-    }
+    //   const initialSupplyUsd = 50;
+    //   transactionItems.push(
+    //     new TransactionItem(async () => {
+    //       const [supplyPrice] = await getTokenPrices([supply]);
+    //       return {
+    //         tx: client.protocolInteraction(
+    //           solautoAction("Deposit", [
+    //             toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+    //           ])
+    //         ),
+    //       };
+    //     }, "deposit")
+    //   );
+    // }
 
     // transactionItems.push(
     //   new TransactionItem(
@@ -104,7 +107,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 5000, attemptNum),
         "rebalance"
       )
     );
@@ -141,7 +144,7 @@ describe("Solauto Marginfi tests", async () => {
       transactionItems,
       undefined,
       !payForTransactions,
-      useJitoBundle,
+      useJitoBundle
     ).send();
   });
 });

package/tests/unit/lookupTables.ts

@@ -1,14 +1,15 @@
 import { describe, it } from 'mocha';
-import { PublicKey } from "@solana/web3.js";
+import { clusterApiUrl, Connection, PublicKey } from "@solana/web3.js";
 import {
   MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
 } from "../../src/constants/marginfiAccounts";
-import { CONNECTION } from "../../src/constants/solautoConstants";
+
+const conn = new Connection(clusterApiUrl("mainnet-beta"), "confirmed");
 
 describe("Assert lookup tables up-to-date", async () => {
   it("marginfi accounts LUT should have everything", async () => {
-    const lookupTable = await CONNECTION.getAddressLookupTable(
+    const lookupTable = await conn.getAddressLookupTable(
       new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE)
     );
     if (lookupTable === null) {