@haven-fi/solauto-sdk 1.0.208 → 1.0.210

package/dist/clients/referralStateManager.d.ts

@@ -7,6 +7,7 @@ interface ReferralStateManagerArgs {
     signer?: Signer;
     wallet?: WalletAdapter;
     referralAuthority?: PublicKey;
+    referredByAuthority?: PublicKey;
 }
 export declare class ReferralStateManager extends TxHandler {
     localTest?: boolean | undefined;
@@ -15,9 +16,12 @@ export declare class ReferralStateManager extends TxHandler {
     referralAuthority: PublicKey;
     referralState: PublicKey;
     referralStateData: ReferralState | null;
+    referredByAuthority?: PublicKey;
+    referredByState?: PublicKey;
     constructor(heliusApiUrl: string, localTest?: boolean | undefined);
     initialize(args: ReferralStateManagerArgs): Promise<void>;
     defaultLookupTables(): string[];
+    setReferredBy(referredBy?: PublicKey): void;
     updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;
     claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder;
     resetLiveTxUpdates(success?: boolean): Promise<void>;

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,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;AAEpI,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,UAAU,wBAAwB;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,iBAAiB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAQN,SAAS,CAAC,EAAE,OAAO;IAPrD,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,EAAS,SAAS,CAAC,EAAE,OAAO,YAAA;IAStD,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAe/C,mBAAmB,IAAI,MAAM,EAAE;IAI/B,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;IAwB3D,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC7D"}
+{"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;AAExC,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;IAaxC,SAAS,CAAC,EAAE,OAAO;IAZrB,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;IAEzC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,eAAe,CAAC,EAAE,SAAS,CAAC;gBAGjC,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAUtB,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAuB/C,mBAAmB,IAAI,MAAM,EAAE;IAMxB,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAoB3C,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,UAAU,CAAC,EAAE,SAAS,EACtB,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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferralStateManager = void 0;
+const web3_js_1 = require("@solana/web3.js");
 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");
@@ -28,9 +29,29 @@ class ReferralStateManager extends txHandler_1.TxHandler {
         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), { commitment: "confirmed" });
+        this.setReferredBy(args.referredByAuthority);
     }
     defaultLookupTables() {
-        return this.referralStateData?.lookupTable ? [this.referralStateData?.lookupTable.toString()] : [];
+        return this.referralStateData?.lookupTable
+            ? [this.referralStateData?.lookupTable.toString()]
+            : [];
+    }
+    setReferredBy(referredBy) {
+        const authorityReferralStateData = this.referralStateData;
+        const hasReferredBy = authorityReferralStateData &&
+            authorityReferralStateData.referredByState !==
+                (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
+        const referredByAuthority = !hasReferredBy &&
+            referredBy &&
+            !referredBy.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
+            ? referredBy
+            : undefined;
+        this.referredByState = hasReferredBy
+            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.referredByState)
+            : referredByAuthority
+                ? (0, utils_1.getReferralState)(referredByAuthority)
+                : undefined;
+        this.referredByAuthority = referredByAuthority;
     }
     updateReferralStatesIx(destFeesMint, referredBy, lookupTable) {
         return (0, generated_1.updateReferralStates)(this.umi, {
@@ -39,13 +60,11 @@ class ReferralStateManager extends txHandler_1.TxHandler {
             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,
+                : this.referredByState
+                    ? (0, umi_1.publicKey)(this.referredByState)
+                    : undefined,
+            referredByAuthority: referredBy ? (0, umi_1.publicKey)(referredBy) : undefined,
+            addressLookupTable: lookupTable ? (0, umi_1.publicKey)(lookupTable) : null,
         });
     }
     claimReferralFeesIx(destFeesMint) {

package/dist/clients/solautoClient.d.ts

@@ -36,8 +36,6 @@ export declare abstract class SolautoClient extends TxHandler {
     positionDebtTa: PublicKey;
     signerDebtTa: PublicKey;
     referralStateManager: ReferralStateManager;
-    referredByState?: PublicKey;
-    referredByAuthority?: PublicKey;
     referredBySupplyTa?: PublicKey;
     solautoFeesWallet: PublicKey;
     solautoFeesSupplyTa: PublicKey;

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":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,MAAM,EACN,kBAAkB,EAOnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,yBAAyB,EACzB,gCAAgC,EAEhC,sBAAsB,EAMvB,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IAEvB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,8BAAsB,aAAc,SAAQ,SAAS;IAC5C,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IACtB,MAAM,EAAG,MAAM,CAAC;IAEhB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,eAAe,EAAG,SAAS,CAAC;IAC5B,mBAAmB,EAAG,eAAe,GAAG,IAAI,CAAC;IAC7C,oBAAoB,EAAG,aAAa,GAAG,SAAS,CAAC;IAEjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,UAAU,EAAG,SAAS,CAAC;IACvB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,QAAQ,EAAG,SAAS,CAAC;IACrB,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,oBAAoB,EAAG,oBAAoB,CAAC;IAC5C,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,iBAAiB,EAAG,SAAS,CAAC;IAC9B,mBAAmB,EAAG,SAAS,CAAC;IAEhC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,mBAAmB,EAAE,mBAAmB,CAA6B;gBAEhE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO;IAUzC,UAAU,CAAC,IAAI,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe;IAqGnE,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAUrC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAuB1C,QAAQ,CAAC,eAAe,IAAI,SAAS;IAErC,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAiBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAChC;QAAE,WAAW,EAAE,kBAAkB,CAAC;QAAC,iBAAiB,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAC5E;IAyDD,uBAAuB,IAAI,yBAAyB,GAAG,SAAS;IAOhE,wBAAwB,IAAI,WAAW,GAAG,SAAS;IAO7C,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAOvE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAwDlE,eAAe,IAAI,kBAAkB;IAYrC,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,OAAO,IAAI,kBAAkB;IAEtC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAuFhE,QAAQ,CAAC,WAAW,CAClB,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IAErB,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAE3E,QAAQ,CAAC,SAAS,CAChB,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;IAEf,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAalE"}

package/dist/clients/solautoClient.js

@@ -38,7 +38,9 @@ class SolautoClient extends txHandler_1.TxHandler {
         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" }) : null;
+        this.solautoPositionData = !args.new
+            ? await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition), { commitment: "confirmed" })
+            : null;
         this.solautoPositionState = this.solautoPositionData?.state;
         this.maxLtvBps = undefined;
         this.liqThresholdBps = undefined;
@@ -59,10 +61,13 @@ class SolautoClient extends txHandler_1.TxHandler {
         this.referralStateManager = new referralStateManager_1.ReferralStateManager(this.rpcUrl);
         await this.referralStateManager.initialize({
             referralAuthority: this.authority,
+            referredByAuthority: args.referredByAuthority,
             signer: args.signer,
             wallet: args.wallet,
         });
-        this.setReferredBy(args.referredByAuthority);
+        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;
@@ -79,23 +84,9 @@ class SolautoClient extends txHandler_1.TxHandler {
             : undefined);
     }
     setReferredBy(referredBy) {
-        const authorityReferralStateData = this.referralStateManager.referralStateData;
-        const hasReferredBy = authorityReferralStateData &&
-            authorityReferralStateData.referredByState !==
-                (0, umi_1.publicKey)(web3_js_1.PublicKey.default);
-        const referredByAuthority = !hasReferredBy &&
-            referredBy &&
-            !referredBy.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
-            ? referredBy
-            : undefined;
-        this.referredByState = hasReferredBy
-            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.referredByState)
-            : referredByAuthority
-                ? (0, accountUtils_1.getReferralState)(referredByAuthority)
-                : undefined;
-        this.referredByAuthority = referredByAuthority;
-        if (this.referredByState !== undefined) {
-            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referredByState, this.supplyMint);
+        this.referralStateManager.setReferredBy(referredBy);
+        if (this.referralStateManager.referredByState !== undefined) {
+            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referralStateManager.referredByState, this.supplyMint);
         }
     }
     async resetLiveTxUpdates(success) {

package/dist/clients/solautoMarginfiClient.js

@@ -136,8 +136,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             signerReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
-            referredByState: this.referredByState
-                ? (0, umi_1.publicKey)(this.referredByState)
+            referredByState: this.referralStateManager.referredByState
+                ? (0, umi_1.publicKey)(this.referralStateManager.referredByState)
                 : undefined,
             referredBySupplyTa: this.referredBySupplyTa
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa)

