@haven-fi/solauto-sdk 1.0.81 → 1.0.83

package/dist/clients/index.d.ts

@@ -1,3 +1,4 @@
 export * from './solautoMarginfiClient';
 export * from './solautoClient';
+export * from './referralStateManager';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC"}

package/dist/clients/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./solautoMarginfiClient"), exports);
 __exportStar(require("./solautoClient"), exports);
+__exportStar(require("./referralStateManager"), exports);

package/dist/clients/referralStateManager.d.ts

@@ -0,0 +1,22 @@
+import { PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
+import { ReferralState } from "../generated";
+interface ReferralStateManagerArgs {
+    referralAuthority?: PublicKey;
+    signer?: Signer;
+    wallet?: WalletAdapter;
+}
+export declare class ReferralStateManager {
+    umi: Umi;
+    signer: Signer;
+    referralAuthority: PublicKey;
+    referralState: PublicKey;
+    referralStateData: ReferralState | null;
+    constructor(heliusApiKey: string);
+    initialize(args: ReferralStateManagerArgs): Promise<void>;
+    updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;
+    claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder;
+}
+export {};
+//# sourceMappingURL=referralStateManager.d.ts.map

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

@@ -0,0 +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,EAAa,MAAM,EAAkB,kBAAkB,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEtG,OAAO,EAAE,aAAa,EAAyB,MAAM,iDAAiD,CAAC;AACvG,OAAO,EAA2C,aAAa,EAAgD,MAAM,cAAc,CAAC;AAGpI,UAAU,wBAAwB;IAC9B,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,qBAAa,oBAAoB;IACtB,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;gBAEpC,YAAY,EAAE,MAAM;IAS1B,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAe/C,sBAAsB,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAiBrH,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,GAAG,kBAAkB;CAwBpE"}

package/dist/clients/referralStateManager.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReferralStateManager = void 0;
+const spl_token_1 = require("@solana/spl-token");
+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 utils_1 = require("../utils");
+class ReferralStateManager {
+    constructor(heliusApiKey) {
+        const [_, umi] = (0, utils_1.getSolanaRpcConnection)(heliusApiKey);
+        this.umi = umi.use({
+            install(umi) {
+                umi.programs.add((0, generated_1.createSolautoProgram)(), false);
+            },
+        });
+    }
+    async initialize(args) {
+        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.referralState = (0, utils_1.getReferralState)(args.referralAuthority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey));
+        this.referralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.referralState));
+    }
+    updateReferralStatesIx(destFeesMint, referredBy, lookupTable) {
+        return (0, generated_1.updateReferralStates)(this.umi, {
+            signer: this.signer,
+            signerReferralState: (0, umi_1.publicKey)(this.referralState),
+            referralFeesDestMint: destFeesMint ? (0, umi_1.publicKey)(destFeesMint) : null,
+            referredByState: referredBy
+                ? (0, umi_1.publicKey)((0, utils_1.getReferralState)(referredBy))
+                : undefined,
+            referredByAuthority: referredBy
+                ? (0, umi_1.publicKey)(referredBy)
+                : undefined,
+            addressLookupTable: lookupTable
+                ? (0, umi_1.publicKey)(lookupTable)
+                : null,
+        });
+    }
+    claimReferralFeesIx(destFeesMint) {
+        const referralFeesDestMint = destFeesMint ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.destFeesMint);
+        const referralDestTa = (0, utils_1.getTokenAccount)(this.referralState, referralFeesDestMint);
+        const feesDestinationTa = referralFeesDestMint !== spl_token_1.NATIVE_MINT
+            ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), referralFeesDestMint))
+            : undefined;
+        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),
+            referralState: (0, umi_1.publicKey)(this.referralState),
+            referralFeesDestTa: (0, umi_1.publicKey)(referralDestTa),
+            referralFeesDestMint: (0, umi_1.publicKey)(referralFeesDestMint),
+            feesDestinationTa,
+        });
+    }
+}
+exports.ReferralStateManager = ReferralStateManager;

package/dist/clients/solautoClient.d.ts

@@ -2,10 +2,11 @@ import "rpc-websockets/dist/lib/client";
 import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
