@haven-fi/solauto-sdk 1.0.618 → 1.0.620

package/dist/services/rebalance/rebalanceSwapManager.d.ts

@@ -23,7 +23,7 @@ export declare class RebalanceSwapManager {
     getSwapTxData(): Promise<{
         swapQuote: QuoteResponse;
         lookupTableAddresses: string[];
-        setupInstructions: import("@metaplex-foundation/umi").TransactionBuilder;
+        setupIx: import("@metaplex-foundation/umi").TransactionBuilder;
         swapIx: import("@metaplex-foundation/umi").TransactionBuilder;
     }>;
 }

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -136,11 +136,11 @@ class RebalanceSwapManager {
         };
     }
     async getSwapTxData() {
-        const { jupQuote, lookupTableAddresses, setupInstructions, swapIx } = await this.jupSwapManager.getJupSwapTxData(this.swapParams);
+        const { jupQuote, lookupTableAddresses, setupIx, swapIx } = await this.jupSwapManager.getJupSwapTxData(this.swapParams);
         return {
             swapQuote: jupQuote,
             lookupTableAddresses,
-            setupInstructions,
+            setupIx,
             swapIx,
         };
     }

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -143,7 +143,7 @@ class RebalanceTxBuilder {
         return false;
     }
     async assembleTransaction() {
-        const { swapQuote, lookupTableAddresses, setupInstructions, swapIx } = await this.swapManager.getSwapTxData();
+        const { swapQuote, lookupTableAddresses, setupIx, swapIx } = await this.swapManager.getSwapTxData();
         const flashLoanDetails = this.flRequirements
             ? this.getFlashLoanDetails()
             : undefined;
@@ -161,7 +161,7 @@ class RebalanceTxBuilder {
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);
         const lastRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PostSwap, rebalanceDetails);
         if (!flashLoanDetails) {
-            tx = tx.add([setupInstructions, firstRebalance, swapIx, lastRebalance]);
+            tx = tx.add([setupIx, firstRebalance, swapIx, lastRebalance]);
         }
         else {
             (0, utils_1.consoleLog)("Flash loan details:", flashLoanDetails);
@@ -172,7 +172,7 @@ class RebalanceTxBuilder {
                 ? (0, utils_1.getTokenAccount)(this.client.pos.publicKey, new web3_js_1.PublicKey(swapQuote.outputMint))
                 : (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.client.signer.publicKey), new web3_js_1.PublicKey(swapQuote.inputMint));
             tx = tx.add([
-                setupInstructions,
+                setupIx,
                 this.client.flProvider.flashBorrow(flashLoanDetails, flashBorrowDest),
                 ...(addFirstRebalance ? [firstRebalance] : []),
                 swapIx,

package/dist/services/solauto/solautoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAkFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAwBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAEL,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAElC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAkFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAgBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}

package/dist/services/solauto/solautoClient.js

@@ -163,15 +163,10 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         };
     }
     async signerBalances() {
-        if (this.signerSupplyBalance !== undefined &&
-            this.signerDebtBalance !== undefined) {
-            return {
-                supplyBalance: this.signerSupplyBalance,
-                debtBalance: this.signerDebtBalance,
-            };
+        if (!this.signerSupplyBalance || !this.signerDebtBalance) {
+            [this.signerSupplyBalance, this.signerDebtBalance] =
+                await (0, solanaUtils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint(), this.pos.debtMint()]);
         }
-        [this.signerSupplyBalance, this.signerDebtBalance] =
-            await (0, solanaUtils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint(), this.pos.debtMint()]);
         return {
             supplyBalance: this.signerSupplyBalance,
             debtBalance: this.signerDebtBalance,

package/dist/services/swap/jupSwapManager.d.ts

@@ -11,13 +11,13 @@ export interface SwapInput {
     slippageBps?: number;
 }
 export interface SwapParams extends SwapInput {
-    destinationWallet: PublicKey;
+    destinationWallet?: PublicKey;
     slippageIncFactor?: number;
     wrapAndUnwrapSol?: boolean;
 }
 export interface JupSwapTransactionData {
     jupQuote: QuoteResponse;
-    setupInstructions: TransactionBuilder;
+    setupIx: TransactionBuilder;
     swapIx: TransactionBuilder;
     cleanupIx: TransactionBuilder;
     lookupTableAddresses: string[];

package/dist/services/swap/jupSwapManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,EAAE,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAqChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}
+{"version":3,"file":"jupSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/swap/jupSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,qBAAa,cAAc;IAKb,OAAO,CAAC,MAAM;IAJ1B,MAAM,mCAA4B;IAE3B,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAa;gBAEnC,MAAM,EAAE,MAAM;IAErB,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;YAoBhD,kBAAkB;IAsChC,cAAc;IAId,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,0BAA0B;IAc5B,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2CnE,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAYlE"}

package/dist/services/swap/jupSwapManager.js

@@ -7,6 +7,7 @@ const solanaUtils_1 = require("../../utils/solanaUtils");
 const numberUtils_1 = require("../../utils/numberUtils");
 const accountUtils_1 = require("../../utils/accountUtils");
 const utils_1 = require("../../utils");
+const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 class JupSwapManager {
     constructor(signer) {
         this.signer = signer;
@@ -38,7 +39,8 @@ class JupSwapManager {
                     quoteResponse: this.jupQuote,
                     wrapAndUnwrapSol: data.wrapAndUnwrapSol ?? false,
                     useTokenLedger: !data.exactOut && !data.exactIn,
-                    destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(data.destinationWallet, data.outputMint).toString(),
+                    destinationTokenAccount: (0, accountUtils_1.getTokenAccount)(data.destinationWallet ??
+                        (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), data.outputMint).toString(),
                 },
             });
             if (!res) {
@@ -82,7 +84,7 @@ class JupSwapManager {
         return {
             jupQuote: this.jupQuote,
             lookupTableAddresses: instructions.addressLookupTableAddresses,
-            setupInstructions: (0, umi_1.transactionBuilder)((instructions.setupInstructions ?? []).map((ix) => (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(ix)))),
+            setupIx: (0, umi_1.transactionBuilder)((instructions.setupInstructions ?? []).map((ix) => (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(ix)))),
             swapIx: (0, umi_1.transactionBuilder)([
                 (0, solanaUtils_1.getWrappedInstruction)(this.signer, (0, utils_1.jupIxToSolanaIx)(instructions.swapInstruction)),
             ]),
@@ -97,7 +99,7 @@ class JupSwapManager {
         const swapData = await this.getJupSwapTxData(data);
         return {
             tx: (0, umi_1.transactionBuilder)().add([
-                swapData.setupInstructions,
+                swapData.setupIx,
                 swapData.swapIx,
                 swapData.cleanupIx,
             ]),

package/dist/services/transactions/transactionUtils.js

@@ -320,7 +320,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         return undefined;
     }
     const jupSwapManager = new __1.JupSwapManager(referralManager.umi.identity);
-    const { lookupTableAddresses, setupInstructions, swapIx, cleanupIx } = await jupSwapManager.getJupSwapTxData({
+    const { lookupTableAddresses, setupIx, swapIx, cleanupIx } = await jupSwapManager.getJupSwapTxData({
         amount: tokenAccountData.amount,
         destinationWallet: referralManager.referralState,
         inputMint: tokenAccountData.mint,
@@ -329,7 +329,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
         slippageIncFactor: 0.25,
     });
     let tx = (0, umi_1.transactionBuilder)()
-        .add(setupInstructions)
+        .add(setupIx)
         .add((0, generated_1.convertReferralFees)(referralManager.umi, {
         signer: referralManager.signer,
         intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),

package/package.json

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

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -211,13 +211,13 @@ export class RebalanceSwapManager {
   }
 
   async getSwapTxData() {
-    const { jupQuote, lookupTableAddresses, setupInstructions, swapIx } =
+    const { jupQuote, lookupTableAddresses, setupIx, swapIx } =
       await this.jupSwapManager.getJupSwapTxData(this.swapParams);
 
     return {
       swapQuote: jupQuote,
       lookupTableAddresses,
-      setupInstructions,
+      setupIx,
       swapIx,
     };
   }

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -246,7 +246,7 @@ export class RebalanceTxBuilder {
   }
 
   private async assembleTransaction(): Promise<TransactionItemInputs> {
-    const { swapQuote, lookupTableAddresses, setupInstructions, swapIx } =
+    const { swapQuote, lookupTableAddresses, setupIx, swapIx } =
       await this.swapManager.getSwapTxData();
 
     const flashLoanDetails = this.flRequirements
@@ -277,7 +277,7 @@ export class RebalanceTxBuilder {
     );
 
     if (!flashLoanDetails) {
-      tx = tx.add([setupInstructions, firstRebalance, swapIx, lastRebalance]);
+      tx = tx.add([setupIx, firstRebalance, swapIx, lastRebalance]);
     } else {
       consoleLog("Flash loan details:", flashLoanDetails);
 
@@ -296,7 +296,7 @@ export class RebalanceTxBuilder {
           );
 
       tx = tx.add([
-        setupInstructions,
+        setupIx,
         this.client.flProvider.flashBorrow(flashLoanDetails, flashBorrowDest),
         ...(addFirstRebalance ? [firstRebalance] : []),
         swapIx,

package/src/services/solauto/solautoClient.ts

@@ -307,23 +307,15 @@ export abstract class SolautoClient extends ReferralStateManager {
     supplyBalance: bigint;
     debtBalance: bigint;
   }> {
-    if (
-      this.signerSupplyBalance !== undefined &&
-      this.signerDebtBalance !== undefined
-    ) {
-      return {
-        supplyBalance: this.signerSupplyBalance,
-        debtBalance: this.signerDebtBalance,
-      };
+    if (!this.signerSupplyBalance || !this.signerDebtBalance) {
+      [this.signerSupplyBalance, this.signerDebtBalance] =
+        await getWalletSplBalances(
+          this.connection,
+          toWeb3JsPublicKey(this.signer.publicKey),
+          [this.pos.supplyMint(), this.pos.debtMint()]
+        );
     }
 
-    [this.signerSupplyBalance, this.signerDebtBalance] =
-      await getWalletSplBalances(
-        this.connection,
-        toWeb3JsPublicKey(this.signer.publicKey),
-        [this.pos.supplyMint(), this.pos.debtMint()]
-      );
-
     return {
       supplyBalance: this.signerSupplyBalance,
       debtBalance: this.signerDebtBalance,

package/src/services/swap/jupSwapManager.ts

@@ -18,6 +18,7 @@ import {
   retryWithExponentialBackoff,
 } from "../../utils";
 import { TransactionItemInputs } from "../../types";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 
 export interface SwapInput {
   inputMint: PublicKey;
@@ -29,14 +30,14 @@ export interface SwapInput {
 }
 
 export interface SwapParams extends SwapInput {
-  destinationWallet: PublicKey;
+  destinationWallet?: PublicKey;
   slippageIncFactor?: number;
   wrapAndUnwrapSol?: boolean;
 }
 
 export interface JupSwapTransactionData {
   jupQuote: QuoteResponse;
-  setupInstructions: TransactionBuilder;
+  setupIx: TransactionBuilder;
   swapIx: TransactionBuilder;
   cleanupIx: TransactionBuilder;
   lookupTableAddresses: string[];
@@ -87,7 +88,8 @@ export class JupSwapManager {
             wrapAndUnwrapSol: data.wrapAndUnwrapSol ?? false,
             useTokenLedger: !data.exactOut && !data.exactIn,
             destinationTokenAccount: getTokenAccount(
-              data.destinationWallet,
+              data.destinationWallet ??
+                toWeb3JsPublicKey(this.signer.publicKey),
               data.outputMint
             ).toString(),
           },
@@ -151,7 +153,7 @@ export class JupSwapManager {
     return {
       jupQuote: this.jupQuote,
       lookupTableAddresses: instructions.addressLookupTableAddresses,
-      setupInstructions: transactionBuilder(
+      setupIx: transactionBuilder(
         (instructions.setupInstructions ?? []).map((ix) =>
           getWrappedInstruction(this.signer, jupIxToSolanaIx(ix))
         )
@@ -180,7 +182,7 @@ export class JupSwapManager {
 
     return {
       tx: transactionBuilder().add([
-        swapData.setupInstructions,
+        swapData.setupIx,
         swapData.swapIx,
         swapData.cleanupIx,
       ]),

package/src/services/transactions/transactionUtils.ts

@@ -567,7 +567,7 @@ export async function convertReferralFeesToDestination(
   }
 
   const jupSwapManager = new JupSwapManager(referralManager.umi.identity);
-  const { lookupTableAddresses, setupInstructions, swapIx, cleanupIx } =
+  const { lookupTableAddresses, setupIx, swapIx, cleanupIx } =
     await jupSwapManager.getJupSwapTxData({
       amount: tokenAccountData.amount,
       destinationWallet: referralManager.referralState,
@@ -578,7 +578,7 @@ export async function convertReferralFeesToDestination(
     });
 
   let tx = transactionBuilder()
-    .add(setupInstructions)
+    .add(setupIx)
     .add(
       convertReferralFees(referralManager.umi, {
         signer: referralManager.signer,