@haven-fi/solauto-sdk 1.0.182 → 1.0.184

package/dist/clients/txHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,8BAAsB,SAAS;IAOpB,SAAS,CAAC,EAAE,OAAO;IANrB,YAAY,EAAG,MAAM,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAG7B,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAQ5B,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"txHandler.d.ts","sourceRoot":"","sources":["../../src/clients/txHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,8BAAsB,SAAS;IAOpB,SAAS,CAAC,EAAE,OAAO;IANrB,YAAY,EAAG,MAAM,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,UAAU,EAAG,UAAU,CAAC;gBAG7B,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAS5B,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzB,QAAQ,CAAC,mBAAmB,IAAI,MAAM,EAAE;IAExC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC9D"}

package/dist/clients/txHandler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TxHandler = void 0;
 const utils_1 = require("../utils");
+const constants_1 = require("../constants");
 class TxHandler {
     constructor(heliusApiUrl, localTest) {
         this.localTest = localTest;
@@ -9,11 +10,10 @@ class TxHandler {
         const [connection, umi] = (0, utils_1.getSolanaRpcConnection)(this.heliusApiUrl);
         this.connection = connection;
         this.umi = umi;
+        constants_1.RUNTIME_DATA.localTest = Boolean(localTest);
     }
     log(...args) {
-        if (this.localTest) {
-            console.log(...args);
-        }
+        (0, utils_1.consoleLog)(...args);
     }
 }
 exports.TxHandler = TxHandler;

package/dist/constants/solautoConstants.d.ts

@@ -11,4 +11,10 @@ export declare const PRICES: {
 };
 export declare const SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
+declare class RuntimeData {
+    localTest: boolean;
+    constructor();
+}
+export declare const RUNTIME_DATA: RuntimeData;
+export {};
 //# sourceMappingURL=solautoConstants.d.ts.map

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAQpC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAE1E,eAAO,MAAM,qBAAqB,UAWjC,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAQpC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;KAAE,CAAA;CAAO,CAAC;AAE9E,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAE1E,eAAO,MAAM,qBAAqB,UAWjC,CAAC;AAEF,cAAM,WAAW;IACR,SAAS,EAAE,OAAO,CAAC;;CAI3B;AAED,eAAO,MAAM,YAAY,aAAoB,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.BASIS_POINTS = void 0;
+exports.RUNTIME_DATA = exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.PRICES = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.MIN_POSITION_STATE_FRESHNESS_SECS = exports.DEFAULT_LIMIT_GAP_BPS = exports.BASIS_POINTS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 // import { JitoRpcConnection } from "jito-ts";
@@ -31,3 +31,9 @@ exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY.toString(),
     jupiter_sdk_1.JUPITER_PROGRAM_ID
 ];
+class RuntimeData {
+    constructor() {
+        this.localTest = false;
+    }
+}
+exports.RUNTIME_DATA = new RuntimeData();

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiOzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,aAAa,WAwCnE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAwHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiOzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,aAAa,WAwCnE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}

package/dist/transactions/transactionUtils.js

@@ -361,8 +361,8 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     const values = (0, rebalanceUtils_1.getRebalanceValues)(client.solautoPositionState, client.solautoPositionSettings(), client.solautoPositionActiveDca(), (0, generalUtils_1.currentUnixSeconds)(), (0, generalUtils_1.safeGetPrice)(client.supplyMint), (0, generalUtils_1.safeGetPrice)(client.debtMint), targetLiqUtilizationRateBps);
     client.log("Rebalance values: ", values);
     const swapDetails = (0, rebalanceUtils_1.getJupSwapRebalanceDetails)(client, values, targetLiqUtilizationRateBps, attemptNum);
