@haven-fi/solauto-sdk 1.0.403 → 1.0.405
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.
@@ -1 +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,CAmBpC;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,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,
|
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,CAmBpC;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,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwB7B;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,CAoEjC"}
|
@@ -156,7 +156,6 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
|
|
156
156
|
.getInstructions()
|
157
157
|
.flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
|
158
158
|
let feeEstimate;
|
159
|
-
// try {
|
160
159
|
const resp = await umi.rpc.call("getPriorityFeeEstimate", [
|
161
160
|
{
|
162
161
|
transaction: !useAccounts
|
@@ -169,22 +168,6 @@ async function getComputeUnitPriceEstimate(umi, tx, prioritySetting, useAccounts
|
|
169
168
|
},
|
170
169
|
]);
|
171
170
|
feeEstimate = Math.round(resp.priorityFeeEstimate);
|
172
|
-
// }
|
173
|
-
// catch (e) {
|
174
|
-
// try {
|
175
|
-
// const resp = await umi.rpc.call("getPriorityFeeEstimate", [
|
176
|
-
// {
|
177
|
-
// accountKeys,
|
178
|
-
// options: {
|
179
|
-
// priorityLevel: prioritySetting.toString(),
|
180
|
-
// },
|
181
|
-
// },
|
182
|
-
// ]);
|
183
|
-
// feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
|
184
|
-
// } catch (e) {
|
185
|
-
// // console.error(e);
|
186
|
-
// }
|
187
|
-
// }
|
188
171
|
return feeEstimate;
|
189
172
|
}
|
190
173
|
async function spamSendTransactionUntilConfirmed(connection, transaction, blockhash, spamInterval = 1500) {
|
@@ -244,7 +227,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
|
|
244
227
|
if (!cuPrice) {
|
245
228
|
cuPrice = 1000000;
|
246
229
|
}
|
247
|
-
|
230
|
+
cuPrice = Math.min(cuPrice, 100 * 1000000);
|
248
231
|
(0, generalUtils_1.consoleLog)("Compute unit price: ", cuPrice);
|
249
232
|
}
|
250
233
|
if (txType !== "only-simulate") {
|
package/package.json
CHANGED
package/src/utils/solanaUtils.ts
CHANGED
@@ -301,35 +301,18 @@ export async function getComputeUnitPriceEstimate(
|
|
301
301
|
.flatMap((x) => x.keys.flatMap((x) => x.pubkey.toString()));
|
302
302
|
|
303
303
|
let feeEstimate: number | undefined;
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
priorityLevel: prioritySetting.toString(),
|
313
|
-
},
|
304
|
+
const resp = await umi.rpc.call("getPriorityFeeEstimate", [
|
305
|
+
{
|
306
|
+
transaction: !useAccounts
|
307
|
+
? bs58.encode(web3Transaction.serialize())
|
308
|
+
: undefined,
|
309
|
+
accountKeys: useAccounts ? accountKeys : undefined,
|
310
|
+
options: {
|
311
|
+
priorityLevel: prioritySetting.toString(),
|
314
312
|
},
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
// catch (e) {
|
319
|
-
// try {
|
320
|
-
// const resp = await umi.rpc.call("getPriorityFeeEstimate", [
|
321
|
-
// {
|
322
|
-
// accountKeys,
|
323
|
-
// options: {
|
324
|
-
// priorityLevel: prioritySetting.toString(),
|
325
|
-
// },
|
326
|
-
// },
|
327
|
-
// ]);
|
328
|
-
// feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
|
329
|
-
// } catch (e) {
|
330
|
-
// // console.error(e);
|
331
|
-
// }
|
332
|
-
// }
|
313
|
+
},
|
314
|
+
]);
|
315
|
+
feeEstimate = Math.round((resp as any).priorityFeeEstimate as number);
|
333
316
|
|
334
317
|
return feeEstimate;
|
335
318
|
}
|
@@ -430,7 +413,7 @@ export async function sendSingleOptimizedTransaction(
|
|
430
413
|
if (!cuPrice) {
|
431
414
|
cuPrice = 1_000_000;
|
432
415
|
}
|
433
|
-
|
416
|
+
cuPrice = Math.min(cuPrice, 100 * 1_000_000);
|
434
417
|
consoleLog("Compute unit price: ", cuPrice);
|
435
418
|
}
|
436
419
|
|