@haven-fi/solauto-sdk 1.0.215 → 1.0.217

package/dist/transactions/transactionUtils.js

@@ -51,14 +51,13 @@ function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn)
 }
 async function transactionChoresBefore(client, accountsGettingCreated, solautoActions, initiatingDcaIn) {
     let chores = (0, umi_1.transactionBuilder)();
-    if (client.referralStateManager.referralStateData === null ||
-        (client.referralStateManager.referredBy !== undefined &&
-            client.referralStateManager.referralStateData?.referredByState ===
+    if (client.referralStateData === null ||
+        (client.referredBy !== undefined &&
+            client.referralStateData?.referredByState ===
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default)) ||
         (client.authorityLutAddress !== undefined &&
-            client.referralStateManager.referralStateData.lookupTable ==
-                (0, umi_1.publicKey)(web3_js_1.PublicKey.default))) {
-        chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.authorityLutAddress));
+            client.referralStateData.lookupTable == (0, umi_1.publicKey)(web3_js_1.PublicKey.default))) {
+        chores = chores.add(client.updateReferralStatesIx(undefined, client.authorityLutAddress));
     }
     if (client.selfManaged) {
         if (client.solautoPositionData === null) {
@@ -127,14 +126,16 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     const usesAccount = (key) => tx
         .getInstructions()
         .some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
-    const checkReferralSupplyTa = client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
+    const checkReferralSupplyTa = client.referredBySupplyTa() && usesAccount(client.referredBySupplyTa());
     const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
     const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
         usesAccount(client.intermediaryMarginfiAccountPk);
     const checkSignerSupplyTa = usesAccount(client.signerSupplyTa);
     const checkSignerDebtTa = usesAccount(client.signerDebtTa);
     const accountsNeeded = [
-        ...[checkReferralSupplyTa ? client.referredBySupplyTa : web3_js_1.PublicKey.default],
+        ...[
+            checkReferralSupplyTa ? client.referredBySupplyTa() : web3_js_1.PublicKey.default,
+        ],
         ...[checkSolautoFeesTa ? client.solautoFeesSupplyTa : web3_js_1.PublicKey.default],
         ...[
             checkIntermediaryMfiAccount
@@ -148,7 +149,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by TA for ", client.supplyMint.toString());
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referralStateManager.referredByState, client.supplyMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.supplyMint));
     }
     if (checkSolautoFeesTa && !(0, generalUtils_1.rpcAccountCreated)(solautoFeesSupplyTa)) {
         client.log("Creating Solauto fees TA for ", client.supplyMint.toString());
@@ -380,11 +381,11 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
             client.flashBorrow(flashLoan, (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), swapDetails.inputMint)),
             ...(addFirstRebalance
                 ? [
-                    client.rebalance("A", jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
+                    client.rebalance("A", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps),
                 ]
                 : []),
             swapIx,
-            client.rebalance("B", jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
+            client.rebalance("B", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps),
             client.flashRepay(flashLoan),
         ]);
     }
@@ -393,9 +394,9 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         tx = tx.add([
             setupInstructions,
             tokenLedgerIx,
-            client.rebalance("A", jupQuote, rebalanceType, undefined, targetLiqUtilizationRateBps),
+            client.rebalance("A", jupQuote, rebalanceType, values, undefined, targetLiqUtilizationRateBps),
             swapIx,
-            client.rebalance("B", jupQuote, rebalanceType, undefined, targetLiqUtilizationRateBps),
+            client.rebalance("B", jupQuote, rebalanceType, values, undefined, targetLiqUtilizationRateBps),
         ]);
     }
     return {

package/dist/utils/solauto/rebalanceUtils.d.ts

@@ -3,6 +3,7 @@ import { SolautoClient } from "../../clients/solautoClient";
 import { DCASettings, PositionState, SolautoSettingsParameters, TokenType } from "../../generated";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
+import { RebalanceAction } from "../../types";
 export interface RebalanceValues {
     increasingLeverage: boolean;
     debtAdjustmentUsd: number;
@@ -10,6 +11,7 @@ export interface RebalanceValues {
     amountToDcaIn: number;
     amountUsdToDcaIn: number;
     dcaTokenType?: TokenType;
+    rebalanceAction: RebalanceAction;
 }
 export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): RebalanceValues;
 export interface FlashLoanDetails {

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA8IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAiDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAkI9C,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAmDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -100,6 +100,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         amountToDcaIn: amountToDcaIn ?? 0,
         amountUsdToDcaIn,
         dcaTokenType: dca?.tokenType,
+        rebalanceAction: (amountToDcaIn ?? 0) > 0 ? "dca" : increasingLeverage ? "boost" : "repay",
     };
 }
 function getFlashLoanDetails(client, values, jupQuote) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.215",
