@haven-fi/solauto-sdk 1.0.38 → 1.0.40

package/dist/clients/solautoClient.d.ts

@@ -69,7 +69,7 @@ export declare abstract class SolautoClient {
     protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
     abstract flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
     abstract flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
-    abstract rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
+    abstract rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
     getFreshPositionState(): Promise<PositionState | undefined>;
 }
 //# sourceMappingURL=solautoClient.d.ts.map

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

@@ -172,9 +172,9 @@ class SolautoClient {
                 addresses: accountsToAdd,
             })));
         }
-        const addingReferredBy = accountsToAdd.length === 1;
-        // && accountsToAdd[0].toString().toLowerCase() ===
-        //   this.referredBySupplyTa?.toString().toLowerCase();
+        const addingReferredBy = accountsToAdd.length === 1 &&
+            accountsToAdd[0].toString().toLowerCase() ===
+                this.referredBySupplyTa?.toString().toLowerCase();
         if (tx.getInstructions().length > 0) {
             this.log("Updating authority lookup table...");
         }

package/dist/clients/solautoMarginfiClient.d.ts

@@ -34,7 +34,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
     private marginfiProtocolInteractionIx;
     private marginfiSolautoProtocolInteractionIx;
-    rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
+    rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
     flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
     flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
     createIntermediaryMarginfiAccount(): 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,EACL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,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;AAQnE,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,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IAsCpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IAgDrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,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;AAK1D,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;AAQnE,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,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IAsCpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,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;IA4DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -125,7 +125,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 settingParams: settingParams ?? null,
                 dca: dca ?? null,
             },
-            marginfiAccountSeedIdx: !this.selfManaged ? this.marginfiAccountSeedIdx : null,
+            marginfiAccountSeedIdx: !this.selfManaged
+                ? this.marginfiAccountSeedIdx
+                : null,
         });
     }
     refresh() {
@@ -248,15 +250,21 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             solautoAction: args,
         });
     }
-    rebalance(rebalanceStep, swapDetails, rebalanceType, targetLiqUtilizationRateBps, limitGapBps) {
+    rebalance(rebalanceStep, swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps, limitGapBps) {
+        const inputIsSupply = swapDetails.inputMint.equals(this.supplyMint);
+        const outputIsSupply = swapDetails.outputMint.equals(this.supplyMint);
+        const needSupplyAccounts = (inputIsSupply && rebalanceStep === "A") ||
+            (outputIsSupply && rebalanceStep === "B") ||
+            (inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
+        const needDebtAccounts = (!inputIsSupply && rebalanceStep === "A") ||
+            (!outputIsSupply && rebalanceStep === "B") ||
+            (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             solautoFeesSupplyTa: rebalanceStep === "B" ? (0, umi_1.publicKey)(this.solautoFeesSupplyTa) : undefined,
-            authorityReferralState: rebalanceStep === "B"
-                ? (0, umi_1.publicKey)(this.authorityReferralState)
-                : undefined,
+            authorityReferralState: (0, umi_1.publicKey)(this.authorityReferralState),
             referredBySupplyTa: rebalanceStep === "B" && this.referredBySupplyTa
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa)
                 : undefined,
@@ -270,14 +278,22 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signerSupplyTa: this.selfManaged
                 ? (0, umi_1.publicKey)(this.signerSupplyTa)
                 : undefined,
-            vaultSupplyTa: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
-            supplyVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority),
+            vaultSupplyTa: needSupplyAccounts
+                ? (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault)
+                : undefined,
+            supplyVaultAuthority: needSupplyAccounts
+                ? (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority)
+                : undefined,
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
             debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.priceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
-            vaultDebtTa: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
-            debtVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority),
+            vaultDebtTa: needDebtAccounts
+                ? (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault)
+                : undefined,
+            debtVaultAuthority: needDebtAccounts
+                ? (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority)
+                : undefined,
             rebalanceType,
             targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
             limitGapBps: limitGapBps ?? null,

package/dist/generated/instructions/marginfiRebalance.d.ts

@@ -15,7 +15,7 @@ export type MarginfiRebalanceInstructionAccounts = {
     tokenProgram?: PublicKey | Pda;
     ixsSysvar: PublicKey | Pda;
     solautoFeesSupplyTa?: PublicKey | Pda;
-    authorityReferralState?: PublicKey | Pda;
+    authorityReferralState: PublicKey | Pda;
     referredBySupplyTa?: PublicKey | Pda;
     solautoPosition: PublicKey | Pda;
     marginfiGroup: PublicKey | Pda;

package/dist/generated/instructions/marginfiRebalance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAoBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CA6KpB"}
+{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,EAAE,SAAS,GAAG,GAAG,CAAC;IACxC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAoBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CA6KpB"}

package/dist/generated/instructions/marginfiRebalance.js

@@ -114,7 +114,7 @@ function marginfiRebalance(context, input) {
         },
         supplyVaultAuthority: {
             index: 17,
-            isWritable: true,
+            isWritable: false,
             value: input.supplyVaultAuthority ?? null,
         },
         debtBank: {
@@ -144,7 +144,7 @@ function marginfiRebalance(context, input) {
         },
         debtVaultAuthority: {
             index: 23,
-            isWritable: true,
+            isWritable: false,
             value: input.debtVaultAuthority ?? null,
         },
     };

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;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;AAqMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAgG7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA4GA;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,EAGL,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;AAqMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAgH7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAgHA;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

@@ -115,8 +115,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     if (rebalanceInstructions.length === 0) {
         return (0, umi_1.transactionBuilder)();
     }
-    const usesAccount = (key) => rebalanceInstructions
-        .some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
+    const usesAccount = (key) => rebalanceInstructions.some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
     const checkReferralSupplyTa = client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
     const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
     const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
@@ -134,7 +133,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
         ...[checkSignerSupplyTa ? client.signerSupplyTa : web3_js_1.PublicKey.default],
         ...[checkSignerDebtTa ? client.signerDebtTa : web3_js_1.PublicKey.default],
     ];
-    const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
+    const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa,] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by TA for ", client.supplyMint.toString());
@@ -148,12 +147,16 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
         !(0, generalUtils_1.rpcAccountCreated)(intermediaryMarginfiAccount)) {
         chores = chores.add(client.createIntermediaryMarginfiAccount());
     }
