@haven-fi/solauto-sdk 1.0.414 → 1.0.416

package/dist/transactions/transactionUtils.js

@@ -431,7 +431,7 @@ async function convertReferralFeesToDestination(referralManager, tokenAccount, d
     let tx = (0, umi_1.transactionBuilder)()
         .add(setupInstructions)
         .add((0, generated_1.convertReferralFees)(referralManager.umi, {
-        signer: referralManager.umi.identity,
+        signer: referralManager.signer,
         intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
         referralState: (0, umi_1.publicKey)(referralManager.referralState),

package/dist/utils/jitoUtils.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAqND,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAgG/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGT,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AAqND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;;IAoB3D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA+F/B"}

package/dist/utils/jitoUtils.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRandomTipAccount = getRandomTipAccount;
+exports.getRequiredSigners = getRequiredSigners;
 exports.sendJitoBundledTransactions = sendJitoBundledTransactions;
 const web3_js_1 = require("@solana/web3.js");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
@@ -15,7 +16,7 @@ const axios_1 = __importDefault(require("axios"));
 const bs58_1 = __importDefault(require("bs58"));
 const transactions_1 = require("../types/transactions");
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
-async function getRandomTipAccount() {
+function getRandomTipAccount() {
     const tipAccounts = [
         "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
         "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",
@@ -29,8 +30,8 @@ async function getRandomTipAccount() {
     const randomInt = Math.floor(Math.random() * tipAccounts.length);
     return new web3_js_1.PublicKey(tipAccounts[randomInt]);
 }
-async function getTipInstruction(signer, tipLamports) {
-    return (0, solanaUtils_1.systemTransferUmiIx)(signer, await getRandomTipAccount(), BigInt(tipLamports));
+function getTipInstruction(signer, tipLamports) {
+    return (0, solanaUtils_1.systemTransferUmiIx)(signer, getRandomTipAccount(), BigInt(tipLamports));
 }
 function parseJitoErrorMessage(message) {
     const regex = /Error processing Instruction (\d+): custom program error: (0x[0-9A-Fa-f]+|\d+)/;
@@ -175,6 +176,23 @@ async function sendJitoBundle(umi, transactions) {
     (0, generalUtils_1.consoleLog)("Bundle ID:", bundleId);
     return bundleId ? await pollBundleStatus(bundleId) : [];
 }
+function getRequiredSigners(message) {
+    const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
+    // Among the required signers, some are writable and some are read-only.
+    // "numRequiredSignatures - numReadonlySignedAccounts" tells us how many signers are writable.
+    const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
+    const signersInfo = [];
+    for (let i = 0; i < numRequiredSignatures; i++) {
+        const publicKey = message.staticAccountKeys[i].toBase58();
+        const isWritable = i < numWritableSigners;
+        signersInfo.push({
+            index: i,
+            publicKey,
+            isWritable,
+        });
+    }
+    return signersInfo;
+}
 async function sendJitoBundledTransactions(umi, connection, signer, txs, txType, priorityFeeSetting = types_1.PriorityFeeSetting.Min, onAwaitingSign) {
     if (txs.length === 1) {
         const resp = await (0, solanaUtils_1.sendSingleOptimizedTransaction)(umi, connection, txs[0], txType, priorityFeeSetting, onAwaitingSign);
@@ -182,18 +200,14 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
     }
     (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
-    (0, generalUtils_1.consoleLog)(txs.forEach((tx) => tx.getInstructions().map((x) => x.programId.toString())));
+    (0, generalUtils_1.consoleLog)(txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString())));
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
-    txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
+    txs[0] = txs[0].prepend(getTipInstruction(signer, 150000));
     const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
         ? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting, true)) ?? 1000000))
         : undefined;
     const latestBlockhash = (await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })).blockhash;
-    console.log("Signers expected:");
-    txs.forEach((tx) => {
-        tx.getSigners(umi).map((x) => x.publicKey.toString());
-    });
-    let builtTxs;
+    let builtTxs = [];
     let simulationResults;
     if (txType !== "skip-simulation") {
         builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, false, feeEstimates);
@@ -202,6 +216,8 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
     }
     if (txType !== "only-simulate") {
         onAwaitingSign?.();
+        console.log("Signers expected:");
+        (0, generalUtils_1.consoleLog)(builtTxs.map((tx) => getRequiredSigners(tx.message)));
         builtTxs = await umiToVersionedTransactions(umi, latestBlockhash, signer, txs, true, feeEstimates, simulationResults
             ? simulationResults.map((x) => x.unitsConsumed * 1.15)
             : undefined);

package/local/logPositions.ts

@@ -14,7 +14,7 @@ import {
   TOKEN_INFO,
   USD_DECIMALS,
 } from "../src";
-import { PublicKey, VersionedTransaction } from "@solana/web3.js";
+import { PublicKey, SystemProgram, VersionedTransaction } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { fromBaseUnit } from "../dist";
@@ -253,3 +253,5 @@ console.log(
     "e6uLxBWUSbPnkYKPWoyoR6YZw7Qt4NnZcabGwaAChdAN4N4GFwvxMxwq3mrxoRM3CDzPHhAh7rbEmzAzyA8pJAhGAaDWfCG3CjnVoWbpdDQvpwUxRffK3xFDGqJeoQvQBvQtZidwaDvDnnkJ6xRgsnpujS65jcGP5AsECsaJ2uRMSsLt8ucynZjQzVw24jqaYRRmUN4otF2mSgbgkXLu9G82g8sfcj3VQuZxoA9Hrpm9kTMNu28R9wRG9yZKCQozSJjL4GGwe3ZMDRdfggbq9xPddNcHFgUGk6PYHgLvVWTr8GSLQpj8HLdtekxdywwXYcK3oS8RNmgrnbm6o7PADSWRYZhAHJLD8G92N5yCnFy8sRGHhMosdgQ5TjF8d5uG92tMfmS67VkjSJqMsX6pZnhnN9K5EFmdZxutaHMuyo5kv9DoXivrCdQrku5yfYbfCPgPY3Ei25tBYN1kTLYXoJvdUuxehjLkR2pVseae2TbApigLAhdvrxGNHLZTncunfp18c2kmWVrwLqc7UPANuKSmNAyy4ntU9nL1zkA9WTxFLsNK5xZukZi8vsK8XoM8f1wyyoiGHPHCF5i2QAat1kwEZ71GdRodeumYb96GwLyskbJJo8g8Yp5oVQhLeKopTSezEgJ3awQCgpd4xqg3rd9ijvRUq5g3aR2NbmrtEZUxumuf5G2RfPK5Nx7MFUuJeT2Pn6LHShsGCzsKt1GewgErWSJMNktBgkJkAyWMQkxt6No8ZSKjDbrnyQEGuuXLKCeMhdFFC6dm8oMgiWC6KLJjzLkG5T4iySKnYcM7pCKtfZLLXXTEGJ8Zz3rqspCGozrwzUGeL86FFqqNNCHFY2Zx2de75krrPo5QfiLMQ1ECgMkLbrmYTx8owsPeM3nDgmMTpooKoVp94GZi22XCda9F3M7HTHrMXsAjNHm7C26VSUbKJCySneNnKzpZ3wP88Kf8qmq6B392k3HdaUyoWXMTaBHKnkzhyMECXSzxbpZPoNa4ra6bscXUSqQijSg2uh6TR7X7hLEmDQKuDTbTVL62oMvw1qgNtsQmkeZFhrumLHj4askbDFzV8ghK15T6GDDnN9gEaFKZU7LbyWscJjdb4RGHy79LCYB2iAg6kJw4efc6p16gqKqnYPBJdXbJjXHKZpUhrJa8YcSwbFWM3YabHNFxwjNHzXJydEg37DpAjjaLVfBhcVCXEBh8K7FcojQ9yT6u3HMjFZwV4fvrBBBSMiNrhvgFVUAQtUaFVmx4BhMvkJTPsR6UrXp4HCPXgohUEUtFEJeyGQPEibBqwgjUpMLWyKUAxjKpYQ3AmdjnseE23njArKaEwrRQA4NnxpUUazzsWJqHymHPJG73GQhQtxNtvfDDMVSj95UkiscssHNEpkt6dqLeohDR1rP2kg41EBGQMNEdeYtUt1JkzdjZBsvU1oV81GG1tEQoSUR1skjq9tWpfoiSPVN9QTQC3kQUgZQQPR9arK5XWqj6y5iPnusQk8zdzoHJt5EFm7aagfLG3uJxdd9ZF7Gk4tMzijx5d1fV1uGhcxAyb5B5m8nkCdap"
   )
 );
+
+console.log(SystemProgram.programId.toString());

package/package.json

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

package/src/transactions/transactionUtils.ts

@@ -808,7 +808,7 @@ export async function convertReferralFeesToDestination(
     .add(setupInstructions)
     .add(
       convertReferralFees(referralManager.umi, {
-        signer: referralManager.umi.identity,
+        signer: referralManager.signer,
         intermediaryTa: publicKey(
           getTokenAccount(
             toWeb3JsPublicKey(referralManager.umi.identity.publicKey),

package/src/utils/jitoUtils.ts

@@ -3,6 +3,7 @@ import {
   PublicKey,
   SimulatedTransactionResponse,
   TransactionExpiredBlockheightExceededError,
+  VersionedMessage,
   VersionedTransaction,
 } from "@solana/web3.js";
 import { toWeb3JsTransaction } from "@metaplex-foundation/umi-web3js-adapters";
@@ -26,7 +27,7 @@ import base58 from "bs58";
 import { BundleSimulationError } from "../types/transactions";
 import { bs58 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
 
-export async function getRandomTipAccount(): Promise<PublicKey> {
+export function getRandomTipAccount(): PublicKey {
   const tipAccounts = [
     "96gYZGLnJYVFmbjzopPSU6QiEV5fGqZNyN9nmNhvrZU5",
     "HFqU5x63VTqvQss8hp11i4wVV8bD44PvwucfZ2bU7gRe",
@@ -41,13 +42,13 @@ export async function getRandomTipAccount(): Promise<PublicKey> {
   return new PublicKey(tipAccounts[randomInt]);
 }
 
-async function getTipInstruction(
+function getTipInstruction(
   signer: Signer,
   tipLamports: number
-): Promise<WrappedInstruction> {
+): WrappedInstruction {
   return systemTransferUmiIx(
     signer,
-    await getRandomTipAccount(),
+    getRandomTipAccount(),
     BigInt(tipLamports)
   );
 }
@@ -252,6 +253,28 @@ async function sendJitoBundle(
   return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 
+export function getRequiredSigners(message: VersionedMessage) {
+  const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
+  // Among the required signers, some are writable and some are read-only.
+  // "numRequiredSignatures - numReadonlySignedAccounts" tells us how many signers are writable.
+
+  const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
+
+  const signersInfo = [];
+  for (let i = 0; i < numRequiredSignatures; i++) {
+    const publicKey = message.staticAccountKeys[i].toBase58();
+    const isWritable = i < numWritableSigners;
+
+    signersInfo.push({
+      index: i,
+      publicKey,
+      isWritable,
+    });
+  }
+
+  return signersInfo;
+}
+
 export async function sendJitoBundledTransactions(
   umi: Umi,
   connection: Connection,
@@ -276,14 +299,14 @@ export async function sendJitoBundledTransactions(
   consoleLog("Sending Jito bundle...");
   consoleLog("Transactions: ", txs.length);
   consoleLog(
-    txs.forEach((tx) => tx.getInstructions().map((x) => x.programId.toString()))
+    txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString()))
   );
   consoleLog(
     "Transaction sizes: ",
     txs.map((x) => x.getTransactionSize(umi))
   );
 
-  txs[0] = txs[0].prepend(await getTipInstruction(signer, 150_000));
+  txs[0] = txs[0].prepend(getTipInstruction(signer, 150_000));
   const feeEstimates =
     priorityFeeSetting !== PriorityFeeSetting.None
       ? await Promise.all(
@@ -303,12 +326,7 @@ export async function sendJitoBundledTransactions(
     await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })
   ).blockhash;
 
-  console.log("Signers expected:");
-  txs.forEach((tx) => {
-    tx.getSigners(umi).map((x) => x.publicKey.toString());
-  });
-
-  let builtTxs: VersionedTransaction[];
+  let builtTxs: VersionedTransaction[] = [];
   let simulationResults: SimulatedTransactionResponse[] | undefined;
   if (txType !== "skip-simulation") {
     builtTxs = await umiToVersionedTransactions(
@@ -331,6 +349,10 @@ export async function sendJitoBundledTransactions(
 
   if (txType !== "only-simulate") {
     onAwaitingSign?.();
+
+    console.log("Signers expected:");
+    consoleLog(builtTxs.map((tx) => getRequiredSigners(tx.message)));
+
     builtTxs = await umiToVersionedTransactions(
       umi,
       latestBlockhash,