package/dist/clients/txHandler.d.ts

@@ -1,5 +1,5 @@
 import { Umi } from "@metaplex-foundation/umi";
-import { Connection } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 export declare abstract class TxHandler {
     rpcUrl: string;
     umi: Umi;
@@ -8,5 +8,6 @@ export declare abstract class TxHandler {
     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,MAAM,iBAAiB,CAAC;AAG7C,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"}
+{"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;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;IAE7D,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,IAAI;CACrD"}

package/dist/transactions/transactionUtils.d.ts

@@ -2,14 +2,12 @@ import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../clients/solautoClient";
 import { ReferralStateManager } from "../clients";
+import { TransactionItemInputs } from "../types";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
 export declare function requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
-export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<{
-    tx: TransactionBuilder;
-    lookupTableAddresses: string[];
-} | undefined>;
-export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
+export declare function buildSolautoRebalanceTransaction(client: SolautoClient, targetLiqUtilizationRateBps?: number, attemptNum?: number): Promise<TransactionItemInputs | undefined>;
+export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<TransactionItemInputs | undefined>;
 export declare function getErrorInfo(tx: TransactionBuilder, error: any): {
     errorName: string | undefined;
     errorInfo: 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,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAsBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAgM7D,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,oBAwCzE;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,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;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;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA0LjD,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,oBAwCzE;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

@@ -52,13 +52,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.referredByState !== undefined &&
+        (client.referralStateManager.referredByState !== undefined &&
             client.referralStateManager.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.referredByAuthority, client.authorityLutAddress));
+        chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.referralStateManager.referredByAuthority, client.authorityLutAddress));
     }
     if (client.selfManaged) {
         if (client.solautoPositionData === null) {
@@ -148,7 +148,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.referredByState, client.supplyMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referralStateManager.referredByState, client.supplyMint));
     }
     if (checkSolautoFeesTa && !(0, generalUtils_1.rpcAccountCreated)(solautoFeesSupplyTa)) {
         client.log("Creating Solauto fees TA for ", client.supplyMint.toString());
@@ -423,7 +423,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         referralFeesTa: (0, umi_1.publicKey)(tokenAccount),
     }))
         .add(swapIx);
