@haven-fi/solauto-sdk 1.0.313 → 1.0.314

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

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

package/dist/utils/jitoUtils.js

@@ -30,23 +30,24 @@ async function getRandomTipAccount() {
 async function getTipInstruction(signer, tipLamports) {
     return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
 }
-// async function simulateJitoBundle(
-//   txs: VersionedTransaction[]
-// ): Promise<SimulatedBundleTransactionResult[]> {
-//   const simulationResult = await JITO_CONNECTION.simulateBundle(txs, {
-//     preExecutionAccountsConfigs: txs.map((x) => null),
-//     postExecutionAccountsConfigs: txs.map((x) => null),
-//     skipSigVerify: true,
-//   });
-//   simulationResult.value.transactionResults.forEach((tx) => {
-//     if (tx.err) {
-//       tx.logs?.forEach((x) => {
-//         consoleLog(x);
-//       });
-//       throw tx.err;
+// TODO: fix
+// async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
+//   const simulationResult = await axios.post(
+//     `${JITO_BLOCK_ENGINE}/api/v1/bundles`,
+//     {
+//       method: "simulateBundle",
+//       id: 1,
+//       jsonrpc: "2.0",
+//       params: [
+//         {
+//           encodedTransactions: txs.map((x) => bs58.encode(x.serialize())),
+//           preExecutionAccountsConfigs: txs.map((_) => ""),
+//           postExecutionAccountsConfigs: txs.map((_) => ""),
+//           skipSigVerify: true,
+//         },
+//       ],
 //     }
-//   });
-//   return simulationResult.value.transactionResults;
+//   );
 // }
 async function umiToVersionedTransactions(umi, signer, txs, feeEstimates, computeUnitLimits) {
     return await Promise.all(txs.map(async (tx, i) => {
@@ -96,13 +97,10 @@ async function sendJitoBundledTransactions(umi, signer, txs, simulateOnly, prior
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
     txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
-    const feeEstimates = await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting, true)) ??
+    const feeEstimates = await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
         1000000));
-    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates
-    // Array(txs.length).fill(1_400_000)
-    );
-    // // TODO: Skip over this for now, and instead don't specify a compute unit limit in the final bundle transactions
-    // const simulationResults = await simulateJitoBundle(builtTxs);
+    let builtTxs = await umiToVersionedTransactions(umi, signer, txs, feeEstimates);
+    // const simulationResults = await simulateJitoBundle(umi, builtTxs);
     if (!simulateOnly) {
         // let builtTxs = await umiToVersionedTransactions(
         //   client.signer,

package/dist/utils/solanaUtils.d.ts

@@ -14,6 +14,6 @@ export declare function splTokenTransferUmiIx(signer: Signer, fromTa: PublicKey,
 export declare function getAddressLookupInputs(umi: Umi, lookupTableAddresses: string[]): Promise<AddressLookupTableInput[]>;
 export declare function addTxOptimizations(signer: Signer, transaction: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
 export declare function assembleFinalTransaction(signer: Signer, transaction: TransactionBuilder, computeUnitPrice?: number, computeUnitLimit?: number): TransactionBuilder;
-export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting, simMayFail: boolean): Promise<number | undefined>;
+export declare function getComputeUnitPriceEstimate(umi: Umi, tx: TransactionBuilder, prioritySetting: PriorityFeeSetting): Promise<number | undefined>;
 export declare function sendSingleOptimizedTransaction(umi: Umi, connection: Connection, tx: TransactionBuilder, txType?: TransactionRunType, prioritySetting?: PriorityFeeSetting, onAwaitingSign?: () => void): Promise<Uint8Array | undefined>;
 //# sourceMappingURL=solanaUtils.d.ts.map

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

package/dist/utils/solanaUtils.js

@@ -150,22 +150,13 @@ async function simulateTransaction(umi, connection, transaction) {
     }
     return simulationResult;
 }
-async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, simMayFail) {
+async function getComputeUnitPriceEstimate(umi, tx, prioritySetting) {
     const web3Transaction = (0, umi_web3js_adapters_1.toWeb3JsTransaction)((await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi));
-    const transaction = simMayFail
-        ? undefined
-        : bs58_1.default.encode(web3Transaction.serialize());
-    const accountKeys = simMayFail
-        ? tx
-            .getInstructions()
-            .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()))
-        : undefined;
     let feeEstimate;
     try {
         const resp = await umi.rpc.call("getPriorityFeeEstimate", [
             {
-                transaction,
-                accountKeys,
+                transaction: bs58_1.default.encode(web3Transaction.serialize()),
                 options: {
                     priorityLevel: prioritySetting.toString(),
                 },
@@ -174,7 +165,22 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, simMayFail)
         feeEstimate = Math.round(resp.priorityFeeEstimate);
     }
     catch (e) {
-        console.error(e);
+        try {
+            const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+                {
+                    accountKeys: tx
+                        .getInstructions()
+                        .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString())),
+                    options: {
+                        priorityLevel: prioritySetting.toString(),
+                    },
+                },
+            ]);
+            feeEstimate = Math.round(resp.priorityFeeEstimate);
+        }
+        catch (e) {
+            console.error(e);
+        }
     }
     return feeEstimate;
 }
@@ -216,7 +222,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
     (0, generalUtils_1.consoleLog)("Serialized transaction size: ", tx.getTransactionSize(umi));
     let cuPrice;
     if (prioritySetting !== types_1.PriorityFeeSetting.None) {
-        cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting, false);
+        cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
         if (!cuPrice) {
             cuPrice = 1000000;
         }

package/package.json

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

package/src/utils/jitoUtils.ts

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

package/src/utils/solanaUtils.ts

@@ -288,27 +288,17 @@ async function simulateTransaction(
 export async function getComputeUnitPriceEstimate(
   umi: Umi,
   tx: TransactionBuilder,
-  prioritySetting: PriorityFeeSetting,
-  simMayFail: boolean
+  prioritySetting: PriorityFeeSetting
 ): Promise<number | undefined> {
   const web3Transaction = toWeb3JsTransaction(
     (await tx.setLatestBlockhash(umi, { commitment: "finalized" })).build(umi)
   );
-  const transaction = simMayFail
-    ? undefined
-    : bs58.encode(web3Transaction.serialize());
-  const accountKeys = simMayFail
-    ? tx
-        .getInstructions()
-        .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()))
-    : undefined;
 
   let feeEstimate: number | undefined;
   try {
     const resp = await umi.rpc.call("getPriorityFeeEstimate", [
       {
-        transaction,
-        accountKeys,
+        transaction: bs58.encode(web3Transaction.serialize()),
         options: {
           priorityLevel: prioritySetting.toString(),
         },
@@ -316,7 +306,21 @@ export async function getComputeUnitPriceEstimate(
     ]);
     feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
   } catch (e) {
-    console.error(e);
+    try {
+      const resp = await umi.rpc.call("getPriorityFeeEstimate", [
+        {
+          accountKeys: tx
+            .getInstructions()
+            .flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString())),
+          options: {
+            priorityLevel: prioritySetting.toString(),
+          },
+        },
+      ]);
+      feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
+    } catch (e) {
+      console.error(e);
+    }
   }
 
   return feeEstimate;
@@ -383,7 +387,11 @@ export async function sendSingleOptimizedTransaction(
 
   let cuPrice: number | undefined;
   if (prioritySetting !== PriorityFeeSetting.None) {
-    cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting, false);
+    cuPrice = await getComputeUnitPriceEstimate(
+      umi,
+      tx,
+      prioritySetting,
+    );
     if (!cuPrice) {
       cuPrice = 1000000;
     }