@haven-fi/solauto-sdk 1.0.312 → 1.0.314

package/dist/clients/solautoClient.js

@@ -319,7 +319,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                 this.livePositionUpdates.new({
                     type: "supply",
                     value: (this.solautoPositionState?.supply.amountUsed.baseUnit ??
-                        BigInt(0)) + this.livePositionUpdates.supplyAdjustment,
+                        BigInt(0)) * BigInt(-1),
                 });
             }
         }
@@ -339,8 +339,8 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.livePositionUpdates.new({
                     type: "debt",
-                    value: (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) +
-                        this.livePositionUpdates.debtAdjustment,
+                    value: (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) *
+                        BigInt(-1),
                 });
             }
         }

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;AAoCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2LjD,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,oBA2CzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA4H5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EA0DxE"}
+{"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;AAoCzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2LjD,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,oBA2CzE;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,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EA0DxE"}

package/dist/transactions/transactionUtils.js

@@ -360,7 +360,7 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     if ((client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) &&
         client.livePositionUpdates.supplyAdjustment === BigInt(0)) ||
         (targetLiqUtilizationRateBps === undefined &&
-            !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice, 0))) {
+            !(0, generalUtils_2.eligibleForRebalance)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), supplyPrice, debtPrice))) {
         client.log("Not eligible for a rebalance");
         return undefined;
     }

package/dist/transactions/transactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAmFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YA8D7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAW7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAyFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAMb,SAAS;IAgBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA4FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YAyE7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAmD9B"}

package/dist/transactions/transactionsManager.js

@@ -97,6 +97,9 @@ class TransactionSet {
     add(...items) {
         this.items.push(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
     }
+    prepend(...items) {
+        this.items.unshift(...items.filter((x) => x.tx && x.tx.getInstructions().length > 0));
+    }
     async refetchAll(attemptNum) {
         await this.txHandler.resetLiveTxUpdates();
         for (const item of this.items) {
@@ -117,7 +120,7 @@ class TransactionSet {
     }
     name() {
         let names = this.items
-            .filter((x) => x.tx && x.name !== undefined)
+            .filter((x) => x.tx && Boolean(x.name))
             .map((x) => x.name.toLowerCase());
         if (names.length > 1) {
             names = names.filter((x) => x !== CHORES_TX_NAME);
@@ -154,9 +157,9 @@ class TransactionsManager {
     async assembleTransactionSets(items) {
         let transactionSets = [];
         this.txHandler.log(`Reassembling ${items.length} items`);
-        for (let i = 0; i < items.length;) {
+        for (let i = items.length - 1; i >= 0;) {
             let item = items[i];
-            i++;
+            i--;
             if (!item.tx) {
                 continue;
             }
@@ -168,16 +171,16 @@ class TransactionsManager {
                 let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
                     item,
                 ]);
-                for (let j = i; j < items.length; j++) {
+                for (let j = i; j >= 0; j--) {
                     if (await newSet.fitsWith(items[j])) {
-                        newSet.add(items[j]);
-                        i++;
+                        newSet.prepend(items[j]);
+                        i--;
                     }
                     else {
                         break;
                     }
                 }
-                transactionSets.push(newSet);
+                transactionSets.unshift(newSet);
             }
         }
         return transactionSets;
@@ -270,7 +273,9 @@ class TransactionsManager {
             const stale = (await (0, utils_1.getSwitchboardFeedData)(client.connection, [mint]))[0]
                 .stale;
             if (stale) {
-                const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), items.length === 1 ? "Update oracle" : "");
+                this.txHandler.log("Requires oracle update...");
+                const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), "Update oracle");
+                await swbTx.initialize();
                 items.unshift(swbTx);
             }
         }
@@ -331,23 +336,33 @@ class TransactionsManager {
     }
     async processTransactionsAtomically(itemSets) {
         let num = 0;
+        let sets = itemSets;
         await (0, generalUtils_1.retryWithExponentialBackoff)(async (attemptNum) => {
             num = attemptNum;
+            if (attemptNum > 0) {
+                sets = [];
+                for (let i = 0; i < itemSets.length; i++) {
+                    const txSet = await this.refreshItemSet(itemSets, i, attemptNum);
+                    if (txSet) {
+                        sets.push(txSet);
+                    }
+                }
+            }
             let transactions = [];
-            for (const set of itemSets) {
+            for (const set of sets) {
                 transactions.push(await set.getSingleTransaction());
             }
-            itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum));
+            sets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum));
             const txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, false, this.priorityFeeSetting);
             if (txSigs) {
-                itemSets.forEach((x, i) => this.updateStatus(x.name(), TransactionStatus.Successful, attemptNum, txSigs[i]));
+                sets.forEach((x, i) => this.updateStatus(x.name(), TransactionStatus.Successful, attemptNum, txSigs[i]));
             }
             else {
-                itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, attemptNum, undefined, true));
+                sets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, attemptNum, undefined, true));
                 throw new Error("Unknown error");
             }
         }, this.retries, this.retryDelay, this.errorsToThrow).catch((e) => {
-            itemSets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, num, undefined, true, e.message));
+            sets.forEach((x) => this.updateStatus(x.name(), TransactionStatus.Failed, num, undefined, true, e.message));
             throw e;
         });
     }

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,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAI9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA2GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA0C/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAK9C,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AA0GD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,YAAY,CAAC,EAAE,OAAO,EACtB,kBAAkB,GAAE,kBAA2C,GAC9D,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAyC/B"}