-    return [tx, lookupTableAddresses];
+    return { tx, lookupTableAddresses };
 }
 function getErrorInfo(tx, error) {
     let canBeIgnored = false;

package/dist/transactions/transactionsManager.d.ts

@@ -1,20 +1,14 @@
 import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
 import { ErrorsToThrow } from "../utils/generalUtils";
-import { PriorityFeeSetting, TransactionRunType } from "../types";
+import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../types";
 import { ReferralStateManager } from "../clients";
 export declare class TransactionItem {
-    fetchTx: (attemptNum: number) => Promise<{
-        tx: TransactionBuilder;
-        lookupTableAddresses?: string[];
-    } | undefined>;
+    fetchTx: (attemptNum: number) => Promise<TransactionItemInputs | undefined>;
     name?: string | undefined;
     lookupTableAddresses: string[];
     tx?: TransactionBuilder;
-    constructor(fetchTx: (attemptNum: number) => Promise<{
-        tx: TransactionBuilder;
-        lookupTableAddresses?: string[];
-    } | undefined>, name?: string | undefined);
+    constructor(fetchTx: (attemptNum: number) => Promise<TransactionItemInputs | undefined>, name?: string | undefined);
     initialize(): Promise<void>;
     refetch(attemptNum: number): Promise<void>;
     uniqueAccounts(): string[];

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,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,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AA0C7D,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;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoBd,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,EAC/B,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,0BAA0B,CAAC;IAyEzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,EACxB,eAAe,CAAC,EAAE,kBAAkB,EACpC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,0BAA0B,CAAC;YAwGxB,eAAe;CAkD9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,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,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAwC7D,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IAPtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAVpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,YAAY,CAAC,EAAE,OAAO,YAAA,EACtB,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA8CN,aAAa;IAoBd,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,EAC/B,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,0BAA0B,CAAC;IAyEzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,EACxB,eAAe,CAAC,EAAE,kBAAkB,EACpC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,0BAA0B,CAAC;YAwGxB,eAAe;CAoD9B"}

package/dist/types/solauto.d.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform, PositionType } from "../generated";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
 export interface SolautoPositionDetails {
     publicKey?: PublicKey;
     authority: PublicKey;
@@ -16,4 +17,8 @@ export declare enum PriorityFeeSetting {
 }
 export type RebalanceAction = "boost" | "repay" | "dca";
 export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";
+export interface TransactionItemInputs {
+    tx: TransactionBuilder;
+    lookupTableAddresses?: string[];
+}
 //# sourceMappingURL=solauto.d.ts.map

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.208",
+  "version": "1.0.210",
   "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

@@ -1,94 +1,154 @@
 import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { publicKey, Signer, signerIdentity, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+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 {
+  WalletAdapter,
+  walletAdapterIdentity,
+} from "@metaplex-foundation/umi-signer-wallet-adapters";
+import {
+  claimReferralFees,
+  createSolautoProgram,
+  ReferralState,
+  safeFetchReferralState,
+  updateReferralStates,
+} from "../generated";
 import { getReferralState, getTokenAccount } from "../utils";
 import { TxHandler } from "./txHandler";
 
 interface ReferralStateManagerArgs {
-    signer?: Signer;
-    wallet?: WalletAdapter;
-    referralAuthority?: PublicKey;
+  signer?: Signer;
+  wallet?: WalletAdapter;
+  referralAuthority?: PublicKey;
+  referredByAuthority?: PublicKey;
 }
 
 export class ReferralStateManager extends TxHandler {
-    public umi!: Umi;
-    public signer!: Signer;
+  public umi!: Umi;
+  public signer!: Signer;
 
-    public referralAuthority!: PublicKey;
-    public referralState!: PublicKey;
-    public referralStateData!: ReferralState | null;
+  public referralAuthority!: PublicKey;
+  public referralState!: PublicKey;
+  public referralStateData!: ReferralState | null;
 
-    constructor(heliusApiUrl: string, public localTest?: boolean) {
-        super(heliusApiUrl, localTest)
-        this.umi = this.umi.use({
-            install(umi) {
-                umi.programs.add(createSolautoProgram(), false);
-            },
-        });
-    }
+  public referredByAuthority?: PublicKey;
+  public referredByState?: PublicKey;
 
-    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)
-        );
+  constructor(
+    heliusApiUrl: string,
+    public localTest?: boolean
+  ) {
+    super(heliusApiUrl, localTest);
+    this.umi = this.umi.use({
+      install(umi) {
+        umi.programs.add(createSolautoProgram(), false);
+      },
+    });
+  }
 
-        this.signer = this.umi.identity;
-        this.referralState = getReferralState(args.referralAuthority ?? toWeb3JsPublicKey(this.signer.publicKey));
-        this.referralStateData = await safeFetchReferralState(this.umi, publicKey(this.referralState), { commitment: "confirmed" });
+  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)
+    );
 
