@haven-fi/solauto-sdk 1.0.207 → 1.0.209

package/dist/transactions/transactionUtils.d.ts

@@ -1,15 +1,13 @@
-import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { ReferralState } from "../generated";
 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(umi: Umi, referralState: ReferralState, tokenAccount: 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,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqOzD,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,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,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;AAsBxE,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

@@ -400,30 +400,30 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         lookupTableAddresses,
     };
 }
-async function convertReferralFeesToDestination(umi, referralState, tokenAccount) {
-    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(umi, tokenAccount);
+async function convertReferralFeesToDestination(referralManager, tokenAccount, destinationMint) {
+    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
     if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
         return undefined;
     }
-    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(umi.identity, {
+    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(referralManager.umi.identity, {
         amount: tokenAccountData.amount,
-        destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.publicKey),
+        destinationWallet: referralManager.referralState,
         inputMint: tokenAccountData.mint,
-        outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.destFeesMint),
+        outputMint: destinationMint,
         exactIn: true,
         slippageIncFactor: 0.25,
     });
     let tx = (0, umi_1.transactionBuilder)()
         .add(setupInstructions)
-        .add((0, generated_1.convertReferralFees)(umi, {
-        signer: umi.identity,
-        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(umi.identity.publicKey), tokenAccountData.mint)),
+        .add((0, generated_1.convertReferralFees)(referralManager.umi, {
+        signer: referralManager.umi.identity,
+        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: (0, umi_1.publicKey)(referralManager.referralState),
         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.207",
+  "version": "1.0.209",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -22,7 +22,6 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.92.1",
-    "@sqds/multisig": "^2.1.3",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "rpc-websockets": "7.11.0"

package/src/transactions/transactionUtils.ts

@@ -26,6 +26,7 @@ import {
   getMarginfiRebalanceInstructionDataSerializer,
   getSolautoErrorFromCode,
   isSolautoAction,
+  safeFetchReferralState,
   solautoAction,
 } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
@@ -65,13 +66,14 @@ import {
   getMarginfiErrorFromName,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
-import { TxHandler } from "../clients";
+import { ReferralStateManager, TxHandler } from "../clients";
 import {
   createJupiterProgram,
   getJupiterErrorFromName,
   JUPITER_PROGRAM_ID,
 } from "../jupiter-sdk";
 import { PRICES } from "../constants";
+import { TransactionItemInputs } from "../types";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
@@ -627,13 +629,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) &&
@@ -750,21 +746,24 @@ export async function buildSolautoRebalanceTransaction(
 }
 
 export async function convertReferralFeesToDestination(
-  umi: Umi,
-  referralState: ReferralState,
-  tokenAccount: PublicKey
-): Promise<[TransactionBuilder, string[]] | undefined> {
-  const tokenAccountData = await getTokenAccountData(umi, tokenAccount);
+  referralManager: ReferralStateManager,
+  tokenAccount: PublicKey,
+  destinationMint: PublicKey
+): Promise<TransactionItemInputs | undefined> {
+  const tokenAccountData = await getTokenAccountData(
+    referralManager.umi,
+    tokenAccount
+  );
   if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
     return undefined;
   }
 
   const { lookupTableAddresses, setupInstructions, swapIx } =
-    await getJupSwapTransaction(umi.identity, {
+    await getJupSwapTransaction(referralManager.umi.identity, {
       amount: tokenAccountData.amount,
-      destinationWallet: toWeb3JsPublicKey(referralState.publicKey),
+      destinationWallet: referralManager.referralState,
       inputMint: tokenAccountData.mint,
-      outputMint: toWeb3JsPublicKey(referralState.destFeesMint),
+      outputMint: destinationMint,
       exactIn: true,
       slippageIncFactor: 0.25,
     });
@@ -772,22 +771,22 @@ export async function convertReferralFeesToDestination(
   let tx = transactionBuilder()
     .add(setupInstructions)
     .add(
-      convertReferralFees(umi, {
-        signer: umi.identity,
+      convertReferralFees(referralManager.umi, {
+        signer: referralManager.umi.identity,
         intermediaryTa: publicKey(
           getTokenAccount(
-            toWeb3JsPublicKey(umi.identity.publicKey),
+            toWeb3JsPublicKey(referralManager.umi.identity.publicKey),
             tokenAccountData.mint
           )
         ),
         ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: publicKey(referralManager.referralState),
         referralFeesTa: publicKey(tokenAccount),
       })
     )
     .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[];
+}