@haven-fi/solauto-sdk 1.0.543 → 1.0.545

package/dist/constants/solautoConstants.d.ts

@@ -14,7 +14,7 @@ export declare const PRICES: {
 };
 export declare const JITO_BLOCK_ENGINE = "https://mainnet.block-engine.jito.wtf";
 export declare const JITO_TIP_ACCOUNTS: string[];
-export declare const SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
+export declare const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
 export declare const BROKEN_TOKENS: string[];
 //# 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":"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,UAaR,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;AAMF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAG3B,eAAO,MAAM,aAAa,UAOzB,CAAA"}

package/dist/constants/solautoConstants.js

@@ -26,7 +26,11 @@ exports.JITO_TIP_ACCOUNTS = [
     "DttWaMuVvTiduZRnguLF7jNxTgiMBZ1hyAumKUiL2KRL",
     "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
 ];
-exports.SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
+// "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
+// "J97FEQeJzChRnaAjNy3dRvm9FBavKqAdxo8jKXzw17ut"
+// "ByhmNseaYZXBDcBm6xhbgarwixgjym6H4ddLsvgoL3BL"
+// "2VJK8AHqtiaiJKYbBtFr3EHV4Hcy1FHCiEYQFmUvxot8"
+exports.SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.PublicKey.default,
     exports.SOLAUTO_PROD_PROGRAM,
@@ -39,7 +43,6 @@ exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.SYSVAR_RENT_PUBKEY,
     web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
     jupiter_sdk_1.JUPITER_PROGRAM_ID,
-    ...exports.JITO_TIP_ACCOUNTS
 ].map((x) => x.toString());
 // TODO:
 exports.BROKEN_TOKENS = [

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;AA+ND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8F/B"}
+{"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"}

package/dist/utils/jitoUtils.js

@@ -93,7 +93,7 @@ async function simulateJitoBundle(umi, txs) {
         else if (res.error && res.error.message) {
             throw new Error(res.error.message);
         }
-        return res;
+        return res.result.value;
     });
     const transactionResults = simulationResult.transactionResults;
     return transactionResults;
@@ -170,6 +170,12 @@ async function sendJitoBundle(umi, transactions) {
             throw e;
         }
     }
+    if (resp?.data?.error?.message === "All providers failed") {
+        throw new Error(resp.data.error.responses[0].response.error.message);
+    }
+    else if (resp.data.error) {
+        throw new Error(resp.data.error);
+    }
     const bundleId = resp.data.result;
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(umi, bundleId) : [];
@@ -207,7 +213,6 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     let simulationResults;
     if (txType !== "skip-simulation") {
         builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, false, feeEstimates);
-        (0, generalUtils_1.consoleLog)(builtTxs.map((x) => x.message.compiledInstructions.map((y) => x.message.staticAccountKeys[y.programIdIndex].toString())));
         simulationResults = await simulateJitoBundle(umi, builtTxs);
     }
     if (txType !== "only-simulate") {
@@ -215,6 +220,13 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
         builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, userSigner, otherSigners, txs, true, feeEstimates, simulationResults
             ? simulationResults.map((x) => x.unitsConsumed * 1.15)
             : undefined);