-    const { jupQuote, priceImpactBps, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
-    const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote, priceImpactBps);
+    const { jupQuote, lookupTableAddresses, setupInstructions, tokenLedgerIx, swapIx, } = await (0, jupiterUtils_1.getJupSwapTransaction)(client.signer, swapDetails, attemptNum);
+    const flashLoan = (0, rebalanceUtils_1.getFlashLoanDetails)(client, values, jupQuote);
     let tx = (0, umi_1.transactionBuilder)();
     if (requiresRefreshBeforeRebalance(client)) {
         tx = tx.add(client.refresh());

package/dist/utils/generalUtils.d.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, Umi, PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
+export declare function consoleLog(...args: any[]): void;
 export declare function generateRandomU8(): number;
 export declare function generateRandomU64(): bigint;
 export declare function currentUnixSeconds(): number;

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,eAAe,EAEf,GAAG,EACH,SAAS,IAAI,YAAY,EAC1B,MAAM,0BAA0B,CAAC;AAKlC,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAwD5E;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ"}

package/dist/utils/generalUtils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.consoleLog = consoleLog;
 exports.generateRandomU8 = generateRandomU8;
 exports.generateRandomU64 = generateRandomU64;
 exports.currentUnixSeconds = currentUnixSeconds;
@@ -13,6 +14,11 @@ const umi_1 = require("@metaplex-foundation/umi");
 const pythConstants_1 = require("../constants/pythConstants");
 const numberUtils_1 = require("./numberUtils");
 const solautoConstants_1 = require("../constants/solautoConstants");
+function consoleLog(...args) {
+    if (solautoConstants_1.RUNTIME_DATA.localTest) {
+        console.log(...args);
+    }
+}
 function generateRandomU8() {
     return Math.floor(Math.random() * 255 + 1);
 }
@@ -104,9 +110,9 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
                     return;
                 }
                 if (attemptNum < retries) {
-                    console.log(error);
+                    consoleLog(error);
                     setTimeout(() => {
-                        console.log("Retrying...");
+                        consoleLog("Retrying...");
                         return attempt(attemptNum);
                     }, delay);
                     delay *= 2;

package/dist/utils/jitoUtils.js

@@ -45,7 +45,7 @@
 //     const nextLeader = await searcher.getNextScheduledLeader();
 //     const numSlots = nextLeader.nextLeaderSlot - nextLeader.currentSlot;
 //     isLeaderSlot = numSlots <= distanceFromJitoSlot && numSlots > 1;
-//     console.log(`Next jito leader slot in ${numSlots} slots`);
+//     consoleLog(`Next jito leader slot in ${numSlots} slots`);
 //     await new Promise((r) => setTimeout(r, 500));
 //   }
 // }
@@ -70,7 +70,7 @@
 //   simulationResult.value.transactionResults.forEach((tx) => {
 //     if (tx.err) {
 //       tx.logs?.forEach((x) => {
-//         console.log(x);
+//         consoleLog(x);
 //       });
 //       throw tx.err;
 //     }
@@ -102,10 +102,10 @@
 // async function sendJitoBundle(bundle: Bundle): Promise<BundleResult> {
 //   await waitUntilJitoNextLeader();
 //   let searcher = getSearcherClient();
-//   console.log("Sending bundle...");
+//   consoleLog("Sending bundle...");
 //   try {
 //     const resp = await searcher.sendBundle(bundle);
-//     console.log("Send bundle response:", resp);
+//     consoleLog("Send bundle response:", resp);
 //   } catch (e) {
 //     console.error("Error sending bundle:", e);
 //   }
@@ -115,12 +115,12 @@
 //         if (res.accepted || res.processed || res.finalized) {
 //           resolve(res);
 //         } else {
-//           console.log(res);
+//           consoleLog(res);
 //           return reject("Bundle not accepted");
 //         }
 //       },
 //       (err) => {
-//         console.log("Error: ", err);
+//         consoleLog("Error: ", err);
 //         return reject(err);
 //       }
 //     );

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

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

package/dist/utils/jupiterUtils.js

@@ -21,7 +21,7 @@ function createTransactionInstruction(instruction) {
     });
 }
 async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
-    console.log("Getting jup quote...");
+    (0, generalUtils_1.consoleLog)("Getting jup quote...");
     const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
