@haven-fi/solauto-sdk 1.0.25 → 1.0.27

package/src/clients/solautoMarginfiClient.ts

@@ -11,9 +11,10 @@ import {
   transactionBuilder,
   createSignerFromKeypair,
   AccountMeta,
-  createUmi,
 } from "@metaplex-foundation/umi";
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
+  clusterApiUrl,
   Keypair,
   PublicKey,
   SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -42,9 +43,11 @@ import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
+  lendingAccountDeposit,
   lendingAccountEndFlashloan,
   lendingAccountRepay,
   lendingAccountStartFlashloan,
+  lendingAccountWithdraw,
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
   safeFetchMarginfiAccount,
@@ -73,16 +76,14 @@ export function newSolautoMarginfiPositionArgs(
   debtMint: PublicKey,
   referredByAuthority?: PublicKey
 ): SolautoMarginfiClientArgs {
+  const umi = createUmi(clusterApiUrl("mainnet-beta"));
   return {
     positionId,
     signer,
     wallet,
     marginfiAccount:
       positionId === 0
-        ? createSignerFromKeypair(
-            createUmi(),
-            fromWeb3JsKeypair(Keypair.generate())
-          )
+        ? createSignerFromKeypair(umi, umi.eddsa.generateKeypair())
         : undefined,
     marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
     supplyMint: supplyMint,
@@ -151,7 +152,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     const emptyMarginfiAccounts = (
       await safeFetchAllMarginfiAccount(
         this.umi,
-        existingMarginfiAccounts.map((x) => publicKey(x))
+        existingMarginfiAccounts.map((x) => publicKey(x.marginfiAccount))
       )
     ).filter(
       (x) =>
@@ -166,10 +167,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.intermediaryMarginfiAccountSigner =
       emptyMarginfiAccounts.length > 0
         ? undefined
-        : createSignerFromKeypair(
-            this.umi,
-            fromWeb3JsKeypair(Keypair.generate())
-          );
+        : createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
     this.intermediaryMarginfiAccountPk =
       emptyMarginfiAccounts.length > 0
         ? toWeb3JsPublicKey(emptyMarginfiAccounts[0].publicKey)
@@ -203,9 +201,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
-    let signerDebtLiquidityTa: UmiPublicKey | undefined = undefined;
+    let signerDebtTa: UmiPublicKey | undefined = undefined;
     if (dca) {
-      signerDebtLiquidityTa = publicKey(this.signerDebtLiquidityTa);
+      signerDebtTa = publicKey(this.signerDebtTa);
     }
 
     return marginfiOpenPosition(this.umi, {
@@ -228,11 +226,11 @@ export class SolautoMarginfiClient extends SolautoClient {
           : (this.marginfiAccount as Signer),
       supplyMint: publicKey(this.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
-      positionSupplyTa: publicKey(this.positionSupplyLiquidityTa),
+      positionSupplyTa: publicKey(this.positionSupplyTa),
       debtMint: publicKey(this.debtMint),
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
-      positionDebtTa: publicKey(this.positionDebtLiquidityTa),
-      signerDebtTa: signerDebtLiquidityTa,
+      positionDebtTa: publicKey(this.positionDebtTa),
+      signerDebtTa: signerDebtTa,
       positionData: {
         positionId: this.positionId!,
         settingParams: settingParams ?? null,
@@ -257,22 +255,80 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   protocolInteraction(args: SolautoActionArgs): TransactionBuilder {
-    return super
-      .protocolInteraction(args)
-      .add(this.marginfiProtocolInteractionIx(args));
+    let tx = super.protocolInteraction(args);
+
+    if (this.selfManaged) {
+      return tx.add(this.marginfiProtocolInteractionIx(args));
+    } else {
+      return tx.add(this.marginfiSolautoProtocolInteractionIx(args));
+    }
+  }
+
+  private marginfiProtocolInteractionIx(args: SolautoActionArgs) {
+    switch (args.__kind) {
+      case "Deposit": {
+        console.log(args.fields[0]);
+        return lendingAccountDeposit(this.umi, {
+          amount: args.fields[0],
+          signer: this.signer,
+          signerTokenAccount: publicKey(this.signerSupplyTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiSupplyBankAccounts.bank),
+          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
+        });
+      }
+      case "Borrow": {
+        return lendingAccountBorrow(this.umi, {
+          amount: args.fields[0],
+          signer: this.signer,
+          destinationTokenAccount: publicKey(this.signerDebtTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiDebtBankAccounts.bank),
+          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
+          bankLiquidityVaultAuthority: publicKey(this.marginfiDebtBankAccounts.vaultAuthority),
+        });
+      }
+      case "Repay": {
+        return lendingAccountRepay(this.umi, {
+          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          repayAll: args.fields[0].__kind === "All" ? true : false,
+          signer: this.signer,
+          signerTokenAccount: publicKey(this.signerDebtTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiDebtBankAccounts.bank),
+          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
+        });
+      }
+      case "Withdraw": {
+        return lendingAccountWithdraw(this.umi, {
+          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          withdrawAll: args.fields[0].__kind === "All" ? true : false,
+          signer: this.signer,
+          destinationTokenAccount: publicKey(this.signerSupplyTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiSupplyBankAccounts.bank),
+          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
+          bankLiquidityVaultAuthority: publicKey(this.marginfiSupplyBankAccounts.vaultAuthority),
+        });
+      }
+    }
   }
 
-  private marginfiProtocolInteractionIx(
+  private marginfiSolautoProtocolInteractionIx(
     args: SolautoActionArgs
   ): TransactionBuilder {
-    let sourceSupplyTa: UmiPublicKey | undefined = undefined;
+    let positionSupplyTa: UmiPublicKey | undefined = undefined;
     let vaultSupplyTa: UmiPublicKey | undefined = undefined;
     let supplyVaultAuthority: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Deposit" || args.__kind === "Withdraw") {
-      sourceSupplyTa = publicKey(
+      positionSupplyTa = publicKey(
         args.__kind === "Withdraw" || this.selfManaged
-          ? this.signerSupplyLiquidityTa
-          : this.positionSupplyLiquidityTa
+          ? this.signerSupplyTa
+          : this.positionSupplyTa
       );
       vaultSupplyTa = publicKey(this.marginfiSupplyBankAccounts.liquidityVault);
       supplyVaultAuthority = publicKey(
@@ -280,14 +336,14 @@ export class SolautoMarginfiClient extends SolautoClient {
       );
     }
 
-    let sourceDebtTa: UmiPublicKey | undefined = undefined;
+    let positionDebtTa: UmiPublicKey | undefined = undefined;
     let vaultDebtTa: UmiPublicKey | undefined = undefined;
     let debtVaultAuthority: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Borrow" || args.__kind === "Repay") {
-      sourceDebtTa = publicKey(
+      positionDebtTa = publicKey(
         args.__kind === "Borrow" || this.selfManaged
-          ? this.signerDebtLiquidityTa
-          : this.positionDebtLiquidityTa
+          ? this.signerDebtTa
+          : this.positionDebtTa
       );
       vaultDebtTa = publicKey(this.marginfiDebtBankAccounts.liquidityVault);
       debtVaultAuthority = publicKey(
@@ -312,12 +368,12 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiAccount: publicKey(this.marginfiAccountPk),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle,
-      sourceSupplyTa,
+      positionSupplyTa,
       vaultSupplyTa,
       supplyVaultAuthority,
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       debtPriceOracle,
-      sourceDebtTa,
+      positionDebtTa,
       vaultDebtTa,
       debtVaultAuthority,
       solautoAction: args,
@@ -356,14 +412,16 @@ export class SolautoMarginfiClient extends SolautoClient {
       ),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
-      positionSupplyTa: publicKey(this.positionSupplyLiquidityTa),
+      positionSupplyTa: publicKey(this.positionSupplyTa),
+      signerSupplyTa: this.selfManaged ? publicKey(this.signerSupplyTa) : undefined,
       vaultSupplyTa: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
       supplyVaultAuthority: publicKey(
         this.marginfiSupplyBankAccounts.vaultAuthority
       ),
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       debtPriceOracle: publicKey(this.marginfiDebtBankAccounts.priceOracle),
-      positionDebtTa: publicKey(this.positionDebtLiquidityTa),
+      positionDebtTa: publicKey(this.positionDebtTa),
+      signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
       vaultDebtTa: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
       debtVaultAuthority: publicKey(
         this.marginfiDebtBankAccounts.vaultAuthority

package/src/generated/instructions/closePosition.ts

@@ -33,11 +33,11 @@ export type ClosePositionInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ataProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
-  signerSupplyLiquidityTa: PublicKey | Pda;
-  positionSupplyLiquidityTa: PublicKey | Pda;
+  signerSupplyTa: PublicKey | Pda;
+  positionSupplyTa: PublicKey | Pda;
   positionSupplyCollateralTa?: PublicKey | Pda;
-  positionDebtLiquidityTa: PublicKey | Pda;
-  signerDebtLiquidityTa: PublicKey | Pda;
+  positionDebtTa: PublicKey | Pda;
+  signerDebtTa: PublicKey | Pda;
 };
 
 // Data.
@@ -102,30 +102,30 @@ export function closePosition(
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
-    signerSupplyLiquidityTa: {
+    signerSupplyTa: {
       index: 5,
       isWritable: true as boolean,
-      value: input.signerSupplyLiquidityTa ?? null,
+      value: input.signerSupplyTa ?? null,
     },
-    positionSupplyLiquidityTa: {
+    positionSupplyTa: {
       index: 6,
       isWritable: true as boolean,
-      value: input.positionSupplyLiquidityTa ?? null,
+      value: input.positionSupplyTa ?? null,
     },
     positionSupplyCollateralTa: {
       index: 7,
       isWritable: true as boolean,
       value: input.positionSupplyCollateralTa ?? null,
     },
-    positionDebtLiquidityTa: {
+    positionDebtTa: {
       index: 8,
       isWritable: true as boolean,
-      value: input.positionDebtLiquidityTa ?? null,
+      value: input.positionDebtTa ?? null,
     },
-    signerDebtLiquidityTa: {
+    signerDebtTa: {
       index: 9,
       isWritable: true as boolean,
-      value: input.signerDebtLiquidityTa ?? null,
+      value: input.signerDebtTa ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;
 

package/src/generated/instructions/marginfiProtocolInteraction.ts

@@ -45,12 +45,12 @@ export type MarginfiProtocolInteractionInstructionAccounts = {
   marginfiAccount: PublicKey | Pda;
   supplyBank: PublicKey | Pda;
   supplyPriceOracle?: PublicKey | Pda;
-  sourceSupplyTa?: PublicKey | Pda;
+  positionSupplyTa?: PublicKey | Pda;
   vaultSupplyTa?: PublicKey | Pda;
   supplyVaultAuthority?: PublicKey | Pda;
   debtBank: PublicKey | Pda;
   debtPriceOracle?: PublicKey | Pda;
-  sourceDebtTa?: PublicKey | Pda;
+  positionDebtTa?: PublicKey | Pda;
   vaultDebtTa?: PublicKey | Pda;
   debtVaultAuthority?: PublicKey | Pda;
 };
@@ -157,10 +157,10 @@ export function marginfiProtocolInteraction(
       isWritable: false as boolean,
       value: input.supplyPriceOracle ?? null,
     },
-    sourceSupplyTa: {
+    positionSupplyTa: {
       index: 11,
       isWritable: true as boolean,
-      value: input.sourceSupplyTa ?? null,
+      value: input.positionSupplyTa ?? null,
     },
     vaultSupplyTa: {
       index: 12,
@@ -182,10 +182,10 @@ export function marginfiProtocolInteraction(
       isWritable: false as boolean,
       value: input.debtPriceOracle ?? null,
     },
-    sourceDebtTa: {
+    positionDebtTa: {
       index: 16,
       isWritable: true as boolean,
-      value: input.sourceDebtTa ?? null,
+      value: input.positionDebtTa ?? null,
     },
     vaultDebtTa: {
       index: 17,

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

@@ -40,11 +40,19 @@ import {
   rpcAccountCreated,
 } from "../utils/generalUtils";
 import { SolautoMarginfiClient } from "../clients/solautoMarginfiClient";
-import { getMaxLiqUtilizationRate, uint8ArrayToBigInt } from "../utils/numberUtils";
 import {
-  eligibileForRebalance,
-} from "../utils/solauto/generalUtils";
+  getMaxLiqUtilizationRate,
+  uint8ArrayToBigInt,
+} from "../utils/numberUtils";
+import { eligibileForRebalance } from "../utils/solauto/generalUtils";
 import { getTokenAccount } from "../utils/accountUtils";
+import {
+  getLendingAccountBorrowInstructionDataSerializer,
+  getLendingAccountDepositInstructionDataSerializer,
+  getLendingAccountRepayInstructionDataSerializer,
+  getLendingAccountWithdrawInstructionDataSerializer,
+  MARGINFI_PROGRAM_ID,
+} from "../marginfi-sdk";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -76,12 +84,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 +128,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 +141,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 +184,8 @@ async function transactionChoresBefore(
     }
 
     const tokenAccount = isSolautoAction("Withdraw", solautoAction)
-      ? client.signerSupplyLiquidityTa
-      : client.signerDebtLiquidityTa;
+      ? client.signerSupplyTa
+      : client.signerDebtTa;
     if (accountsGettingCreated.includes(tokenAccount.toString())) {
       continue;
     }
@@ -235,10 +243,7 @@ export async function rebalanceChoresBefore(
   let chores = transactionBuilder();
 
   if (checkReferralSupplyTa && !rpcAccountCreated(referredBySupplyTa)) {
-    client.log(
-      "Creating referred-by TA for ",
-      client.supplyMint.toString()
-    );
+    client.log("Creating referred-by TA for ", client.supplyMint.toString());
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
@@ -249,10 +254,7 @@ export async function rebalanceChoresBefore(
   }
 
   if (checkSolautoFeesTa && !rpcAccountCreated(solautoFeesSupplyTa)) {
-    client.log(
-      "Creating Solauto fees TA for ",
-      client.supplyMint.toString()
-    );
+    client.log("Creating Solauto fees TA for ", client.supplyMint.toString());
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
@@ -304,25 +306,127 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
   let solautoActions: SolautoAction[] = [];
 
   tx.getInstructions().forEach((x) => {
-    if (x.programId !== SOLAUTO_PROGRAM_ID) {
-      return;
-    }
-
-    try {
-      const serializer =
-        getMarginfiProtocolInteractionInstructionDataSerializer();
-      const discriminator = uint8ArrayToBigInt(
-        serializer
+    if (x.programId === SOLAUTO_PROGRAM_ID) {
+      try {
+        const serializer =
+          getMarginfiProtocolInteractionInstructionDataSerializer();
+        const discriminator = serializer
           .serialize({
             solautoAction: solautoAction("Deposit", [BigInt(0)]),
           })
-          .slice(0, 8)
-      );
-      const [data, _] = serializer.deserialize(x.data);
-      if (BigInt(data.discriminator) === discriminator) {
-        solautoActions?.push(data.solautoAction);
-      }
-    } catch {}
+          .slice(0, 1)[0];
+        const [data, _] = serializer.deserialize(x.data);
+        if (data.discriminator === discriminator) {
+          solautoActions?.push(data.solautoAction);
+        }
+      } catch {}
+    }
+
+    if (x.programId === MARGINFI_PROGRAM_ID) {
+      try {
+        const serializer = getLendingAccountDepositInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Deposit",
+            fields: [data.amount],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountBorrowInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Borrow",
+            fields: [data.amount],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountWithdrawInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+              withdrawAll: false,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Withdraw",
+            fields: [
+              data.withdrawAll
+                ? {
+                    __kind: "All",
+                  }
+                : {
+                    __kind: "Some",
+                    fields: [data.amount],
+                  },
+            ],
+          });
+        }
+      } catch {}
+
+      try {
+        const serializer = getLendingAccountRepayInstructionDataSerializer();
+        const discriminator = uint8ArrayToBigInt(
+          serializer
+            .serialize({
+              amount: 0,
+              repayAll: false,
+            })
+            .slice(0, 8)
+        );
+        const [data, _] = serializer.deserialize(x.data);
+        if (
+          uint8ArrayToBigInt(new Uint8Array(data.discriminator)) ===
+          discriminator
+        ) {
+          solautoActions?.push({
+            __kind: "Repay",
+            fields: [
+              data.repayAll
+                ? {
+                    __kind: "All",
+                  }
+                : {
+                    __kind: "Some",
+                    fields: [data.amount],
+                  },
+            ],
+          });
+        }
+      } catch {}
+    }
 
     // TODO support other platforms
   });
@@ -483,7 +587,7 @@ export async function buildSolautoRebalanceTransaction(
 export async function convertReferralFeesToDestination(
   umi: Umi,
   referralState: ReferralState,
-  tokenAccount: SplTokenAccount,
+  tokenAccount: SplTokenAccount
 ): Promise<[TransactionBuilder, string[]]> {
   const { lookupTableAddresses, setupInstructions, swapIx } =
     await getJupSwapTransaction(umi.identity, {

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;
+}