@haven-fi/solauto-sdk 1.0.555 → 1.0.557

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

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,iBAAiB,0CAA0C,CAAC;AAEzE,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAMF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAG3B,eAAO,MAAM,aAAa,UAOzB,CAAA"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AASzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,iBAAiB,0CAA0C,CAAC;AAEzE,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAG3B,eAAO,MAAM,aAAa,UAOzB,CAAA"}

package/dist/constants/solautoConstants.js

@@ -26,10 +26,6 @@ exports.JITO_TIP_ACCOUNTS = [
     "DttWaMuVvTiduZRnguLF7jNxTgiMBZ1hyAumKUiL2KRL",
     "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
 ];
-// "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
-// "J97FEQeJzChRnaAjNy3dRvm9FBavKqAdxo8jKXzw17ut"
-// "ByhmNseaYZXBDcBm6xhbgarwixgjym6H4ddLsvgoL3BL"
-// "2VJK8AHqtiaiJKYbBtFr3EHV4Hcy1FHCiEYQFmUvxot8"
 exports.SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.PublicKey.default,

package/dist/utils/generalUtils.d.ts

@@ -15,4 +15,5 @@ export declare function zip<T, U>(list1: T[], list2: U[]): [T, U][];
 export type ErrorsToThrow = Array<new (...args: any[]) => Error>;
 export declare function retryWithExponentialBackoff<T>(fn: (attemptNum: number, prevErr?: Error) => Promise<T>, retries?: number, delay?: number, errorsToThrow?: ErrorsToThrow): Promise<T>;
 export declare function toEnumValue<E extends object>(enumObj: E, value: number): E[keyof E] | undefined;
+export declare function customRpcCall(umi: Umi, method: string, params?: any): Promise<any>;
 //# sourceMappingURL=generalUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,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,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;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,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAGrD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,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,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;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,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,gBAuBzE"}

package/dist/utils/generalUtils.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLog = consoleLog;
 exports.tokenInfo = tokenInfo;
@@ -13,9 +16,11 @@ exports.arraysAreEqual = arraysAreEqual;
 exports.zip = zip;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
 exports.toEnumValue = toEnumValue;
