@haven-fi/solauto-sdk 1.0.432 → 1.0.434

package/dist/clients/solautoMarginfiClient.js

@@ -384,9 +384,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }));
     }
     flashRepay(flashLoanDetails) {
-        const accounts = flashLoanDetails.mint.equals(this.supplyMint)
-            ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
-            : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
+        const accounts = flashLoanDetails.useDebtLiquidity
+            ? { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle }
+            : { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle };
         const remainingAccounts = [];
         let includedFlashLoanToken = false;
         if (this.intermediaryMarginfiAccount) {

package/dist/generated/types/solautoRebalanceType.d.ts

@@ -10,7 +10,8 @@ export declare enum SolautoRebalanceType {
     None = 0,
     Regular = 1,
     DoubleRebalanceWithFL = 2,
-    SingleRebalanceWithFL = 3
+    FLSwapThenRebalance = 3,
+    FLRebalanceThenSwap = 4
 }
 export type SolautoRebalanceTypeArgs = SolautoRebalanceType;
 export declare function getSolautoRebalanceTypeSerializer(): Serializer<SolautoRebalanceTypeArgs, SolautoRebalanceType>;

package/dist/generated/types/solautoRebalanceType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoRebalanceType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/solautoRebalanceType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,oBAAoB;IAC9B,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,qBAAqB,IAAA;IACrB,qBAAqB,IAAA;CACtB;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,CAAC;AAE5D,wBAAgB,iCAAiC,IAAI,UAAU,CAC7D,wBAAwB,EACxB,oBAAoB,CACrB,CAIA"}
+{"version":3,"file":"solautoRebalanceType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/solautoRebalanceType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,oBAAoB;IAC9B,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,qBAAqB,IAAA;IACrB,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;CACpB;AAED,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,CAAC;AAE5D,wBAAgB,iCAAiC,IAAI,UAAU,CAC7D,wBAAwB,EACxB,oBAAoB,CACrB,CAIA"}

package/dist/generated/types/solautoRebalanceType.js

@@ -15,7 +15,8 @@ var SolautoRebalanceType;
     SolautoRebalanceType[SolautoRebalanceType["None"] = 0] = "None";
     SolautoRebalanceType[SolautoRebalanceType["Regular"] = 1] = "Regular";
     SolautoRebalanceType[SolautoRebalanceType["DoubleRebalanceWithFL"] = 2] = "DoubleRebalanceWithFL";
-    SolautoRebalanceType[SolautoRebalanceType["SingleRebalanceWithFL"] = 3] = "SingleRebalanceWithFL";
+    SolautoRebalanceType[SolautoRebalanceType["FLSwapThenRebalance"] = 3] = "FLSwapThenRebalance";
+    SolautoRebalanceType[SolautoRebalanceType["FLRebalanceThenSwap"] = 4] = "FLRebalanceThenSwap";
 })(SolautoRebalanceType || (exports.SolautoRebalanceType = SolautoRebalanceType = {}));
 function getSolautoRebalanceTypeSerializer() {
     return (0, serializers_1.scalarEnum)(SolautoRebalanceType, {

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,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAmBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA4LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,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,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA2H5C;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,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA2F/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAoBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA4LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAoH7B;AA2LD,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,oBAqDzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoI5C;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,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EAiG/B"}

package/dist/transactions/transactionUtils.js

@@ -383,20 +383,27 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     if (flashLoan) {
         client.log("Flash loan details: ", flashLoan);
         const addFirstRebalance = values.amountUsdToDcaIn > 0;
+        const rebalanceThenSwap = values.rebalanceDirection === generated_1.RebalanceDirection.Repay &&
+            flashLoan.useDebtLiquidity;
         const rebalanceType = addFirstRebalance
             ? generated_1.SolautoRebalanceType.DoubleRebalanceWithFL
-            : generated_1.SolautoRebalanceType.SingleRebalanceWithFL;
+            : rebalanceThenSwap
+                ? generated_1.SolautoRebalanceType.FLRebalanceThenSwap
+                : generated_1.SolautoRebalanceType.FLSwapThenRebalance;
+        client.log("Rebalance type:", rebalanceType);
+        const firstRebalance = client.rebalance("A", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps);
+        const lastRebalance = client.rebalance("B", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps);
+        const flashBorrowDest = (0, accountUtils_1.getTokenAccount)(rebalanceThenSwap
+            ? client.solautoPosition
+            : (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), rebalanceThenSwap ? swapDetails.outputMint : swapDetails.inputMint);
         tx = tx.add([
             setupInstructions,
             tokenLedgerIx,
-            client.flashBorrow(flashLoan, (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), swapDetails.inputMint)),
-            ...(addFirstRebalance
-                ? [
-                    client.rebalance("A", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps),
-                ]
-                : []),
-            swapIx,
-            client.rebalance("B", jupQuote, rebalanceType, values, flashLoan, targetLiqUtilizationRateBps),
+            client.flashBorrow(flashLoan, flashBorrowDest),
+            ...(addFirstRebalance ? [firstRebalance] : []),
+            ...(rebalanceThenSwap
+                ? [lastRebalance, swapIx]
+                : [swapIx, lastRebalance]),
             client.flashRepay(flashLoan),
         ]);
     }

package/dist/utils/jitoUtils.d.ts

@@ -1,8 +1,8 @@
-import { Connection, PublicKey, VersionedMessage } from "@solana/web3.js";
-import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): PublicKey;
-export declare function getRequiredSigners(message: VersionedMessage): {
+export declare function getRequiredSigners(message: TransactionMessage): {
     index: number;
     publicKey: string;
     isWritable: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGT,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AAqND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;;IAkB3D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AA8ND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8F/B"}

package/dist/utils/jitoUtils.js

@@ -116,8 +116,15 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
     }));
     if (sign) {
         builtTxs = await userSigner.signAllTransactions(builtTxs);
-        for (const s of otherSigners) {
-            builtTxs = await s.signAllTransactions(builtTxs);
+        for (const signer of otherSigners) {
+            for (let i = 0; i < builtTxs.length; i++) {
+                const requiredSigners = getRequiredSigners(builtTxs[i].message);
+                if (requiredSigners
+                    .map((x) => x.publicKey)
+                    .includes(signer.publicKey.toString())) {
+                    builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+                }
+            }
         }
     }
     return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
@@ -182,7 +189,7 @@ function getRequiredSigners(message) {
     const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
     const signersInfo = [];
     for (let i = 0; i < numRequiredSignatures; i++) {
-        const publicKey = message.staticAccountKeys[i].toBase58();
+        const publicKey = message.accounts[i].toString();
         const isWritable = i < numWritableSigners;
         signersInfo.push({
             index: i,

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

@@ -18,6 +18,7 @@ export declare function getRebalanceValues(state: PositionState, settings: Solau
 export interface FlashLoanDetails {
     baseUnitAmount: bigint;
     mint: PublicKey;
+    useDebtLiquidity: boolean;
 }
 export declare function getFlashLoanDetails(client: SolautoClient, values: RebalanceValues, jupQuote: QuoteResponse): FlashLoanDetails | undefined;
 export declare function getJupSwapRebalanceDetails(client: SolautoClient, values: RebalanceValues, targetLiqUtilizationRateBps?: number, attemptNum?: number): JupSwapDetails;

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAwDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAuE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA8ChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,kBAAkB,EAClB,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAmI9C,MAAM,WAAW,eAAe;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,GACnC,eAAe,CAwDjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CA2E9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA8ChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -128,7 +128,10 @@ function getFlashLoanDetails(client, values, jupQuote) {
     (0, generalUtils_2.consoleLog)("Intermediary liq utilization rate:", tempLiqUtilizationRateBps, `$${supplyUsd}`, `$${debtUsd}`, "Max:", maxLiqUtilizationRateBps);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
-    if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost) {
+    const baseUnitAmount = BigInt(parseInt(jupQuote.inAmount));
+    if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
+        baseUnitAmount <=
+            (client.solautoPositionState?.debt.amountCanBeUsed.baseUnit ?? BigInt(0))) {
         flashLoanToken = client.solautoPositionState.debt;
         flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.debtMint);
     }
@@ -136,15 +139,14 @@ function getFlashLoanDetails(client, values, jupQuote) {
         flashLoanToken = client.solautoPositionState.supply;
         flashLoanTokenPrice = (0, priceUtils_1.safeGetPrice)(client.supplyMint);
     }
-    const exactAmountBaseUnit = jupQuote.swapMode === "ExactOut" || jupQuote.swapMode === "ExactIn"
-        ? BigInt(parseInt(jupQuote.inAmount))
-        : undefined;
+    if (jupQuote.swapMode !== "ExactOut" && jupQuote.swapMode !== "ExactIn") {
+        throw new Error("Token ledger swap not currently supported");
+    }
     return requiresFlashLoan
         ? {
-            baseUnitAmount: exactAmountBaseUnit
-                ? exactAmountBaseUnit
-                : (0, numberUtils_1.toBaseUnit)(debtAdjustmentUsdAbs / flashLoanTokenPrice, flashLoanToken.decimals),
+            baseUnitAmount,
             mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint),
+            useDebtLiquidity: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint).equals(client.debtMint),
         }
         : undefined;
 }

package/local/logPositions.ts

@@ -7,7 +7,6 @@ import {
   getSolautoManagedPositions,
   PositionState,
   positionStateWithLatestPrices,
-  PRICES,
   retryWithExponentialBackoff,
   safeFetchAllSolautoPosition,
   safeGetPrice,
@@ -15,7 +14,7 @@ import {
   TOKEN_INFO,
   USD_DECIMALS,
 } from "../src";
-import { PublicKey, SystemProgram, VersionedTransaction } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
@@ -187,6 +186,7 @@ async function main(filterWhitelist: boolean) {
   console.log("\n\n");
 
   const latestStates: PositionState[] = [];
+  let unhealthyPositions = 0;
   for (const pos of solautoPositionsData) {
     const latestState = await positionStateWithLatestPrices(
       pos.state,
@@ -200,15 +200,20 @@ async function main(filterWhitelist: boolean) {
       toWeb3JsPublicKey(pos.state.debt.mint)
     );
 
-    console.log("Position:", pos.publicKey.toString());
-    console.log("Authority:", pos.authority.toString());
+    const repayFrom = pos.position.settingParams.repayToBps + pos.position.settingParams.repayGap;
+    const unhealthy = pos.state.liqUtilizationRateBps > repayFrom;
+    const healthText = unhealthy ? `(Unhealthy: ${pos.state.liqUtilizationRateBps - repayFrom}` : "";
+    if (unhealthy) {
+      unhealthyPositions += 1;
+    }
+
+    console.log(pos.publicKey.toString(), `(${pos.authority.toString()})`);
     console.log(
-      `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)}`
+      `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)} ${healthText}`
     );
-    console.log("\n");
   }
 
-  console.log("Total positions:", solautoPositionsData.length);
+  console.log("\nTotal positions:", solautoPositionsData.length, unhealthyPositions ? ` (unhealthy: ${unhealthyPositions})` : "");
   console.log(
     "Total users:",
     Array.from(new Set(solautoPositionsData.map((x) => x.authority.toString())))
@@ -221,37 +226,5 @@ async function main(filterWhitelist: boolean) {
   console.log(`Total TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
 }
 
-import { Transaction } from "@solana/web3.js";
-import * as bs58 from "bs58";
-
-function decodeVersionedTx(base58Tx: string) {
-  // 1) Decode base58 into raw bytes
-  const txBuffer = bs58.decode(base58Tx);
-
-  // 2) Parse as versioned transaction
-  const versionedTx = VersionedTransaction.deserialize(txBuffer);
-
-  // 3) Extract signatures or do other things with `versionedTx`
-  const signatures = versionedTx.signatures.map((sigBytes, index) => ({
-    index,
-    signature: bs58.encode(sigBytes), // convert signature bytes to base58 string
-  }));
-
-  return { versionedTx, signatures };
-}
-
 const filterWhitelist = true;
-main(filterWhitelist).then((x) => x);
-
-// console.log(
-//   decodeVersionedTx(
-//     "mQkqpyEB1JEkGUsowzhUXvn2v1kwdGYApNGDUsRZ1BmpmKJhMUXQhmyZoDXKPtVhcjgWQHqN6S94p2fNiPxyRhBUvN1Vs5HjbhdVjhhG4XEDCXRw4K2PPEeTowWf7N5GjQ4wZdpdP8UZtnz3CXtbkCYGnxfjt6AtanQXsJpWUpC84g7ZSfYiNAYRv2geHp6E13yNXya9FGFekmsN3S9UcmWJTQgLu9vFxmL9S6DD6npDK7wPyZ66dcKWTMg2nb8Drig8aLAiFRnkqC99QjN7YYG65qq9VkzTC7o8EbGddddrfLu6Hyk2SgEqebMvhiV729y3sWpDpbbKakknJj4PUodasfKza4XNg3jRGBoVRxvSb3QGFdhbDJa86YvQbsP7pWLqMuJcoaGX3uLgsBFA2z8kGmZBuzGAS3FtgnmE7L8dFMLWGDDKTdFwsTbeZQJsGGtn5sy627onUqyTxHy9UfuBz57h3kd26yUBUmbR9RVgCX2WMSHdEW58uYd2BYbAG4NVQYCzgcWzZEjayXn73fo2Y72Y4BrxnKcqJ8WixHjaj7PPRdvX87wxiHy9b8CxsngKhYM5sWoXVWj5CAq6drS2g7b4b7CZzjeQYkCF"
-//   )
-// );
-// console.log(
-//   decodeVersionedTx(
-//     "e6uLxBWUSbPnkYKPWoyoR6YZw7Qt4NnZcabGwaAChdAN4N4GFwvxMxwq3mrxoRM3CDzPHhAh7rbEmzAzyA8pJAhGAaDWfCG3CjnVoWbpdDQvpwUxRffK3xFDGqJeoQvQBvQtZidwaDvDnnkJ6xRgsnpujS65jcGP5AsECsaJ2uRMSsLt8ucynZjQzVw24jqaYRRmUN4otF2mSgbgkXLu9G82g8sfcj3VQuZxoA9Hrpm9kTMNu28R9wRG9yZKCQozSJjL4GGwe3ZMDRdfggbq9xPddNcHFgUGk6PYHgLvVWTr8GSLQpj8HLdtekxdywwXYcK3oS8RNmgrnbm6o7PADSWRYZhAHJLD8G92N5yCnFy8sRGHhMosdgQ5TjF8d5uG92tMfmS67VkjSJqMsX6pZnhnN9K5EFmdZxutaHMuyo5kv9DoXivrCdQrku5yfYbfCPgPY3Ei25tBYN1kTLYXoJvdUuxehjLkR2pVseae2TbApigLAhdvrxGNHLZTncunfp18c2kmWVrwLqc7UPANuKSmNAyy4ntU9nL1zkA9WTxFLsNK5xZukZi8vsK8XoM8f1wyyoiGHPHCF5i2QAat1kwEZ71GdRodeumYb96GwLyskbJJo8g8Yp5oVQhLeKopTSezEgJ3awQCgpd4xqg3rd9ijvRUq5g3aR2NbmrtEZUxumuf5G2RfPK5Nx7MFUuJeT2Pn6LHShsGCzsKt1GewgErWSJMNktBgkJkAyWMQkxt6No8ZSKjDbrnyQEGuuXLKCeMhdFFC6dm8oMgiWC6KLJjzLkG5T4iySKnYcM7pCKtfZLLXXTEGJ8Zz3rqspCGozrwzUGeL86FFqqNNCHFY2Zx2de75krrPo5QfiLMQ1ECgMkLbrmYTx8owsPeM3nDgmMTpooKoVp94GZi22XCda9F3M7HTHrMXsAjNHm7C26VSUbKJCySneNnKzpZ3wP88Kf8qmq6B392k3HdaUyoWXMTaBHKnkzhyMECXSzxbpZPoNa4ra6bscXUSqQijSg2uh6TR7X7hLEmDQKuDTbTVL62oMvw1qgNtsQmkeZFhrumLHj4askbDFzV8ghK15T6GDDnN9gEaFKZU7LbyWscJjdb4RGHy79LCYB2iAg6kJw4efc6p16gqKqnYPBJdXbJjXHKZpUhrJa8YcSwbFWM3YabHNFxwjNHzXJydEg37DpAjjaLVfBhcVCXEBh8K7FcojQ9yT6u3HMjFZwV4fvrBBBSMiNrhvgFVUAQtUaFVmx4BhMvkJTPsR6UrXp4HCPXgohUEUtFEJeyGQPEibBqwgjUpMLWyKUAxjKpYQ3AmdjnseE23njArKaEwrRQA4NnxpUUazzsWJqHymHPJG73GQhQtxNtvfDDMVSj95UkiscssHNEpkt6dqLeohDR1rP2kg41EBGQMNEdeYtUt1JkzdjZBsvU1oV81GG1tEQoSUR1skjq9tWpfoiSPVN9QTQC3kQUgZQQPR9arK5XWqj6y5iPnusQk8zdzoHJt5EFm7aagfLG3uJxdd9ZF7Gk4tMzijx5d1fV1uGhcxAyb5B5m8nkCdap"
-//   )
-// );
-
-// console.log(SystemProgram.programId.toString());
+main(filterWhitelist).then((x) => x);

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -594,9 +594,9 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
-    const accounts = flashLoanDetails.mint.equals(this.supplyMint)
-      ? { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle }
-      : { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle };
+    const accounts = flashLoanDetails.useDebtLiquidity
+      ? { data: this.marginfiDebtAccounts, oracle: this.debtPriceOracle }
+      : { data: this.marginfiSupplyAccounts, oracle: this.supplyPriceOracle };
 
     const remainingAccounts: AccountMeta[] = [];
     let includedFlashLoanToken = false;

package/src/generated/types/solautoRebalanceType.ts

@@ -12,7 +12,8 @@ export enum SolautoRebalanceType {
   None,
   Regular,
   DoubleRebalanceWithFL,
-  SingleRebalanceWithFL,
+  FLSwapThenRebalance,
+  FLRebalanceThenSwap,
 }
 
 export type SolautoRebalanceTypeArgs = SolautoRebalanceType;

package/src/transactions/transactionUtils.ts

@@ -16,6 +16,7 @@ import {
 import {
   InvalidRebalanceConditionError,
   LendingPlatform,
+  RebalanceDirection,
   SolautoAction,
   SolautoRebalanceType,
   TokenType,
@@ -713,41 +714,50 @@ export async function buildSolautoRebalanceTransaction(
   if (flashLoan) {
     client.log("Flash loan details: ", flashLoan);
     const addFirstRebalance = values.amountUsdToDcaIn > 0;
+
+    const rebalanceThenSwap =
+      values.rebalanceDirection === RebalanceDirection.Repay &&
+      flashLoan.useDebtLiquidity;
+
     const rebalanceType = addFirstRebalance
       ? SolautoRebalanceType.DoubleRebalanceWithFL
-      : SolautoRebalanceType.SingleRebalanceWithFL;
+      : rebalanceThenSwap
+        ? SolautoRebalanceType.FLRebalanceThenSwap
+        : SolautoRebalanceType.FLSwapThenRebalance;
+
+    client.log("Rebalance type:", rebalanceType);
+    const firstRebalance = client.rebalance(
+      "A",
+      jupQuote,
+      rebalanceType,
+      values,
+      flashLoan,
+      targetLiqUtilizationRateBps
+    );
+    const lastRebalance = client.rebalance(
+      "B",
+      jupQuote,
+      rebalanceType,
+      values,
+      flashLoan,
+      targetLiqUtilizationRateBps
+    );
+
+    const flashBorrowDest = getTokenAccount(
+      rebalanceThenSwap
+        ? client.solautoPosition
+        : toWeb3JsPublicKey(client.signer.publicKey),
+      rebalanceThenSwap ? swapDetails.outputMint : swapDetails.inputMint
+    );
 
     tx = tx.add([
       setupInstructions,
       tokenLedgerIx,
-      client.flashBorrow(
-        flashLoan,
-        getTokenAccount(
-          toWeb3JsPublicKey(client.signer.publicKey),
-          swapDetails.inputMint
-        )
-      ),
-      ...(addFirstRebalance
-        ? [
-            client.rebalance(
-              "A",
-              jupQuote,
-              rebalanceType,
-              values,
-              flashLoan,
-              targetLiqUtilizationRateBps
-            ),
-          ]
-        : []),
-      swapIx,
-      client.rebalance(
-        "B",
-        jupQuote,
-        rebalanceType,
-        values,
-        flashLoan,
-        targetLiqUtilizationRateBps
-      ),
+      client.flashBorrow(flashLoan, flashBorrowDest),
+      ...(addFirstRebalance ? [firstRebalance] : []),
+      ...(rebalanceThenSwap
+        ? [lastRebalance, swapIx]
+        : [swapIx, lastRebalance]),
       client.flashRepay(flashLoan),
     ]);
   } else {
@@ -880,8 +890,14 @@ export function getErrorInfo(
     consoleLog("Error code:", errCode);
     consoleLog("Error instruction program:", errIx?.programId.toString());
 
-    const solautoError = getSolautoErrorFromCode(errCode ?? -1, createSolautoProgram());
-    const marginfiError = getMarginfiErrorFromCode(errCode ?? -1, createMarginfiProgram());
+    const solautoError = getSolautoErrorFromCode(
+      errCode ?? -1,
+      createSolautoProgram()
+    );
+    const marginfiError = getMarginfiErrorFromCode(
+      errCode ?? -1,
+      createMarginfiProgram()
+    );
 
     if (
       errCode &&

package/src/utils/jitoUtils.ts

@@ -13,6 +13,7 @@ import {
   TransactionBuilder,
   Umi,
   WrappedInstruction,
+  TransactionMessage,
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
@@ -178,8 +179,17 @@ async function umiToVersionedTransactions(
 
   if (sign) {
     builtTxs = await userSigner.signAllTransactions(builtTxs);
-    for (const s of otherSigners) {
-      builtTxs = await s.signAllTransactions(builtTxs);
+    for (const signer of otherSigners) {
+      for (let i = 0; i < builtTxs.length; i++) {
+        const requiredSigners = getRequiredSigners(builtTxs[i].message);
+        if (
+          requiredSigners
+            .map((x) => x.publicKey)
+            .includes(signer.publicKey.toString())
+        ) {
+          builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+        }
+      }
     }
   }
 
@@ -253,14 +263,14 @@ async function sendJitoBundle(
   return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 
-export function getRequiredSigners(message: VersionedMessage) {
+export function getRequiredSigners(message: TransactionMessage) {
   const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
 
   const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
 
   const signersInfo = [];
   for (let i = 0; i < numRequiredSignatures; i++) {
-    const publicKey = message.staticAccountKeys[i].toBase58();
+    const publicKey = message.accounts[i].toString();
     const isWritable = i < numWritableSigners;
 
     signersInfo.push({

package/src/utils/solauto/rebalanceUtils.ts

@@ -239,6 +239,7 @@ export function getRebalanceValues(
 export interface FlashLoanDetails {
   baseUnitAmount: bigint;
   mint: PublicKey;
+  useDebtLiquidity: boolean;
 }
 
 export function getFlashLoanDetails(
@@ -292,7 +293,14 @@ export function getFlashLoanDetails(
 
   let flashLoanToken: PositionTokenUsage | undefined = undefined;
   let flashLoanTokenPrice = 0;
-  if (values.rebalanceDirection === RebalanceDirection.Boost) {
+
+  const baseUnitAmount = BigInt(parseInt(jupQuote.inAmount));
+
+  if (
+    values.rebalanceDirection === RebalanceDirection.Boost ||
+    baseUnitAmount <=
+      (client.solautoPositionState?.debt.amountCanBeUsed.baseUnit ?? BigInt(0))
+  ) {
     flashLoanToken = client.solautoPositionState!.debt;
     flashLoanTokenPrice = safeGetPrice(client.debtMint)!;
   } else {
@@ -300,20 +308,17 @@ export function getFlashLoanDetails(
     flashLoanTokenPrice = safeGetPrice(client.supplyMint)!;
   }
 
-  const exactAmountBaseUnit =
-    jupQuote.swapMode === "ExactOut" || jupQuote.swapMode === "ExactIn"
-      ? BigInt(parseInt(jupQuote.inAmount))
-      : undefined;
+  if (jupQuote.swapMode !== "ExactOut" && jupQuote.swapMode !== "ExactIn") {
+    throw new Error("Token ledger swap not currently supported");
+  }
 
   return requiresFlashLoan
     ? {
-        baseUnitAmount: exactAmountBaseUnit
-          ? exactAmountBaseUnit
-          : toBaseUnit(
-              debtAdjustmentUsdAbs / flashLoanTokenPrice,
-              flashLoanToken.decimals
-            ),
+        baseUnitAmount,
         mint: toWeb3JsPublicKey(flashLoanToken.mint),
+        useDebtLiquidity: toWeb3JsPublicKey(flashLoanToken.mint).equals(
+          client.debtMint
+        ),
       }
     : undefined;
 }