@haven-fi/solauto-sdk 1.0.400 → 1.0.402

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;AA0FD,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;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAuH7B,qBAAqB;YA2CrB,cAAc;YAqCd,eAAe;CA0D9B"}
+{"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;AA0FD,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;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YA4BxB,6BAA6B;YAwH7B,qBAAqB;YA2CrB,cAAc;YAqCd,eAAe;CA0D9B"}

package/dist/transactions/transactionsManager.js

@@ -355,7 +355,7 @@ class TransactionsManager {
             let txSigs;
             let error;
             try {
-                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.signer, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
+                txSigs = await (0, jitoUtils_1.sendJitoBundledTransactions)(this.txHandler.umi, this.txHandler.connection, this.txHandler.signer, transactions, this.txType, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), () => this.updateStatusForSets(itemSets, TransactionStatus.Processing, attemptNum, undefined, true));
             }
             catch (e) {
                 error = e;

package/dist/types/solauto.d.ts

@@ -16,7 +16,8 @@ export declare enum PriorityFeeSetting {
     Min = "Min",
     Low = "Low",
     Default = "Medium",
-    High = "High"
+    High = "High",
+    VeryHigh = "VeryHigh"
 }
 export declare const priorityFeeSettingValues: PriorityFeeSetting[];
 export type RebalanceAction = "boost" | "repay" | "dca";

package/dist/types/solauto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;CACd;AAED,eAAO,MAAM,wBAAwB,EAAwC,kBAAkB,EAAE,CAAC;AAElG,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,OAAO,WAAW;IAClB,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,wBAAwB,EAAwC,kBAAkB,EAAE,CAAC;AAElG,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,OAAO,GAAG,KAAK,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,GAAG,QAAQ,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC"}

package/dist/types/solauto.js

@@ -8,5 +8,6 @@ var PriorityFeeSetting;
     PriorityFeeSetting["Low"] = "Low";
     PriorityFeeSetting["Default"] = "Medium";
     PriorityFeeSetting["High"] = "High";
+    PriorityFeeSetting["VeryHigh"] = "VeryHigh";
 })(PriorityFeeSetting || (exports.PriorityFeeSetting = PriorityFeeSetting = {}));
 exports.priorityFeeSettingValues = Object.values(PriorityFeeSetting);

package/dist/utils/jitoUtils.d.ts