+        // consoleLog(
+        //   builtTxs.map((x) =>
+        //     x.message.compiledInstructions.map((y) =>
+        //       x.message.staticAccountKeys[y.programIdIndex].toString()
+        //     )
+        //   )
+        // );
         const serializedTxs = builtTxs.map((x) => x.serialize());
         if (serializedTxs.find((x) => x.length > 1232)) {
             throw new Error("A transaction is too large");

package/dist/utils/jupiterUtils.js

@@ -101,7 +101,7 @@ async function getJupPriceData(mints, mayIncludeSpamTokens) {
         if (invalidValues && !mayIncludeSpamTokens) {
             throw new Error("Invalid price values");
         }
-        const trueData = Object.entries(result).reduce((acc, [key, val]) => val.extraInfo?.quotedPrice?.sellAt === null
+        const trueData = Object.entries(result).reduce((acc, [key, val]) => !val?.extraInfo?.quotedPrice?.sellAt
             ? { ...acc, [key]: { ...val, price: "0" } }
             : { ...acc, [key]: val }, {});
         return trueData;

package/local/logPositions.ts

@@ -1,6 +1,6 @@
 import { publicKey } from "@metaplex-foundation/umi";
 import {
-  buildHeliusApiUrl,
+  buildIronforgeApiUrl,
   calcNetWorthUsd,
   calcSupplyUsd,
   currentUnixSeconds,
@@ -20,17 +20,10 @@ import { PublicKey } from "@solana/web3.js";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
+import { getBatches } from "./shared";
 
 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 roundToDecimals(value: number, decimals: number = 2): number {
   if (!value || isNaN(value)) {
     return value;
@@ -96,7 +89,7 @@ export function formatNumber(
 
 async function main(filterWhitelist: boolean) {
   const [_, umi] = getSolanaRpcConnection(
-    buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
+    buildIronforgeApiUrl(process.env.IRONFORGE_API_KEY!),
     SOLAUTO_PROD_PROGRAM
   );
 

package/local/shared.ts

@@ -10,6 +10,14 @@ import {
 } from "@solana/web3.js";
 import { buildHeliusApiUrl, getSolanaRpcConnection } from "../src/utils/solanaUtils";
 
+export 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;
+}
+
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));
   return new Uint8Array(secretKey);
@@ -59,16 +67,20 @@ async function addAddressesIfNeeded(
   const addresses = addressesToAdd
     .filter((x) => !existingAddresses.includes(x))
     .map((x) => new PublicKey(x));
-
+  
   if (addresses.length > 0) {
-    await createAndSendV0Tx([
-      AddressLookupTableProgram.extendLookupTable({
-        payer: keypair.publicKey,
-        authority: keypair.publicKey,
-        lookupTable: lookupTableAddress,
-        addresses,
-      }),
-    ]);
+    const batches = getBatches(addresses, 20);
+    for (const addressBatch of batches) {
+      console.log(addressBatch.map(x => x.toString()));
+      await createAndSendV0Tx([
+        AddressLookupTableProgram.extendLookupTable({
+          payer: keypair.publicKey,
+          authority: keypair.publicKey,
+          lookupTable: lookupTableAddress,
+          addresses: addressBatch,
+        }),
+      ]);
+    }
   }
 }
 
@@ -87,7 +99,7 @@ export async function updateLookupTable(
     });
     lookupTableAddress = addr;
     console.log("Lookup Table Address:", lookupTableAddress.toString());
-    createAndSendV0Tx([createLutIx]);
+    await createAndSendV0Tx([createLutIx]);
   }
 
   const existingAccounts =

package/local/updateSolautoLUT.ts

@@ -17,7 +17,7 @@ import {
 } from "../src/utils";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../src/constants/switchboardConstants";
 
-const LOOKUP_TABLE_ADDRESS = new PublicKey(SOLAUTO_LUT);
+const LOOKUP_TABLE_ADDRESS = Boolean(SOLAUTO_LUT) ? new PublicKey(SOLAUTO_LUT) : undefined;
 const solautoManagerTokenAccounts = getTokenAccounts(
   SOLAUTO_MANAGER,
   ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.543",
+  "version": "1.0.545",
   "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,7 +44,11 @@ export const JITO_TIP_ACCOUNTS = [
   "3AVi9Tg9Uo68tJfuvoKvqKNWKkC5wPdSSdeBnizKZ6jT",
 ];
 
-export const SOLAUTO_LUT = "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
+// "9D4xwZwDf46n9ft5gQxZzq3rBbdRXsXojKQLZbBdskPY";
+// "J97FEQeJzChRnaAjNy3dRvm9FBavKqAdxo8jKXzw17ut"
+// "ByhmNseaYZXBDcBm6xhbgarwixgjym6H4ddLsvgoL3BL"
+// "2VJK8AHqtiaiJKYbBtFr3EHV4Hcy1FHCiEYQFmUvxot8"
+export const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export const STANDARD_LUT_ACCOUNTS = [
   PublicKey.default,
   SOLAUTO_PROD_PROGRAM,
@@ -57,7 +61,6 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_RENT_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
-  ...JITO_TIP_ACCOUNTS
 ].map((x) => x.toString());
 
 // TODO:

package/src/utils/jitoUtils.ts

@@ -139,7 +139,7 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
       throw new Error(res.error.message);
     }
 
-    return res;
+    return res.result.value;
   });
 
   const transactionResults =
@@ -253,6 +253,12 @@ async function sendJitoBundle(
     }
   }
 
