@haven-fi/solauto-sdk 1.0.420 → 1.0.422
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -319,7 +319,7 @@ class TransactionsManager {
|
|
319
319
|
const itemSets = await this.assembleTransactionSets(items);
|
320
320
|
this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
|
321
321
|
this.txHandler.log("Initial item sets:", itemSets.length);
|
322
|
-
if (
|
322
|
+
if (this.atomically) {
|
323
323
|
await this.processTransactionsAtomically(itemSets);
|
324
324
|
}
|
325
325
|
else {
|
@@ -1 +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;
|
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;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
CHANGED
@@ -212,7 +212,8 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
|
|
212
212
|
}
|
213
213
|
if (txType !== "only-simulate") {
|
214
214
|
const signers = [...builtTxs].map((tx) => getRequiredSigners(tx.message));
|
215
|
-
if (Array.from(new Set(signers.flatMap(x => x).filter(x => x.publicKey)))
|
215
|
+
if (Array.from(new Set(signers.flatMap((x) => x).filter((x) => x.publicKey)))
|
216
|
+
.length > 1) {
|
216
217
|
(0, generalUtils_1.consoleLog)("Signers:", signers);
|
217
218
|
throw new Error("Unexpected error 301. Please retry.");
|
218
219
|
}
|
@@ -224,13 +225,8 @@ async function sendJitoBundledTransactions(umi, connection, signer, txs, txType,
|
|
224
225
|
if (serializedTxs.find((x) => x.length > 1232)) {
|
225
226
|
throw new Error("A transaction is too large");
|
226
227
|
}
|
227
|
-
|
228
|
-
|
229
|
-
// umi,
|
230
|
-
// serializedTxs.map((x) => base58.encode(x))
|
231
|
-
// );
|
232
|
-
// return txSigs.length > 0 ? txSigs : undefined;
|
233
|
-
return ["test"];
|
228
|
+
const txSigs = await sendJitoBundle(umi, serializedTxs.map((x) => bs58_1.default.encode(x)));
|
229
|
+
return txSigs.length > 0 ? txSigs : undefined;
|
234
230
|
}
|
235
231
|
return undefined;
|
236
232
|
}
|
package/package.json
CHANGED
@@ -510,7 +510,7 @@ export class TransactionsManager {
|
|
510
510
|
this.updateStatusForSets(itemSets, TransactionStatus.Queued, 0);
|
511
511
|
this.txHandler.log("Initial item sets:", itemSets.length);
|
512
512
|
|
513
|
-
if (
|
513
|
+
if (this.atomically) {
|
514
514
|
await this.processTransactionsAtomically(itemSets);
|
515
515
|
} else {
|
516
516
|
let currentIndex = 0;
|
package/src/utils/jitoUtils.ts
CHANGED
@@ -229,15 +229,12 @@ async function sendJitoBundle(
|
|
229
229
|
): Promise<string[]> {
|
230
230
|
let resp: any;
|
231
231
|
try {
|
232
|
-
resp = await axios.post<{ result: string }>(
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
params: [transactions],
|
239
|
-
}
|
240
|
-
);
|
232
|
+
resp = await axios.post<{ result: string }>(umi.rpc.getEndpoint(), {
|
233
|
+
jsonrpc: "2.0",
|
234
|
+
id: 1,
|
235
|
+
method: "sendBundle",
|
236
|
+
params: [transactions],
|
237
|
+
});
|
241
238
|
} catch (e: any) {
|
242
239
|
if (e.response.data.error) {
|
243
240
|
console.error("Jito send bundle error:", e.response.data.error);
|
@@ -346,7 +343,10 @@ export async function sendJitoBundledTransactions(
|
|
346
343
|
|
347
344
|
if (txType !== "only-simulate") {
|
348
345
|
const signers = [...builtTxs].map((tx) => getRequiredSigners(tx.message));
|
349
|
-
if (
|
346
|
+
if (
|
347
|
+
Array.from(new Set(signers.flatMap((x) => x).filter((x) => x.publicKey)))
|
348
|
+
.length > 1
|
349
|
+
) {
|
350
350
|
consoleLog("Signers:", signers);
|
351
351
|
throw new Error("Unexpected error 301. Please retry.");
|
352
352
|
}
|
@@ -370,14 +370,11 @@ export async function sendJitoBundledTransactions(
|
|
370
370
|
throw new Error("A transaction is too large");
|
371
371
|
}
|
372
372
|
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
// );
|
379
|
-
// return txSigs.length > 0 ? txSigs : undefined;
|
380
|
-
return ["test"];
|
373
|
+
const txSigs = await sendJitoBundle(
|
374
|
+
umi,
|
375
|
+
serializedTxs.map((x) => base58.encode(x))
|
376
|
+
);
|
377
|
+
return txSigs.length > 0 ? txSigs : undefined;
|
381
378
|
}
|
382
379
|
|
383
380
|
return undefined;
|