@@ -1,6 +1,6 @@
-import { PublicKey } from "@solana/web3.js";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): Promise<PublicKey>;
-export declare function sendJitoBundledTransactions(umi: Umi, signer: Signer, txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
+export declare function sendJitoBundledTransactions(umi: Umi, connection: Connection, signer: Signer, txs: TransactionBuilder[], txType?: TransactionRunType, priorityFeeSetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<string[] | undefined>;
 //# sourceMappingURL=jitoUtils.d.ts.map

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,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAKlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAiND,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,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,CAwE/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,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,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAiND,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,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,CA6E/B"}

package/dist/utils/jitoUtils.js

@@ -14,6 +14,7 @@ const types_1 = require("../types");
 const axios_1 = __importDefault(require("axios"));
 const bs58_1 = __importDefault(require("bs58"));
 const transactions_1 = require("../types/transactions");
+const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 async function getRandomTipAccount() {
     const tipAccounts = [
         "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
@@ -172,7 +173,11 @@ async function sendJitoBundle(umi, transactions) {
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(bundleId) : [];
 }
-async function sendJitoBundledTransactions(umi, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
+async function sendJitoBundledTransactions(umi, connection, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
+    if (txs.length === 1) {
+        const resp = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(umi, connection, txs[0], txType, priorityFeeSetting, onAwaitingSign);
+        return resp ? [bytes_1.bs58.encode(resp)] : undefined;
+    }
     (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));

package/dist/utils/jupiterUtils.js

@@ -35,7 +35,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
                 ? "ExactIn"
                 : undefined,
         slippageBps: memecoinSwap ? 500 : 50,
-        maxAccounts: !swapDetails.exactOut ? 50 : undefined,
+        maxAccounts: !swapDetails.exactOut ? 60 : undefined,
     }), 4, 200);
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *

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,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;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,CAoEjC"}
+{"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,CAmBpC;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,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAyC7B;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,CAoEjC"}

package/dist/utils/solanaUtils.js

@@ -79,7 +79,7 @@ function splTokenTransferUmiIx(signer, fromTa, toTa, authority, amount) {
     return getWrappedInstruction(signer, (0, spl_token_1.createTransferInstruction)(fromTa, toTa, authority, amount));
 }
 async function getAddressLookupInputs(umi, lookupTableAddresses) {
-    const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)));
+    const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)), { commitment: "confirmed" });
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
         const addressLookupTableAddress = lookupTableAddresses[index];
         if (accountInfo.exists) {
@@ -156,36 +156,35 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
         .getInstructions()
         .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
     let feeEstimate;
-    try {
-        const resp = await umi.rpc.call("getPriorityFeeEstimate", [
-            {
-                transaction: !useAccounts
-                    ? bs58_1.default.encode(web3Transaction.serialize())
-                    : undefined,
-                accountKeys: useAccounts ? accountKeys : undefined,
-                options: {
-                    priorityLevel: prioritySetting.toString(),
-                },
+    // try {
+    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+        {
+            transaction: !useAccounts
+                ? bs58_1.default.encode(web3Transaction.serialize())
+                : undefined,
+            accountKeys: useAccounts ? accountKeys : undefined,
+            options: {
+                priorityLevel: prioritySetting.toString(),
             },
-        ]);
-        feeEstimate = Math.round(resp.priorityFeeEstimate);
-    }
-    catch (e) {
-        try {
-            const resp = await umi.rpc.call("getPriorityFeeEstimate", [
-                {
-                    accountKeys,
-                    options: {
-                        priorityLevel: prioritySetting.toString(),
-                    },
-                },
-            ]);
-            feeEstimate = Math.round(resp.priorityFeeEstimate);
-        }
-        catch (e) {
-            // console.error(e);
-        }
-    }
+        },
+    ]);
+    feeEstimate = Math.round(resp.priorityFeeEstimate);
+    // }
+    // catch (e) {
+    //   try {
+    //     const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+    //       {
+    //         accountKeys,
+    //         options: {
+    //           priorityLevel: prioritySetting.toString(),
+    //         },
+    //       },
+    //     ]);
+    //     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+    //   } catch (e) {
+    //     // console.error(e);
+    //   }
+    // }
     return feeEstimate;
 }
 async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 1500) {
@@ -245,7 +244,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
         if (!cuPrice) {
             cuPrice = 1000000;
         }
-        cuPrice = Math.min(cuPrice, 100 * 1000000);
+        // cuPrice = Math.min(cuPrice, 100 * 1_000_000);
         (0, generalUtils_1.consoleLog)("Compute unit price: ", cuPrice);
     }
     if (txType !== "only-simulate") {

package/dist/utils/solauto/rebalanceUtils.js

@@ -170,7 +170,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         inputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(input.mint),
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
-        slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
+        slippageIncFactor: 1 + (attemptNum ?? 0) * 0.2,
         amount: exactOut ? outputAmount : inputAmount,
         exactIn: exactIn,
         exactOut: exactOut,

package/local/.env

@@ -0,0 +1 @@
+ADDRESS_WHITELIST=5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe,E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe,DRP5cgM1JpnMySvwg3jqRP2VA2DXSWUjo6VGLkNZ2etb,5qbTgNHBo5kedvDCseLbn5vJCtjrpUyNWwZzRnx72rPT

package/local/logPositions.ts

@@ -1,21 +1,225 @@
+import { publicKey } from "@metaplex-foundation/umi";
 import {
   buildHeliusApiUrl,
+  fetchTokenPrices,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  PositionState,
+  positionStateWithLatestPrices,
+  PRICES,
+  retryWithExponentialBackoff,
+  safeFetchAllSolautoPosition,
+  safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
+  TOKEN_INFO,
+  USD_DECIMALS,
 } from "../src";
+import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { fromBaseUnit } from "../dist";
+import path from 'path';
+import { config } from 'dotenv';
 
-async function main() {
+config({ path: path.join(__dirname, '.env') });
+
+function getBatches<T>(items: T[], batchSize: number): T[][] {
+  const batches: T[][] = [];
+  for (let i = 0; i < items.length; i += batchSize) {
+    batches.push(items.slice(i, i + batchSize));
+  }
+  return batches;
+}
+
+export function tokenInfo(mint?: PublicKey) {
+  return TOKEN_INFO[mint ? mint.toString() : PublicKey.default.toString()];
+}
+
+type StrategyType = "Long" | "Short";
+
+function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey) {
+  const supplyInfo = tokenInfo(supplyMint);
+  const debtInfo = tokenInfo(debtMint);
+  const strat = strategyType(
+    supplyMint ?? PublicKey.default,
+    debtMint ?? PublicKey.default
+  );
+
+  if (strat === "Long") {
+    return debtInfo.isStableCoin
+      ? `${supplyInfo.ticker} Long`
+      : supplyInfo.ticker
+        ? `${supplyInfo.ticker}/${debtInfo.ticker} Long`
+        : "";
+  } else {
+    return `${debtInfo.ticker} Short`;
+  }
+}
+
+function strategyType(
+  supplyMint: PublicKey,
+  debtMint: PublicKey
+): StrategyType {
+  const supplyInfo = tokenInfo(supplyMint);
+  const debtInfo = tokenInfo(debtMint);
+
+  if (supplyInfo.isLST && debtMint.equals(NATIVE_MINT)) {
+    // Yield
+    throw new Error("Not yet supported");
+  } else if (debtInfo.isStableCoin) {
+    return "Long";
+  } else if (supplyInfo.isStableCoin) {
+    return "Short";
+  } else {
+    return "Long";
+  }
+}
+
+export function roundToDecimals(value: number, decimals: number = 2): number {
+  if (!value || isNaN(value)) {
+    return value;
+  }
+
+  let roundedValue: number | undefined;
+  do {
+    const factor = Math.pow(10, decimals ?? 2);
+    roundedValue = Math.round(value * factor) / factor;
+    decimals += 1;
+  } while (!roundedValue || decimals >= 10);
+
+  return roundedValue;
+}
+
+export function formatNumberToShortForm(
+  num: number,
+  decimals?: number
+): string {
+  if (decimals === undefined) {
+    decimals = 1;
+  }
+  if (num >= 1_000_000_000) {
+    return (
+      (num / 1_000_000_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "B"
+    );
+  }
+  if (num >= 1_000_000) {
+    return (
+      (num / 1_000_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "M"
+    );
+  }
+  if (num >= 1_000) {
+    return (
+      (num / 1_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "K"
+    );
+  }
+  return num.toFixed(decimals).replace(new RegExp(`\\.0{${decimals}}$`), "");
+}
+
+export function formatNumber(
+  num: number,
+  decimals?: number,
+  shortFormAtThreshold?: number,
+  decimalsAtShortform?: number
+): string {
+  if (shortFormAtThreshold !== undefined && num > shortFormAtThreshold) {
+    return formatNumberToShortForm(num, decimalsAtShortform);
+  } else {
+    return num < 1
+      ? roundToDecimals(num, decimals).toString()
+      : new Intl.NumberFormat("en-US").format(
+          decimals !== undefined ? roundToDecimals(num, decimals) : num
+        );
+  }
+}
+
+async function main(filterWhitelist: boolean) {
   const [_, umi] = getSolanaRpcConnection(
     buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
     SOLAUTO_PROD_PROGRAM
   );
-  const positions = await getSolautoManagedPositions(umi);
-  // TODO: filter out certain wallet authorities using an env variable
+  let positions = await getSolautoManagedPositions(umi);
+
+  if (filterWhitelist) {
+    const addressWhitelist = process.env.ADDRESS_WHITELIST?.split(",") ?? [];
+    positions = positions.filter(
+      (x) => !addressWhitelist.includes(x.authority.toString())
+    );
+  }
+
+  const batches = getBatches(positions, 30);
+
+  const solautoPositionsData = (
+    await Promise.all(
+      batches.map(async (pubkeys) => {
+        return retryWithExponentialBackoff(
+          async () =>
+            await safeFetchAllSolautoPosition(
+              umi,
+              pubkeys.map((x) => publicKey(x.publicKey!))
+            )
+        );
+      })
+    )
+  ).flat();
+
+  const tokensUsed = Array.from(
+    new Set(
+      positions.flatMap((x) => [
+        x.supplyMint!.toString(),
+        x.debtMint!.toString(),
+      ])
+    )
+  );
+
+  const tokenBatches = getBatches(tokensUsed, 15);
+  await Promise.all(
+    tokenBatches.map(async (batch) => {
+      await fetchTokenPrices(batch.map((x) => new PublicKey(x)));
+    })
+  );
+
+  console.log("\n\n");
+
+  const latestStates: PositionState[] = [];
+  for (const pos of solautoPositionsData) {
+    const latestState = await positionStateWithLatestPrices(
+      pos.state,
+      safeGetPrice(pos.state.supply.mint),
+      safeGetPrice(pos.state.debt.mint)
+    );
+    latestStates.push(latestState);
+
+    const strategy = solautoStrategyName(
+      toWeb3JsPublicKey(pos.state.supply.mint),
+      toWeb3JsPublicKey(pos.state.debt.mint)
+    );
+
+    console.log("Position:", pos.publicKey.toString());
+    console.log("Authority:", pos.authority.toString());
+    console.log(
+      `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)}`
+    );
+    console.log("\n");
+  }
+
+  console.log("Total positions:", solautoPositionsData.length);
+  console.log(
+    "Total users:",
+    Array.from(new Set(solautoPositionsData.map((x) => x.authority.toString())))
+      .length
+  );
 
-  console.log(positions);
-  console.log("Total positions:", positions.length);
-  // TODO: log net worth / balances
+  const tvl = latestStates
+    .map((x) => fromBaseUnit(x.netWorth.baseAmountUsdValue, USD_DECIMALS))
+    .reduce((acc, curr) => acc + curr, 0);
+  console.log(`Total TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
 }
 
-main().then((x) => x);
+const filterWhitelist = true;
+main(filterWhitelist).then((x) => x);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.400",
+  "version": "1.0.402",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -27,6 +27,7 @@
     "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
+    "dotenv": "^16.4.7",
     "rpc-websockets": "7.11.0"
   },
   "devDependencies": {

package/src/transactions/transactionsManager.ts

@@ -567,6 +567,7 @@ export class TransactionsManager {
         try {
           txSigs = await sendJitoBundledTransactions(
             this.txHandler.umi,
+            this.txHandler.connection,
             this.txHandler.signer,
             transactions,
             this.txType,

package/src/types/solauto.ts

@@ -19,6 +19,7 @@ export enum PriorityFeeSetting {
   Low = "Low",
   Default = "Medium",
   High = "High",
+  VeryHigh = "VeryHigh",
 }
 
 export const priorityFeeSettingValues = Object.values(PriorityFeeSetting) as PriorityFeeSetting[];

package/src/utils/jitoUtils.ts

@@ -1,4 +1,5 @@
 import {
+  Connection,
   PublicKey,
   SimulatedTransactionResponse,
   TransactionExpiredBlockheightExceededError,
@@ -15,6 +16,7 @@ import {
 import {
   assembleFinalTransaction,
   getComputeUnitPriceEstimate,
+  sendSingleOptimizedTransaction,
   systemTransferUmiIx,
 } from "./solanaUtils";
 import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
@@ -22,6 +24,7 @@ import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
 import { BundleSimulationError } from "../types/transactions";
+import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
 export async function getRandomTipAccount(): Promise<PublicKey> {
   const tipAccounts = [
@@ -247,12 +250,18 @@ async function sendJitoBundle(
 
 export async function sendJitoBundledTransactions(
   umi: Umi,
+  connection: Connection,
   signer: Signer,
   txs: TransactionBuilder[],
   txType?: TransactionRunType,
   priorityFeeSetting: PriorityFeeSetting = PriorityFeeSetting.Min,
   onAwaitingSign?: () => void
 ): Promise<string[] | undefined> {
+  if (txs.length === 1) {
+    const resp = await sendSingleOptimizedTransaction(umi, connection, txs[0], txType, priorityFeeSetting, onAwaitingSign);
+    return resp ? [bs58.encode(resp)] : undefined;
+  }
+
   consoleLog("Sending Jito bundle...");
   consoleLog("Transactions: ", txs.length);
   consoleLog(

package/src/utils/jupiterUtils.ts

@@ -71,7 +71,7 @@ export async function getJupSwapTransaction(
             ? "ExactIn"
             : undefined,
         slippageBps: memecoinSwap ? 500 : 50,
-        maxAccounts: !swapDetails.exactOut ? 50 : undefined,
+        maxAccounts: !swapDetails.exactOut ? 60 : undefined,
       }),
     4,
     200

package/src/utils/solanaUtils.ts

@@ -162,7 +162,8 @@ export async function getAddressLookupInputs(
   lookupTableAddresses: string[]
 ): Promise<AddressLookupTableInput[]> {
   const addressLookupTableAccountInfos = await umi.rpc.getAccounts(
-    lookupTableAddresses.map((key) => publicKey(key))
+    lookupTableAddresses.map((key) => publicKey(key)),
+    { commitment: "confirmed" }
   );
 
   return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
@@ -300,7 +301,7 @@ export async function getComputeUnitPriceEstimate(
     .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
 
   let feeEstimate: number | undefined;
-  try {
+  // try {
     const resp = await umi.rpc.call("getPriorityFeeEstimate", [
       {
         transaction: !useAccounts
@@ -313,21 +314,22 @@ export async function getComputeUnitPriceEstimate(
       },
     ]);
     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
-  } catch (e) {
-    try {
-      const resp = await umi.rpc.call("getPriorityFeeEstimate", [
-        {
-          accountKeys,
-          options: {
-            priorityLevel: prioritySetting.toString(),
-          },
-        },
-      ]);
-      feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
-    } catch (e) {
-      // console.error(e);
-    }
-  }
+  // }
+  // catch (e) {
+  //   try {
+  //     const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+  //       {
+  //         accountKeys,
+  //         options: {
+  //           priorityLevel: prioritySetting.toString(),
+  //         },
+  //       },
+  //     ]);
+  //     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+  //   } catch (e) {
+  //     // console.error(e);
+  //   }
+  // }
 
   return feeEstimate;
 }
@@ -426,9 +428,9 @@ export async function sendSingleOptimizedTransaction(
   if (prioritySetting !== PriorityFeeSetting.None) {
     cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
     if (!cuPrice) {
-      cuPrice = 1000000;
+      cuPrice = 1_000_000;
     }
-    cuPrice = Math.min(cuPrice, 100 * 1_000_000);
+    // cuPrice = Math.min(cuPrice, 100 * 1_000_000);
     consoleLog("Compute unit price: ", cuPrice);
   }
 

package/src/utils/solauto/rebalanceUtils.ts

@@ -361,7 +361,7 @@ export function getJupSwapRebalanceDetails(
     inputMint: toWeb3JsPublicKey(input.mint),
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
-    slippageIncFactor: 0.5 + (attemptNum ?? 0) * 0.2,
+    slippageIncFactor: 1 + (attemptNum ?? 0) * 0.2,
     amount: exactOut ? outputAmount : inputAmount,
     exactIn: exactIn,
     exactOut: exactOut,

package/tests/transactions/solautoMarginfi.ts

@@ -1,23 +1,22 @@
 import { describe, it } from "mocha";
-import { none, publicKey, some, transactionBuilder } from "@metaplex-foundation/umi";
+import {
+  none,
+  publicKey,
+  some,
+} from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
-  PositionType,
   safeFetchSolautoPosition,
   solautoAction,
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
 import {
-  fromBaseUnit,
-  getDebtAdjustmentUsd,
-  getMaxLiqUtilizationRateBps,
   maxBoostToBps,
   maxRepayFromBps,
   maxRepayToBps,
   toBaseUnit,
-  toBps,
 } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import {
@@ -26,50 +25,28 @@ import {
 } from "../../src/transactions/transactionsManager";
 import { PublicKey } from "@solana/web3.js";
 import {
-  B_SOL,
-  DEFAULT_MARGINFI_GROUP,
-  HMTR,
-  JITO_SOL,
-  JLP,
-  POPCAT,
-  RETARDIO,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
-  USD_DECIMALS,
   USDC,
-  WETH,
 } from "../../src/constants";
-import { buildHeliusApiUrl, calcMarginfiMaxLtvAndLiqThreshold, fetchTokenPrices, getAllPositionsByAuthority, getJupPriceData, getJupTokenPrices, getMarginfiAccountPositionState, getSolautoManagedPositions, safeGetPrice } from "../../src/utils";
+import {
+  buildHeliusApiUrl,
+  getSolautoManagedPositions,
+} from "../../src/utils";
 import { PriorityFeeSetting } from "../../src/types";
-import { buildIronforgeApiUrl, MARGINFI_ACCOUNTS, TransactionManagerStatuses } from "../../dist";
-import { connect } from "http2";
-import CommonClient from "rpc-websockets/dist/lib/client";
-import { safeFetchAllBank } from "../../src/marginfi-sdk";
-
-export function getLeverageFactor(
-  strategyType: "Long" | "Short",
-  supplyUsd: number,
-  debtUsd: number
-): number {
-  let levFactor =
-    (strategyType === 'Long' ? supplyUsd : debtUsd) / (supplyUsd - debtUsd);
-  if (strategyType === 'Short') {
-    levFactor += 1;
-  }
-  return levFactor;
-}
 
 describe("Solauto Marginfi tests", async () => {
-  const signer = setupTest();
-  // const signer = setupTest("solauto-manager");
+  // const signer = setupTest();
+  const signer = setupTest("solauto-manager");
 
   const payForTransactions = true;
-  const testProgram = true;
+  const testProgram = false;
   const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
-      buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
+      // buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
+      "https://staked.helius-rpc.com?api-key=6a7423cf-35ef-44ce-b02b-02567f57d181",
       true,
       testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM
     );
@@ -81,7 +58,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
+      authority: new PublicKey("5bFfSCsGUgEzYH8kwwRtFnWkKZ1by8uD8RHvKQPnQReB"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
@@ -91,52 +68,7 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    // console.log(await getAllPositionsByAuthority(client.umi, new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"), PositionType.Leverage));
-
-
-    // console.log(JSON.stringify(await getJupPriceData([new PublicKey("7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2")], true), null, 2));
-    // console.log(JSON.stringify(await getJupPriceData([new PublicKey(POPCAT)], true), null, 2));
-
-    // const tokenMint = NATIVE_MINT.toString();
-    // await fetchTokenPrices([new PublicKey(tokenMint)]);
-
-    // // const accounts = MARGINFI_ACCOUNTS["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"];
-    // const accounts = MARGINFI_ACCOUNTS[DEFAULT_MARGINFI_GROUP];
-    // const [supplyBank, debtBank] = await safeFetchAllBank(client.umi, [publicKey(accounts[tokenMint].bank), publicKey(accounts[USDC].bank)]);
-
-    // console.log(supplyBank, debtBank);
-    // const [maxLtv, liqThreshold] = calcMarginfiMaxLtvAndLiqThreshold(
-    //   supplyBank,
-    //   debtBank,
-    //   safeGetPrice(new PublicKey(USDC)) ?? 0
-    // );
-
-    // console.log(maxLtv, liqThreshold);
-
-    // const supplyUsd = 100;
-    // const debtAdjustmentUsd = getDebtAdjustmentUsd(
-    //   toBps(liqThreshold),
-    //   supplyUsd,
-    //   0,
-    //   maxBoostToBps(toBps(maxLtv), toBps(liqThreshold))
-    //   // getMaxLiqUtilizationRateBps(toBps(maxLtv), toBps(liqThreshold), 0.005)
-    // );
-    // const maxLeverage = getLeverageFactor(
-    //   "Long",
-    //   supplyUsd + debtAdjustmentUsd,
-    //   debtAdjustmentUsd
-    // );
-    // console.log(maxLeverage, supplyUsd + debtAdjustmentUsd, debtAdjustmentUsd);
-
-    // const state = await getMarginfiAccountPositionState(client.umi, { pk: new PublicKey("GSw9ewsUgmuzDRJGYvSzkPPZgXfDszuGx7y22zMWSQkS") });
-    // const stateKeverage = getLeverageFactor(
-    //   "Short",
-    //   fromBaseUnit(state.supply.amountUsed.baseAmountUsdValue, USD_DECIMALS),
-    //   fromBaseUnit(state.debt.amountUsed.baseAmountUsdValue, USD_DECIMALS)
-    // );
-    // console.log(stateKeverage);
-
-    // console.log(await fetchTokenPrices([new PublicKey(HMTR)]));
+    // console.log(await getSolautoManagedPositions(client.umi));
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {
@@ -169,17 +101,7 @@ describe("Solauto Marginfi tests", async () => {
     //     // const [supplyPrice] = await fetchTokenPrices([supply]);
     //     return {
     //       tx: client.protocolInteraction(
-    //         solautoAction("Deposit", [toBaseUnit(0.05, supplyDecimals)])
-    //       ),
-    //     };
-    //   }, "deposit")
-    // );
-    // transactionItems.push(
-    //   new TransactionItem(async () => {
-    //     // const [supplyPrice] = await fetchTokenPrices([supply]);
-    //     return {
-    //       tx: client.protocolInteraction(
-    //         solautoAction("Deposit", [toBaseUnit(0.05, supplyDecimals)])
+    //         solautoAction("Deposit", [toBaseUnit(300, supplyDecimals)])
     //       ),
     //     };
     //   }, "deposit")
@@ -222,66 +144,17 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    transactionItems.push(
-      new TransactionItem(
-        async () => ({
-          tx: client.protocolInteraction(
-            solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
-          ),
-        }),
-        "withdraw"
-      )
-    );
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
     //       tx: client.protocolInteraction(
-    //         solautoAction("Withdraw", [{ __kind: "Some", fields: [toBaseUnit(0.03, 9)] }])
+    //         solautoAction("Withdraw", [{ __kind: "All" }])
     //       ),
     //     }),
     //     "withdraw"
     //   )
     // );
 
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: transactionBuilder()
-    //         .add(
-    //           client.protocolInteraction(
-    //             solautoAction("Withdraw", [
-    //               { __kind: "Some", fields: [toBaseUnit(0.01, 9)] },
-    //             ])
-    //           )
-    //         )
-    //     }),
-    //     "withdraw"
-    //   )
-    // );
-
-    // transactionItems.push(
-    //   new TransactionItem(
-    //     async () => ({
-    //       tx: transactionBuilder()
-    //         .add(
-    //           client.protocolInteraction(
-    //             solautoAction("Withdraw", [
-    //               { __kind: "Some", fields: [toBaseUnit(0.01, 9)] },
-    //             ])
-    //           )
-    //         )
-    //         .add(
-    //           client.protocolInteraction(
-    //             solautoAction("Withdraw", [
-    //               { __kind: "Some", fields: [toBaseUnit(300, 9)] },
-    //             ])
-    //           )
-    //         )
-    //     }),
-    //     "withdraw"
-    //   )
-    // );
-
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
@@ -291,17 +164,12 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    const temp = (statuses: TransactionManagerStatuses) =>
-      console.log(statuses);
-
     const statuses = await new TransactionsManager(
       client,
-      temp,
-      !payForTransactions ? "only-simulate" : "normal",
-      PriorityFeeSetting.Low,
-      true,
       undefined,
-      0
+      !payForTransactions ? "only-simulate" : "normal",
+      PriorityFeeSetting.High,
+      true
     ).clientSend(transactionItems);
 
     console.log(statuses);