-import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, ReferralState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
+import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 import { LivePositionUpdates } from "../utils/solauto/generalUtils";
+import { ReferralStateManager } from "./referralStateManager";
 export interface SolautoClientArgs {
     authority?: PublicKey;
     positionId: number;
@@ -13,11 +14,11 @@ export interface SolautoClientArgs {
     wallet?: WalletAdapter;
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
-    referralFeesDestMint?: PublicKey;
     referredByAuthority?: PublicKey;
 }
 export declare abstract class SolautoClient {
     localTest?: boolean | undefined;
+    private heliusApiKey;
     umi: Umi;
     connection: Connection;
     lendingPlatform: LendingPlatform;
@@ -34,10 +35,7 @@ export declare abstract class SolautoClient {
     debtMint: PublicKey;
     positionDebtTa: PublicKey;
     signerDebtTa: PublicKey;
-    authorityReferralState: PublicKey;
-    authorityReferralStateData: ReferralState | null;
-    authorityReferralFeesDestMint: PublicKey;
-    authorityReferralDestTa: PublicKey;
+    referralStateManager: ReferralStateManager;
     referredByState?: PublicKey;
     referredByAuthority?: PublicKey;
     referredBySupplyTa?: PublicKey;
@@ -50,6 +48,7 @@ export declare abstract class SolautoClient {
     initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform): Promise<void>;
     log(...args: any[]): void;
     resetLivePositionUpdates(): Promise<void>;
+    abstract protocolAccount(): PublicKey;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];
     fetchExistingAuthorityLutAccounts(): Promise<PublicKey[]>;
@@ -59,8 +58,6 @@ export declare abstract class SolautoClient {
     } | undefined>;
     solautoPositionSettings(): SolautoSettingsParameters | undefined;
     solautoPositionActiveDca(): DCASettings | undefined;
-    updateReferralStatesIx(): TransactionBuilder;
-    claimReferralFeesIx(): TransactionBuilder;
     openPosition(settingParams?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
     updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
     closePositionIx(): TransactionBuilder;

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

@@ -10,15 +10,16 @@ const generated_1 = require("../generated");
 const accountUtils_1 = require("../utils/accountUtils");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("../utils/solanaUtils");
-const spl_token_1 = require("@solana/spl-token");
 const solautoConstants_1 = require("../constants/solautoConstants");
 const generalUtils_1 = require("../utils/generalUtils");
 const generalUtils_2 = require("../utils/solauto/generalUtils");
+const referralStateManager_1 = require("./referralStateManager");
 class SolautoClient {
     constructor(heliusApiKey, localTest) {
         this.localTest = localTest;
         this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
-        const [connection, umi] = (0, solanaUtils_1.getSolanaRpcConnection)(heliusApiKey);
+        this.heliusApiKey = heliusApiKey;
+        const [connection, umi] = (0, solanaUtils_1.getSolanaRpcConnection)(this.heliusApiKey);
         this.connection = connection;
         this.umi = umi.use({
             install(umi) {
@@ -38,7 +39,7 @@ class SolautoClient {
         this.positionId = args.positionId;
         this.selfManaged = this.positionId === 0;
         this.lendingPlatform = lendingPlatform;
-        this.solautoPosition = await (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
+        this.solautoPosition = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
         this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
         this.solautoPositionState = this.solautoPositionData?.state;
         this.supplyMint =
@@ -51,16 +52,15 @@ class SolautoClient {
                 (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint);
         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.authorityReferralState = await (0, accountUtils_1.getReferralState)(this.authority);
-        this.authorityReferralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.authorityReferralState));
-        this.authorityReferralFeesDestMint = args.referralFeesDestMint
-            ? args.referralFeesDestMint
-            : this.authorityReferralStateData?.destFeesMint
-                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.destFeesMint)
-                : spl_token_1.NATIVE_MINT;
-        this.authorityReferralDestTa = (0, accountUtils_1.getTokenAccount)(this.authorityReferralState, this.authorityReferralFeesDestMint);
-        const hasReferredBy = this.authorityReferralStateData &&
-            this.authorityReferralStateData.referredByState !==
+        this.referralStateManager = new referralStateManager_1.ReferralStateManager(this.heliusApiKey);
+        await this.referralStateManager.initialize({
+            referralAuthority: this.authority,
+            signer: args.signer,
+            wallet: args.wallet
+        });
+        const authorityReferralStateData = this.referralStateManager.referralStateData;
+        const hasReferredBy = authorityReferralStateData &&
+            authorityReferralStateData.referredByState !==
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
         const referredByAuthority = !hasReferredBy &&
             args.referredByAuthority &&
@@ -68,9 +68,9 @@ class SolautoClient {
             ? args.referredByAuthority
             : undefined;
         this.referredByState = hasReferredBy
-            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData.referredByState)
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.referredByState)
             : referredByAuthority
-                ? await (0, accountUtils_1.getReferralState)(referredByAuthority)
+                ? (0, accountUtils_1.getReferralState)(referredByAuthority)
                 : undefined;
         this.referredByAuthority = referredByAuthority;
         if (this.referredByState !== undefined) {
@@ -78,8 +78,8 @@ class SolautoClient {
         }
         this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
         this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyMint);
-        this.authorityLutAddress = this.authorityReferralStateData?.lookupTable
-            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.authorityReferralStateData?.lookupTable)
+        this.authorityLutAddress = authorityReferralStateData?.lookupTable
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData?.lookupTable)
             : undefined;
         this.upToDateLutAccounts = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority)
             ? await this.fetchExistingAuthorityLutAccounts()
@@ -128,7 +128,7 @@ class SolautoClient {
             this.solautoPosition,
             this.positionSupplyTa,
             this.positionDebtTa,
-            this.authorityReferralState,
+            this.referralStateManager.referralState,
             ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
         ];
     }
@@ -186,36 +186,6 @@ class SolautoClient {
         return (this.livePositionUpdates.activeDca ??
             this.solautoPositionData?.position.dca);
     }
-    updateReferralStatesIx() {
-        return (0, generated_1.updateReferralStates)(this.umi, {
-            signer: this.signer,
-            signerReferralState: (0, umi_1.publicKey)(this.authorityReferralState),
-            referralFeesDestMint: (0, umi_1.publicKey)(this.authorityReferralFeesDestMint),
-            referredByState: this.referredByState
-                ? (0, umi_1.publicKey)(this.referredByState)
-                : undefined,
-            referredByAuthority: this.referredByAuthority
-                ? (0, umi_1.publicKey)(this.referredByAuthority)
-                : undefined,
-            addressLookupTable: this.authorityLutAddress
-                ? (0, umi_1.some)((0, umi_1.publicKey)(this.authorityLutAddress))
-                : null,
-        });
-    }
-    claimReferralFeesIx() {
-        const feesDestinationTa = this.authorityReferralFeesDestMint !== spl_token_1.NATIVE_MINT
-            ? (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.authorityReferralFeesDestMint))
-            : undefined;
-        return (0, generated_1.claimReferralFees)(this.umi, {
-            signer: this.signer,
-            signerWsolTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), spl_token_1.NATIVE_MINT)),
-            referralAuthority: (0, umi_1.publicKey)(this.authorityReferralStateData.authority),
-            referralState: (0, umi_1.publicKey)(this.authorityReferralState),
-            referralFeesDestTa: (0, umi_1.publicKey)(this.authorityReferralDestTa),
-            referralFeesDestMint: (0, umi_1.publicKey)(this.authorityReferralFeesDestMint),
-            feesDestinationTa,
-        });
-    }
     openPosition(settingParams, dca) {
         if (dca && dca.debtToAddBaseUnit > 0) {
             this.livePositionUpdates.new({

package/dist/clients/solautoMarginfiClient.d.ts

@@ -27,6 +27,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     intermediaryMarginfiAccount?: MarginfiAccount;
     initialize(args: SolautoMarginfiClientArgs): Promise<void>;
     setIntermediaryMarginfiDetails(): Promise<void>;
+    protocolAccount(): PublicKey;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];
     marginfiAccountInitialize(): TransactionBuilder;

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,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAGL,eAAe,EAYhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAWnE,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;IAkE1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,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,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,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;CAiBlE"}
+{"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,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAWnE,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;IAkE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAU/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,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,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA2DrB,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;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -82,6 +82,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.intermediaryMarginfiAccount =
             emptyMarginfiAccounts.length > 0 ? emptyMarginfiAccounts[0] : undefined;
     }
+    protocolAccount() {
+        return this.marginfiAccountPk;
+    }
     defaultLookupTables() {
         return [marginfiAccounts_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
     }
@@ -118,7 +121,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             solautoManager: (0, umi_1.publicKey)(constants_1.SOLAUTO_MANAGER),
             solautoFeesWallet: (0, umi_1.publicKey)(this.solautoFeesWallet),
             solautoFeesSupplyTa: (0, umi_1.publicKey)(this.solautoFeesSupplyTa),
-            signerReferralState: (0, umi_1.publicKey)(this.authorityReferralState),
+            signerReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
             referredByState: this.referredByState
                 ? (0, umi_1.publicKey)(this.referredByState)
                 : undefined,
@@ -281,7 +284,7 @@ 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.authorityReferralState),
+            authorityReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
             referredBySupplyTa: this.referredBySupplyTa
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa)
                 : undefined,

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,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACA,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACC,SAAS,CACZ,CA2HA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}

package/dist/transactions/transactionUtils.js

@@ -47,14 +47,14 @@ function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn)
 }
 async function transactionChoresBefore(client, accountsGettingCreated, solautoActions, initiatingDcaIn) {
     let chores = (0, umi_1.transactionBuilder)();
-    if (client.authorityReferralStateData === null ||
+    if (client.referralStateManager.referralState === null ||
         (client.referredByState !== undefined &&
-            client.authorityReferralStateData.referredByState ===
+            client.referralStateManager.referralStateData.referredByState ===
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default)) ||
         (client.authorityLutAddress !== undefined &&
-            client.authorityReferralStateData.lookupTable ==
+            client.referralStateManager.referralStateData.lookupTable ==
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default))) {
-        chores = chores.add(client.updateReferralStatesIx());
+        chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.referredByAuthority, client.authorityLutAddress));
     }
     if (client.selfManaged) {
         if (client.solautoPositionData === null) {

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAEvB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,cAAM,YAAY;IAIJ,OAAO,CAAC,MAAM;IAH1B,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,KAAK,EAAE,uBAAuB,EAAE,CAAM;gBAElB,MAAM,EAAE,aAAa;IAInC,YAAY,CAChB,mBAAmB,EAAE,MAAM,EAAE,GAC5B,OAAO,CAAC,uBAAuB,EAAE,CAAC;CAqBtC;AAED,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC,EAAE,MAAM;IATtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAED,cAAM,cAAc;IAEhB,OAAO,CAAC,MAAM;IACP,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,eAAe,EAAE;gBAFvB,MAAM,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,KAAK,GAAE,eAAe,EAAO;IAGhC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,GAAG,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAMzB,UAAU,CAAC,UAAU,EAAE,MAAM;IAO7B,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAYzD,YAAY,IAAI,MAAM,EAAE;IAMxB,IAAI,IAAI,MAAM;CAYf;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,aAAa,CAAC,EAAE,aAAa,YAAA;YAKzB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAiB9D,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,kBAAkB;IAkB7D,IAAI,CAAC,eAAe,CAAC,EAAE,kBAAkB;CA6JhD"}

package/dist/transactions/transactionsManager.js

@@ -141,11 +141,7 @@ class TransactionsManager {
             }
             const transaction = item.tx.setAddressLookupTables(await this.lookupTables.getLutInputs(item.lookupTableAddresses));
             if (!transaction.fitsInOneTransaction(this.client.umi)) {
-                // TODO: revert me
-                // throw new Error(
-                //   `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
-                // );
-                transactionSets.push(new TransactionSet(this.client, this.lookupTables, [item]));
+                throw new Error(`Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`);
             }
             else {
                 let newSet = new TransactionSet(this.client, this.lookupTables, [item]);

package/dist/utils/accountUtils.d.ts

@@ -3,7 +3,7 @@ export declare function bufferFromU8(num: number): Buffer;
 export declare function bufferFromU64(num: bigint): Buffer;
 export declare function getTokenAccount(wallet: PublicKey, tokenMint: PublicKey): PublicKey;
 export declare function getTokenAccounts(wallet: PublicKey, tokenMints: PublicKey[]): PublicKey[];
-export declare function getSolautoPositionAccount(signer: PublicKey, positionId: number): Promise<PublicKey>;
-export declare function getReferralState(authority: PublicKey): Promise<PublicKey>;
+export declare function getSolautoPositionAccount(signer: PublicKey, positionId: number): PublicKey;
+export declare function getReferralState(authority: PublicKey): PublicKey;
 export declare function getMarginfiAccountPDA(solautoPositionAccount: PublicKey, marginfiAccountSeedIdx: bigint): Promise<PublicKey>;
 //# sourceMappingURL=accountUtils.d.ts.map

package/dist/utils/accountUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,sBAQnB;AAED,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,SAAS,sBAU1D;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B"}
+{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,aAQnB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,aAUpD;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B"}

package/dist/utils/accountUtils.js

@@ -26,14 +26,14 @@ function getTokenAccount(wallet, tokenMint) {
 function getTokenAccounts(wallet, tokenMints) {
     return tokenMints.map(x => getTokenAccount(wallet, x));
 }
-async function getSolautoPositionAccount(signer, positionId) {
-    const [positionAccount, _] = await web3_js_1.PublicKey.findProgramAddress([bufferFromU8(positionId), signer.toBuffer()], new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
+function getSolautoPositionAccount(signer, positionId) {
+    const [positionAccount, _] = web3_js_1.PublicKey.findProgramAddressSync([bufferFromU8(positionId), signer.toBuffer()], new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
     return positionAccount;
 }
-async function getReferralState(authority) {
+function getReferralState(authority) {
     const str = "referral_state";
     const strBuffer = Buffer.from(str, "utf-8");
-    const [ReferralState, _] = await web3_js_1.PublicKey.findProgramAddress([strBuffer, authority.toBuffer()], new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
+    const [ReferralState, _] = web3_js_1.PublicKey.findProgramAddressSync([strBuffer, authority.toBuffer()], new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
     return ReferralState;
 }
 async function getMarginfiAccountPDA(solautoPositionAccount, marginfiAccountSeedIdx) {

package/dist/utils/solauto/generalUtils.js

@@ -165,7 +165,7 @@ async function getReferralsByUser(umi, user) {
     // padding: [u8; 7],
     // authority: Pubkey,
     // referred_by_state: Pubkey,
-    const userReferralState = await (0, accountUtils_1.getReferralState)(user);
+    const userReferralState = (0, accountUtils_1.getReferralState)(user);
     const accounts = await umi.rpc.getProgramAccounts(generated_1.SOLAUTO_PROGRAM_ID, {
         commitment: "finalized",
         dataSlice: {

package/package.json

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

package/src/clients/index.ts

@@ -1,2 +1,3 @@
 export * from './solautoMarginfiClient';
-export * from './solautoClient';
+export * from './solautoClient';
+export * from './referralStateManager';

package/src/clients/referralStateManager.ts

@@ -0,0 +1,88 @@
+import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
+import { publicKey, Signer, signerIdentity, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { WalletAdapter, walletAdapterIdentity } from "@metaplex-foundation/umi-signer-wallet-adapters";
+import { claimReferralFees, createSolautoProgram, ReferralState, safeFetchReferralState, updateReferralStates } from "../generated";
+import { getReferralState, getSolanaRpcConnection, getTokenAccount } from "../utils";
+
+interface ReferralStateManagerArgs {
+    referralAuthority?: PublicKey;
+    signer?: Signer;
+    wallet?: WalletAdapter;
+}
+
+export class ReferralStateManager {
+    public umi!: Umi;
+    public signer!: Signer;
+
+    public referralAuthority!: PublicKey;
+    public referralState!: PublicKey;
+    public referralStateData!: ReferralState | null;
+
+    constructor(heliusApiKey: string) {
+        const [_, umi] = getSolanaRpcConnection(heliusApiKey);
+        this.umi = umi.use({
+            install(umi) {
+                umi.programs.add(createSolautoProgram(), false);
+            },
+        });
+    }
+
+    async initialize(args: ReferralStateManagerArgs) {
+        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.referralState = getReferralState(args.referralAuthority ?? toWeb3JsPublicKey(this.signer.publicKey));
+        this.referralStateData = await safeFetchReferralState(this.umi, publicKey(this.referralState));
+    }
+
+    updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder {
+        return updateReferralStates(this.umi, {
+            signer: this.signer,
+            signerReferralState: publicKey(this.referralState),
+            referralFeesDestMint: destFeesMint ? publicKey(destFeesMint) : null,
+            referredByState: referredBy
+                ? publicKey(getReferralState(referredBy))
+                : undefined,
+            referredByAuthority: referredBy
+                ? publicKey(referredBy)
+                : undefined,
+            addressLookupTable: lookupTable
+                ? publicKey(lookupTable)
+                : null,
+        });
+    }
+
+    claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder {
+        const referralFeesDestMint = destFeesMint ?? toWeb3JsPublicKey(this.referralStateData!.destFeesMint);
+        const referralDestTa = getTokenAccount(this.referralState, referralFeesDestMint);
+        const feesDestinationTa =
+            referralFeesDestMint !== NATIVE_MINT
+                ? publicKey(
+                    getTokenAccount(
+                        toWeb3JsPublicKey(this.signer.publicKey),
+                        referralFeesDestMint
+                    )
+                )
+                : undefined;
+
+        return claimReferralFees(this.umi, {
+            signer: this.signer,
+            signerWsolTa: publicKey(getTokenAccount(toWeb3JsPublicKey(this.signer.publicKey), NATIVE_MINT)),
+            referralAuthority: publicKey(this.referralAuthority),
+            referralState: publicKey(this.referralState),
+            referralFeesDestTa: publicKey(referralDestTa),
+            referralFeesDestMint: publicKey(referralFeesDestMint),
+            feesDestinationTa,
+        });
+    }
+
+}

package/src/clients/solautoClient.ts

@@ -14,7 +14,6 @@ import {
   isSome,
   transactionBuilder,
   signerIdentity,
-  some,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
@@ -26,7 +25,6 @@ import {
   DCASettingsInpArgs,
   LendingPlatform,
   PositionState,
-  ReferralState,
   SolautoActionArgs,
   SolautoPosition,
   SolautoRebalanceTypeArgs,
@@ -34,13 +32,10 @@ import {
   SolautoSettingsParametersInpArgs,
   UpdatePositionDataArgs,
   cancelDCA,
-  claimReferralFees,
   closePosition,
   createSolautoProgram,
-  safeFetchReferralState,
   safeFetchSolautoPosition,
   updatePosition,
-  updateReferralStates,
 } from "../generated";
 import {
   getReferralState,
@@ -57,13 +52,13 @@ import {
   splTokenTransferUmiIx,
 } from "../utils/solanaUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
-import { NATIVE_MINT } from "@solana/spl-token";
 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";
 
 export interface SolautoClientArgs {
   authority?: PublicKey;
@@ -74,11 +69,11 @@ export interface SolautoClientArgs {
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
 
-  referralFeesDestMint?: PublicKey;
   referredByAuthority?: PublicKey;
 }
 
 export abstract class SolautoClient {
+  private heliusApiKey!: string;
   public umi!: Umi;
   public connection!: Connection;
   public lendingPlatform!: LendingPlatform;
@@ -100,10 +95,7 @@ export abstract class SolautoClient {
   public positionDebtTa!: PublicKey;
   public signerDebtTa!: PublicKey;
 
-  public authorityReferralState!: PublicKey;
-  public authorityReferralStateData!: ReferralState | null;
-  public authorityReferralFeesDestMint!: PublicKey;
-  public authorityReferralDestTa!: PublicKey;
+  public referralStateManager!: ReferralStateManager;
 
   public referredByState?: PublicKey;
   public referredByAuthority?: PublicKey;
@@ -121,7 +113,8 @@ export abstract class SolautoClient {
     heliusApiKey: string,
     public localTest?: boolean
   ) {
-    const [connection, umi] = getSolanaRpcConnection(heliusApiKey);
+    this.heliusApiKey = heliusApiKey;
+    const [connection, umi] = getSolanaRpcConnection(this.heliusApiKey);
     this.connection = connection;
     this.umi = umi.use({
       install(umi) {
@@ -146,7 +139,7 @@ export abstract class SolautoClient {
     this.positionId = args.positionId;
     this.selfManaged = this.positionId === 0;
     this.lendingPlatform = lendingPlatform;
-    this.solautoPosition = await getSolautoPositionAccount(
+    this.solautoPosition = getSolautoPositionAccount(
       this.authority,
       this.positionId
     );
@@ -177,35 +170,28 @@ export abstract class SolautoClient {
       this.debtMint
     );
 
-    this.authorityReferralState = await getReferralState(this.authority);
-    this.authorityReferralStateData = await safeFetchReferralState(
-      this.umi,
-      publicKey(this.authorityReferralState)
-    );
-    this.authorityReferralFeesDestMint = args.referralFeesDestMint
-      ? args.referralFeesDestMint
-      : this.authorityReferralStateData?.destFeesMint
-        ? toWeb3JsPublicKey(this.authorityReferralStateData?.destFeesMint)
-        : NATIVE_MINT;
-    this.authorityReferralDestTa = getTokenAccount(
-      this.authorityReferralState,
-      this.authorityReferralFeesDestMint
-    );
+    this.referralStateManager = new ReferralStateManager(this.heliusApiKey)
+    await this.referralStateManager.initialize({
+      referralAuthority: this.authority,
+      signer: args.signer,
+      wallet: args.wallet
+    });
 
+    const authorityReferralStateData = this.referralStateManager.referralStateData;
     const hasReferredBy =
-      this.authorityReferralStateData &&
-      this.authorityReferralStateData.referredByState !==
-        publicKey(PublicKey.default);
+    authorityReferralStateData &&
+    authorityReferralStateData.referredByState !==
+      publicKey(PublicKey.default);
     const referredByAuthority =
       !hasReferredBy &&
-      args.referredByAuthority &&
-      !args.referredByAuthority.equals(toWeb3JsPublicKey(this.signer.publicKey))
+        args.referredByAuthority &&
+        !args.referredByAuthority.equals(toWeb3JsPublicKey(this.signer.publicKey))
         ? args.referredByAuthority
         : undefined;
     this.referredByState = hasReferredBy
-      ? toWeb3JsPublicKey(this.authorityReferralStateData!.referredByState)
+      ? toWeb3JsPublicKey(authorityReferralStateData!.referredByState)
       : referredByAuthority
-        ? await getReferralState(referredByAuthority!)
+        ? getReferralState(referredByAuthority!)
         : undefined;
     this.referredByAuthority = referredByAuthority;
     if (this.referredByState !== undefined) {
@@ -221,8 +207,8 @@ export abstract class SolautoClient {
       this.supplyMint
     );
 
-    this.authorityLutAddress = this.authorityReferralStateData?.lookupTable
-      ? toWeb3JsPublicKey(this.authorityReferralStateData?.lookupTable)
+    this.authorityLutAddress = authorityReferralStateData?.lookupTable
+      ? toWeb3JsPublicKey(authorityReferralStateData?.lookupTable)
       : undefined;
     this.upToDateLutAccounts = toWeb3JsPublicKey(this.signer.publicKey).equals(
       this.authority
@@ -270,6 +256,8 @@ export abstract class SolautoClient {
     this.livePositionUpdates.reset();
   }
 
+  abstract protocolAccount(): PublicKey;
+
   defaultLookupTables(): string[] {
     return [SOLAUTO_LUT];
   }
@@ -286,7 +274,7 @@ export abstract class SolautoClient {
       this.solautoPosition,
       this.positionSupplyTa,
       this.positionDebtTa,
-      this.authorityReferralState,
+      this.referralStateManager.referralState,
       ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
     ];
   }
@@ -353,7 +341,7 @@ export abstract class SolautoClient {
     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...");
@@ -376,44 +364,6 @@ export abstract class SolautoClient {
     );
   }
 
-  updateReferralStatesIx(): TransactionBuilder {
-    return updateReferralStates(this.umi, {
-      signer: this.signer,
-      signerReferralState: publicKey(this.authorityReferralState),
-      referralFeesDestMint: publicKey(this.authorityReferralFeesDestMint),
-      referredByState: this.referredByState
-        ? publicKey(this.referredByState)
-        : undefined,
-      referredByAuthority: this.referredByAuthority
-        ? publicKey(this.referredByAuthority)
-        : undefined,
-      addressLookupTable: this.authorityLutAddress
-        ? some(publicKey(this.authorityLutAddress))
-        : null,
-    });
-  }
-
-  claimReferralFeesIx(): TransactionBuilder {
-    const feesDestinationTa =
-      this.authorityReferralFeesDestMint !== NATIVE_MINT
-        ? publicKey(
-            getTokenAccount(
-              toWeb3JsPublicKey(this.signer.publicKey),
-              this.authorityReferralFeesDestMint
-            )
-          )
-        : undefined;
-    return claimReferralFees(this.umi, {
-      signer: this.signer,
-      signerWsolTa: publicKey(getTokenAccount(toWeb3JsPublicKey(this.signer.publicKey), NATIVE_MINT)),
-      referralAuthority: publicKey(this.authorityReferralStateData!.authority),
-      referralState: publicKey(this.authorityReferralState),
-      referralFeesDestTa: publicKey(this.authorityReferralDestTa),
-      referralFeesDestMint: publicKey(this.authorityReferralFeesDestMint),
-      feesDestinationTa,
-    });
-  }
-
   openPosition(
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
@@ -575,7 +525,7 @@ export abstract class SolautoClient {
               BigInt(
                 Math.round(
                   Number(this.solautoPositionState!.debt.amountUsed.baseUnit) *
-                    1.01
+                  1.01
                 )
               )
             )
@@ -647,7 +597,7 @@ export abstract class SolautoClient {
     if (
       Boolean(this.solautoPositionState) &&
       Number(this.solautoPositionState!.lastUpdated) >
-        currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
+      currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
       !this.livePositionUpdates.hasUpdates()
     ) {
       return this.solautoPositionState;

package/src/clients/solautoMarginfiClient.ts

@@ -34,7 +34,6 @@ import {
 import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
 import { generateRandomU64 } from "../utils/generalUtils";
 import {
-  Bank,
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
@@ -44,9 +43,7 @@ import {
   lendingAccountStartFlashloan,
   lendingAccountWithdraw,
   marginfiAccountInitialize,
-  safeFetchAllBank,
   safeFetchAllMarginfiAccount,
-  safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
@@ -196,6 +193,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       emptyMarginfiAccounts.length > 0 ? emptyMarginfiAccounts[0] : undefined;
   }
 
+  protocolAccount(): PublicKey {
+    return this.marginfiAccountPk;
+  }
+
   defaultLookupTables(): string[] {
     return [MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
   }
@@ -243,7 +244,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       solautoManager: publicKey(SOLAUTO_MANAGER),
       solautoFeesWallet: publicKey(this.solautoFeesWallet),
       solautoFeesSupplyTa: publicKey(this.solautoFeesSupplyTa),
-      signerReferralState: publicKey(this.authorityReferralState),
+      signerReferralState: publicKey(this.referralStateManager.referralState),
       referredByState: this.referredByState
         ? publicKey(this.referredByState)
         : undefined,
@@ -448,7 +449,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesSupplyTa:
         rebalanceStep === "B" ? publicKey(this.solautoFeesSupplyTa) : undefined,
-      authorityReferralState: publicKey(this.authorityReferralState),
+      authorityReferralState: publicKey(this.referralStateManager.referralState),
       referredBySupplyTa: this.referredBySupplyTa
         ? publicKey(this.referredBySupplyTa)
         : undefined,

package/src/transactions/transactionUtils.ts

@@ -109,15 +109,15 @@ async function transactionChoresBefore(
   let chores = transactionBuilder();
 
   if (
-    client.authorityReferralStateData === null ||
+    client.referralStateManager.referralState === null ||
     (client.referredByState !== undefined &&
-      client.authorityReferralStateData.referredByState ===
-        publicKey(PublicKey.default)) ||
+      client.referralStateManager.referralStateData!.referredByState ===
+      publicKey(PublicKey.default)) ||
     (client.authorityLutAddress !== undefined &&
-      client.authorityReferralStateData.lookupTable ==
-        publicKey(PublicKey.default))
+      client.referralStateManager.referralStateData!.lookupTable ==
+      publicKey(PublicKey.default))
   ) {
-    chores = chores.add(client.updateReferralStatesIx());
+    chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.referredByAuthority, client.authorityLutAddress));
   }
 
   if (client.selfManaged) {
@@ -379,7 +379,7 @@ function getRebalanceInstructions(tx: TransactionBuilder): Instruction[] {
         if (data.discriminator === discriminator) {
           return true;
         }
-      } catch {}
+      } catch { }
       return false;
     }
   });
@@ -400,7 +400,7 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
         if (data.discriminator === discriminator) {
           solautoActions?.push(data.solautoAction);
         }
-      } catch {}
+      } catch { }
     }
 
     if (x.programId === MARGINFI_PROGRAM_ID) {
@@ -423,7 +423,7 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
             fields: [data.amount],
           });
         }
-      } catch {}
+      } catch { }
 
       try {
         const serializer = getLendingAccountBorrowInstructionDataSerializer();
@@ -444,7 +444,7 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
             fields: [data.amount],
           });
         }
-      } catch {}
+      } catch { }
 
       try {
         const serializer = getLendingAccountWithdrawInstructionDataSerializer();
@@ -466,16 +466,16 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
             fields: [
               data.withdrawAll
                 ? {
-                    __kind: "All",
-                  }
+                  __kind: "All",
+                }
                 : {
-                    __kind: "Some",
-                    fields: [data.amount],
-                  },
+                  __kind: "Some",
+                  fields: [data.amount],
+                },
             ],
           });
         }
-      } catch {}
+      } catch { }
 
       try {
         const serializer = getLendingAccountRepayInstructionDataSerializer();
@@ -497,16 +497,16 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
             fields: [
               data.repayAll
                 ? {
-                    __kind: "All",
-                  }
+                  __kind: "All",
+                }
                 : {
-                    __kind: "Some",
-                    fields: [data.amount],
-                  },
+                  __kind: "Some",
+                  fields: [data.amount],
+                },
             ],
           });
         }
-      } catch {}
+      } catch { }
     }
 
     // TODO support other platforms
@@ -554,9 +554,9 @@ export async function buildSolautoRebalanceTransaction(
   attemptNum?: number
 ): Promise<
   | {
-      tx: TransactionBuilder;
-      lookupTableAddresses: string[];
-    }
+    tx: TransactionBuilder;
+    lookupTableAddresses: string[];
+  }
   | undefined
 > {
   client.solautoPositionState = await client.getFreshPositionState();
@@ -566,9 +566,9 @@ export async function buildSolautoRebalanceTransaction(
       !eligibleForRebalance(
         client.solautoPositionState!,
         client.livePositionUpdates.settings ??
-          client.solautoPositionData?.position.settingParams!,
+        client.solautoPositionData?.position.settingParams!,
         client.livePositionUpdates.activeDca ??
-          client.solautoPositionData?.position.dca!,
+        client.solautoPositionData?.position.dca!,
         currentUnixSeconds()
       ))
   ) {
@@ -624,14 +624,14 @@ export async function buildSolautoRebalanceTransaction(
       ),
       ...(addFirstRebalance
         ? [
-            client.rebalance(
-              "A",
-              swapDetails,
-              rebalanceType,
-              flashLoan,
-              targetLiqUtilizationRateBps
-            ),
-          ]
+          client.rebalance(
+            "A",
+            swapDetails,
+            rebalanceType,
+            flashLoan,
+            targetLiqUtilizationRateBps
+          ),
+        ]
         : []),
       swapIx,
       client.rebalance(

package/src/transactions/transactionsManager.ts

@@ -1,7 +1,6 @@
 import bs58 from "bs58";
 import {
   AddressLookupTableInput,
-  Instruction,
   transactionBuilder,
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
@@ -15,7 +14,6 @@ import {
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { PriorityFeeSetting } from "../types";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
@@ -213,12 +211,8 @@ export class TransactionsManager {
         await this.lookupTables.getLutInputs(item.lookupTableAddresses)
       );
       if (!transaction.fitsInOneTransaction(this.client.umi)) {
-        // TODO: revert me
-        // throw new Error(
-        //   `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
-        // );
-        transactionSets.push(
-          new TransactionSet(this.client, this.lookupTables, [item])
+        throw new Error(
+          `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
         );
       } else {
         let newSet = new TransactionSet(this.client, this.lookupTables, [item]);

package/src/utils/accountUtils.ts

@@ -26,11 +26,11 @@ export function getTokenAccounts(wallet: PublicKey, tokenMints: PublicKey[]): Pu
   return tokenMints.map(x => getTokenAccount(wallet, x));
 }
 
-export async function getSolautoPositionAccount(
+export function getSolautoPositionAccount(
   signer: PublicKey,
   positionId: number
 ) {
-  const [positionAccount, _] = await PublicKey.findProgramAddress(
+  const [positionAccount, _] = PublicKey.findProgramAddressSync(
     [bufferFromU8(positionId), signer.toBuffer()],
     new PublicKey(SOLAUTO_PROGRAM_ID)
   );
@@ -38,11 +38,11 @@ export async function getSolautoPositionAccount(
   return positionAccount;
 }
 
-export async function getReferralState(authority: PublicKey) {
+export function getReferralState(authority: PublicKey) {
   const str = "referral_state";
   const strBuffer = Buffer.from(str, "utf-8");
 
-  const [ReferralState, _] = await PublicKey.findProgramAddress(
+  const [ReferralState, _] = PublicKey.findProgramAddressSync(
     [strBuffer, authority.toBuffer()],
     new PublicKey(SOLAUTO_PROGRAM_ID)
   );

package/src/utils/solauto/generalUtils.ts

@@ -250,7 +250,7 @@ export async function getReferralsByUser(
   // authority: Pubkey,
   // referred_by_state: Pubkey,
 
-  const userReferralState = await getReferralState(user);
+  const userReferralState = getReferralState(user);
   const accounts = await umi.rpc.getProgramAccounts(SOLAUTO_PROGRAM_ID, {
     commitment: "finalized",
     dataSlice: {