@haven-fi/solauto-sdk 1.0.215 → 1.0.216

package/dist/clients/referralStateManager.d.ts

@@ -3,20 +3,22 @@ import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 import { ReferralState } from "../generated";
 import { TxHandler } from "./txHandler";
-interface ReferralStateManagerArgs {
+export interface ReferralStateManagerArgs {
     signer?: Signer;
     wallet?: WalletAdapter;
-    referralAuthority?: PublicKey;
+    authority?: PublicKey;
     referredByAuthority?: PublicKey;
 }
 export declare class ReferralStateManager extends TxHandler {
     localTest?: boolean | undefined;
     umi: Umi;
     signer: Signer;
-    referralAuthority: PublicKey;
+    authority: PublicKey;
     referralState: PublicKey;
     referralStateData: ReferralState | null;
-    constructor(heliusApiUrl: string, localTest?: boolean | undefined);
+    referredBy?: PublicKey;
+    referredByState?: PublicKey;
+    constructor(rpcUrl: string, localTest?: boolean | undefined);
     initialize(args: ReferralStateManagerArgs): Promise<void>;
     defaultLookupTables(): string[];
     setReferredBy(referredBy?: PublicKey): void;
@@ -24,5 +26,4 @@ export declare class ReferralStateManager extends TxHandler {
     claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder;
     resetLiveTxUpdates(success?: boolean): Promise<void>;
 }
-export {};
 //# sourceMappingURL=referralStateManager.d.ts.map

package/dist/clients/referralStateManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAEL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAGL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,UAAU,wBAAwB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAUxC,SAAS,CAAC,EAAE,OAAO;IATrB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAEhB,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;gBAG9C,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAUtB,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAuB/C,mBAAmB,IAAI,MAAM,EAAE;IASxB,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAqB3C,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,GAAG,kBAAkB;IA8B3D,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}
+{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAEL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAGL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAaxC,SAAS,CAAC,EAAE,OAAO;IAZrB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAEhB,SAAS,EAAG,SAAS,CAAC;IACtB,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;IAEzC,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,eAAe,CAAC,EAAE,SAAS,CAAC;gBAGjC,MAAM,EAAE,MAAM,EACP,SAAS,CAAC,EAAE,OAAO,YAAA;IAUtB,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAwB/C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAmBpC,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,GAAG,kBAAkB;IA8B3D,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}

package/dist/clients/referralStateManager.js

@@ -11,8 +11,8 @@ const utils_1 = require("../utils");
 const txHandler_1 = require("./txHandler");
 const constants_1 = require("../constants");
 class ReferralStateManager extends txHandler_1.TxHandler {
-    constructor(heliusApiUrl, localTest) {
-        super(heliusApiUrl, localTest);
+    constructor(rpcUrl, localTest) {
+        super(rpcUrl, localTest);
         this.localTest = localTest;
         this.umi = this.umi.use({
             install(umi) {
@@ -28,7 +28,8 @@ class ReferralStateManager extends txHandler_1.TxHandler {
             ? (0, umi_1.signerIdentity)(args.signer)
             : (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
         this.signer = this.umi.identity;
-        this.referralState = (0, utils_1.getReferralState)(args.referralAuthority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey));
+        this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
+        this.referralState = (0, utils_1.getReferralState)(args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey));
         this.referralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.referralState), { commitment: "confirmed" });
         this.setReferredBy(args.referredByAuthority);
     }
@@ -39,10 +40,8 @@ class ReferralStateManager extends txHandler_1.TxHandler {
             : [constants_1.SOLAUTO_LUT];
     }
     setReferredBy(referredBy) {
-        const authorityReferralStateData = this.referralStateData;
-        const hasReferredBy = authorityReferralStateData &&
-            authorityReferralStateData.referredByState !==
-                (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
+        const hasReferredBy = this.referralStateData &&
+            this.referralStateData.referredByState !== (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
         const finalReferredBy = !hasReferredBy &&
             referredBy &&
             !referredBy.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
@@ -51,8 +50,8 @@ class ReferralStateManager extends txHandler_1.TxHandler {
         this.referredBy = finalReferredBy;
         this.referredByState = finalReferredBy
             ? (0, utils_1.getReferralState)(finalReferredBy)
-            : authorityReferralStateData
-                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.referredByState)
+            : this.referralStateData
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.referredByState)
                 : undefined;
     }
     updateReferralStatesIx(destFeesMint, lookupTable) {
@@ -78,7 +77,7 @@ class ReferralStateManager extends txHandler_1.TxHandler {
         return (0, generated_1.claimReferralFees)(this.umi, {
             signer: this.signer,
             signerWsolTa: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), spl_token_1.NATIVE_MINT)),
-            referralAuthority: (0, umi_1.publicKey)(this.referralAuthority),
+            referralAuthority: (0, umi_1.publicKey)(this.authority),
             referralState: (0, umi_1.publicKey)(this.referralState),
             referralFeesDestTa: (0, umi_1.publicKey)(referralDestTa),
             referralFeesDestMint: (0, umi_1.publicKey)(referralFeesDestMint),

package/dist/clients/solautoClient.d.ts

@@ -1,25 +1,19 @@
 import "rpc-websockets/dist/lib/client";
 import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
-import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 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 declare abstract class SolautoClient extends TxHandler {
-    lendingPlatform: LendingPlatform;
+export declare abstract class SolautoClient extends ReferralStateManager {
+    lendingPlatform?: LendingPlatform;
     authority: PublicKey;
     signer: Signer;
     positionId: number;
@@ -35,15 +29,12 @@ export declare abstract class SolautoClient extends TxHandler {
     debtMint: PublicKey;
     positionDebtTa: PublicKey;
     signerDebtTa: PublicKey;
-    referralStateManager: ReferralStateManager;
-    referredBySupplyTa?: PublicKey;
     solautoFeesWallet: PublicKey;
     solautoFeesSupplyTa: PublicKey;
     authorityLutAddress?: PublicKey;
     livePositionUpdates: LivePositionUpdates;
-    constructor(rpcUrl: string, localTest?: boolean);
-    initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform): Promise<void>;
-    setReferredBy(referredBy?: PublicKey): void;
+    initialize(args: SolautoClientArgs): Promise<void>;
+    referredBySupplyTa(): PublicKey | undefined;
     resetLiveTxUpdates(success?: boolean): Promise<void>;
     abstract protocolAccount(): PublicKey;
     defaultLookupTables(): string[];

package/dist/clients/solautoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoClient.js

@@ -5,7 +5,6 @@ require("rpc-websockets/dist/lib/client");
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
-const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
 const generated_1 = require("../generated");
 const accountUtils_1 = require("../utils/accountUtils");
 const generalAccounts_1 = require("../constants/generalAccounts");
@@ -14,29 +13,15 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const generalUtils_1 = require("../utils/generalUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
 const referralStateManager_1 = require("./referralStateManager");
-const txHandler_1 = require("./txHandler");
-class SolautoClient extends txHandler_1.TxHandler {
-    constructor(rpcUrl, localTest) {
-        super(rpcUrl, localTest);
+class SolautoClient extends referralStateManager_1.ReferralStateManager {
+    constructor() {
+        super(...arguments);
         this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
-        this.umi = this.umi.use({
-            install(umi) {
-                umi.programs.add((0, generated_1.createSolautoProgram)(), false);
-            },
-        });
     }
-    async initialize(args, lendingPlatform) {
-        if (!args.signer && !args.wallet) {
-            throw new Error("Signer or wallet must be provided");
-        }
-        this.umi = this.umi.use(args.signer
-            ? (0, umi_1.signerIdentity)(args.signer)
-            : (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
-        this.signer = this.umi.identity;
-        this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
+    async initialize(args) {
+        await super.initialize(args);
         this.positionId = args.positionId ?? 0;
         this.selfManaged = this.positionId === 0;
-        this.lendingPlatform = lendingPlatform;
         this.solautoPosition = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
         this.solautoPositionData = !args.new
             ? await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition), { commitment: "confirmed" })
@@ -58,24 +43,12 @@ class SolautoClient extends txHandler_1.TxHandler {
                     : web3_js_1.PublicKey.default);
         this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
         this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
-        this.referralStateManager = new referralStateManager_1.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 = (0, accountUtils_1.getTokenAccount)(this.referralStateManager.referredByState, this.supplyMint);
-        }
         this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
         this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyMint);
-        const authorityReferralStateData = this.referralStateManager.referralStateData;
         this.authorityLutAddress =
-            authorityReferralStateData?.lookupTable &&
-                !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
-                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.lookupTable)
+            this.referralStateData?.lookupTable &&
+                !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable)
                 : undefined;
         this.log("Position state: ", this.solautoPositionState);
         this.log("Position settings: ", this.solautoPositionData?.position?.settingParams);
@@ -84,11 +57,11 @@ class SolautoClient extends txHandler_1.TxHandler {
             ? this.solautoPositionData?.position?.dca
             : undefined);
     }
-    setReferredBy(referredBy) {
-        this.referralStateManager.setReferredBy(referredBy);
-        if (this.referralStateManager.referredByState !== undefined) {
-            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referralStateManager.referredByState, this.supplyMint);
+    referredBySupplyTa() {
+        if (this.referredByState !== undefined) {
+            return (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyMint);
         }
+        return undefined;
     }
     async resetLiveTxUpdates(success) {
         if (success) {
@@ -129,8 +102,8 @@ class SolautoClient extends txHandler_1.TxHandler {
             this.solautoPosition,
             this.positionSupplyTa,
             this.positionDebtTa,
-            this.referralStateManager.referralState,
-            ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
+            this.referralState,
+            ...(this.referredBySupplyTa() ? [this.referredBySupplyTa()] : []),
         ];
     }
     async fetchExistingAuthorityLutAccounts() {
@@ -172,7 +145,7 @@ class SolautoClient extends txHandler_1.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...");
         }

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA6D1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAqErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA6ClE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA+D1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAqErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA6ClE"}

package/dist/clients/solautoMarginfiClient.js

@@ -19,7 +19,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiAccountSeedIdx = BigInt(0);
     }
     async initialize(args) {
-        await super.initialize(args, generated_1.LendingPlatform.Marginfi);
+        await super.initialize(args);
+        this.lendingPlatform = generated_1.LendingPlatform.Marginfi;
         if (this.selfManaged) {
             this.marginfiAccount =
                 args.marginfiAccount ??
@@ -135,12 +136,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         return (0, generated_1.marginfiOpenPosition)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
-            signerReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
-            referredByState: this.referralStateManager.referredByState
-                ? (0, umi_1.publicKey)(this.referralStateManager.referredByState)
+            signerReferralState: (0, umi_1.publicKey)(this.referralState),
+            referredByState: this.referredByState
+                ? (0, umi_1.publicKey)(this.referredByState)
                 : undefined,
-            referredBySupplyTa: this.referredBySupplyTa
-                ? (0, umi_1.publicKey)(this.referredBySupplyTa)
+            referredBySupplyTa: this.referredBySupplyTa()
+                ? (0, umi_1.publicKey)(this.referredBySupplyTa())
                 : undefined,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
@@ -299,9 +300,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             solautoFeesSupplyTa: rebalanceStep === "B" ? (0, umi_1.publicKey)(this.solautoFeesSupplyTa) : undefined,
-            authorityReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
-            referredBySupplyTa: this.referredBySupplyTa
-                ? (0, umi_1.publicKey)(this.referredBySupplyTa)
+            authorityReferralState: (0, umi_1.publicKey)(this.referralState),
+            referredBySupplyTa: this.referredBySupplyTa()
+                ? (0, umi_1.publicKey)(this.referredBySupplyTa())
                 : undefined,
             positionAuthority: (0, umi_1.publicKey)(this.authority),
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),

package/dist/clients/txHandler.d.ts

@@ -1,15 +1,12 @@
 import { Umi } from "@metaplex-foundation/umi";
-import { Connection, PublicKey } from "@solana/web3.js";
+import { Connection } from "@solana/web3.js";
 export declare abstract class TxHandler {
     rpcUrl: string;
     umi: Umi;
     connection: Connection;
-    referredBy?: PublicKey;
-    referredByState?: PublicKey;
     constructor(rpcUrl: string, localTest?: boolean);
     log(...args: any[]): void;
     abstract defaultLookupTables(): string[];
     abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
-    abstract setReferredBy(referredBy?: PublicKey): void;
 }
 //# sourceMappingURL=txHandler.d.ts.map

package/dist/clients/txHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGxD,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;IAExB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,eAAe,CAAC,EAAE,SAAS,CAAC;gBAGjC,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,OAAO;IAYrB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7D,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,IAAI;CACrD"}
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAa,MAAM,iBAAiB,CAAC;AAGxD,8BAAsB,SAAS;IACtB,MAAM,EAAG,MAAM,CAAC;IAChB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAG7B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,OAAO;IAYrB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAuBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAyLjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBA4CzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkH5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAuBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAyCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqLjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAiH7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBA2CzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkH5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}

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());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.215",
+  "version": "1.0.216",
   "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";
@@ -50,25 +43,21 @@ import {
 } 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...");

package/src/clients/solautoMarginfiClient.ts

@@ -85,7 +85,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 +264,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),
@@ -472,10 +474,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       solautoFeesSupplyTa:
         rebalanceStep === "B" ? publicKey(this.solautoFeesSupplyTa) : undefined,
       authorityReferralState: publicKey(
-        this.referralStateManager.referralState
+        this.referralState
       ),
-      referredBySupplyTa: this.referredBySupplyTa
-        ? publicKey(this.referredBySupplyTa)
+      referredBySupplyTa: this.referredBySupplyTa()
+        ? publicKey(this.referredBySupplyTa()!)
         : undefined,
       positionAuthority: publicKey(this.authority),
       solautoPosition: publicKey(this.solautoPosition),

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/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
       )
     );

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"
       )
     );