+  if (resp?.data?.error?.message === "All providers failed") {
+    throw new Error(resp.data.error.responses[0].response.error.message);
+  } else if (resp.data.error) {
+    throw new Error(resp.data.error);
+  }
+
   const bundleId = resp.data.result;
   consoleLog("Bundle ID:", bundleId);
   return bundleId ? await pollBundleStatus(umi, bundleId) : [];
@@ -311,6 +317,7 @@ export async function sendJitoBundledTransactions(
   );
 
   txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
+  
   const feeEstimates =
     priorityFeeSetting !== PriorityFeeSetting.None
       ? await Promise.all(
@@ -342,13 +349,6 @@ export async function sendJitoBundledTransactions(
       false,
       feeEstimates
     );
-    consoleLog(
-      builtTxs.map((x) =>
-        x.message.compiledInstructions.map((y) =>
-          x.message.staticAccountKeys[y.programIdIndex].toString()
-        )
-      )
-    );
     simulationResults = await simulateJitoBundle(umi, builtTxs);
   }
 
@@ -367,6 +367,13 @@ export async function sendJitoBundledTransactions(
         ? simulationResults.map((x) => x.unitsConsumed! * 1.15)
         : undefined
     );
+    // consoleLog(
+    //   builtTxs.map((x) =>
+    //     x.message.compiledInstructions.map((y) =>
+    //       x.message.staticAccountKeys[y.programIdIndex].toString()
+    //     )
+    //   )
+    // );
 
     const serializedTxs = builtTxs.map((x) => x.serialize());
     if (serializedTxs.find((x) => x.length > 1232)) {

package/src/utils/jupiterUtils.ts

@@ -204,7 +204,7 @@ export async function getJupPriceData(
       result as { [key: string]: any }
     ).reduce(
       (acc, [key, val]) =>
-        val.extraInfo?.quotedPrice?.sellAt === null
+        !val?.extraInfo?.quotedPrice?.sellAt
           ? { ...acc, [key]: { ...val, price: "0" } }
           : { ...acc, [key]: val },
       {}

package/tests/transactions/solautoMarginfi.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "mocha";
-import { none, publicKey, some } from "@metaplex-foundation/umi";
+import { none, publicKey, some, Umi } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import {
@@ -43,6 +43,29 @@ import {
 import { PriorityFeeSetting } from "../../src/types";
 import { buildIronforgeApiUrl, fromBaseUnit, tokenInfo, USD_DECIMALS } from "../../dist";
 
+async function getAssets(
+  umi: Umi,
+  mints: PublicKey[]
+) {
+  const response = await fetch(umi.rpc.getEndpoint(), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      jsonrpc: '2.0',
+      id: 'get-assets',
+      method: 'getAssetBatch',
+      params: {
+        ids: mints.map((x) => x.toString()),
+      },
+    }),
+  });
+  const res = await response.json();
+  return res;
+}
+
+
 describe("Solauto Marginfi tests", async () => {
   // const signer = setupTest();
   const signer = setupTest("solauto-manager");
@@ -62,18 +85,21 @@ describe("Solauto Marginfi tests", async () => {
     const supplyDecimals = 6;
     const debtDecimals = 6;
 
-    await client.initialize({
-      signer,
-      positionId,
-      authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
-      // new: true,
-      // marginfiAccount: new PublicKey(
-      //   ""
-      // ),
-      // marginfiGroup: new PublicKey(""),
-      // supplyMint: new PublicKey(""),
-      // debtMint: new PublicKey(USDC),
-    });
+    // await client.initialize({
+    //   signer,
+    //   positionId,
+    //   authority: new PublicKey("FKYQs7KgRvaKQHxXwb8HKfoBcFdSxLL3JvHWpPdVQ16v"),
+    //   // new: true,
+    //   // marginfiAccount: new PublicKey(
+    //   //   ""
+    //   // ),
+    //   // marginfiGroup: new PublicKey(""),
+    //   // supplyMint: new PublicKey(""),
+    //   // debtMint: new PublicKey(USDC),
+    // });
+
+    console.log(await getAssets(client.umi, [NATIVE_MINT, new PublicKey(USDC)]));
+    return;
 
     const transactionItems: TransactionItem[] = [];
     // const settingParams: SolautoSettingsParametersInpArgs = {