@haven-fi/solauto-sdk 1.0.419 → 1.0.421

package/dist/transactions/transactionsManager.js

@@ -171,14 +171,15 @@ class TransactionsManager {
                 let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
                     item,
                 ]);
-                // for (let j = i; j >= 0; j--) {
-                //   if (await newSet.fitsWith(items[j])) {
-                //     newSet.prepend(items[j]);
-                //     i--;
-                //   } else {
-                //     break;
-                //   }
-                // }
+                for (let j = i; j >= 0; j--) {
+                    if (await newSet.fitsWith(items[j])) {
+                        newSet.prepend(items[j]);
+                        i--;
+                    }
+                    else {
+                        break;
+                    }
+                }
                 transactionSets.unshift(newSet);
             }
         }

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;AAoND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;;IAkB3D;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,CAqG/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;AAiND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;;IAkB3D;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,CAqG/B"}

package/dist/utils/jitoUtils.js

@@ -211,25 +211,22 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
         simulationResults = await simulateJitoBundle(umi, builtTxs);
     }
     if (txType !== "only-simulate") {
+        const signers = [...builtTxs].map((tx) => getRequiredSigners(tx.message));
+        if (Array.from(new Set(signers.flatMap((x) => x).filter((x) => x.publicKey)))
+            .length > 1) {
+            (0, generalUtils_1.consoleLog)("Signers:", signers);
+            throw new Error("Unexpected error 301. Please retry.");
+        }
         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);
-        console.log("Signers:");
-        (0, generalUtils_1.consoleLog)([...builtTxs].map((tx) => getRequiredSigners(tx.message)));
         const serializedTxs = builtTxs.map((x) => x.serialize());
         if (serializedTxs.find((x) => x.length > 1232)) {
             throw new Error("A transaction is too large");
         }
-        console.log(serializedTxs.map((x) => bs58_1.default.encode(x)));
-        // const txSigs = await sendJitoBundle(
-        //   umi,
-        //   serializedTxs.map((x) => base58.encode(x))
-        // );
-        // return txSigs.length > 0 ? txSigs : undefined;
-        return ["test"];
+        const txSigs = await sendJitoBundle(umi, serializedTxs.map((x) => bs58_1.default.encode(x)));
+        return txSigs.length > 0 ? txSigs : undefined;
     }
     return undefined;
 }

package/package.json

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

package/src/transactions/transactionsManager.ts

@@ -263,14 +263,14 @@ export class TransactionsManager {
         let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
           item,
         ]);
-        // for (let j = i; j >= 0; j--) {
-        //   if (await newSet.fitsWith(items[j])) {
-        //     newSet.prepend(items[j]);
-        //     i--;
-        //   } else {
-        //     break;
-        //   }
-        // }
+        for (let j = i; j >= 0; j--) {
+          if (await newSet.fitsWith(items[j])) {
+            newSet.prepend(items[j]);
+            i--;
+          } else {
+            break;
+          }
+        }
         transactionSets.unshift(newSet);
       }
     }

package/src/utils/jitoUtils.ts

@@ -229,15 +229,12 @@ async function sendJitoBundle(
 ): Promise<string[]> {
   let resp: any;
   try {
-    resp = await axios.post<{ result: string }>(
-      umi.rpc.getEndpoint(),
-      {
-        jsonrpc: "2.0",
-        id: 1,
-        method: "sendBundle",
-        params: [transactions],
-      }
-    );
+    resp = await axios.post<{ result: string }>(umi.rpc.getEndpoint(), {
+      jsonrpc: "2.0",
+      id: 1,
+      method: "sendBundle",
+      params: [transactions],
+    });
   } catch (e: any) {
     if (e.response.data.error) {
       console.error("Jito send bundle error:", e.response.data.error);
@@ -345,10 +342,16 @@ export async function sendJitoBundledTransactions(
   }
 
   if (txType !== "only-simulate") {
-    onAwaitingSign?.();
+    const signers = [...builtTxs].map((tx) => getRequiredSigners(tx.message));
+    if (
+      Array.from(new Set(signers.flatMap((x) => x).filter((x) => x.publicKey)))
+        .length > 1
+    ) {
+      consoleLog("Signers:", signers);
+      throw new Error("Unexpected error 301. Please retry.");
+    }
 
-    console.log("Signers expected:");
-    consoleLog([...builtTxs].map((tx) => getRequiredSigners(tx.message)));
+    onAwaitingSign?.();
 
     builtTxs = await umiToVersionedTransactions(
       umi,
@@ -362,22 +365,16 @@ export async function sendJitoBundledTransactions(
         : undefined
     );
 
-    console.log("Signers:");
-    consoleLog([...builtTxs].map((tx) => getRequiredSigners(tx.message)));
-
     const serializedTxs = builtTxs.map((x) => x.serialize());
     if (serializedTxs.find((x) => x.length > 1232)) {
       throw new Error("A transaction is too large");
     }
 
-    console.log(serializedTxs.map((x) => base58.encode(x)));
-
-    // const txSigs = await sendJitoBundle(
-    //   umi,
-    //   serializedTxs.map((x) => base58.encode(x))
-    // );
-    // return txSigs.length > 0 ? txSigs : undefined;
-    return ["test"];
+    const txSigs = await sendJitoBundle(
+      umi,
+      serializedTxs.map((x) => base58.encode(x))
+    );
+    return txSigs.length > 0 ? txSigs : undefined;
   }
 
   return undefined;