-    if (checkSignerSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(signerSupplyTa) && !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
+    if (checkSignerSupplyTa &&
+        !(0, generalUtils_1.rpcAccountCreated)(signerSupplyTa) &&
+        !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
         client.log("Creating signer supply token account");
         chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.supplyMint));
         accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
     }
-    if (checkSignerDebtTa && !(0, generalUtils_1.rpcAccountCreated)(signerDebtTa) && !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
+    if (checkSignerDebtTa &&
+        !(0, generalUtils_1.rpcAccountCreated)(signerDebtTa) &&
+        !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
         client.log("Creating signer debt token account");
         chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.debtMint));
         accountsGettingCreated.push(signerDebtTa.publicKey.toString());
@@ -177,7 +180,7 @@ function getRebalanceInstructions(tx) {
                 const discriminator = serializer.serialize({
                     limitGapBps: 0,
                     rebalanceType: generated_1.SolautoRebalanceType.None,
-                    targetLiqUtilizationRateBps: 0
+                    targetLiqUtilizationRateBps: 0,
                 })[0];
                 const [data, _] = serializer.deserialize(x.data);
                 if (data.discriminator === discriminator) {
@@ -195,8 +198,7 @@ function getSolautoActions(tx) {
         if (x.programId === generated_1.SOLAUTO_PROGRAM_ID) {
             try {
                 const serializer = (0, generated_1.getMarginfiProtocolInteractionInstructionDataSerializer)();
-                const discriminator = serializer
-                    .serialize({
+                const discriminator = serializer.serialize({
                     solautoAction: (0, generated_1.solautoAction)("Deposit", [BigInt(0)]),
                 })[0];
                 const [data, _] = serializer.deserialize(x.data);
@@ -328,7 +330,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     const values = (0, rebalanceUtils_1.getRebalanceValues)(client, targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
-    const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails);
+    const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
     const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote);
     let tx = (0, umi_1.transactionBuilder)();
     if (flashLoan) {
@@ -343,11 +345,11 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
             client.flashBorrow(flashLoan, (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), swapDetails.inputMint)),
             ...(addFirstRebalance
                 ? [
-                    client.rebalance("A", swapDetails, rebalanceType, targetLiqUtilizationRateBps),
+                    client.rebalance("A", swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
                 ]
                 : []),
             swapIx,
-            client.rebalance("B", swapDetails, rebalanceType, targetLiqUtilizationRateBps),
+            client.rebalance("B", swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
             client.flashRepay(flashLoan),
         ]);
     }
@@ -356,9 +358,9 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         tx = tx.add([
             setupInstructions,
             tokenLedgerIx,
-            client.rebalance("A", swapDetails, rebalanceType, targetLiqUtilizationRateBps),
+            client.rebalance("A", swapDetails, rebalanceType, undefined, targetLiqUtilizationRateBps),
             swapIx,
-            client.rebalance("B", swapDetails, rebalanceType, targetLiqUtilizationRateBps),
+            client.rebalance("B", swapDetails, rebalanceType, undefined, targetLiqUtilizationRateBps),
         ]);
     }
     if (client.solautoPositionState.liqUtilizationRateBps >

package/dist/transactions/transactionsManager.d.ts

@@ -1,6 +1,13 @@
-import { TransactionBuilder } from "@metaplex-foundation/umi";
+import { AddressLookupTableInput, TransactionBuilder } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../clients/solautoClient";
 import { ErrorsToThrow } from "../utils/generalUtils";
+declare class LookupTables {
+    private client;
+    defaultLuts: string[];
+    cache: AddressLookupTableInput[];
+    constructor(client: SolautoClient);
+    getLutInputs(additionalAddresses: string[]): Promise<AddressLookupTableInput[]>;
+}
 export declare class TransactionItem {
     fetchTx: (attemptNum: number) => Promise<{
         tx: TransactionBuilder;
@@ -17,6 +24,18 @@ export declare class TransactionItem {
     refetch(attemptNum: number): Promise<void>;
     uniqueAccounts(): string[];
 }
+declare class TransactionSet {
+    private client;
+    lookupTables: LookupTables;
+    items: TransactionItem[];
+    constructor(client: SolautoClient, lookupTables: LookupTables, items?: TransactionItem[]);
+    fitsWith(item: TransactionItem): Promise<boolean>;
+    add(...items: TransactionItem[]): void;
+    refetchAll(attemptNum: number): Promise<void>;
+    getSingleTransaction(): Promise<TransactionBuilder>;
+    lutAddresses(): string[];
+    name(): string;
+}
 export declare enum TransactionStatus {
     Skipped = "Skipped",
     Processing = "Processing",
@@ -40,6 +59,8 @@ export declare class TransactionsManager {
     constructor(client: SolautoClient, items: TransactionItem[], 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(): 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":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAqC/B,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;IATd,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,oBAAQ;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;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CAgJX"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EAGvB,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAK/B,cAAM,YAAY;IAIJ,OAAO,CAAC,MAAM;IAH1B,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,KAAK,EAAE,uBAAuB,EAAE,CAAM;gBAElB,MAAM,EAAE,aAAa;IAInC,YAAY,CAChB,mBAAmB,EAAE,MAAM,EAAE,GAC5B,OAAO,CAAC,uBAAuB,EAAE,CAAC;CAqBtC;AAED,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,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,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAED,cAAM,cAAc;IAEhB,OAAO,CAAC,MAAM;IACP,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,eAAe,EAAE;gBAFvB,MAAM,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,KAAK,GAAE,eAAe,EAAO;IAGhC,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BvD,GAAG,CAAC,GAAG,KAAK,EAAE,eAAe,EAAE;IAMzB,UAAU,CAAC,UAAU,EAAE,MAAM;IAO7B,oBAAoB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAYzD,YAAY,IAAI,MAAM,EAAE;IAMxB,IAAI,IAAI,MAAM;CAYf;AAED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IA0CrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAiB9D,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,kBAAkB;IA6B7D,IAAI;CAyJX"}

package/dist/transactions/transactionsManager.js

@@ -29,7 +29,7 @@ class LookupTables {
             const additionalInputs = await (0, solanaUtils_1.getAdressLookupInputs)(this.client.umi, missingAddresses);
             this.cache.push(...additionalInputs);
         }
-        return this.cache.filter((x) => addresses.includes(x.publicKey.toString()));
+        return this.cache;
     }
 }
 class TransactionItem {
@@ -141,7 +141,11 @@ class TransactionsManager {
             }
             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)})`);
+                // TODO: revert me
+                // throw new Error(
+                //   `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
+                // );
+                transactionSets.push(new TransactionSet(this.client, this.lookupTables, [item]));
             }
             else {
                 let newSet = new TransactionSet(this.client, this.lookupTables, [item]);
@@ -176,9 +180,32 @@ class TransactionsManager {
         this.client.log(`${name} is ${status.toString().toLowerCase()}`);
         this.statusCallback?.(this.statuses);
     }
+    // TODO remove me
+    async debugAccounts(itemSet, tx) {
+        const lutInputs = await itemSet.lookupTables.getLutInputs([]);
+        const lutAccounts = lutInputs.map((x) => x.addresses).flat();
+        const keys = tx
+            .getInstructions()
+            .map((x) => x.keys)
+            .flat();
+        for (const ix of tx.getInstructions()) {
+            const ixAccounts = ix.keys.map((x) => x.pubkey);
+            const accountsNotInLut = ixAccounts.filter((x) => !lutAccounts.includes(x));
+            console.log("Program", ix.programId, " data ", ix.data.length, ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3);
+            if (accountsNotInLut.length > 0) {
+                console.log("Accounts not in LUT:");
+                for (const key of accountsNotInLut) {
+                    console.log(key.toString());
+                }
+                console.log(ix.keys.length);
+            }
+        }
+    }
     async send() {
         const updateLookupTable = await this.client.updateLookupTable();
-        if (updateLookupTable && updateLookupTable?.needsToBeIsolated) {
+        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);
             this.updateStatus("update lookup table", TransactionStatus.Successful);
@@ -257,6 +284,9 @@ class TransactionsManager {
                     }
                     else {
                         this.updateStatus(itemSet.name(), TransactionStatus.Processing);
+                        if (this.client.localTest) {
+                            await this.debugAccounts(itemSet, tx);
+                        }
                         const txSig = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(this.client.umi, this.client.connection, tx, this.simulateOnly, attemptNum);
                         this.updateStatus(itemSet.name(), TransactionStatus.Successful, txSig ? bs58_1.default.encode(txSig) : undefined);
                     }

package/dist/types/solauto.d.ts

@@ -1,6 +1,8 @@
 import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform } from "../generated";
 export interface SolautoPositionDetails {
+    publicKey: PublicKey;
+    authority: PublicKey;
     positionId: number;
     lendingPlatform: LendingPlatform;
     protocolAccount?: PublicKey;

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,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACxB"}
+{"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,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB"}

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiD1E;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAM3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAiD1E;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}

package/dist/utils/generalUtils.js

@@ -94,7 +94,7 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
                     return;
                 }
                 if (attemptNum < retries) {
-                    console.log(error);
+                    console.log(error.message);
                     setTimeout(() => {
                         console.log("Retrying...");
                         return attempt(attemptNum);

package/dist/utils/jupiterUtils.d.ts

@@ -17,5 +17,5 @@ export interface JupSwapTransaction {
     tokenLedgerIx: TransactionBuilder;
     swapIx: TransactionBuilder;
 }
-export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails): Promise<JupSwapTransaction>;
+export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
 //# sourceMappingURL=jupiterUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAkE7B"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAMrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAsE7B"}

package/dist/utils/jupiterUtils.js

@@ -7,6 +7,7 @@ const solanaUtils_1 = require("./solanaUtils");
 const numberUtils_1 = require("./numberUtils");
 const api_1 = require("@jup-ag/api");
 const accountUtils_1 = require("./accountUtils");
+const generalUtils_1 = require("./generalUtils");
 const jupApi = (0, api_1.createJupiterApiClient)();
 function createTransactionInstruction(instruction) {
     return new web3_js_1.TransactionInstruction({
@@ -19,9 +20,9 @@ function createTransactionInstruction(instruction) {
         data: Buffer.from(instruction.data, "base64"),
     });
 }
-async function getJupSwapTransaction(signer, swapDetails) {
+async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     console.log("Getting jup quote...");
-    const quoteResponse = await jupApi.quoteGet({
+    const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
         outputMint: swapDetails.outputMint.toString(),
@@ -30,8 +31,9 @@ async function getJupSwapTransaction(signer, swapDetails) {
             : swapDetails.exactIn
                 ? "ExactIn"
                 : undefined,
-        slippageBps: 10
-    });
+        slippageBps: 10,
+        maxAccounts: 60,
+    }), 3);
     const finalPriceSlippageBps = Math.round(Math.max(quoteResponse.slippageBps ?? 10, Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct)))) *
         (1 + (swapDetails.slippageBpsIncFactor ?? 0)));
     quoteResponse.slippageBps = finalPriceSlippageBps;

package/dist/utils/solauto/generalUtils.d.ts

@@ -13,12 +13,7 @@ export declare function getSolautoFeesBps(isReferred: boolean, feeType: FeeType)
 };
 export declare function eligibileForRebalance(positionState: PositionState, positionSettings: SolautoSettingsParameters, positionDca: DCASettings): boolean;
 export declare function eligibleForRefresh(positionState: PositionState, positionSettings: SolautoSettingsParameters): boolean;
-export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<{
-    publicKey: PublicKey;
-    authority: PublicKey;
-    positionId: number;
-    lendingPlatform: LendingPlatform;
-}[]>;
+export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicKey): Promise<SolautoPositionDetails[]>;
 export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;
 export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
 export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey): Promise<SolautoPositionDetails[]>;

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -188,11 +188,15 @@ async function getAllPositionsByAuthority(umi, user) {
     const allPositions = [];
     const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
     allPositions.push(...solautoManagedPositions.map((x) => ({
+        publicKey: x.publicKey,
+        authority: user,
         positionId: x.positionId,
         lendingPlatform: x.lendingPlatform,
     })));
     const marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
     allPositions.push(...marginfiPositions.map((x) => ({
+        publicKey: x.marginfiAccount,
+        authority: user,
         positionId: 0,
         lendingPlatform: generated_1.LendingPlatform.Marginfi,
         protocolAccount: x.marginfiAccount,

package/local/shared.ts

@@ -8,7 +8,7 @@ import {
   VersionedTransaction,
   PublicKey,
 } from "@solana/web3.js";
-import { CONNECTION } from "../src/constants/solautoConstants";
+import { getSolanaRpcConnection } from "../src/utils/solanaUtils";
 
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
@@ -22,9 +22,10 @@ export function getSecretKey(keypairFilename: string = "id"): Uint8Array {
 }
 
 const keypair = Keypair.fromSecretKey(getSecretKey());
+const [connection, _] = getSolanaRpcConnection(process.env.HELIUS_API_KEY ?? "");
 
 async function createAndSendV0Tx(txInstructions: TransactionInstruction[]) {
-  let latestBlockhash = await CONNECTION.getLatestBlockhash("finalized");
+  let latestBlockhash = await connection.getLatestBlockhash("finalized");
 
   const messageV0 = new TransactionMessage({
     payerKey: keypair.publicKey,
@@ -35,11 +36,11 @@ async function createAndSendV0Tx(txInstructions: TransactionInstruction[]) {
 
   transaction.sign([keypair]);
 
-  const txid = await CONNECTION.sendTransaction(transaction, {
+  const txid = await connection.sendTransaction(transaction, {
     maxRetries: 5,
   });
 
-  const confirmation = await CONNECTION.confirmTransaction({
+  const confirmation = await connection.confirmTransaction({
     signature: txid,
     blockhash: latestBlockhash.blockhash,
     lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
@@ -76,13 +77,13 @@ export async function updateLookupTable(
   lookupTableAddress?: PublicKey
 ) {
   let lookupTable = lookupTableAddress
-    ? await CONNECTION.getAddressLookupTable(lookupTableAddress)
+    ? await connection.getAddressLookupTable(lookupTableAddress)
     : null;
   if (lookupTable === null) {
     const [createLutIx, addr] = AddressLookupTableProgram.createLookupTable({
       authority: keypair.publicKey,
       payer: keypair.publicKey,
-      recentSlot: await CONNECTION.getSlot({ commitment: "finalized" }),
+      recentSlot: await connection.getSlot({ commitment: "finalized" }),
     });
     lookupTableAddress = addr;
     console.log("Lookup Table Address:", lookupTableAddress.toString());

package/package.json

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

package/src/clients/solautoClient.ts

@@ -347,9 +347,10 @@ export abstract class SolautoClient {
       );
     }
 
-    const addingReferredBy = accountsToAdd.length === 1;
-    // && accountsToAdd[0].toString().toLowerCase() ===
-    //   this.referredBySupplyTa?.toString().toLowerCase();
+    const addingReferredBy =
+      accountsToAdd.length === 1 &&
+      accountsToAdd[0].toString().toLowerCase() ===
+        this.referredBySupplyTa?.toString().toLowerCase();
 
     if (tx.getInstructions().length > 0) {
       this.log("Updating authority lookup table...");
@@ -632,8 +633,9 @@ export abstract class SolautoClient {
     rebalanceStep: "A" | "B",
     swapDetails: JupSwapDetails,
     rebalanceType: SolautoRebalanceTypeArgs,
+    flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number,
-    limitGapBps?: number
+    limitGapBps?: number,
   ): TransactionBuilder;
 
   async getFreshPositionState(): Promise<PositionState | undefined> {

package/src/clients/solautoMarginfiClient.ts

@@ -11,10 +11,7 @@ import {
   createSignerFromKeypair,
   AccountMeta,
 } from "@metaplex-foundation/umi";
-import {
-  PublicKey,
-  SYSVAR_INSTRUCTIONS_PUBKEY,
-} from "@solana/web3.js";
+import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 import { MarginfiTokenAccounts } from "../types/accounts";
 import {
@@ -216,7 +213,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount:
         "publicKey" in this.marginfiAccount
-          ? this.marginfiAccount as Signer
+          ? (this.marginfiAccount as Signer)
           : publicKey(this.marginfiAccount),
       supplyMint: publicKey(this.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
@@ -230,7 +227,9 @@ export class SolautoMarginfiClient extends SolautoClient {
         settingParams: settingParams ?? null,
         dca: dca ?? null,
       },
-      marginfiAccountSeedIdx: !this.selfManaged ? this.marginfiAccountSeedIdx : null,
+      marginfiAccountSeedIdx: !this.selfManaged
+        ? this.marginfiAccountSeedIdx
+        : null,
     });
   }
 
@@ -391,19 +390,28 @@ export class SolautoMarginfiClient extends SolautoClient {
     rebalanceStep: "A" | "B",
     swapDetails: JupSwapDetails,
     rebalanceType: SolautoRebalanceTypeArgs,
+    flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number,
-    limitGapBps?: number
+    limitGapBps?: number,
   ): TransactionBuilder {
+    const inputIsSupply = swapDetails.inputMint.equals(this.supplyMint);
+    const outputIsSupply = swapDetails.outputMint.equals(this.supplyMint);
+    const needSupplyAccounts =
+      (inputIsSupply && rebalanceStep === "A") ||
+      (outputIsSupply && rebalanceStep === "B") ||
+      (inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
+    const needDebtAccounts =
+      (!inputIsSupply && rebalanceStep === "A") ||
+      (!outputIsSupply && rebalanceStep === "B") ||
+      (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
+
     return marginfiRebalance(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesSupplyTa:
         rebalanceStep === "B" ? publicKey(this.solautoFeesSupplyTa) : undefined,
-      authorityReferralState:
-        rebalanceStep === "B"
-          ? publicKey(this.authorityReferralState)
-          : undefined,
+      authorityReferralState: publicKey(this.authorityReferralState),
       referredBySupplyTa:
         rebalanceStep === "B" && this.referredBySupplyTa
           ? publicKey(this.referredBySupplyTa)
@@ -423,18 +431,22 @@ export class SolautoMarginfiClient extends SolautoClient {
       signerSupplyTa: this.selfManaged
         ? publicKey(this.signerSupplyTa)
         : undefined,
-      vaultSupplyTa: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
-      supplyVaultAuthority: publicKey(
-        this.marginfiSupplyBankAccounts.vaultAuthority
-      ),
+      vaultSupplyTa: needSupplyAccounts
+        ? publicKey(this.marginfiSupplyBankAccounts.liquidityVault)
+        : undefined,
+      supplyVaultAuthority: needSupplyAccounts
+        ? publicKey(this.marginfiSupplyBankAccounts.vaultAuthority)
+        : undefined,
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       debtPriceOracle: publicKey(this.marginfiDebtBankAccounts.priceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
-      vaultDebtTa: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
-      debtVaultAuthority: publicKey(
-        this.marginfiDebtBankAccounts.vaultAuthority
-      ),
+      vaultDebtTa: needDebtAccounts
+        ? publicKey(this.marginfiDebtBankAccounts.liquidityVault)
+        : undefined,
+      debtVaultAuthority: needDebtAccounts
+        ? publicKey(this.marginfiDebtBankAccounts.vaultAuthority)
+        : undefined,
       rebalanceType,
       targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
       limitGapBps: limitGapBps ?? null,

package/src/generated/instructions/marginfiRebalance.ts

@@ -43,7 +43,7 @@ export type MarginfiRebalanceInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ixsSysvar: PublicKey | Pda;
   solautoFeesSupplyTa?: PublicKey | Pda;
-  authorityReferralState?: PublicKey | Pda;
+  authorityReferralState: PublicKey | Pda;
   referredBySupplyTa?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
   marginfiGroup: PublicKey | Pda;
@@ -206,7 +206,7 @@ export function marginfiRebalance(
     },
     supplyVaultAuthority: {
       index: 17,
-      isWritable: true as boolean,
+      isWritable: false as boolean,
       value: input.supplyVaultAuthority ?? null,
     },
     debtBank: {
@@ -236,7 +236,7 @@ export function marginfiRebalance(
     },
     debtVaultAuthority: {
       index: 23,
-      isWritable: true as boolean,
+      isWritable: false as boolean,
       value: input.debtVaultAuthority ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;

package/src/transactions/transactionUtils.ts

@@ -103,7 +103,7 @@ async function transactionChoresBefore(
   client: SolautoClient,
   accountsGettingCreated: string[],
   solautoActions?: SolautoAction[],
-  initiatingDcaIn?: bigint,
+  initiatingDcaIn?: bigint
 ): Promise<TransactionBuilder> {
   let chores = transactionBuilder();
 
@@ -233,8 +233,9 @@ export async function rebalanceChoresBefore(
   }
 
   const usesAccount = (key: PublicKey) =>
-    rebalanceInstructions
-      .some((t) => t.keys.some((k) => toWeb3JsPublicKey(k.pubkey).equals(key)));
+    rebalanceInstructions.some((t) =>
+      t.keys.some((k) => toWeb3JsPublicKey(k.pubkey).equals(key))
+    );
 
   const checkReferralSupplyTa =
     client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
@@ -244,8 +245,10 @@ export async function rebalanceChoresBefore(
     usesAccount(
       (client as SolautoMarginfiClient).intermediaryMarginfiAccountPk
     );
-  const checkSignerSupplyTa = client.selfManaged && usesAccount(client.signerSupplyTa);
-  const checkSignerDebtTa = client.selfManaged && usesAccount(client.signerSupplyTa);
+  const checkSignerSupplyTa =
+    client.selfManaged && usesAccount(client.signerSupplyTa);
+  const checkSignerDebtTa =
+    client.selfManaged && usesAccount(client.signerSupplyTa);
 
   const accountsNeeded = [
     ...[checkReferralSupplyTa ? client.referredBySupplyTa : PublicKey.default],
@@ -259,10 +262,15 @@ export async function rebalanceChoresBefore(
     ...[checkSignerDebtTa ? client.signerDebtTa : PublicKey.default],
   ];
 
-  const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa] =
-    await client.umi.rpc.getAccounts(
-      accountsNeeded.map((x) => publicKey(x ?? PublicKey.default))
-    );
+  const [
+    referredBySupplyTa,
+    solautoFeesSupplyTa,
+    intermediaryMarginfiAccount,
+    signerSupplyTa,
+    signerDebtTa,
+  ] = await client.umi.rpc.getAccounts(
+    accountsNeeded.map((x) => publicKey(x ?? PublicKey.default))
+  );
 
   let chores = transactionBuilder();
 
@@ -297,7 +305,11 @@ export async function rebalanceChoresBefore(
     );
   }
 
-  if (checkSignerSupplyTa && !rpcAccountCreated(signerSupplyTa) && !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
+  if (
+    checkSignerSupplyTa &&
+    !rpcAccountCreated(signerSupplyTa) &&
+    !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())
+  ) {
     client.log("Creating signer supply token account");
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
@@ -309,7 +321,11 @@ export async function rebalanceChoresBefore(
     accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
   }
 
-  if (checkSignerDebtTa && !rpcAccountCreated(signerDebtTa) && !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
+  if (
+    checkSignerDebtTa &&
+    !rpcAccountCreated(signerDebtTa) &&
+    !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())
+  ) {
     client.log("Creating signer debt token account");
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
@@ -358,7 +374,7 @@ function getRebalanceInstructions(tx: TransactionBuilder): Instruction[] {
         const discriminator = serializer.serialize({
           limitGapBps: 0,
           rebalanceType: SolautoRebalanceType.None,
-          targetLiqUtilizationRateBps: 0
+          targetLiqUtilizationRateBps: 0,
         })[0];
         const [data, _] = serializer.deserialize(x.data);
         if (data.discriminator === discriminator) {
@@ -378,10 +394,9 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
       try {
         const serializer =
           getMarginfiProtocolInteractionInstructionDataSerializer();
-        const discriminator = serializer
-          .serialize({
-            solautoAction: solautoAction("Deposit", [BigInt(0)]),
-          })[0];
+        const discriminator = serializer.serialize({
+          solautoAction: solautoAction("Deposit", [BigInt(0)]),
+        })[0];
         const [data, _] = serializer.deserialize(x.data);
         if (data.discriminator === discriminator) {
           solautoActions?.push(data.solautoAction);
@@ -518,7 +533,7 @@ export async function getTransactionChores(
       solautoActions,
       client.livePositionUpdates.debtTaBalanceAdjustment > 0
         ? client.livePositionUpdates.debtTaBalanceAdjustment
-        : undefined,
+        : undefined
     ),
     await rebalanceChoresBefore(client, tx, accountsGettingCreated),
   ]);
@@ -576,7 +591,7 @@ export async function buildSolautoRebalanceTransaction(
     setupInstructions,
     tokenLedgerIx,
     swapIx,
-  } = await getJupSwapTransaction(client.signer, swapDetails);
+  } = await getJupSwapTransaction(client.signer, swapDetails, attemptNum);
   const flashLoan = getFlashLoanDetails(client, values, jupQuote);
 
   let tx = transactionBuilder();
@@ -604,6 +619,7 @@ export async function buildSolautoRebalanceTransaction(
               "A",
               swapDetails,
               rebalanceType,
+              flashLoan,
               targetLiqUtilizationRateBps
             ),
           ]
@@ -613,6 +629,7 @@ export async function buildSolautoRebalanceTransaction(
         "B",
         swapDetails,
         rebalanceType,
+        flashLoan,
         targetLiqUtilizationRateBps
       ),
       client.flashRepay(flashLoan),
@@ -626,6 +643,7 @@ export async function buildSolautoRebalanceTransaction(
         "A",
         swapDetails,
         rebalanceType,
+        undefined,
         targetLiqUtilizationRateBps
       ),
       swapIx,
@@ -633,6 +651,7 @@ export async function buildSolautoRebalanceTransaction(
         "B",
         swapDetails,
         rebalanceType,
+        undefined,
         targetLiqUtilizationRateBps
       ),
     ]);

package/src/transactions/transactionsManager.ts

@@ -1,6 +1,7 @@
 import bs58 from "bs58";
 import {
   AddressLookupTableInput,
+  Instruction,
   transactionBuilder,
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
@@ -14,6 +15,7 @@ import {
   retryWithExponentialBackoff,
 } from "../utils/generalUtils";
 import { getTransactionChores } from "./transactionUtils";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 // import { sendJitoBundledTransactions } from "../utils/jitoUtils";
 
 class LookupTables {
@@ -45,7 +47,7 @@ class LookupTables {
       this.cache.push(...additionalInputs);
     }
 
-    return this.cache.filter((x) => addresses.includes(x.publicKey.toString()));
+    return this.cache;
   }
 }
 
@@ -89,7 +91,7 @@ export class TransactionItem {
 class TransactionSet {
   constructor(
     private client: SolautoClient,
-    private lookupTables: LookupTables,
+    public lookupTables: LookupTables,
     public items: TransactionItem[] = []
   ) {}
 
@@ -210,8 +212,12 @@ export class TransactionsManager {
         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)})`
+        // TODO: revert me
+        // throw new Error(
+        //   `Transaction exceeds max transaction size (${transaction.getTransactionSize(this.client.umi)})`
+        // );
+        transactionSets.push(
+          new TransactionSet(this.client, this.lookupTables, [item])
         );
       } else {
         let newSet = new TransactionSet(this.client, this.lookupTables, [item]);
@@ -246,9 +252,43 @@ export class TransactionsManager {
     this.statusCallback?.(this.statuses);
   }
 
+  // TODO remove me
+  async debugAccounts(itemSet: TransactionSet, tx: TransactionBuilder) {
+    const lutInputs = await itemSet.lookupTables.getLutInputs([]);
+    const lutAccounts = lutInputs.map((x) => x.addresses).flat();
+    const keys = tx
+      .getInstructions()
+      .map((x) => x.keys)
+      .flat();
+    for (const ix of tx.getInstructions()) {
+      const ixAccounts = ix.keys.map((x) => x.pubkey);
+      const accountsNotInLut = ixAccounts.filter(
+        (x) => !lutAccounts.includes(x)
+      );
+      console.log(
+        "Program",
+        ix.programId,
+        " data ",
+        ix.data.length,
+        ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3
+      );
+      if (accountsNotInLut.length > 0) {
+        console.log("Accounts not in LUT:");
+        for (const key of accountsNotInLut) {
+          console.log(key.toString());
+        }
+        console.log(ix.keys.length);
+      }
+    }
+  }
+
   async send() {
     const updateLookupTable = await this.client.updateLookupTable();
-    if (updateLookupTable && updateLookupTable?.needsToBeIsolated) {
+    if (
+      updateLookupTable &&
+      updateLookupTable.updateLutTx.getInstructions().length > 0 &&
+      updateLookupTable?.needsToBeIsolated
+    ) {
       this.updateStatus("update lookup table", TransactionStatus.Processing);
       await retryWithExponentialBackoff(
         async (attemptNum) =>
@@ -365,6 +405,11 @@ export class TransactionsManager {
               this.updateStatus(itemSet.name(), TransactionStatus.Skipped);
             } else {
               this.updateStatus(itemSet.name(), TransactionStatus.Processing);
+
+              if (this.client.localTest) {
+                await this.debugAccounts(itemSet, tx);
+              }
+
               const txSig = await sendSingleOptimizedTransaction(
                 this.client.umi,
                 this.client.connection,

package/src/types/solauto.ts

@@ -2,9 +2,11 @@ import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform } from "../generated";
 
 export interface SolautoPositionDetails {
-    positionId: number;
-    lendingPlatform: LendingPlatform;
-    protocolAccount?: PublicKey;
-    supplyMint?: PublicKey;
-    debtMint?: PublicKey;
+  publicKey: PublicKey;
+  authority: PublicKey;
+  positionId: number;
+  lendingPlatform: LendingPlatform;
+  protocolAccount?: PublicKey;
+  supplyMint?: PublicKey;
+  debtMint?: PublicKey;
 }

package/src/utils/generalUtils.ts

@@ -3,6 +3,7 @@ import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
+import { ResponseError } from "@jup-ag/api";
 
 export function generateRandomU8(): number {
   return Math.floor(Math.random() * 255 + 1);
@@ -120,7 +121,7 @@ export function retryWithExponentialBackoff<T>(
           }
 
           if (attemptNum < retries) {
-            console.log(error);
+            console.log(error.message);
             setTimeout(() => {
               console.log("Retrying...");
               return attempt(attemptNum);

package/src/utils/jupiterUtils.ts

@@ -12,6 +12,7 @@ import {
   QuoteResponse,
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
+import { retryWithExponentialBackoff } from "./generalUtils";
 
 const jupApi = createJupiterApiClient();
 
@@ -49,21 +50,26 @@ export interface JupSwapTransaction {
 
 export async function getJupSwapTransaction(
   signer: Signer,
-  swapDetails: JupSwapDetails
+  swapDetails: JupSwapDetails,
+  attemptNum?: number
 ): Promise<JupSwapTransaction> {
   console.log("Getting jup quote...");
-
-  const quoteResponse = await jupApi.quoteGet({
-    amount: Number(swapDetails.amount),
-    inputMint: swapDetails.inputMint.toString(),
-    outputMint: swapDetails.outputMint.toString(),
-    swapMode: swapDetails.exactOut
-      ? "ExactOut"
-      : swapDetails.exactIn
-        ? "ExactIn"
-        : undefined,
-    slippageBps: 10
-  });
+  const quoteResponse = await retryWithExponentialBackoff(
+    async () =>
+      await jupApi.quoteGet({
+        amount: Number(swapDetails.amount),
+        inputMint: swapDetails.inputMint.toString(),
+        outputMint: swapDetails.outputMint.toString(),
+        swapMode: swapDetails.exactOut
+          ? "ExactOut"
+          : swapDetails.exactIn
+            ? "ExactIn"
+            : undefined,
+        slippageBps: 10,
+        maxAccounts: 60,
+      }),
+    3
+  );
 
   const finalPriceSlippageBps = Math.round(
     Math.max(

package/src/utils/solauto/generalUtils.ts

@@ -176,14 +176,7 @@ export function eligibleForRefresh(
 export async function getSolautoManagedPositions(
   umi: Umi,
   authority?: PublicKey
-): Promise<
-  {
-    publicKey: PublicKey;
-    authority: PublicKey;
-    positionId: number;
-    lendingPlatform: LendingPlatform;
-  }[]
-> {
+): Promise<SolautoPositionDetails[]> {
   // bump: [u8; 1]
   // position_id: [u8; 1]
   // self_managed: u8 - (1 for true, 0 for false)
@@ -294,6 +287,8 @@ export async function getAllPositionsByAuthority(
   const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
   allPositions.push(
     ...solautoManagedPositions.map((x) => ({
+      publicKey: x.publicKey,
+      authority: user,
       positionId: x.positionId,
       lendingPlatform: x.lendingPlatform,
     }))
@@ -306,6 +301,8 @@ export async function getAllPositionsByAuthority(
   );
   allPositions.push(
     ...marginfiPositions.map((x) => ({
+      publicKey: x.marginfiAccount,
+      authority: user,
       positionId: 0,
       lendingPlatform: LendingPlatform.Marginfi,
       protocolAccount: x.marginfiAccount,

package/tests/transactions/solautoMarginfi.ts

@@ -24,7 +24,7 @@ describe("Solauto Marginfi tests", async () => {
 
   const payForTransactions = false;
   const useJitoBundle = false;
-  const positionId = 1;
+  const positionId = 0;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
@@ -37,11 +37,11 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
-        // marginfiAccount: new PublicKey(
-        //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-        // ),
-        // supplyMint: NATIVE_MINT,
-        // debtMint: new PublicKey(USDC_MINT),
+        marginfiAccount: new PublicKey(
+          "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+        ),
+        supplyMint: NATIVE_MINT,
+        debtMint: new PublicKey(USDC_MINT),
       }
     );