@haven-fi/solauto-sdk 1.0.82 → 1.0.84

package/dist/clients/index.d.ts

@@ -1,4 +1,5 @@
 export * from './solautoMarginfiClient';
 export * from './solautoClient';
 export * from './referralStateManager';
+export * from './txHandler';
 //# 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;AAChC,cAAc,wBAAwB,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;AACvC,cAAc,aAAa,CAAC"}

package/dist/clients/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./solautoMarginfiClient"), exports);
 __exportStar(require("./solautoClient"), exports);
 __exportStar(require("./referralStateManager"), exports);
+__exportStar(require("./txHandler"), exports);

package/dist/clients/referralStateManager.d.ts

@@ -2,21 +2,25 @@ 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";
+import { TxHandler } from "./txHandler";
 interface ReferralStateManagerArgs {
     referralAuthority?: PublicKey;
     signer?: Signer;
     wallet?: WalletAdapter;
 }
-export declare class ReferralStateManager {
+export declare class ReferralStateManager extends TxHandler {
+    localTest?: boolean | undefined;
     umi: Umi;
     signer: Signer;
     referralAuthority: PublicKey;
     referralState: PublicKey;
     referralStateData: ReferralState | null;
-    constructor(heliusApiKey: string);
+    constructor(heliusApiKey: string, localTest?: boolean | undefined);
     initialize(args: ReferralStateManagerArgs): Promise<void>;
+    defaultLookupTables(): string[];
     updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;
     claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder;
+    resetLiveTxUpdates(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=referralStateManager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,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"}
+{"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,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;CAC1B;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,IAAI,OAAO,CAAC,IAAI,CAAC;CAC5C"}

package/dist/clients/referralStateManager.js

@@ -7,10 +7,12 @@ 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({
+const txHandler_1 = require("./txHandler");
+class ReferralStateManager extends txHandler_1.TxHandler {
+    constructor(heliusApiKey, localTest) {
+        super(heliusApiKey, localTest);
+        this.localTest = localTest;
+        this.umi = this.umi.use({
             install(umi) {
                 umi.programs.add((0, generated_1.createSolautoProgram)(), false);
             },
@@ -27,6 +29,9 @@ class ReferralStateManager {
         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));
     }
+    defaultLookupTables() {
+        return this.referralStateData?.lookupTable ? [this.referralStateData?.lookupTable.toString()] : [];
+    }
     updateReferralStatesIx(destFeesMint, referredBy, lookupTable) {
         return (0, generated_1.updateReferralStates)(this.umi, {
             signer: this.signer,
@@ -59,5 +64,6 @@ class ReferralStateManager {
             feesDestinationTa,
         });
     }
+    async resetLiveTxUpdates() { }
 }
 exports.ReferralStateManager = ReferralStateManager;

package/dist/clients/solautoClient.d.ts

@@ -1,12 +1,13 @@
 import "rpc-websockets/dist/lib/client";
-import { Connection, PublicKey } from "@solana/web3.js";
-import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 import { LivePositionUpdates } from "../utils/solauto/generalUtils";
 import { ReferralStateManager } from "./referralStateManager";
+import { TxHandler } from "./txHandler";
 export interface SolautoClientArgs {
     authority?: PublicKey;
     positionId: number;
@@ -16,11 +17,8 @@ export interface SolautoClientArgs {
     debtMint?: PublicKey;
     referredByAuthority?: PublicKey;
 }
-export declare abstract class SolautoClient {
+export declare abstract class SolautoClient extends TxHandler {
     localTest?: boolean | undefined;
-    private heliusApiKey;
-    umi: Umi;
-    connection: Connection;
     lendingPlatform: LendingPlatform;
     authority: PublicKey;
     signer: Signer;
@@ -46,8 +44,8 @@ export declare abstract class SolautoClient {
     livePositionUpdates: LivePositionUpdates;
     constructor(heliusApiKey: string, localTest?: boolean | undefined);
     initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform): Promise<void>;
-    log(...args: any[]): void;
-    resetLivePositionUpdates(): Promise<void>;
+    resetLiveTxUpdates(): Promise<void>;
+    abstract protocolAccount(): PublicKey;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];
     fetchExistingAuthorityLutAccounts(): Promise<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":"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"}

package/dist/clients/solautoClient.js

@@ -14,14 +14,13 @@ 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 {
+const txHandler_1 = require("./txHandler");
+class SolautoClient extends txHandler_1.TxHandler {
     constructor(heliusApiKey, localTest) {
+        super(heliusApiKey, localTest);
         this.localTest = localTest;
         this.livePositionUpdates = new generalUtils_2.LivePositionUpdates();
-        this.heliusApiKey = heliusApiKey;
-        const [connection, umi] = (0, solanaUtils_1.getSolanaRpcConnection)(this.heliusApiKey);
-        this.connection = connection;
-        this.umi = umi.use({
+        this.umi = this.umi.use({
             install(umi) {
                 umi.programs.add((0, generated_1.createSolautoProgram)(), false);
             },
@@ -91,12 +90,7 @@ class SolautoClient {
             ? this.solautoPositionData?.position?.dca
             : undefined);
     }
-    log(...args) {
-        if (this.localTest) {
-            console.log(...args);
-        }
-    }
-    async resetLivePositionUpdates() {
+    async resetLiveTxUpdates() {
         if (!this.solautoPositionData) {
             this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
         }
@@ -114,7 +108,7 @@ class SolautoClient {
         this.livePositionUpdates.reset();
     }
     defaultLookupTables() {
-        return [solautoConstants_1.SOLAUTO_LUT];
+        return [solautoConstants_1.SOLAUTO_LUT, ...(this.authorityLutAddress ? [this.authorityLutAddress.toString()] : [])];
     }
     lutAccountsToAdd() {
         return [

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,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,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()];
     }

package/dist/clients/txHandler.d.ts

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

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

@@ -0,0 +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;AAI7C,8BAAsB,SAAS;IAMpB,SAAS,CAAC,EAAE,OAAO;IALrB,YAAY,EAAG,MAAM,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAEnB,YAAY,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,OAAO,YAAA;IAO5B,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;CAC7C"}

package/dist/clients/txHandler.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TxHandler = void 0;
+const utils_1 = require("../utils");
+class TxHandler {
+    constructor(heliusApiKey, localTest) {
+        this.localTest = localTest;
+        this.heliusApiKey = heliusApiKey;
+        const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.heliusApiKey);
+        this.connection = connection;
+        this.umi = umi;
+    }
+    log(...args) {
+        if (this.localTest) {
+            console.log(...args);
+        }
+    }
+}
+exports.TxHandler = TxHandler;

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;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"}
+{"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,CAyHA;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

@@ -323,9 +323,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     client.solautoPositionState = await client.getFreshPositionState();
     if (client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) ||
         (targetLiqUtilizationRateBps === undefined &&
-            !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.livePositionUpdates.settings ??
-                client.solautoPositionData?.position.settingParams, client.livePositionUpdates.activeDca ??
-                client.solautoPositionData?.position.dca, (0, generalUtils_1.currentUnixSeconds)()))) {
+            !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)()))) {
         client.log("Not eligible for a rebalance");
         return undefined;
     }

package/dist/transactions/transactionsManager.d.ts

@@ -1,12 +1,13 @@
-import { AddressLookupTableInput, TransactionBuilder } from "@metaplex-foundation/umi";
+import { AddressLookupTableInput, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
 import { ErrorsToThrow } from "../utils/generalUtils";
 import { PriorityFeeSetting } from "../types";
+import { TxHandler } from "../clients";
 declare class LookupTables {
-    private client;
     defaultLuts: string[];
+    private umi;
     cache: AddressLookupTableInput[];
-    constructor(client: SolautoClient);
+    constructor(defaultLuts: string[], umi: Umi);
     getLutInputs(additionalAddresses: string[]): Promise<AddressLookupTableInput[]>;
 }
 export declare class TransactionItem {
@@ -26,10 +27,10 @@ export declare class TransactionItem {
     uniqueAccounts(): string[];
 }
 declare class TransactionSet {
-    private client;
+    private txHandler;
     lookupTables: LookupTables;
     items: TransactionItem[];
-    constructor(client: SolautoClient, lookupTables: LookupTables, items?: TransactionItem[]);
+    constructor(txHandler: TxHandler, lookupTables: LookupTables, items?: TransactionItem[]);
     fitsWith(item: TransactionItem): Promise<boolean>;
     add(...items: TransactionItem[]): void;
     refetchAll(attemptNum: number): Promise<void>;
@@ -49,19 +50,19 @@ export type TransactionManagerStatuses = {
     txSig?: string;
 }[];
 export declare class TransactionsManager {
-    private client;
-    private items;
+    private txHandler;
     private statusCallback?;
     private simulateOnly?;
     private mustBeAtomic?;
     private errorsToThrow?;
     private statuses;
     private lookupTables;
-    constructor(client: SolautoClient, items: TransactionItem[], statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, simulateOnly?: boolean | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined);
+    constructor(txHandler: TxHandler, statusCallback?: ((statuses: TransactionManagerStatuses) => void) | undefined, simulateOnly?: boolean | undefined, mustBeAtomic?: boolean | undefined, errorsToThrow?: ErrorsToThrow | undefined);
     private assembleTransactionSets;
     updateStatus(name: string, status: TransactionStatus, txSig?: string): void;
     debugAccounts(itemSet: TransactionSet, tx: TransactionBuilder): Promise<void>;
-    send(prioritySetting?: PriorityFeeSetting): Promise<void>;
+    sendWithClient(items: TransactionItem[], client: SolautoClient, prioritySetting?: PriorityFeeSetting): Promise<void>;
+    send(items: TransactionItem[], prioritySetting?: PriorityFeeSetting, initialized?: boolean): Promise<void>;
 }
 export {};
 //# sourceMappingURL=transactionsManager.d.ts.map

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":"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"}

package/dist/transactions/transactionsManager.js

@@ -11,22 +11,20 @@ const generalUtils_1 = require("../utils/generalUtils");
 const transactionUtils_1 = require("./transactionUtils");
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 class LookupTables {
-    constructor(client) {
-        this.client = client;
-        this.defaultLuts = [];
+    constructor(defaultLuts, umi) {
+        this.defaultLuts = defaultLuts;
+        this.umi = umi;
         this.cache = [];
-        this.defaultLuts = [...client.defaultLookupTables()];
     }
     async getLutInputs(additionalAddresses) {
         const addresses = [
             ...this.defaultLuts,
-            this.client.authorityLutAddress.toString(),
             ...additionalAddresses,
         ];
         const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
         const missingAddresses = addresses.filter((x) => !currentCacheAddresses.includes(x));
         if (missingAddresses) {
-            const additionalInputs = await (0, solanaUtils_1.getAdressLookupInputs)(this.client.umi, missingAddresses);
+            const additionalInputs = await (0, solanaUtils_1.getAdressLookupInputs)(this.umi, missingAddresses);
             this.cache.push(...additionalInputs);
         }
         return this.cache;
@@ -56,8 +54,8 @@ class TransactionItem {
 }
 exports.TransactionItem = TransactionItem;
 class TransactionSet {
-    constructor(client, lookupTables, items = []) {
-        this.client = client;
+    constructor(txHandler, lookupTables, items = []) {
+        this.txHandler = txHandler;
         this.lookupTables = lookupTables;
         this.items = items;
     }
@@ -78,13 +76,13 @@ class TransactionSet {
             ...this.lutAddresses(),
             ...item.lookupTableAddresses,
         ]))
-            .fitsInOneTransaction(this.client.umi);
+            .fitsInOneTransaction(this.txHandler.umi);
     }
     add(...items) {
         this.items.push(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
     }
     async refetchAll(attemptNum) {
-        await this.client.resetLivePositionUpdates();
+        await this.txHandler.resetLiveTxUpdates();
         for (const item of this.items) {
             await item.refetch(attemptNum);
         }
@@ -120,19 +118,18 @@ var TransactionStatus;
     TransactionStatus["Successful"] = "Successful";
 })(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
 class TransactionsManager {
-    constructor(client, items, statusCallback, simulateOnly, mustBeAtomic, errorsToThrow) {
-        this.client = client;
-        this.items = items;
+    constructor(txHandler, statusCallback, simulateOnly, mustBeAtomic, errorsToThrow) {
+        this.txHandler = txHandler;
         this.statusCallback = statusCallback;
         this.simulateOnly = simulateOnly;
         this.mustBeAtomic = mustBeAtomic;
         this.errorsToThrow = errorsToThrow;
         this.statuses = [];
-        this.lookupTables = new LookupTables(client);
+        this.lookupTables = new LookupTables(this.txHandler.defaultLookupTables(), this.txHandler.umi);
     }
     async assembleTransactionSets(items) {
         let transactionSets = [];
-        this.client.log(`Reassembling ${items.length} items`);
+        this.txHandler.log(`Reassembling ${items.length} items`);
         for (let i = 0; i < items.length;) {
             let item = items[i];
             i++;
@@ -140,11 +137,11 @@ class TransactionsManager {
                 continue;
             }
             const transaction = item.tx.setAddressLookupTables(await this.lookupTables.getLutInputs(item.lookupTableAddresses));
-            if (!transaction.fitsInOneTransaction(this.client.umi)) {
-                throw new Error(`Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`);
+            if (!transaction.fitsInOneTransaction(this.txHandler.umi)) {
+                throw new Error(`Transaction exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`);
             }
             else {
-                let newSet = new TransactionSet(this.client, this.lookupTables, [item]);
+                let newSet = new TransactionSet(this.txHandler, this.lookupTables, [item]);
                 for (let j = i; j < items.length; j++) {
                     if (await newSet.fitsWith(items[j])) {
                         newSet.add(items[j]);
@@ -173,7 +170,7 @@ class TransactionsManager {
                 this.statuses.push({ name, status, txSig });
             }
         }
-        this.client.log(`${name} is ${status.toString().toLowerCase()}`);
+        this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
         this.statusCallback?.(this.statuses);
     }
     // TODO remove me
@@ -183,28 +180,29 @@ class TransactionsManager {
         for (const ix of tx.getInstructions()) {
             const ixAccounts = ix.keys.map((x) => x.pubkey);
             const accountsNotInLut = ixAccounts.filter((x) => !lutAccounts.includes(x));
-            this.client.log(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
+            this.txHandler.log(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
             if (accountsNotInLut.length > 0) {
-                this.client.log(`${accountsNotInLut.length} accounts not in LUT:`);
+                this.txHandler.log(`${accountsNotInLut.length} accounts not in LUT:`);
                 for (const key of accountsNotInLut) {
-                    this.client.log(key.toString());
+                    this.txHandler.log(key.toString());
                 }
             }
         }
     }
-    async send(prioritySetting) {
-        const updateLookupTable = await this.client.updateLookupTable();
+    async sendWithClient(items, client, prioritySetting) {
+        const updateLookupTable = await client.updateLookupTable();
         if (updateLookupTable &&
             updateLookupTable.updateLutTx.getInstructions().length > 0 &&
             updateLookupTable?.needsToBeIsolated) {
             this.updateStatus("update lookup table", TransactionStatus.Processing);
-            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, updateLookupTable.updateLutTx, this.simulateOnly, attemptNum), 3, 150, this.errorsToThrow);
+            await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, updateLookupTable.updateLutTx, this.simulateOnly, attemptNum), 3, 150, this.errorsToThrow);
             this.updateStatus("update lookup table", TransactionStatus.Successful);
         }
-        for (const item of this.items) {
+        this.lookupTables.defaultLuts = client.defaultLookupTables();
+        for (const item of items) {
             await item.initialize();
         }
-        const [choresBefore, choresAfter] = await (0, transactionUtils_1.getTransactionChores)(this.client, (0, umi_1.transactionBuilder)().add(this.items
+        const [choresBefore, choresAfter] = await (0, transactionUtils_1.getTransactionChores)(client, (0, umi_1.transactionBuilder)().add(items
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
             .map((x) => x.tx)));
         if (updateLookupTable && !updateLookupTable.needsToBeIsolated) {
@@ -213,16 +211,27 @@ class TransactionsManager {
         if (choresBefore.getInstructions().length > 0) {
             const chore = new TransactionItem(async () => ({ tx: choresBefore }), "create account(s)");
             await chore.initialize();
-            this.items.unshift(chore);
-            this.client.log("Chores before: ", choresBefore.getInstructions().length);
+            items.unshift(chore);
+            this.txHandler.log("Chores before: ", choresBefore.getInstructions().length);
         }
         if (choresAfter.getInstructions().length > 0) {
             const chore = new TransactionItem(async () => ({ tx: choresAfter }));
             await chore.initialize();
-            this.items.push(chore);
-            this.client.log("Chores after: ", choresAfter.getInstructions().length);
+            items.push(chore);
+            this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);
         }
-        const itemSets = await this.assembleTransactionSets(this.items);
+        await this.send(items, prioritySetting, true);
+        if (!this.simulateOnly) {
+            await client.resetLiveTxUpdates();
+        }
+    }
+    async send(items, prioritySetting, initialized) {
+        if (!initialized) {
+            for (const item of items) {
+                await item.initialize();
+            }
+        }
+        const itemSets = await this.assembleTransactionSets(items);
         const statusesStartIdx = this.statuses.length;
         for (const itemSet of itemSets) {
             this.updateStatus(itemSet.name(), TransactionStatus.Queued);
@@ -258,7 +267,7 @@ class TransactionsManager {
                             name: x.name(),
                             status: TransactionStatus.Queued,
                         })));
-                        this.client.log(this.statuses);
+                        this.txHandler.log(this.statuses);
                         itemSets.splice(i + 1, itemSets.length - i - 1, ...newItemSets.slice(1));
                     }
                     return newItemSets.length > 0 ? newItemSets[0] : undefined;
@@ -278,18 +287,15 @@ class TransactionsManager {
                     }
                     else {
                         this.updateStatus(itemSet.name(), TransactionStatus.Processing);
-                        if (this.client.localTest) {
+                        if (this.txHandler.localTest) {
                             await this.debugAccounts(itemSet, tx);
                         }
-                        const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, tx, this.simulateOnly, attemptNum, prioritySetting);
+                        const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.txHandler.umi, this.txHandler.connection, tx, this.simulateOnly, attemptNum, prioritySetting);
                         this.updateStatus(itemSet.name(), TransactionStatus.Successful, txSig ? bs58_1.default.encode(txSig) : undefined);
                     }
                 }, 4, 150, this.errorsToThrow);
             }
         }
-        if (!this.simulateOnly) {
-            await this.client.resetLivePositionUpdates();
-        }
     }
 }
 exports.TransactionsManager = TransactionsManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "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,3 +1,4 @@
 export * from './solautoMarginfiClient';
 export * from './solautoClient';
-export * from './referralStateManager';
+export * from './referralStateManager';
+export * from './txHandler';

package/src/clients/referralStateManager.ts

@@ -5,6 +5,7 @@ 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";
+import { TxHandler } from "./txHandler";
 
 interface ReferralStateManagerArgs {
     referralAuthority?: PublicKey;
@@ -12,7 +13,7 @@ interface ReferralStateManagerArgs {
     wallet?: WalletAdapter;
 }
 
-export class ReferralStateManager {
+export class ReferralStateManager extends TxHandler {
     public umi!: Umi;
     public signer!: Signer;
 
@@ -20,9 +21,9 @@ export class ReferralStateManager {
     public referralState!: PublicKey;
     public referralStateData!: ReferralState | null;
 
-    constructor(heliusApiKey: string) {
-        const [_, umi] = getSolanaRpcConnection(heliusApiKey);
-        this.umi = umi.use({
+    constructor(heliusApiKey: string, public localTest?: boolean) {
+        super(heliusApiKey, localTest)
+        this.umi = this.umi.use({
             install(umi) {
                 umi.programs.add(createSolautoProgram(), false);
             },
@@ -44,6 +45,10 @@ export class ReferralStateManager {
         this.referralStateData = await safeFetchReferralState(this.umi, publicKey(this.referralState));
     }
 
+    defaultLookupTables(): string[] {
+        return this.referralStateData?.lookupTable ? [this.referralStateData?.lookupTable.toString()] : [];
+    }
+
     updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder {
         return updateReferralStates(this.umi, {
             signer: this.signer,
@@ -85,4 +90,5 @@ export class ReferralStateManager {
         });
     }
 
+    async resetLiveTxUpdates(): Promise<void> { }
 }

package/src/clients/solautoClient.ts

@@ -52,7 +52,6 @@ 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,
@@ -60,6 +59,7 @@ import {
 import { currentUnixSeconds } from "../utils/generalUtils";
 import { LivePositionUpdates } from "../utils/solauto/generalUtils";
 import { ReferralStateManager } from "./referralStateManager";
+import { TxHandler } from "./txHandler";
 
 export interface SolautoClientArgs {
   authority?: PublicKey;
@@ -73,10 +73,7 @@ export interface SolautoClientArgs {
   referredByAuthority?: PublicKey;
 }
 
-export abstract class SolautoClient {
-  private heliusApiKey!: string;
-  public umi!: Umi;
-  public connection!: Connection;
+export abstract class SolautoClient extends TxHandler {
   public lendingPlatform!: LendingPlatform;
 
   public authority!: PublicKey;
@@ -114,10 +111,9 @@ export abstract class SolautoClient {
     heliusApiKey: string,
     public localTest?: boolean
   ) {
-    this.heliusApiKey = heliusApiKey;
-    const [connection, umi] = getSolanaRpcConnection(this.heliusApiKey);
-    this.connection = connection;
-    this.umi = umi.use({
+    super(heliusApiKey, localTest);
+
+    this.umi = this.umi.use({
       install(umi) {
         umi.programs.add(createSolautoProgram(), false);
       },
@@ -231,13 +227,7 @@ export abstract class SolautoClient {
     );
   }
 
-  log(...args: any[]): void {
-    if (this.localTest) {
-      console.log(...args);
-    }
-  }
-
-  async resetLivePositionUpdates() {
+  async resetLiveTxUpdates() {
     if (!this.solautoPositionData) {
       this.solautoPositionData = await safeFetchSolautoPosition(
         this.umi,
@@ -257,8 +247,10 @@ export abstract class SolautoClient {
     this.livePositionUpdates.reset();
   }
 
+  abstract protocolAccount(): PublicKey;
+
   defaultLookupTables(): string[] {
-    return [SOLAUTO_LUT];
+    return [SOLAUTO_LUT, ...(this.authorityLutAddress ? [this.authorityLutAddress.toString()] : [])];
   }
 
   lutAccountsToAdd(): PublicKey[] {

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,
@@ -194,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()];
   }

package/src/clients/txHandler.ts

@@ -0,0 +1,28 @@
+import { Umi } from "@metaplex-foundation/umi";
+import { Connection } from "@solana/web3.js";
+import { getSolanaRpcConnection } from "../utils";
+
+
+export abstract class TxHandler {
+  public heliusApiKey!: string;
+  public umi!: Umi;
+  public connection!: Connection;
+
+  constructor(heliusApiKey: string,
+    public localTest?: boolean) {
+      this.heliusApiKey = heliusApiKey;
+      const [connection, umi] = getSolanaRpcConnection(this.heliusApiKey);
+      this.connection = connection;
+      this.umi = umi;
+  }
+
+  log(...args: any[]): void {
+    if (this.localTest) {
+      console.log(...args);
+    }
+  }
+
+  abstract defaultLookupTables(): string[];
+
+  abstract resetLiveTxUpdates(): Promise<void>;
+}

package/src/transactions/transactionUtils.ts

@@ -565,10 +565,8 @@ export async function buildSolautoRebalanceTransaction(
     (targetLiqUtilizationRateBps === undefined &&
       !eligibleForRebalance(
         client.solautoPositionState!,
-        client.livePositionUpdates.settings ??
-        client.solautoPositionData?.position.settingParams!,
-        client.livePositionUpdates.activeDca ??
-        client.solautoPositionData?.position.dca!,
+        client.solautoPositionSettings()!,
+        client.solautoPositionActiveDca()!,
         currentUnixSeconds()
       ))
   ) {

package/src/transactions/transactionsManager.ts

@@ -3,6 +3,7 @@ import {
   AddressLookupTableInput,
   transactionBuilder,
   TransactionBuilder,
+  Umi,
 } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
 import {
@@ -15,14 +16,14 @@ import {
 } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
 import { PriorityFeeSetting } from "../types";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { TxHandler } from "../clients";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 class LookupTables {
-  defaultLuts: string[] = [];
   cache: AddressLookupTableInput[] = [];
 
-  constructor(private client: SolautoClient) {
-    this.defaultLuts = [...client.defaultLookupTables()];
+  constructor(public defaultLuts: string[], private umi: Umi) {
   }
 
   async getLutInputs(
@@ -30,7 +31,6 @@ class LookupTables {
   ): Promise<AddressLookupTableInput[]> {
     const addresses = [
       ...this.defaultLuts,
-      this.client.authorityLutAddress!.toString(),
       ...additionalAddresses,
     ];
     const currentCacheAddresses = this.cache.map((x) => x.publicKey.toString());
@@ -40,7 +40,7 @@ class LookupTables {
     );
     if (missingAddresses) {
       const additionalInputs = await getAdressLookupInputs(
-        this.client.umi,
+        this.umi,
         missingAddresses
       );
       this.cache.push(...additionalInputs);
@@ -61,7 +61,7 @@ export class TransactionItem {
       { tx: TransactionBuilder; lookupTableAddresses?: string[] } | undefined
     >,
     public name?: string
-  ) {}
+  ) { }
 
   async initialize() {
     await this.refetch(0);
@@ -89,10 +89,10 @@ export class TransactionItem {
 
 class TransactionSet {
   constructor(
-    private client: SolautoClient,
+    private txHandler: TxHandler,
     public lookupTables: LookupTables,
     public items: TransactionItem[] = []
-  ) {}
+  ) { }
 
   async fitsWith(item: TransactionItem): Promise<boolean> {
     if (!item.tx) {
@@ -117,7 +117,7 @@ class TransactionSet {
           ...item.lookupTableAddresses,
         ])
       )
-      .fitsInOneTransaction(this.client.umi);
+      .fitsInOneTransaction(this.txHandler.umi);
   }
 
   add(...items: TransactionItem[]) {
@@ -127,7 +127,7 @@ class TransactionSet {
   }
 
   async refetchAll(attemptNum: number) {
-    await this.client.resetLivePositionUpdates();
+    await this.txHandler.resetLiveTxUpdates();
     for (const item of this.items) {
       await item.refetch(attemptNum);
     }
@@ -183,23 +183,22 @@ export class TransactionsManager {
   private lookupTables: LookupTables;
 
   constructor(
-    private client: SolautoClient,
-    private items: TransactionItem[],
+    private txHandler: TxHandler,
     private statusCallback?: (statuses: TransactionManagerStatuses) => void,
     private simulateOnly?: boolean,
     private mustBeAtomic?: boolean,
     private errorsToThrow?: ErrorsToThrow
   ) {
-    this.lookupTables = new LookupTables(client);
+    this.lookupTables = new LookupTables(this.txHandler.defaultLookupTables(), this.txHandler.umi);
   }
 
   private async assembleTransactionSets(
     items: TransactionItem[]
   ): Promise<TransactionSet[]> {
     let transactionSets: TransactionSet[] = [];
-    this.client.log(`Reassembling ${items.length} items`);
+    this.txHandler.log(`Reassembling ${items.length} items`);
 
-    for (let i = 0; i < items.length; ) {
+    for (let i = 0; i < items.length;) {
       let item = items[i];
       i++;
 
@@ -210,12 +209,12 @@ export class TransactionsManager {
       const transaction = item.tx.setAddressLookupTables(
         await this.lookupTables.getLutInputs(item.lookupTableAddresses)
       );
-      if (!transaction.fitsInOneTransaction(this.client.umi)) {
+      if (!transaction.fitsInOneTransaction(this.txHandler.umi)) {
         throw new Error(
-          `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
+          `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`
         );
       } else {
-        let newSet = new TransactionSet(this.client, this.lookupTables, [item]);
+        let newSet = new TransactionSet(this.txHandler, this.lookupTables, [item]);
         for (let j = i; j < items.length; j++) {
           if (await newSet.fitsWith(items[j])) {
             newSet.add(items[j]);
@@ -243,7 +242,7 @@ export class TransactionsManager {
         this.statuses.push({ name, status, txSig });
       }
     }
-    this.client.log(`${name} is ${status.toString().toLowerCase()}`);
+    this.txHandler.log(`${name} is ${status.toString().toLowerCase()}`);
     this.statusCallback?.(this.statuses);
   }
 
@@ -256,18 +255,18 @@ export class TransactionsManager {
       const accountsNotInLut = ixAccounts.filter(
         (x) => !lutAccounts.includes(x)
       );
-      this.client.log(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
+      this.txHandler.log(`Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`);
       if (accountsNotInLut.length > 0) {
-        this.client.log(`${accountsNotInLut.length} accounts not in LUT:`);
+        this.txHandler.log(`${accountsNotInLut.length} accounts not in LUT:`);
         for (const key of accountsNotInLut) {
-          this.client.log(key.toString());
+          this.txHandler.log(key.toString());
         }
       }
     }
   }
 
-  async send(prioritySetting?: PriorityFeeSetting) {
-    const updateLookupTable = await this.client.updateLookupTable();
+  async sendWithClient(items: TransactionItem[], client: SolautoClient, prioritySetting?: PriorityFeeSetting) {
+    const updateLookupTable = await client.updateLookupTable();
     if (
       updateLookupTable &&
       updateLookupTable.updateLutTx.getInstructions().length > 0 &&
@@ -277,8 +276,8 @@ export class TransactionsManager {
       await retryWithExponentialBackoff(
         async (attemptNum) =>
           await sendSingleOptimizedTransaction(
-            this.client.umi,
-            this.client.connection,
+            this.txHandler.umi,
+            this.txHandler.connection,
             updateLookupTable.updateLutTx,
             this.simulateOnly,
             attemptNum
@@ -290,14 +289,16 @@ export class TransactionsManager {
       this.updateStatus("update lookup table", TransactionStatus.Successful);
     }
 
-    for (const item of this.items) {
+    this.lookupTables.defaultLuts = client.defaultLookupTables();
+
+    for (const item of items) {
       await item.initialize();
     }
 
     const [choresBefore, choresAfter] = await getTransactionChores(
-      this.client,
+      client,
       transactionBuilder().add(
-        this.items
+        items
           .filter((x) => x.tx && x.tx.getInstructions().length > 0)
           .map((x) => x.tx!)
       )
@@ -311,17 +312,31 @@ export class TransactionsManager {
         "create account(s)"
       );
       await chore.initialize();
-      this.items.unshift(chore);
-      this.client.log("Chores before: ", choresBefore.getInstructions().length);
+      items.unshift(chore);
+      this.txHandler.log("Chores before: ", choresBefore.getInstructions().length);
     }
     if (choresAfter.getInstructions().length > 0) {
       const chore = new TransactionItem(async () => ({ tx: choresAfter }));
       await chore.initialize();
-      this.items.push(chore);
-      this.client.log("Chores after: ", choresAfter.getInstructions().length);
+      items.push(chore);
+      this.txHandler.log("Chores after: ", choresAfter.getInstructions().length);
     }
 
-    const itemSets = await this.assembleTransactionSets(this.items);
+    await this.send(items, prioritySetting, true);
+
+    if (!this.simulateOnly) {
+      await client.resetLiveTxUpdates();
+    }
+  }
+
+  async send(items: TransactionItem[], prioritySetting?: PriorityFeeSetting, initialized?: boolean) {
+    if (!initialized) {
+      for (const item of items) {
+        await item.initialize();
+      }
+    }
+
+    const itemSets = await this.assembleTransactionSets(items);
     const statusesStartIdx = this.statuses.length;
     for (const itemSet of itemSets) {
       this.updateStatus(itemSet.name(), TransactionStatus.Queued);
@@ -366,7 +381,7 @@ export class TransactionsManager {
                 status: TransactionStatus.Queued,
               }))
             );
-            this.client.log(this.statuses);
+            this.txHandler.log(this.statuses);
             itemSets.splice(
               i + 1,
               itemSets.length - i - 1,
@@ -393,13 +408,13 @@ export class TransactionsManager {
             } else {
               this.updateStatus(itemSet.name(), TransactionStatus.Processing);
 
-              if (this.client.localTest) {
+              if (this.txHandler.localTest) {
                 await this.debugAccounts(itemSet, tx);
               }
 
               const txSig = await sendSingleOptimizedTransaction(
-                this.client.umi,
-                this.client.connection,
+                this.txHandler.umi,
+                this.txHandler.connection,
                 tx,
                 this.simulateOnly,
                 attemptNum,
@@ -418,9 +433,5 @@ export class TransactionsManager {
         );
       }
     }
-
-    if (!this.simulateOnly) {
-      await this.client.resetLivePositionUpdates();
-    }
   }
 }

package/tests/transactions/solautoMarginfi.ts

@@ -66,19 +66,19 @@ describe("Solauto Marginfi tests", async () => {
     //     }, "open position")
     //   );
 
-      // const initialSupplyUsd = 150;
-      // transactionItems.push(
-      //   new TransactionItem(async () => {
-      //     const [supplyPrice] = await getTokenPrices([supply]);
-      //     return {
-      //       tx: client.protocolInteraction(
-      //         solautoAction("Deposit", [
-      //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
-      //         ])
-      //       ),
-      //     };
-      //   }, "deposit")
-      // );
+    // const initialSupplyUsd = 150;
+    // transactionItems.push(
+    //   new TransactionItem(async () => {
+    //     const [supplyPrice] = await getTokenPrices([supply]);
+    //     return {
+    //       tx: client.protocolInteraction(
+    //         solautoAction("Deposit", [
+    //           toBaseUnit(initialSupplyUsd / supplyPrice, supplyDecimals),
+    //         ])
+    //       ),
+    //     };
+    //   }, "deposit")
+    // );
     // }
 
     // const maxLtvBps = client.solautoPositionState!.maxLtvBps;
@@ -118,7 +118,7 @@ describe("Solauto Marginfi tests", async () => {
     //     };
     //   }, "deposit")
     // );
-    
+
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
@@ -156,10 +156,9 @@ describe("Solauto Marginfi tests", async () => {
 
     await new TransactionsManager(
       client,
-      transactionItems,
       undefined,
       !payForTransactions,
       useJitoBundle
-    ).send();
+    ).sendWithClient(transactionItems, client);
   });
 });