package/dist/utils/jitoUtils.js

@@ -30,23 +30,24 @@ async function getRandomTipAccount() {
 async function getTipInstruction(signer, tipLamports) {
     return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
 }
-// async function simulateJitoBundle(
-//   txs: VersionedTransaction[]
-// ): Promise<SimulatedBundleTransactionResult[]> {
-//   const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
-//     preExecutionAccountsConfigs: txs.map((x) => null),
-//     postExecutionAccountsConfigs: txs.map((x) => null),
-//     skipSigVerify: true,
-//   });
-//   simulationResult.value.transactionResults.forEach((tx) => {
-//     if (tx.err) {
-//       tx.logs?.forEach((x) => {
-//         consoleLog(x);
-//       });
-//       throw tx.err;
+// TODO: fix
+// async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
+//   const simulationResult = await axios.post(
+//     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
+//     {
+//       method: "simulateBundle",
+//       id: 1,
+//       jsonrpc: "2.0",
+//       params: [
+//         {
+//           encodedTransactions: txs.map((x) => bs58.encode(x.serialize())),
+//           preExecutionAccountsConfigs: txs.map((_) => ""),
+//           postExecutionAccountsConfigs: txs.map((_) => ""),
+//           skipSigVerify: true,
+//         },
+//       ],
 //     }
-//   });
-//   return simulationResult.value.transactionResults;
+//   );
 // }
 async function umiToVersionedTransactions(umi, signer, txs, feeEstimates, computeUnitLimits) {
     return await Promise.all(txs.map(async (tx, i) => {
@@ -81,7 +82,6 @@ async function pollBundleStatus(bundleId, interval = 1000, timeout = 40000) {
     return [];
 }
 async function sendJitoBundle(transactions) {
-    (0, generalUtils_1.consoleLog)("Sending bundle...");
     const resp = await axios_1.default.post(`${solautoConstants_1.JITO_BLOCK_ENGINE}/api/v1/bundles`, {
         jsonrpc: "2.0",
         id: 1,
@@ -89,7 +89,8 @@ async function sendJitoBundle(transactions) {
         params: [transactions],
     });
     const bundleId = resp.data.result;
-    return await pollBundleStatus(bundleId);
+    (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
+    return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, priorityFeeSetting = types_1.PriorityFeeSetting.Min) {
     (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
@@ -98,11 +99,8 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
     txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
     const feeEstimates = await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
         1000000));
-    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates
-    // Array(txs.length).fill(1_400_000)
-    );
-    // // TODO: Skip over this for now, and instead don't specify a compute unit limit in the final bundle transactions
-    // const simulationResults = await simulateJitoBundle(builtTxs);
+    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates);
+    // const simulationResults = await simulateJitoBundle(umi, builtTxs);
     if (!simulateOnly) {
         // let builtTxs = await umiToVersionedTransactions(
         //   client.signer,

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

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsB7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA2DjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmC7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA+DjC"}

package/dist/utils/solanaUtils.js

@@ -152,12 +152,11 @@ async function simulateTransaction(umi, connection, transaction) {
 }
 async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
-    const serializedTransaction = bs58_1.default.encode(web3Transaction.serialize());
     let feeEstimate;
     try {
         const resp = await umi.rpc.call("getPriorityFeeEstimate", [
             {
-                transaction: serializedTransaction,
+                transaction: bs58_1.default.encode(web3Transaction.serialize()),
                 options: {
                     priorityLevel: prioritySetting.toString(),
                 },
@@ -166,7 +165,22 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
         feeEstimate = Math.round(resp.priorityFeeEstimate);
     }
     catch (e) {
-        console.error(e);
+        try {
+            const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+                {
+                    accountKeys: tx
+                        .getInstructions()
+                        .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString())),
+                    options: {
+                        priorityLevel: prioritySetting.toString(),
+                    },
+                },
+            ]);
+            feeEstimate = Math.round(resp.priorityFeeEstimate);
+        }
+        catch (e) {
+            console.error(e);
+        }
     }
     return feeEstimate;
 }

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,CAiDjB;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,CA0D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAyChB"}
+{"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,CA8D9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CA2ChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -84,7 +84,9 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
     const { targetRateBps, amountToDcaIn } = getTargetRateAndDcaAmount(state, settings, dca, currentUnixTime, targetLiqUtilizationRateBps);
     const amountUsdToDcaIn = (0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
         (dca?.tokenType === generated_1.TokenType.Debt ? debtPrice : supplyPrice);
-    const rebalanceDirection = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps <= targetRateBps ? generated_1.RebalanceDirection.Boost : generated_1.RebalanceDirection.Repay;
+    const rebalanceDirection = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps <= targetRateBps
+        ? generated_1.RebalanceDirection.Boost
+        : generated_1.RebalanceDirection.Repay;
     const adjustmentFeeBps = (0, numberUtils_1.getSolautoFeesBps)(false, targetLiqUtilizationRateBps, (0, numberUtils_1.fromBaseUnit)(state.netWorth.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS), rebalanceDirection).total;
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(state.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
         amountUsdToDcaIn;
@@ -97,24 +99,32 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         amountToDcaIn: amountToDcaIn ?? 0,
         amountUsdToDcaIn,
         dcaTokenType: dca?.tokenType,
-        rebalanceAction: (amountToDcaIn ?? 0) > 0 ? "dca" : rebalanceDirection === generated_1.RebalanceDirection.Boost ? "boost" : "repay",
+        rebalanceAction: (amountToDcaIn ?? 0) > 0
+            ? "dca"
+            : rebalanceDirection === generated_1.RebalanceDirection.Boost
+                ? "boost"
+                : "repay",
         rebalanceDirection,
-        feesUsd: debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps)
+        feesUsd: debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps),
     };
 }
 function getFlashLoanDetails(client, values, jupQuote) {
     let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) +
         (values.dcaTokenType === generated_1.TokenType.Supply ? values.amountUsdToDcaIn : 0);
     let debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
-    const debtAdjustmentUsd = Math.abs(values.debtAdjustmentUsd);
+    const debtAdjustmentUsdAbs = Math.abs(values.debtAdjustmentUsd);
     supplyUsd =
-        values.debtAdjustmentUsd < 0 ? supplyUsd - debtAdjustmentUsd : supplyUsd;
+        values.rebalanceDirection === generated_1.RebalanceDirection.Repay
+            ? supplyUsd - debtAdjustmentUsdAbs
+            : supplyUsd;
     debtUsd =
-        values.debtAdjustmentUsd > 0 ? debtUsd + debtAdjustmentUsd : debtUsd;
+        values.rebalanceDirection === generated_1.RebalanceDirection.Boost
+            ? debtUsd + debtAdjustmentUsdAbs
+            : debtUsd;
     const tempLiqUtilizationRateBps = (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, client.solautoPositionState.liqThresholdBps);
     const requiresFlashLoan = supplyUsd <= 0 ||
         tempLiqUtilizationRateBps >
-            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.01);
+            (0, numberUtils_1.getMaxLiqUtilizationRateBps)(client.solautoPositionState.maxLtvBps, client.solautoPositionState.liqThresholdBps, 0.015);
     let flashLoanToken = undefined;
     let flashLoanTokenPrice = 0;
     if (values.rebalanceDirection === generated_1.RebalanceDirection.Boost) {
@@ -132,7 +142,7 @@ function getFlashLoanDetails(client, values, jupQuote) {
         ? {
             baseUnitAmount: exactAmountBaseUnit
                 ? exactAmountBaseUnit
-                : (0, numberUtils_1.toBaseUnit)(debtAdjustmentUsd / flashLoanTokenPrice, flashLoanToken.decimals),
+                : (0, numberUtils_1.toBaseUnit)(debtAdjustmentUsdAbs / flashLoanTokenPrice, flashLoanToken.decimals),
             mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(flashLoanToken.mint),
         }
         : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.312",
+  "version": "1.0.314",
   "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

@@ -517,7 +517,7 @@ export abstract class SolautoClient extends ReferralStateManager {
           type: "supply",
           value:
             (this.solautoPositionState?.supply.amountUsed.baseUnit ??
-              BigInt(0)) + this.livePositionUpdates.supplyAdjustment,
+              BigInt(0)) * BigInt(-1),
         });
       }
     } else if (args.__kind === "Borrow") {
@@ -535,8 +535,8 @@ export abstract class SolautoClient extends ReferralStateManager {
         this.livePositionUpdates.new({
           type: "debt",
           value:
-            (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) +
-            this.livePositionUpdates.debtAdjustment,
+            (this.solautoPositionState?.debt.amountUsed.baseUnit ?? BigInt(0)) *
+            BigInt(-1),
         });
       }
     }

