@haven-fi/solauto-sdk 1.0.432 → 1.0.433

package/dist/utils/jitoUtils.d.ts

@@ -1,8 +1,8 @@
-import { Connection, PublicKey, VersionedMessage } from "@solana/web3.js";
-import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): PublicKey;
-export declare function getRequiredSigners(message: VersionedMessage): {
+export declare function getRequiredSigners(message: TransactionMessage): {
     index: number;
     publicKey: string;
     isWritable: boolean;

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,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;;;;IAkB3D;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;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AA8ND,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"}

package/dist/utils/jitoUtils.js

@@ -116,8 +116,15 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
     }));
     if (sign) {
         builtTxs = await userSigner.signAllTransactions(builtTxs);
-        for (const s of otherSigners) {
-            builtTxs = await s.signAllTransactions(builtTxs);
+        for (const signer of otherSigners) {
+            for (let i = 0; i < builtTxs.length; i++) {
+                const requiredSigners = getRequiredSigners(builtTxs[i].message);
+                if (requiredSigners
+                    .map((x) => x.publicKey)
+                    .includes(signer.publicKey.toString())) {
+                    builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+                }
+            }
         }
     }
     return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
@@ -182,7 +189,7 @@ function getRequiredSigners(message) {
     const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
     const signersInfo = [];
     for (let i = 0; i < numRequiredSignatures; i++) {
-        const publicKey = message.staticAccountKeys[i].toBase58();
+        const publicKey = message.accounts[i].toString();
         const isWritable = i < numWritableSigners;
         signersInfo.push({
             index: i,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.432",
+  "version": "1.0.433",
   "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

@@ -13,6 +13,7 @@ import {
   TransactionBuilder,
   Umi,
   WrappedInstruction,
+  TransactionMessage,
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
@@ -178,8 +179,17 @@ async function umiToVersionedTransactions(
 
   if (sign) {
     builtTxs = await userSigner.signAllTransactions(builtTxs);
-    for (const s of otherSigners) {
-      builtTxs = await s.signAllTransactions(builtTxs);
+    for (const signer of otherSigners) {
+      for (let i = 0; i < builtTxs.length; i++) {
+        const requiredSigners = getRequiredSigners(builtTxs[i].message);
+        if (
+          requiredSigners
+            .map((x) => x.publicKey)
+            .includes(signer.publicKey.toString())
+        ) {
+          builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+        }
+      }
     }
   }
 
@@ -253,14 +263,14 @@ async function sendJitoBundle(
   return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 
-export function getRequiredSigners(message: VersionedMessage) {
+export function getRequiredSigners(message: TransactionMessage) {
   const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
 
   const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
 
   const signersInfo = [];
   for (let i = 0; i < numRequiredSignatures; i++) {
-    const publicKey = message.staticAccountKeys[i].toBase58();
+    const publicKey = message.accounts[i].toString();
     const isWritable = i < numWritableSigners;
 
     signersInfo.push({