@@ -38,14 +38,12 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
         (1 + (swapDetails.slippageIncFactor ?? 0)));
     quoteResponse.slippageBps = finalPriceSlippageBps;
-    console.log(quoteResponse);
+    (0, generalUtils_1.consoleLog)(quoteResponse);
     if (swapDetails.exactOut) {
-        console.log(quoteResponse.inAmount);
         quoteResponse.inAmount = (parseInt(quoteResponse.inAmount) +
-            Math.ceil(parseInt(quoteResponse.inAmount) * (0, numberUtils_1.fromBps)(priceImpactBps))).toString();
-        console.log(quoteResponse.inAmount);
+            Math.ceil(parseInt(quoteResponse.inAmount) * (0, numberUtils_1.fromBps)(finalPriceSlippageBps))).toString();
     }
-    console.log("Getting jup instructions...");
+    (0, generalUtils_1.consoleLog)("Getting jup instructions...");
     const instructions = await jupApi.swapInstructionsPost({
         swapRequest: {
             userPublicKey: signer.publicKey.toString(),
@@ -58,9 +56,9 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     if (!instructions.swapInstruction) {
         throw new Error("No swap instruction was returned by Jupiter");
     }
-    console.log("Raw price impact bps:", priceImpactBps);
+    (0, generalUtils_1.consoleLog)("Raw price impact bps:", priceImpactBps);
     const finalPriceImpactBps = priceImpactBps * (1 + (swapDetails.slippageIncFactor ?? 0));
-    console.log("Increased price impact bps:", finalPriceImpactBps);
+    (0, generalUtils_1.consoleLog)("Increased price impact bps:", finalPriceImpactBps);
     return {
         jupQuote: quoteResponse,
         priceImpactBps: finalPriceImpactBps,

package/dist/utils/solanaUtils.js

@@ -128,7 +128,7 @@ async function simulateTransaction(connection, transaction) {
     });
     if (simulationResult.value.err) {
         simulationResult.value.logs?.forEach((x) => {
-            console.log(x);
+            (0, generalUtils_1.consoleLog)(x);
         });
         throw simulationResult.value.err;
     }
@@ -149,17 +149,17 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     return feeEstimate;
 }
 async function sendSingleOptimizedTransaction(umi, connection, tx, txType, attemptNum, prioritySetting = types_1.PriorityFeeSetting.Default, onAwaitingSign) {
-    console.log("Sending single optimized transaction...");
-    console.log("Instructions: ", tx.getInstructions().length);
-    console.log("Serialized transaction size: ", tx.getTransactionSize(umi));
+    (0, generalUtils_1.consoleLog)("Sending single optimized transaction...");
+    (0, generalUtils_1.consoleLog)("Instructions: ", tx.getInstructions().length);
+    (0, generalUtils_1.consoleLog)("Serialized transaction size: ", tx.getTransactionSize(umi));
     const feeEstimate = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
-    console.log("Compute unit price: ", feeEstimate);
+    (0, generalUtils_1.consoleLog)("Compute unit price: ", feeEstimate);
     let computeUnitLimit = undefined;
     if (txType !== "skip-simulation") {
         // TODO: we should only retry simulation if it's not a solauto error
         const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await simulateTransaction(connection, (0, umi_web3js_adapters_1.toWeb3JsTransaction)(await (await assembleFinalTransaction(umi.identity, tx, feeEstimate, 1400000).setLatestBlockhash(umi)).build(umi))), 3);
         computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
-        console.log("Compute unit limit: ", computeUnitLimit);
+        (0, generalUtils_1.consoleLog)("Compute unit limit: ", computeUnitLimit);
     }
     if (txType !== "only-simulate") {
         onAwaitingSign?.();
@@ -171,8 +171,8 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, attem
             confirm: { commitment: "confirmed" },
         });
         const txSig = bs58_1.default.encode(result.signature);
-        console.log(`Transaction signature: ${txSig}`);
-        console.log(`https://solscan.io/tx/${txSig}`);
+        (0, generalUtils_1.consoleLog)(`Transaction signature: ${txSig}`);
+        (0, generalUtils_1.consoleLog)(`https://solscan.io/tx/${txSig}`);
         if (result.result.value.err !== null) {
             throw new Error(result.result.value.err.toString());
         }

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

@@ -2,7 +2,6 @@ import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, PositionType, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
-export declare function findMintByTicker(ticker: string): PublicKey;
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
 export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings, currentUnixTime: number): boolean;
 export declare function getUpdatedValueFromAutomation(currValue: number, targetValue: number, automation: AutomationSettings, currentUnixTimestamp: number): number;

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

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