-    defaultLookupTables(): string[] {
-        return this.referralStateData?.lookupTable ? [this.referralStateData?.lookupTable.toString()] : [];
-    }
+    this.signer = this.umi.identity;
+    this.referralState = getReferralState(
+      args.referralAuthority ?? toWeb3JsPublicKey(this.signer.publicKey)
+    );
+    this.referralStateData = await safeFetchReferralState(
+      this.umi,
+      publicKey(this.referralState),
+      { commitment: "confirmed" }
+    );
 
-    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,
-        });
-    }
+    this.setReferredBy(args.referredByAuthority);
+  }
 
-    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;
+  defaultLookupTables(): string[] {
+    return this.referralStateData?.lookupTable
+      ? [this.referralStateData?.lookupTable.toString()]
+      : [];
+  }
 
-        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,
-        });
-    }
+  public setReferredBy(referredBy?: PublicKey) {
+    const authorityReferralStateData = this.referralStateData;
+    const hasReferredBy =
+      authorityReferralStateData &&
+      authorityReferralStateData.referredByState !==
+        publicKey(PublicKey.default);
+    const referredByAuthority =
+      !hasReferredBy &&
+      referredBy &&
+      !referredBy.equals(toWeb3JsPublicKey(this.signer.publicKey))
+        ? referredBy
+        : undefined;
+    this.referredByState = hasReferredBy
+      ? toWeb3JsPublicKey(authorityReferralStateData!.referredByState)
+      : referredByAuthority
+        ? getReferralState(referredByAuthority!)
+        : undefined;
+    this.referredByAuthority = referredByAuthority;
+  }
 
-    async resetLiveTxUpdates(success?: boolean): Promise<void> { }
-}
+  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))
+        : this.referredByState
+          ? publicKey(this.referredByState)
+          : 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,
+    });
+  }
+
+  async resetLiveTxUpdates(success?: boolean): Promise<void> {}
+}

package/src/clients/solautoClient.ts