package/src/transactions/transactionUtils.ts

@@ -659,8 +659,7 @@ export async function buildSolautoRebalanceTransaction(
         client.solautoPositionActiveDca(),
         currentUnixSeconds(),
         supplyPrice,
-        debtPrice,
-        0
+        debtPrice
       ))
   ) {
     client.log("Not eligible for a rebalance");

package/src/transactions/transactionsManager.ts

@@ -153,6 +153,12 @@ class TransactionSet {
     );
   }
 
+  prepend(...items: TransactionItem[]) {
+    this.items.unshift(
+      ...items.filter((x) => x.tx && x.tx.getInstructions().length > 0)
+    );
+  }
+
   async refetchAll(attemptNum: number) {
     await this.txHandler.resetLiveTxUpdates();
     for (const item of this.items) {
@@ -179,7 +185,7 @@ class TransactionSet {
 
   name(): string {
     let names = this.items
-      .filter((x) => x.tx && x.name !== undefined)
+      .filter((x) => x.tx && Boolean(x.name))
       .map((x) => x.name!.toLowerCase());
     if (names.length > 1) {
       names = names.filter((x) => x !== CHORES_TX_NAME);
@@ -237,9 +243,9 @@ export class TransactionsManager {
     let transactionSets: TransactionSet[] = [];
     this.txHandler.log(`Reassembling ${items.length} items`);
 
-    for (let i = 0; i < items.length; ) {
+    for (let i = items.length - 1; i >= 0; ) {
       let item = items[i];
-      i++;
+      i--;
 
       if (!item.tx) {
         continue;
@@ -256,15 +262,15 @@ export class TransactionsManager {
         let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
           item,
         ]);
-        for (let j = i; j < items.length; j++) {
+        for (let j = i; j >= 0; j--) {
           if (await newSet.fitsWith(items[j])) {
-            newSet.add(items[j]);
-            i++;
+            newSet.prepend(items[j]);
+            i--;
           } else {
             break;
           }
         }
-        transactionSets.push(newSet);
+        transactionSets.unshift(newSet);
       }
     }
 
@@ -409,11 +415,13 @@ export class TransactionsManager {
         .stale;
 
       if (stale) {
+        this.txHandler.log("Requires oracle update...");
         const swbTx = new TransactionItem(
           async () =>
             buildSwbSubmitResponseTx(client.connection, client.signer, mint),
-          items.length === 1 ? "Update oracle" : ""
+          "Update oracle"
         );
+        await swbTx.initialize();
         items.unshift(swbTx);
       }
     }
@@ -505,17 +513,28 @@ export class TransactionsManager {
 
   private async processTransactionsAtomically(itemSets: TransactionSet[]) {
     let num = 0;
+    let sets = itemSets;
 
     await retryWithExponentialBackoff(
       async (attemptNum) => {
         num = attemptNum;
 
+        if (attemptNum > 0) {
+          sets = [];
+          for (let i = 0; i < itemSets.length; i++) {
+            const txSet = await this.refreshItemSet(itemSets, i, attemptNum);
+            if (txSet) {
+              sets.push(txSet);
+            }
+          }
+        }
+
         let transactions = [];
-        for (const set of itemSets) {
+        for (const set of sets) {
           transactions.push(await set.getSingleTransaction());
         }
 
-        itemSets.forEach((x) =>
+        sets.forEach((x) =>
           this.updateStatus(x.name(), TransactionStatus.Processing, attemptNum)
         );
         const txSigs = await sendJitoBundledTransactions(
@@ -526,7 +545,7 @@ export class TransactionsManager {
           this.priorityFeeSetting
         );
         if (txSigs) {
-          itemSets.forEach((x, i) =>
+          sets.forEach((x, i) =>
             this.updateStatus(
               x.name(),
               TransactionStatus.Successful,
@@ -535,7 +554,7 @@ export class TransactionsManager {
             )
           );
         } else {
-          itemSets.forEach((x) =>
+          sets.forEach((x) =>
             this.updateStatus(
               x.name(),
               TransactionStatus.Failed,
@@ -551,7 +570,7 @@ export class TransactionsManager {
       this.retryDelay,
       this.errorsToThrow
     ).catch((e: Error) => {
-      itemSets.forEach((x) =>
+      sets.forEach((x) =>
         this.updateStatus(
           x.name(),
           TransactionStatus.Failed,

package/src/utils/jitoUtils.ts

@@ -9,6 +9,7 @@ import {
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
+  buildIronforgeApiUrl,
   getComputeUnitPriceEstimate,
   systemTransferUmiIx,
 } from "./solanaUtils";
@@ -16,6 +17,7 @@ import { consoleLog } from "./generalUtils";
 import { PriorityFeeSetting } from "../types";
 import axios from "axios";
 import base58 from "bs58";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export async function getRandomTipAccount(): Promise<PublicKey> {
   const tipAccounts = [
@@ -43,25 +45,24 @@ async function getTipInstruction(
   );
 }
 
-// async function simulateJitoBundle(
-//   txs: VersionedTransaction[]
-// ): Promise<SimulatedBundleTransactionResult[]> {
-//   const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
-//     preExecutionAccountsConfigs: txs.map((x) => null),
-//     postExecutionAccountsConfigs: txs.map((x) => null),
-//     skipSigVerify: true,
-//   });
-
-//   simulationResult.value.transactionResults.forEach((tx) => {
-//     if (tx.err) {
-//       tx.logs?.forEach((x) => {
-//         consoleLog(x);
-//       });
-//       throw tx.err;
+// TODO: fix
+// async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
+//   const simulationResult = await axios.post(
+//     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
+//     {
+//       method: "simulateBundle",
+//       id: 1,
+//       jsonrpc: "2.0",
+//       params: [
+//         {
+//           encodedTransactions: txs.map((x) => bs58.encode(x.serialize())),
+//           preExecutionAccountsConfigs: txs.map((_) => ""),
+//           postExecutionAccountsConfigs: txs.map((_) => ""),
+//           skipSigVerify: true,
+//         },
+//       ],
 //     }
-//   });
-
-//   return simulationResult.value.transactionResults;
+//   );
 // }
 
 async function umiToVersionedTransactions(
@@ -122,7 +123,6 @@ async function pollBundleStatus(
 }
 
 async function sendJitoBundle(transactions: string[]): Promise<string[]> {
-  consoleLog("Sending bundle...");
   const resp = await axios.post<{ result: string }>(
     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
     {
@@ -134,7 +134,8 @@ async function sendJitoBundle(transactions: string[]): Promise<string[]> {
   );
 
   const bundleId = resp.data.result;
-  return await pollBundleStatus(bundleId);
+  consoleLog("Bundle ID:", bundleId);
+  return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 
 export async function sendJitoBundledTransactions(
@@ -165,10 +166,9 @@ export async function sendJitoBundledTransactions(
     signer,
     txs,
     feeEstimates
-    // Array(txs.length).fill(1_400_000)
   );
-  // // TODO: Skip over this for now, and instead don't specify a compute unit limit in the final bundle transactions
-  // const simulationResults = await simulateJitoBundle(builtTxs);
+
+  // const simulationResults = await simulateJitoBundle(umi, builtTxs);
 
   if (!simulateOnly) {
     // let builtTxs = await umiToVersionedTransactions(

package/src/utils/solanaUtils.ts

@@ -293,13 +293,12 @@ export async function getComputeUnitPriceEstimate(
   const web3Transaction = toWeb3JsTransaction(
     (await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi)
   );
-  const serializedTransaction = bs58.encode(web3Transaction.serialize());
 
   let feeEstimate: number | undefined;
   try {
     const resp = await umi.rpc.call("getPriorityFeeEstimate", [
       {
-        transaction: serializedTransaction,
+        transaction: bs58.encode(web3Transaction.serialize()),
         options: {
           priorityLevel: prioritySetting.toString(),
         },
@@ -307,7 +306,21 @@ export async function getComputeUnitPriceEstimate(
     ]);
     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
   } catch (e) {
-    console.error(e);
+    try {
+      const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+        {
+          accountKeys: tx
+            .getInstructions()
+            .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString())),
+          options: {
+            priorityLevel: prioritySetting.toString(),
+          },
+        },
+      ]);
+      feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+    } catch (e) {
+      console.error(e);
+    }
   }
 
   return feeEstimate;
@@ -374,7 +387,11 @@ export async function sendSingleOptimizedTransaction(
 
   let cuPrice: number | undefined;
   if (prioritySetting !== PriorityFeeSetting.None) {
-    cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
+    cuPrice = await getComputeUnitPriceEstimate(
+      umi,
+      tx,
+      prioritySetting,
+    );
     if (!cuPrice) {
       cuPrice = 1000000;
     }

package/src/utils/solauto/rebalanceUtils.ts

@@ -191,7 +191,10 @@ export function getRebalanceValues(
     fromBaseUnit(BigInt(Math.round(amountToDcaIn ?? 0)), state.debt.decimals) *
     (dca?.tokenType === TokenType.Debt ? debtPrice : supplyPrice);
 
-  const rebalanceDirection = amountUsdToDcaIn > 0 || state.liqUtilizationRateBps <= targetRateBps ? RebalanceDirection.Boost : RebalanceDirection.Repay;
+  const rebalanceDirection =
+    amountUsdToDcaIn > 0 || state.liqUtilizationRateBps <= targetRateBps
+      ? RebalanceDirection.Boost
+      : RebalanceDirection.Repay;
   const adjustmentFeeBps = getSolautoFeesBps(
     false,
     targetLiqUtilizationRateBps,
@@ -223,9 +226,13 @@ export function getRebalanceValues(
     amountUsdToDcaIn,
     dcaTokenType: dca?.tokenType,
     rebalanceAction:
-      (amountToDcaIn ?? 0) > 0 ? "dca" : rebalanceDirection === RebalanceDirection.Boost ? "boost" : "repay",
+      (amountToDcaIn ?? 0) > 0
+        ? "dca"
+        : rebalanceDirection === RebalanceDirection.Boost
+          ? "boost"
+          : "repay",
     rebalanceDirection,
-    feesUsd: debtAdjustmentUsd * fromBps(adjustmentFeeBps)
+    feesUsd: debtAdjustmentUsd * fromBps(adjustmentFeeBps),
   };
 }
 
@@ -250,11 +257,15 @@ export function getFlashLoanDetails(
     USD_DECIMALS
   );
 
-  const debtAdjustmentUsd = Math.abs(values.debtAdjustmentUsd);
+  const debtAdjustmentUsdAbs = Math.abs(values.debtAdjustmentUsd);
   supplyUsd =
-    values.debtAdjustmentUsd < 0 ? supplyUsd - debtAdjustmentUsd : supplyUsd;
+    values.rebalanceDirection === RebalanceDirection.Repay
+      ? supplyUsd - debtAdjustmentUsdAbs
+      : supplyUsd;
   debtUsd =
-    values.debtAdjustmentUsd > 0 ? debtUsd + debtAdjustmentUsd : debtUsd;
+    values.rebalanceDirection === RebalanceDirection.Boost
+      ? debtUsd + debtAdjustmentUsdAbs
+      : debtUsd;
 
   const tempLiqUtilizationRateBps = getLiqUtilzationRateBps(
     supplyUsd,
@@ -267,7 +278,7 @@ export function getFlashLoanDetails(
       getMaxLiqUtilizationRateBps(
         client.solautoPositionState!.maxLtvBps,
         client.solautoPositionState!.liqThresholdBps,
-        0.01
+        0.015
       );
 
   let flashLoanToken: PositionTokenUsage | undefined = undefined;
@@ -290,7 +301,7 @@ export function getFlashLoanDetails(
         baseUnitAmount: exactAmountBaseUnit
           ? exactAmountBaseUnit
           : toBaseUnit(
-              debtAdjustmentUsd / flashLoanTokenPrice,
+              debtAdjustmentUsdAbs / flashLoanTokenPrice,
               flashLoanToken.decimals
             ),
         mint: toWeb3JsPublicKey(flashLoanToken.mint),
@@ -304,12 +315,14 @@ export function getJupSwapRebalanceDetails(
   targetLiqUtilizationRateBps?: number,
   attemptNum?: number
 ): JupSwapDetails {
-  const input = values.rebalanceDirection === RebalanceDirection.Boost
-    ? client.solautoPositionState!.debt
-    : client.solautoPositionState!.supply;
-  const output = values.rebalanceDirection === RebalanceDirection.Boost
-    ? client.solautoPositionState!.supply
-    : client.solautoPositionState!.debt;
+  const input =
+    values.rebalanceDirection === RebalanceDirection.Boost
+      ? client.solautoPositionState!.debt
+      : client.solautoPositionState!.supply;
+  const output =
+    values.rebalanceDirection === RebalanceDirection.Boost
+      ? client.solautoPositionState!.supply
+      : client.solautoPositionState!.debt;
 
   const usdToSwap =
     Math.abs(values.debtAdjustmentUsd) +

package/tests/transactions/solautoMarginfi.ts

@@ -16,7 +16,6 @@ import {
   toBaseUnit,
 } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
-import { consoleLog } from "../../src/utils/generalUtils";
 import {
   TransactionItem,
   TransactionsManager,
@@ -34,9 +33,9 @@ describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
   // const signer = setupTest("solauto-manager");
 
-  const payForTransactions = true;
+  const payForTransactions = false;
   const testProgram = true;
-  const positionId = 3;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -52,7 +51,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"), // positions 1 & 3 are taken
+      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -123,7 +122,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 5000, attemptNum),
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
         "rebalance"
       )
     );