+  "version": "1.0.217",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/clients/referralStateManager.ts

@@ -23,10 +23,10 @@ import { getReferralState, getTokenAccount } from "../utils";
 import { TxHandler } from "./txHandler";
 import { SOLAUTO_LUT } from "../constants";
 
-interface ReferralStateManagerArgs {
+export interface ReferralStateManagerArgs {
   signer?: Signer;
   wallet?: WalletAdapter;
-  referralAuthority?: PublicKey;
+  authority?: PublicKey;
   referredByAuthority?: PublicKey;
 }
 
@@ -34,15 +34,18 @@ export class ReferralStateManager extends TxHandler {
   public umi!: Umi;
   public signer!: Signer;
 
-  public referralAuthority!: PublicKey;
+  public authority!: PublicKey;
   public referralState!: PublicKey;
   public referralStateData!: ReferralState | null;
 
+  public referredBy?: PublicKey;
+  public referredByState?: PublicKey;
+
   constructor(
-    heliusApiUrl: string,
+    rpcUrl: string,
     public localTest?: boolean
   ) {
-    super(heliusApiUrl, localTest);
+    super(rpcUrl, localTest);
     this.umi = this.umi.use({
       install(umi) {
         umi.programs.add(createSolautoProgram(), false);
@@ -59,10 +62,11 @@ export class ReferralStateManager extends TxHandler {
         ? signerIdentity(args.signer)
         : walletAdapterIdentity(args.wallet!, true)
     );
-
     this.signer = this.umi.identity;
+    this.authority = args.authority ?? toWeb3JsPublicKey(this.signer.publicKey);
+
     this.referralState = getReferralState(
-      args.referralAuthority ?? toWeb3JsPublicKey(this.signer.publicKey)
+      args.authority ?? toWeb3JsPublicKey(this.signer.publicKey)
     );
     this.referralStateData = await safeFetchReferralState(
       this.umi,
@@ -82,12 +86,10 @@ export class ReferralStateManager extends TxHandler {
       : [SOLAUTO_LUT];
   }
 
-  public setReferredBy(referredBy?: PublicKey) {
-    const authorityReferralStateData = this.referralStateData;
+  setReferredBy(referredBy?: PublicKey) {
     const hasReferredBy =
-      authorityReferralStateData &&
-      authorityReferralStateData.referredByState !==
-        publicKey(PublicKey.default);
+      this.referralStateData &&
+      this.referralStateData.referredByState !== publicKey(PublicKey.default);
     const finalReferredBy =
       !hasReferredBy &&
       referredBy &&
@@ -98,8 +100,8 @@ export class ReferralStateManager extends TxHandler {
     this.referredBy = finalReferredBy;
     this.referredByState = finalReferredBy
       ? getReferralState(finalReferredBy)
-      : authorityReferralStateData
-        ? toWeb3JsPublicKey(authorityReferralStateData.referredByState)
+      : this.referralStateData
+        ? toWeb3JsPublicKey(this.referralStateData.referredByState)
         : undefined;
   }
 
@@ -143,7 +145,7 @@ export class ReferralStateManager extends TxHandler {
       signerWsolTa: publicKey(
         getTokenAccount(toWeb3JsPublicKey(this.signer.publicKey), NATIVE_MINT)
       ),
-      referralAuthority: publicKey(this.referralAuthority),
+      referralAuthority: publicKey(this.authority),
       referralState: publicKey(this.referralState),
       referralFeesDestTa: publicKey(referralDestTa),
       referralFeesDestMint: publicKey(referralFeesDestMint),

package/src/clients/solautoClient.ts

@@ -8,13 +8,8 @@ import {
   PublicKey as UmiPublicKey,
   isSome,
   transactionBuilder,
-  signerIdentity,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import {
-  WalletAdapter,
-  walletAdapterIdentity,
-} from "@metaplex-foundation/umi-signer-wallet-adapters";
 import {
   DCASettings,
   DCASettingsInpArgs,
@@ -29,12 +24,10 @@ import {
   UpdatePositionDataArgs,
   cancelDCA,
   closePosition,
-  createSolautoProgram,
   safeFetchSolautoPosition,
   updatePosition,
 } from "../generated";
 import {
-  getReferralState,
   getSolautoPositionAccount,
   getTokenAccount,
 } from "../utils/accountUtils";
@@ -43,32 +36,28 @@ import {
   getWrappedInstruction,
   splTokenTransferUmiIx,
 } from "../utils/solanaUtils";
-import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
+import { FlashLoanDetails, RebalanceValues } from "../utils/solauto/rebalanceUtils";
 import {
   MIN_POSITION_STATE_FRESHNESS_SECS,
   SOLAUTO_LUT,
 } from "../constants/solautoConstants";
 import { currentUnixSeconds } from "../utils/generalUtils";
 import { LivePositionUpdates } from "../utils/solauto/generalUtils";
-import { ReferralStateManager } from "./referralStateManager";
-import { TxHandler } from "./txHandler";
+import {
+  ReferralStateManager,
+  ReferralStateManagerArgs,
+} from "./referralStateManager";
 import { QuoteResponse } from "@jup-ag/api";
 
-export interface SolautoClientArgs {
+export interface SolautoClientArgs extends ReferralStateManagerArgs {
   new?: boolean;
-  authority?: PublicKey;
   positionId?: number;
-  signer?: Signer;
-  wallet?: WalletAdapter;
-
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
-
-  referredByAuthority?: PublicKey;
 }
 
-export abstract class SolautoClient extends TxHandler {
-  public lendingPlatform!: LendingPlatform;
+export abstract class SolautoClient extends ReferralStateManager {
+  public lendingPlatform?: LendingPlatform;
 
   public authority!: PublicKey;
   public signer!: Signer;
@@ -90,9 +79,6 @@ export abstract class SolautoClient extends TxHandler {
   public positionDebtTa!: PublicKey;
   public signerDebtTa!: PublicKey;
 
-  public referralStateManager!: ReferralStateManager;
-  public referredBySupplyTa?: PublicKey;
-
   public solautoFeesWallet!: PublicKey;
   public solautoFeesSupplyTa!: PublicKey;
 
@@ -100,32 +86,11 @@ export abstract class SolautoClient extends TxHandler {
 
   public livePositionUpdates: LivePositionUpdates = new LivePositionUpdates();
 
-  constructor(rpcUrl: string, localTest?: boolean) {
-    super(rpcUrl, localTest);
-
-    this.umi = this.umi.use({
-      install(umi) {
-        umi.programs.add(createSolautoProgram(), false);
-      },
-    });
-  }
-
-  async initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform) {
-    if (!args.signer && !args.wallet) {
-      throw new Error("Signer or wallet must be provided");
-    }
-    this.umi = this.umi.use(
-      args.signer
-        ? signerIdentity(args.signer)
-        : walletAdapterIdentity(args.wallet!, true)
-    );
-
-    this.signer = this.umi.identity;
-    this.authority = args.authority ?? toWeb3JsPublicKey(this.signer.publicKey);
+  async initialize(args: SolautoClientArgs) {
+    await super.initialize(args);
 
     this.positionId = args.positionId ?? 0;
     this.selfManaged = this.positionId === 0;
-    this.lendingPlatform = lendingPlatform;
     this.solautoPosition = getSolautoPositionAccount(
       this.authority,
       this.positionId
@@ -167,35 +132,18 @@ export abstract class SolautoClient extends TxHandler {
       this.debtMint
     );
 
-    this.referralStateManager = new ReferralStateManager(this.rpcUrl);
-    await this.referralStateManager.initialize({
-      referralAuthority: this.authority,
-      referredByAuthority: args.referredByAuthority,
-      signer: args.signer,
-      wallet: args.wallet,
-    });
-    console.log(this.referralStateManager.referredBy?.toString());
-    if (this.referralStateManager.referredByState !== undefined) {
-      this.referredBySupplyTa = getTokenAccount(
-        this.referralStateManager.referredByState,
-        this.supplyMint
-      );
-    }
-
     this.solautoFeesWallet = SOLAUTO_FEES_WALLET;
     this.solautoFeesSupplyTa = getTokenAccount(
       this.solautoFeesWallet,
       this.supplyMint
     );
 
-    const authorityReferralStateData =
-      this.referralStateManager.referralStateData;
     this.authorityLutAddress =
-      authorityReferralStateData?.lookupTable &&
-      !toWeb3JsPublicKey(authorityReferralStateData.lookupTable).equals(
+      this.referralStateData?.lookupTable &&
+      !toWeb3JsPublicKey(this.referralStateData.lookupTable).equals(
         PublicKey.default
       )
-        ? toWeb3JsPublicKey(authorityReferralStateData.lookupTable)
+        ? toWeb3JsPublicKey(this.referralStateData.lookupTable)
         : undefined;
 
     this.log("Position state: ", this.solautoPositionState);
@@ -212,14 +160,11 @@ export abstract class SolautoClient extends TxHandler {
     );
   }
 
-  public setReferredBy(referredBy?: PublicKey) {
-    this.referralStateManager.setReferredBy(referredBy);
-    if (this.referralStateManager.referredByState !== undefined) {
-      this.referredBySupplyTa = getTokenAccount(
-        this.referralStateManager.referredByState!,
-        this.supplyMint
-      );
+  referredBySupplyTa(): PublicKey | undefined {
+    if (this.referredByState !== undefined) {
+      return getTokenAccount(this.referredByState, this.supplyMint);
     }
+    return undefined;
   }
 
   async resetLiveTxUpdates(success?: boolean) {
@@ -268,8 +213,8 @@ export abstract class SolautoClient extends TxHandler {
       this.solautoPosition,
       this.positionSupplyTa,
       this.positionDebtTa,
-      this.referralStateManager.referralState,
-      ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
+      this.referralState,
+      ...(this.referredBySupplyTa() ? [this.referredBySupplyTa()!] : []),
     ];
   }
 
@@ -333,7 +278,7 @@ export abstract class SolautoClient extends TxHandler {
     const addingReferredBy =
       accountsToAdd.length === 1 &&
       accountsToAdd[0].toString().toLowerCase() ===
-        this.referredBySupplyTa?.toString().toLowerCase();
+        this.referredBySupplyTa()?.toString().toLowerCase();
 
     if (tx.getInstructions().length > 0) {
       this.log("Updating authority lookup table...");
@@ -592,6 +537,7 @@ export abstract class SolautoClient extends TxHandler {
     rebalanceStep: "A" | "B",
     jupQuote: QuoteResponse,
     rebalanceType: SolautoRebalanceTypeArgs,
+    rebalanceValues: RebalanceValues,
     flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number
   ): TransactionBuilder;

package/src/clients/solautoMarginfiClient.ts

@@ -32,7 +32,11 @@ import {
   marginfiRebalance,
   marginfiRefreshData,
 } from "../generated";
-import { getMarginfiAccountPDA, getReferralState, getTokenAccount } from "../utils/accountUtils";
+import {
+  getMarginfiAccountPDA,
+  getReferralState,
+  getTokenAccount,
+} from "../utils/accountUtils";
 import { generateRandomU64, safeGetPrice } from "../utils/generalUtils";
 import {
   MARGINFI_PROGRAM_ID,
@@ -47,7 +51,10 @@ import {
   safeFetchAllMarginfiAccount,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
-import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
+import {
+  FlashLoanDetails,
+  RebalanceValues,
+} from "../utils/solauto/rebalanceUtils";
 import {
   findMarginfiAccounts,
   getAllMarginfiAccountsByAuthority,
@@ -85,7 +92,9 @@ export class SolautoMarginfiClient extends SolautoClient {
   public intermediaryMarginfiAccount?: MarginfiAccount;
 
   async initialize(args: SolautoMarginfiClientArgs) {
-    await super.initialize(args, LendingPlatform.Marginfi);
+    await super.initialize(args);
+
+    this.lendingPlatform = LendingPlatform.Marginfi;
 
     if (this.selfManaged) {
       this.marginfiAccount =
@@ -262,12 +271,12 @@ export class SolautoMarginfiClient extends SolautoClient {
     return marginfiOpenPosition(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
-      signerReferralState: publicKey(this.referralStateManager.referralState),
-      referredByState: this.referralStateManager.referredByState
-        ? publicKey(this.referralStateManager.referredByState)
+      signerReferralState: publicKey(this.referralState),
+      referredByState: this.referredByState
+        ? publicKey(this.referredByState)
         : undefined,
-      referredBySupplyTa: this.referredBySupplyTa
-        ? publicKey(this.referredBySupplyTa)
+      referredBySupplyTa: this.referredBySupplyTa()
+        ? publicKey(this.referredBySupplyTa()!)
         : undefined,
       solautoPosition: publicKey(this.solautoPosition),
       marginfiGroup: publicKey(this.marginfiGroup),
@@ -447,6 +456,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     rebalanceStep: "A" | "B",
     jupQuote: QuoteResponse,
     rebalanceType: SolautoRebalanceTypeArgs,
+    rebalanceValues: RebalanceValues,
     flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number
   ): TransactionBuilder {
@@ -471,13 +481,14 @@ export class SolautoMarginfiClient extends SolautoClient {
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesSupplyTa:
         rebalanceStep === "B" ? publicKey(this.solautoFeesSupplyTa) : undefined,
-      authorityReferralState: publicKey(
-        this.referralStateManager.referralState
-      ),
-      referredBySupplyTa: this.referredBySupplyTa
-        ? publicKey(this.referredBySupplyTa)
+      authorityReferralState: publicKey(this.referralState),
+      referredBySupplyTa: this.referredBySupplyTa()
+        ? publicKey(this.referredBySupplyTa()!)
         : undefined,
-      positionAuthority: publicKey(this.authority),
+      positionAuthority:
+        rebalanceValues.rebalanceAction === "dca"
+          ? publicKey(this.authority)
+          : undefined,
       solautoPosition: publicKey(this.solautoPosition),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -490,9 +501,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
       supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
-      authoritySupplyTa: publicKey(
-        getTokenAccount(this.authority, this.supplyMint)
-      ),
+      authoritySupplyTa: this.selfManaged
+        ? publicKey(getTokenAccount(this.authority, this.supplyMint))
+        : undefined,
       vaultSupplyTa: needSupplyAccounts
         ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
         : undefined,
@@ -502,9 +513,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
-      authorityDebtTa: publicKey(
-        getTokenAccount(this.authority, this.debtMint)
-      ),
+      authorityDebtTa: this.selfManaged
+        ? publicKey(getTokenAccount(this.authority, this.debtMint))
+        : undefined,
       vaultDebtTa: needDebtAccounts
         ? publicKey(this.marginfiDebtAccounts.liquidityVault)
         : undefined,

package/src/clients/txHandler.ts

@@ -7,9 +7,6 @@ export abstract class TxHandler {
   public umi!: Umi;
   public connection!: Connection;
 
-  public referredBy?: PublicKey;
-  public referredByState?: PublicKey;
-
   constructor(
     rpcUrl: string,
     localTest?: boolean
@@ -31,6 +28,4 @@ export abstract class TxHandler {
   abstract defaultLookupTables(): string[];
 
   abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
-
-  abstract setReferredBy(referredBy?: PublicKey): void;
 }

package/src/generated/instructions/marginfiRebalance.ts

@@ -46,7 +46,7 @@ export type MarginfiRebalanceInstructionAccounts = {
   solautoFeesSupplyTa?: PublicKey | Pda;
   authorityReferralState: PublicKey | Pda;
   referredBySupplyTa?: PublicKey | Pda;
-  positionAuthority: PublicKey | Pda;
+  positionAuthority?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
   marginfiGroup: PublicKey | Pda;
   marginfiAccount: PublicKey | Pda;

package/src/generated/types/index.ts

@@ -17,6 +17,7 @@ export * from './positionState';
 export * from './positionTokenUsage';
 export * from './positionType';
 export * from './rebalanceData';
+export * from './rebalanceDirection';
 export * from './solautoAction';
 export * from './solautoRebalanceType';
 export * from './solautoSettingsParameters';

package/src/generated/types/rebalanceData.ts

@@ -11,20 +11,22 @@ import {
   array,
   bytes,
   struct,
-  u16,
   u64,
   u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
+  RebalanceDirection,
+  RebalanceDirectionArgs,
   SolautoRebalanceType,
   SolautoRebalanceTypeArgs,
+  getRebalanceDirectionSerializer,
   getSolautoRebalanceTypeSerializer,
 } from '.';
 
 export type RebalanceData = {
   rebalanceType: SolautoRebalanceType;
   padding1: Array<number>;
-  targetLiqUtilizationRateBps: number;
+  rebalanceDirection: RebalanceDirection;
   padding2: Array<number>;
   flashLoanAmount: bigint;
   padding: Uint8Array;
@@ -33,7 +35,7 @@ export type RebalanceData = {
 export type RebalanceDataArgs = {
   rebalanceType: SolautoRebalanceTypeArgs;
   padding1: Array<number>;
-  targetLiqUtilizationRateBps: number;
+  rebalanceDirection: RebalanceDirectionArgs;
   padding2: Array<number>;
   flashLoanAmount: number | bigint;
   padding: Uint8Array;
@@ -47,8 +49,8 @@ export function getRebalanceDataSerializer(): Serializer<
     [
       ['rebalanceType', getSolautoRebalanceTypeSerializer()],
       ['padding1', array(u8(), { size: 7 })],
-      ['targetLiqUtilizationRateBps', u16()],
-      ['padding2', array(u8(), { size: 6 })],
+      ['rebalanceDirection', getRebalanceDirectionSerializer()],
+      ['padding2', array(u8(), { size: 7 })],
       ['flashLoanAmount', u64()],
       ['padding', bytes({ size: 32 })],
     ],

package/src/generated/types/rebalanceDirection.ts

@@ -0,0 +1,25 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+
+import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
+
+export enum RebalanceDirection {
+  Boost,
+  Repay,
+}
+
+export type RebalanceDirectionArgs = RebalanceDirection;
+
+export function getRebalanceDirectionSerializer(): Serializer<
+  RebalanceDirectionArgs,
+  RebalanceDirection
+> {
+  return scalarEnum<RebalanceDirection>(RebalanceDirection, {
+    description: 'RebalanceDirection',
+  }) as Serializer<RebalanceDirectionArgs, RebalanceDirection>;
+}