+exports.customRpcCall = customRpcCall;
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const constants_1 = require("../constants");
+const axios_1 = __importDefault(require("axios"));
 function consoleLog(...args) {
     if (globalThis.LOCAL_TEST) {
         console.log(...args);
@@ -120,3 +125,21 @@ function toEnumValue(enumObj, value) {
     }
     return undefined;
 }
+async function customRpcCall(umi, method, params) {
+    const data = (await axios_1.default.post(umi.rpc.getEndpoint(), {
+        jsonrpc: "2.0",
+        id: 1,
+        method,
+        params,
+    }, {
+        headers: {
+            "Content-Type": "application/json",
+        },
+    })).data;
+    if ("result" in data) {
+        return data.result;
+    }
+    else {
+        return data;
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAqOD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAYlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAG/C;AAgND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}

package/dist/utils/jitoUtils.js

@@ -46,29 +46,19 @@ function parseJitoErrorMessage(message) {
 }
 async function simulateJitoBundle(umi, txs) {
     const simulationResult = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
-        const resp = await axios_1.default.post(umi.rpc.getEndpoint(), {
-            jsonrpc: "2.0",
-            id: 1,
-            method: "simulateBundle",
-            params: [
-                {
-                    encodedTransactions: txs.map((x) => Buffer.from(x.serialize()).toString("base64")),
-                },
-                {
-                    encoding: "base64",
-                    commitment: "confirmed",
-                    preExecutionAccountsConfigs: txs.map((_) => { }),
-                    postExecutionAccountsConfigs: txs.map((_) => { }),
-                    skipSigVerify: true,
-                },
-            ],
-        }, {
-            headers: {
-                "Content-Type": "application/json",
+        const res = await (0, generalUtils_1.customRpcCall)(umi, "simulateBundle", [
+            {
+                encodedTransactions: txs.map((x) => Buffer.from(x.serialize()).toString("base64")),
             },
-        });
-        const res = resp.data;
-        if (res.result && res.result.value && res.result.value.summary.failed) {
+            {
+                encoding: "base64",
+                commitment: "confirmed",
+                preExecutionAccountsConfigs: txs.map((_) => { }),
+                postExecutionAccountsConfigs: txs.map((_) => { }),
+                skipSigVerify: true,
+            },
+        ]);
+        if (res.value && res.value.summary.failed) {
             const resValue = res.result.value;
             const transactionResults = resValue.transactionResults;
             transactionResults.forEach((x) => {
@@ -93,7 +83,7 @@ async function simulateJitoBundle(umi, txs) {
         else if (res.error && res.error.message) {
             throw new Error(res.error.message);
         }
-        return res.result.value;
+        return res.value;
     });
     const transactionResults = simulationResult.transactionResults;
     return transactionResults;
@@ -120,16 +110,11 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
     return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
 }
 async function getBundleStatus(umi, bundleId) {
-    const res = await axios_1.default.post(umi.rpc.getEndpoint(), {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "getBundleStatuses",
-        params: [[bundleId]],
-    });
-    if (res.data.error) {
-        throw new Error(`Failed to get bundle status: ${res.data.error}`);
+    const res = await (0, generalUtils_1.customRpcCall)(umi, "getBundleStatuses", [[bundleId]]);
+    if (res.error) {
+        throw new Error(`Failed to get bundle status: ${res.error}`);
     }
-    return res.data.result;
+    return res;
 }
 async function pollBundleStatus(umi, bundleId, interval = 1000, timeout = 40000) {
     const endTime = Date.now() + timeout;

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;AAKlE,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,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAYd;AAED,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;AA+CD,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;AAiBzB,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,6BAA6B,CACjD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,GAAE,MAAW,GACvB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,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;AA+CD,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,CAuEjC"}

package/dist/utils/solanaUtils.js

@@ -31,7 +31,6 @@ const marginfi_sdk_1 = require("../marginfi-sdk");
 const types_1 = require("../types");
 const solauto_1 = require("./solauto");
 const constants_1 = require("../constants");
-const axios_1 = __importDefault(require("axios"));
 function buildHeliusApiUrl(heliusApiKey) {
     return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
 }
@@ -153,15 +152,10 @@ async function simulateTransaction(umi, connection, transaction) {
     return simulationResult;
 }
 async function getQnComputeUnitPriceEstimate(umi, programId, blockheight = 50) {
-    return (await axios_1.default.post(umi.rpc.getEndpoint(), {
-        method: "qn_estimatePriorityFees",
-        jsonrpc: "2.0",
-        id: 1,
-        params: {
-            last_n_blocks: blockheight,
-            account: programId.toString(),
-        },
-    })).data;
+    return await (0, generalUtils_1.customRpcCall)(umi, "qn_estimatePriorityFees", {
+        last_n_blocks: blockheight,
+        account: programId.toString(),
+    });
 }
 async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts) {
     const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
@@ -170,7 +164,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
         .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
     let feeEstimate;
     try {
-        const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+        const resp = await (0, generalUtils_1.customRpcCall)(umi, "getPriorityFeeEstimate", [
             {
                 transaction: !useAccounts
                     ? bs58_1.default.encode(web3Transaction.serialize())
@@ -185,7 +179,7 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
     }
     catch (e) {
         try {
-            const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+            const resp = await (0, generalUtils_1.customRpcCall)(umi, "getPriorityFeeEstimate", [
                 {
                     accountKeys,
                     options: {
@@ -235,7 +229,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     (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));
-    (0, generalUtils_1.consoleLog)("Programs: ", tx.getInstructions().map(x => x.programId));
+    (0, generalUtils_1.consoleLog)("Programs: ", tx.getInstructions().map((x) => x.programId));
     const accounts = tx
         .getInstructions()
         .flatMap((x) => [

package/package.json

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

package/src/constants/solautoConstants.ts

@@ -44,10 +44,6 @@ export const JITO_TIP_ACCOUNTS = [
   "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
 ];
 
-// "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
-// "J97FEQeJzChRnaAjNy3dRvm9FBavKqAdxo8jKXzw17ut"
-// "ByhmNseaYZXBDcBm6xhbgarwixgjym6H4ddLsvgoL3BL"
-// "2VJK8AHqtiaiJKYbBtFr3EHV4Hcy1FHCiEYQFmUvxot8"
 export const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export const STANDARD_LUT_ACCOUNTS = [
   PublicKey.default,

package/src/utils/generalUtils.ts

@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
 import { TOKEN_INFO, TokenInfo } from "../constants";
+import axios from "axios";
 
 export function consoleLog(...args: any[]): void {
   if ((globalThis as any).LOCAL_TEST) {
@@ -142,3 +143,28 @@ export function toEnumValue<E extends object>(
 
   return undefined;
 }
+
+export async function customRpcCall(umi: Umi, method: string, params?: any) {
+  const data = (
+    await axios.post(
+      umi.rpc.getEndpoint(),
+      {
+        jsonrpc: "2.0",
+        id: 1,
+        method,
+        params,
+      },
+      {
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    )
+  ).data;
+
+  if ("result" in data) {
+    return data.result;
+  } else {
+    return data;
+  }
+}

package/src/utils/jitoUtils.ts

@@ -25,7 +25,11 @@ import {
   sendSingleOptimizedTransaction,
   systemTransferUmiIx,
 } from "./solanaUtils";
-import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
+import {
+  consoleLog,
+  customRpcCall,
+  retryWithExponentialBackoff,
+} from "./generalUtils";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import axios from "axios";
 import base58 from "bs58";
@@ -74,37 +78,22 @@ function parseJitoErrorMessage(message: string) {
 
 async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
   const simulationResult = await retryWithExponentialBackoff(async () => {
-    const resp = await axios.post(
-      umi.rpc.getEndpoint(),
+    const res = await customRpcCall(umi, "simulateBundle", [
       {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "simulateBundle",
-        params: [
-          {
-            encodedTransactions: txs.map((x) =>
-              Buffer.from(x.serialize()).toString("base64")
-            ),
-          },
-          {
-            encoding: "base64",
-            commitment: "confirmed",
-            preExecutionAccountsConfigs: txs.map((_) => {}),
-            postExecutionAccountsConfigs: txs.map((_) => {}),
-            skipSigVerify: true,
-          },
-        ],
+        encodedTransactions: txs.map((x) =>
+          Buffer.from(x.serialize()).toString("base64")
+        ),
       },
       {
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    );
-
-    const res = resp.data as any;
+        encoding: "base64",
+        commitment: "confirmed",
+        preExecutionAccountsConfigs: txs.map((_) => {}),
+        postExecutionAccountsConfigs: txs.map((_) => {}),
+        skipSigVerify: true,
+      },
+    ]);
 
-    if (res.result && res.result.value && res.result.value.summary.failed) {
+    if (res.value && res.value.summary.failed) {
       const resValue = res.result.value;
       const transactionResults =
         resValue.transactionResults as SimulatedTransactionResponse[];
@@ -139,7 +128,7 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
       throw new Error(res.error.message);
     }
 
-    return res.result.value;
+    return res.value;
   });
 
   const transactionResults =
@@ -191,17 +180,11 @@ async function umiToVersionedTransactions(
 }
 
 async function getBundleStatus(umi: Umi, bundleId: string) {
-  const res = await axios.post(umi.rpc.getEndpoint(), {
-    jsonrpc: "2.0",
-    id: 1,
-    method: "getBundleStatuses",
-    params: [[bundleId]],
-  });
-  if (res.data.error) {
-    throw new Error(`Failed to get bundle status: ${res.data.error}`);
+  const res = await customRpcCall(umi, "getBundleStatuses", [[bundleId]]);
+  if (res.error) {
+    throw new Error(`Failed to get bundle status: ${res.error}`);
   }
-
-  return res.data.result;
+  return res;
 }
 
 async function pollBundleStatus(
@@ -317,7 +300,7 @@ export async function sendJitoBundledTransactions(
   );
 
   txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
-  
+
   const feeEstimates =
     priorityFeeSetting !== PriorityFeeSetting.None
       ? await Promise.all(

package/src/utils/solanaUtils.ts

@@ -36,6 +36,7 @@ import { getTokenAccount } from "./accountUtils";
 import {
   arraysAreEqual,
   consoleLog,
+  customRpcCall,
   retryWithExponentialBackoff,
 } from "./generalUtils";
 import {
@@ -45,7 +46,6 @@ import {
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 import { createDynamicSolautoProgram } from "./solauto";
 import { SOLAUTO_PROD_PROGRAM } from "../constants";
-import axios from "axios";
 
 export function buildHeliusApiUrl(heliusApiKey: string) {
   return `https://mainnet.helius-rpc.com/?api-key=${heliusApiKey}`;
@@ -292,17 +292,10 @@ export async function getQnComputeUnitPriceEstimate(
   programId: PublicKey,
   blockheight: number = 50
 ): Promise<any> {
-  return (
-    await axios.post(umi.rpc.getEndpoint(), {
-      method: "qn_estimatePriorityFees",
-      jsonrpc: "2.0",
-      id: 1,
-      params: {
-        last_n_blocks: blockheight,
-        account: programId.toString(),
-      },
-    })
-  ).data;
+  return await customRpcCall(umi, "qn_estimatePriorityFees", {
+    last_n_blocks: blockheight,
+    account: programId.toString(),
+  });
 }
 
 export async function getComputeUnitPriceEstimate(
@@ -321,7 +314,7 @@ export async function getComputeUnitPriceEstimate(
 
   let feeEstimate: number | undefined;
   try {
-    const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+    const resp = await customRpcCall(umi, "getPriorityFeeEstimate", [
       {
         transaction: !useAccounts
           ? bs58.encode(web3Transaction.serialize())
@@ -335,7 +328,7 @@ export async function getComputeUnitPriceEstimate(
     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
   } catch (e) {
     try {
-      const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+      const resp = await customRpcCall(umi, "getPriorityFeeEstimate", [
         {
           accountKeys,
           options: {
@@ -408,7 +401,10 @@ export async function sendSingleOptimizedTransaction(
   consoleLog("Sending single optimized transaction...");
   consoleLog("Instructions: ", tx.getInstructions().length);
   consoleLog("Serialized transaction size: ", tx.getTransactionSize(umi));
-  consoleLog("Programs: ", tx.getInstructions().map(x => x.programId));
+  consoleLog(
+    "Programs: ",
+    tx.getInstructions().map((x) => x.programId)
+  );
 
   const accounts = tx
     .getInstructions()

package/tests/transactions/solautoMarginfi.ts

@@ -44,12 +44,12 @@ import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
 
 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 = false;
-  const positionId = 3;
+  const payForTransactions = false;
+  const testProgram = true;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -65,7 +65,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
+      // authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""
@@ -145,7 +145,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 2000, attemptNum),
         "rebalance"
       )
     );