package/dist/utils/solauto/generalUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LivePositionUpdates = void 0;
-exports.findMintByTicker = findMintByTicker;
 exports.nextAutomationPeriodTimestamp = nextAutomationPeriodTimestamp;
 exports.eligibleForNextAutomationPeriod = eligibleForNextAutomationPeriod;
 exports.getUpdatedValueFromAutomation = getUpdatedValueFromAutomation;
@@ -24,16 +23,6 @@ const accountUtils_1 = require("../accountUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
 const marginfiUtils_1 = require("../marginfiUtils");
-function findMintByTicker(ticker) {
-    for (const key in constants_1.TOKEN_INFO) {
-        const account = constants_1.TOKEN_INFO[key];
-        if (account.ticker.toString().toLowerCase() ===
-            ticker.toString().toLowerCase()) {
-            return new web3_js_1.PublicKey(key);
-        }
-    }
-    throw new Error(`Token mint not found by the ticker: ${ticker}`);
-}
 function newPeriodsPassed(automation, currentUnixTimestamp) {
     return Math.min(automation.targetPeriods, automation.periodsPassed +
         Math.floor((currentUnixTimestamp - Number(automation.unixStartDate)) /

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

@@ -16,6 +16,6 @@ export interface FlashLoanDetails {
     baseUnitAmount: bigint;
     mint: PublicKey;
 }
-export declare function getFlashLoanDetails(client: SolautoClient, values: RebalanceValues, jupQuote: QuoteResponse, priceImpactBps: number): FlashLoanDetails | undefined;
+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;
 //# sourceMappingURL=rebalanceUtils.d.ts.map

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,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA+IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CAC1B;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,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAoEjB;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,EACvB,cAAc,EAAE,MAAM,GACrB,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,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA+IjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,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;CAC1B;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,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAoEjB;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"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -116,7 +116,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         dcaTokenType: dca?.tokenType,
     };
 }
-function getFlashLoanDetails(client, values, jupQuote, priceImpactBps) {
+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);

package/package.json

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

package/src/clients/txHandler.ts

@@ -1,6 +1,7 @@
 import { Umi } from "@metaplex-foundation/umi";
 import { Connection } from "@solana/web3.js";
-import { getSolanaRpcConnection } from "../utils";
+import { consoleLog, getSolanaRpcConnection } from "../utils";
+import { RUNTIME_DATA } from "../constants";
 
 export abstract class TxHandler {
   public heliusApiUrl!: string;
@@ -15,12 +16,11 @@ export abstract class TxHandler {
     const [connection, umi] = getSolanaRpcConnection(this.heliusApiUrl);
     this.connection = connection;
     this.umi = umi;
+    RUNTIME_DATA.localTest = Boolean(localTest);
   }
 
   log(...args: any[]): void {
-    if (this.localTest) {
-      console.log(...args);
-    }
+    consoleLog(...args);
   }
 
   abstract defaultLookupTables(): string[];

package/src/constants/solautoConstants.ts

@@ -42,4 +42,13 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_RENT_PUBKEY.toString(),
   SYSVAR_INSTRUCTIONS_PUBKEY.toString(),
   JUPITER_PROGRAM_ID
-];
+];
+
+class RuntimeData {
+  public localTest: boolean;
+  constructor() {
+    this.localTest = false;
+  }
+}
+
+export const RUNTIME_DATA = new RuntimeData();

package/src/transactions/transactionUtils.ts

@@ -666,18 +666,12 @@ export async function buildSolautoRebalanceTransaction(
   );
   const {
     jupQuote,
-    priceImpactBps,
     lookupTableAddresses,
     setupInstructions,
     tokenLedgerIx,
     swapIx,
   } = await getJupSwapTransaction(client.signer, swapDetails, attemptNum);
-  const flashLoan = getFlashLoanDetails(
-    client,
-    values,
-    jupQuote,
-    priceImpactBps
-  );
+  const flashLoan = getFlashLoanDetails(client, values, jupQuote);
 
   let tx = transactionBuilder();
 

package/src/utils/generalUtils.ts

@@ -7,8 +7,13 @@ import {
 } from "@metaplex-foundation/umi";
 import { PYTH_PRICE_FEED_IDS } from "../constants/pythConstants";
 import { fromBaseUnit, toBaseUnit } from "./numberUtils";
-import { PRICES } from "../constants/solautoConstants";
+import { PRICES, RUNTIME_DATA } from "../constants/solautoConstants";
 
+export function consoleLog(...args: any[]): void {
+  if (RUNTIME_DATA.localTest) {
+    console.log(...args);
+  }
+}
 export function generateRandomU8(): number {
   return Math.floor(Math.random() * 255 + 1);
 }
@@ -143,9 +148,9 @@ export function retryWithExponentialBackoff<T>(
           }
 
           if (attemptNum < retries) {
-            console.log(error);
+            consoleLog(error);
             setTimeout(() => {
-              console.log("Retrying...");
+              consoleLog("Retrying...");
               return attempt(attemptNum);
             }, delay);
             delay *= 2;

package/src/utils/jitoUtils.ts

@@ -48,7 +48,7 @@
 //     const nextLeader = await searcher.getNextScheduledLeader();
 //     const numSlots = nextLeader.nextLeaderSlot - nextLeader.currentSlot;
 //     isLeaderSlot = numSlots <= distanceFromJitoSlot && numSlots > 1;
-//     console.log(`Next jito leader slot in ${numSlots} slots`);
+//     consoleLog(`Next jito leader slot in ${numSlots} slots`);
 //     await new Promise((r) => setTimeout(r, 500));
 //   }
 // }
@@ -76,7 +76,7 @@
 //   simulationResult.value.transactionResults.forEach((tx) => {
 //     if (tx.err) {
 //       tx.logs?.forEach((x) => {
-//         console.log(x);
+//         consoleLog(x);
 //       });
 //       throw tx.err;
 //     }
@@ -112,10 +112,10 @@
 //   await waitUntilJitoNextLeader();
 //   let searcher = getSearcherClient();
 
-//   console.log("Sending bundle...");
+//   consoleLog("Sending bundle...");
 //   try {
 //     const resp = await searcher.sendBundle(bundle);
-//     console.log("Send bundle response:", resp);
+//     consoleLog("Send bundle response:", resp);
 //   } catch (e) {
 //     console.error("Error sending bundle:", e);
 //   }
@@ -126,12 +126,12 @@
 //         if (res.accepted || res.processed || res.finalized) {
 //           resolve(res);
 //         } else {
-//           console.log(res);
+//           consoleLog(res);
 //           return reject("Bundle not accepted");
 //         }
 //       },
 //       (err) => {
-//         console.log("Error: ", err);
+//         consoleLog("Error: ", err);
 //         return reject(err);
 //       }
 //     );

package/src/utils/jupiterUtils.ts

@@ -12,7 +12,7 @@ import {
   QuoteResponse,
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
-import { retryWithExponentialBackoff } from "./generalUtils";
+import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
 
 const jupApi = createJupiterApiClient();
 
@@ -54,7 +54,7 @@ export async function getJupSwapTransaction(
   swapDetails: JupSwapDetails,
   attemptNum?: number
 ): Promise<JupSwapTransaction> {
-  console.log("Getting jup quote...");
+  consoleLog("Getting jup quote...");
   const quoteResponse = await retryWithExponentialBackoff(
     async () =>
       await jupApi.quoteGet({
@@ -79,18 +79,16 @@ export async function getJupSwapTransaction(
       (1 + (swapDetails.slippageIncFactor ?? 0))
   );
   quoteResponse.slippageBps = finalPriceSlippageBps;
-  console.log(quoteResponse);
+  consoleLog(quoteResponse);
 
   if (swapDetails.exactOut) {
-    console.log(quoteResponse.inAmount);
     quoteResponse.inAmount = (
       parseInt(quoteResponse.inAmount) +
-      Math.ceil(parseInt(quoteResponse.inAmount) * fromBps(priceImpactBps))
+      Math.ceil(parseInt(quoteResponse.inAmount) * fromBps(finalPriceSlippageBps))
     ).toString();
-    console.log(quoteResponse.inAmount);
   }
 
-  console.log("Getting jup instructions...");
+  consoleLog("Getting jup instructions...");
   const instructions = await jupApi.swapInstructionsPost({
     swapRequest: {
       userPublicKey: signer.publicKey.toString(),
@@ -108,10 +106,10 @@ export async function getJupSwapTransaction(
     throw new Error("No swap instruction was returned by Jupiter");
   }
 
-  console.log("Raw price impact bps:", priceImpactBps);
+  consoleLog("Raw price impact bps:", priceImpactBps);
   const finalPriceImpactBps =
     priceImpactBps * (1 + (swapDetails.slippageIncFactor ?? 0));
-  console.log("Increased price impact bps:", finalPriceImpactBps);
+  consoleLog("Increased price impact bps:", finalPriceImpactBps);
 
   return {
     jupQuote: quoteResponse,

package/src/utils/solanaUtils.ts

@@ -31,7 +31,7 @@ import {
   createTransferInstruction,
 } from "@solana/spl-token";
 import { getTokenAccount } from "./accountUtils";
-import { arraysAreEqual, retryWithExponentialBackoff } from "./generalUtils";
+import { arraysAreEqual, consoleLog, retryWithExponentialBackoff } from "./generalUtils";
 import {
   getLendingAccountEndFlashloanInstructionDataSerializer,
   getLendingAccountStartFlashloanInstructionDataSerializer,
@@ -239,7 +239,7 @@ async function simulateTransaction(
   });
   if (simulationResult.value.err) {
     simulationResult.value.logs?.forEach((x: any) => {
-      console.log(x);
+      consoleLog(x);
     });
     throw simulationResult.value.err;
   }
@@ -277,16 +277,16 @@ export async function sendSingleOptimizedTransaction(
   prioritySetting: PriorityFeeSetting = PriorityFeeSetting.Default,
   onAwaitingSign?: () => void
 ): Promise<Uint8Array | undefined> {
-  console.log("Sending single optimized transaction...");
-  console.log("Instructions: ", tx.getInstructions().length);
-  console.log("Serialized transaction size: ", tx.getTransactionSize(umi));
+  consoleLog("Sending single optimized transaction...");
+  consoleLog("Instructions: ", tx.getInstructions().length);
+  consoleLog("Serialized transaction size: ", tx.getTransactionSize(umi));
 
   const feeEstimate = await getComputeUnitPriceEstimate(
     umi,
     tx,
     prioritySetting
   );
-  console.log("Compute unit price: ", feeEstimate);
+  consoleLog("Compute unit price: ", feeEstimate);
 
   let computeUnitLimit = undefined;
   if (txType !== "skip-simulation") {
@@ -312,7 +312,7 @@ export async function sendSingleOptimizedTransaction(
     computeUnitLimit = Math.round(
       simulationResult.value.unitsConsumed! * 1.1
     );
-    console.log("Compute unit limit: ", computeUnitLimit);
+    consoleLog("Compute unit limit: ", computeUnitLimit);
   }
 
   if (txType !== "only-simulate") {
@@ -330,8 +330,8 @@ export async function sendSingleOptimizedTransaction(
       confirm: { commitment: "confirmed" },
     });
     const txSig = bs58.encode(result.signature);
-    console.log(`Transaction signature: ${txSig}`);
-    console.log(`https://solscan.io/tx/${txSig}`);
+    consoleLog(`Transaction signature: ${txSig}`);
+    consoleLog(`https://solscan.io/tx/${txSig}`);
     if (result.result.value.err !== null) {
       throw new Error(result.result.value.err.toString());
     }

package/src/utils/solauto/generalUtils.ts

@@ -31,19 +31,6 @@ import {
 import { getAllMarginfiAccountsByAuthority } from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 
-export function findMintByTicker(ticker: string): PublicKey {
-  for (const key in TOKEN_INFO) {
-    const account = TOKEN_INFO[key];
-    if (
-      account.ticker.toString().toLowerCase() ===
-      ticker.toString().toLowerCase()
-    ) {
-      return new PublicKey(key);
-    }
-  }
-  throw new Error(`Token mint not found by the ticker: ${ticker}`);
-}
-
 function newPeriodsPassed(
   automation: AutomationSettings,
   currentUnixTimestamp: number

package/src/utils/solauto/rebalanceUtils.ts

@@ -254,7 +254,6 @@ export function getFlashLoanDetails(
   client: SolautoClient,
   values: RebalanceValues,
   jupQuote: QuoteResponse,
-  priceImpactBps: number
 ): FlashLoanDetails | undefined {
   let supplyUsd =
     fromBaseUnit(

package/dist/utils/deleteme.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=deleteme.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"deleteme.d.ts","sourceRoot":"","sources":["../../src/utils/deleteme.ts"],"names":[],"mappings":""}

package/dist/utils/deleteme.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const numberUtils_1 = require("./numberUtils");
-// TODO delete this file
-async function check() {
-    let supply = 458948;
-    let debt = 212846;
-    let supply_weight = 0.899999976158142;
-    let debt_weight = 1.100000023841858;
-    let liq_threshold = (supply_weight / debt_weight) * 10000;
-    console.log(liq_threshold);
-    let liq_utilization_rate = (0, numberUtils_1.getLiqUtilzationRateBps)(supply, debt, liq_threshold);
-    console.log(liq_utilization_rate);
-    let debt_adjustment_usd = (0, numberUtils_1.getDebtAdjustmentUsd)(liq_threshold, supply, debt, 6000, 0);
-    supply += debt_adjustment_usd;
-    debt += debt_adjustment_usd;
-    liq_utilization_rate = (0, numberUtils_1.getLiqUtilzationRateBps)(supply, debt, liq_threshold);
-    console.log(debt_adjustment_usd);
-    console.log(liq_utilization_rate);
-}
-check();

package/src/utils/deleteme.ts

@@ -1,40 +0,0 @@
-import { getDebtAdjustmentUsd, getLiqUtilzationRateBps } from "./numberUtils";
-
-// TODO delete this file
-async function check() {
-  let supply = 458948;
-  let debt = 212846;
-  let supply_weight = 0.899999976158142;
-  let debt_weight = 1.100000023841858;
-  let liq_threshold = (supply_weight / debt_weight) * 10000;
-
-  console.log(liq_threshold);
-  let liq_utilization_rate = getLiqUtilzationRateBps(
-    supply,
-    debt,
-    liq_threshold
-  );
-  console.log!(liq_utilization_rate);
-
-  let debt_adjustment_usd = getDebtAdjustmentUsd(
-    liq_threshold,
-    supply,
-    debt,
-    6000,
-    0
-  );
-
-  supply += debt_adjustment_usd;
-  debt += debt_adjustment_usd;
-
-  liq_utilization_rate = getLiqUtilzationRateBps(
-    supply,
-    debt,
-    liq_threshold
-  );
-
-  console.log(debt_adjustment_usd);
-  console.log!(liq_utilization_rate);
-}
-
-check();