@@ -91,9 +91,6 @@ export abstract class SolautoClient extends TxHandler {
   public signerDebtTa!: PublicKey;
 
   public referralStateManager!: ReferralStateManager;
-
-  public referredByState?: PublicKey;
-  public referredByAuthority?: PublicKey;
   public referredBySupplyTa?: PublicKey;
 
   public solautoFeesWallet!: PublicKey;
@@ -133,11 +130,13 @@ export abstract class SolautoClient extends TxHandler {
       this.authority,
       this.positionId
     );
-    this.solautoPositionData = !args.new ? await safeFetchSolautoPosition(
-      this.umi,
-      publicKey(this.solautoPosition),
-      { commitment: "confirmed" }
-    ) : null;
+    this.solautoPositionData = !args.new
+      ? await safeFetchSolautoPosition(
+          this.umi,
+          publicKey(this.solautoPosition),
+          { commitment: "confirmed" }
+        )
+      : null;
     this.solautoPositionState = this.solautoPositionData?.state;
 
     this.maxLtvBps = undefined;
@@ -171,11 +170,16 @@ export abstract class SolautoClient extends TxHandler {
     this.referralStateManager = new ReferralStateManager(this.rpcUrl);
     await this.referralStateManager.initialize({
       referralAuthority: this.authority,
+      referredByAuthority: args.referredByAuthority,
       signer: args.signer,
       wallet: args.wallet,
     });
-
-    this.setReferredBy(args.referredByAuthority);
+    if (this.referralStateManager.referredByState !== undefined) {
+      this.referredBySupplyTa = getTokenAccount(
+        this.referralStateManager.referredByState,
+        this.supplyMint
+      );
+    }
 
     this.solautoFeesWallet = SOLAUTO_FEES_WALLET;
     this.solautoFeesSupplyTa = getTokenAccount(
@@ -208,27 +212,10 @@ export abstract class SolautoClient extends TxHandler {
   }
 
   public setReferredBy(referredBy?: PublicKey) {
-    const authorityReferralStateData =
-      this.referralStateManager.referralStateData;
-    const hasReferredBy =
-      authorityReferralStateData &&
-      authorityReferralStateData.referredByState !==
-        publicKey(PublicKey.default);
-    const referredByAuthority =
-      !hasReferredBy &&
-      referredBy &&
-      !referredBy.equals(toWeb3JsPublicKey(this.signer.publicKey))
-        ? referredBy
-        : undefined;
-    this.referredByState = hasReferredBy
-      ? toWeb3JsPublicKey(authorityReferralStateData!.referredByState)
-      : referredByAuthority
-        ? getReferralState(referredByAuthority!)
-        : undefined;
-    this.referredByAuthority = referredByAuthority;
-    if (this.referredByState !== undefined) {
+    this.referralStateManager.setReferredBy(referredBy);
+    if (this.referralStateManager.referredByState !== undefined) {
       this.referredBySupplyTa = getTokenAccount(
-        this.referredByState,
+        this.referralStateManager.referredByState,
         this.supplyMint
       );
     }

package/src/clients/solautoMarginfiClient.ts

@@ -263,8 +263,8 @@ export class SolautoMarginfiClient extends SolautoClient {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
       signerReferralState: publicKey(this.referralStateManager.referralState),
-      referredByState: this.referredByState
-        ? publicKey(this.referredByState)
+      referredByState: this.referralStateManager.referredByState
+        ? publicKey(this.referralStateManager.referredByState)
         : undefined,
       referredBySupplyTa: this.referredBySupplyTa
         ? publicKey(this.referredBySupplyTa)

package/src/clients/txHandler.ts

@@ -1,5 +1,5 @@
 import { Umi } from "@metaplex-foundation/umi";
-import { Connection } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { consoleLog, getSolanaRpcConnection } from "../utils";
 
 export abstract class TxHandler {
@@ -28,4 +28,6 @@ export abstract class TxHandler {
   abstract defaultLookupTables(): string[];
 
   abstract resetLiveTxUpdates(success?: boolean): Promise<void>;
+
+  abstract setReferredBy(referredBy?: PublicKey): void;
 }

package/src/transactions/transactionUtils.ts

@@ -11,6 +11,7 @@ import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import {
   ACCOUNT_SIZE as TOKEN_ACCOUNT_SIZE,
   NATIVE_MINT,
+  RawAccount,
 } from "@solana/spl-token";
 import {
   InvalidRebalanceConditionError,
@@ -73,6 +74,7 @@ import {
   JUPITER_PROGRAM_ID,
 } from "../jupiter-sdk";
 import { PRICES } from "../constants";
+import { TransactionItemInputs } from "../types";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -138,7 +140,7 @@ async function transactionChoresBefore(
 
   if (
     client.referralStateManager.referralStateData === null ||
-    (client.referredByState !== undefined &&
+    (client.referralStateManager.referredByState !== undefined &&
       client.referralStateManager.referralStateData?.referredByState ===
         publicKey(PublicKey.default)) ||
     (client.authorityLutAddress !== undefined &&
@@ -148,7 +150,7 @@ async function transactionChoresBefore(
     chores = chores.add(
       client.referralStateManager.updateReferralStatesIx(
         undefined,
-        client.referredByAuthority,
+        client.referralStateManager.referredByAuthority,
         client.authorityLutAddress
       )
     );
@@ -313,7 +315,7 @@ export async function rebalanceChoresBefore(
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
-        client.referredByState!,
+        client.referralStateManager.referredByState!,
         client.supplyMint
       )
     );
@@ -628,13 +630,7 @@ export async function buildSolautoRebalanceTransaction(
   client: SolautoClient,
   targetLiqUtilizationRateBps?: number,
   attemptNum?: number
-): Promise<
-  | {
-      tx: TransactionBuilder;
-      lookupTableAddresses: string[];
-    }
-  | undefined
-> {
+): Promise<TransactionItemInputs | undefined> {
   client.solautoPositionState = await client.getFreshPositionState();
   if (
     (client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
@@ -754,8 +750,11 @@ export async function convertReferralFeesToDestination(
   referralManager: ReferralStateManager,
   tokenAccount: PublicKey,
   destinationMint: PublicKey
-): Promise<[TransactionBuilder, string[]] | undefined> {
-  const tokenAccountData = await getTokenAccountData(referralManager.umi, tokenAccount);
+): Promise<TransactionItemInputs | undefined> {
+  const tokenAccountData = await getTokenAccountData(
+    referralManager.umi,
+    tokenAccount
+  );
   if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
     return undefined;
   }
@@ -788,7 +787,7 @@ export async function convertReferralFeesToDestination(
     )
     .add(swapIx);
 
-  return [tx, lookupTableAddresses];
+  return { tx, lookupTableAddresses };
 }
 
 export function getErrorInfo(tx: TransactionBuilder, error: any) {

package/src/transactions/transactionsManager.ts

@@ -15,12 +15,8 @@ import {
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
 import { getErrorInfo, getTransactionChores } from "./transactionUtils";
-import { PriorityFeeSetting, TransactionRunType } from "../types";
+import { PriorityFeeSetting, TransactionItemInputs, TransactionRunType } from "../types";
 import { ReferralStateManager, TxHandler } from "../clients";
-import {
-  InvalidRebalanceConditionError,
-  SOLAUTO_PROGRAM_ID,
-} from "../generated";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 class LookupTables {
@@ -58,6 +54,8 @@ class LookupTables {
   }
 }
 
+
+
 export class TransactionItem {
   lookupTableAddresses!: string[];
   tx?: TransactionBuilder;
@@ -65,9 +63,7 @@ export class TransactionItem {
   constructor(
     public fetchTx: (
       attemptNum: number
-    ) => Promise<
-      { tx: TransactionBuilder; lookupTableAddresses?: string[] } | undefined
-    >,
+    ) => Promise<TransactionItemInputs | undefined>,
     public name?: string
   ) {}
 
@@ -542,7 +538,9 @@ export class TransactionsManager {
         undefined,
         errorDetails.errorInfo ?? errorDetails.errorName ?? "Unknown error"
       );
-      this.txHandler.log(`${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo ?? "unknown"}`);
+      this.txHandler.log(
+        `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo ?? "unknown"}`
+      );
 
       if (!errorDetails.canBeIgnored) {
         throw e;

package/src/types/solauto.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform, PositionType } from "../generated";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
 
 export interface SolautoPositionDetails {
   publicKey?: PublicKey;
@@ -14,9 +15,14 @@ export interface SolautoPositionDetails {
 
 export enum PriorityFeeSetting {
   Default = "Medium",
-  High = "High"
+  High = "High",
 }
 
 export type RebalanceAction = "boost" | "repay" | "dca";
 
-export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";
+export type TransactionRunType = "skip-simulation" | "only-simulate" | "normal";
+
+export interface TransactionItemInputs {
+  tx: TransactionBuilder;
+  lookupTableAddresses?: string[];
+}