@helium/spl-utils 0.9.23 → 0.9.24
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.
- package/lib/cjs/idl/helium_entity_manager.json +62 -15
- package/lib/cjs/idl/helium_sub_daos.json +41 -27
- package/lib/cjs/priorityFees.js +12 -3
- package/lib/cjs/priorityFees.js.map +1 -1
- package/lib/cjs/transaction.js +1 -1
- package/lib/esm/src/idl/helium_entity_manager.json +62 -15
- package/lib/esm/src/idl/helium_sub_daos.json +41 -27
- package/lib/esm/src/priorityFees.js +12 -3
- package/lib/esm/src/priorityFees.js.map +1 -1
- package/lib/esm/src/transaction.js +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/priorityFees.d.ts.map +1 -1
- package/package.json +4 -4
|
@@ -3302,6 +3302,34 @@
|
|
|
3302
3302
|
}
|
|
3303
3303
|
}
|
|
3304
3304
|
]
|
|
3305
|
+
},
|
|
3306
|
+
{
|
|
3307
|
+
"name": "tempBackfillMobileInfo",
|
|
3308
|
+
"accounts": [
|
|
3309
|
+
{
|
|
3310
|
+
"name": "payer",
|
|
3311
|
+
"isMut": true,
|
|
3312
|
+
"isSigner": true
|
|
3313
|
+
},
|
|
3314
|
+
{
|
|
3315
|
+
"name": "mobileInfo",
|
|
3316
|
+
"isMut": true,
|
|
3317
|
+
"isSigner": false
|
|
3318
|
+
},
|
|
3319
|
+
{
|
|
3320
|
+
"name": "systemProgram",
|
|
3321
|
+
"isMut": false,
|
|
3322
|
+
"isSigner": false
|
|
3323
|
+
}
|
|
3324
|
+
],
|
|
3325
|
+
"args": [
|
|
3326
|
+
{
|
|
3327
|
+
"name": "args",
|
|
3328
|
+
"type": {
|
|
3329
|
+
"defined": "TempBackfillMobileInfoArgs"
|
|
3330
|
+
}
|
|
3331
|
+
}
|
|
3332
|
+
]
|
|
3305
3333
|
}
|
|
3306
3334
|
],
|
|
3307
3335
|
"accounts": [
|
|
@@ -4019,6 +4047,28 @@
|
|
|
4019
4047
|
]
|
|
4020
4048
|
}
|
|
4021
4049
|
},
|
|
4050
|
+
{
|
|
4051
|
+
"name": "TempBackfillMobileInfoArgs",
|
|
4052
|
+
"type": {
|
|
4053
|
+
"kind": "struct",
|
|
4054
|
+
"fields": [
|
|
4055
|
+
{
|
|
4056
|
+
"name": "location",
|
|
4057
|
+
"type": {
|
|
4058
|
+
"option": "u64"
|
|
4059
|
+
}
|
|
4060
|
+
},
|
|
4061
|
+
{
|
|
4062
|
+
"name": "deploymentInfo",
|
|
4063
|
+
"type": {
|
|
4064
|
+
"option": {
|
|
4065
|
+
"defined": "MobileDeploymentInfoV0"
|
|
4066
|
+
}
|
|
4067
|
+
}
|
|
4068
|
+
}
|
|
4069
|
+
]
|
|
4070
|
+
}
|
|
4071
|
+
},
|
|
4022
4072
|
{
|
|
4023
4073
|
"name": "MetadataArgs",
|
|
4024
4074
|
"type": {
|
|
@@ -4379,19 +4429,19 @@
|
|
|
4379
4429
|
"name": "IotConfig",
|
|
4380
4430
|
"fields": [
|
|
4381
4431
|
{
|
|
4382
|
-
"name": "
|
|
4432
|
+
"name": "minGain",
|
|
4383
4433
|
"type": "i32"
|
|
4384
4434
|
},
|
|
4385
4435
|
{
|
|
4386
|
-
"name": "
|
|
4436
|
+
"name": "maxGain",
|
|
4387
4437
|
"type": "i32"
|
|
4388
4438
|
},
|
|
4389
4439
|
{
|
|
4390
|
-
"name": "
|
|
4440
|
+
"name": "fullLocationStakingFee",
|
|
4391
4441
|
"type": "u64"
|
|
4392
4442
|
},
|
|
4393
4443
|
{
|
|
4394
|
-
"name": "
|
|
4444
|
+
"name": "dataonlyLocationStakingFee",
|
|
4395
4445
|
"type": "u64"
|
|
4396
4446
|
}
|
|
4397
4447
|
]
|
|
@@ -4400,11 +4450,11 @@
|
|
|
4400
4450
|
"name": "MobileConfig",
|
|
4401
4451
|
"fields": [
|
|
4402
4452
|
{
|
|
4403
|
-
"name": "
|
|
4453
|
+
"name": "fullLocationStakingFee",
|
|
4404
4454
|
"type": "u64"
|
|
4405
4455
|
},
|
|
4406
4456
|
{
|
|
4407
|
-
"name": "
|
|
4457
|
+
"name": "dataonlyLocationStakingFee",
|
|
4408
4458
|
"type": "u64"
|
|
4409
4459
|
}
|
|
4410
4460
|
]
|
|
@@ -4413,7 +4463,7 @@
|
|
|
4413
4463
|
"name": "MobileConfigV1",
|
|
4414
4464
|
"fields": [
|
|
4415
4465
|
{
|
|
4416
|
-
"name": "
|
|
4466
|
+
"name": "feesByDevice",
|
|
4417
4467
|
"type": {
|
|
4418
4468
|
"vec": {
|
|
4419
4469
|
"defined": "DeviceFeesV0"
|
|
@@ -4426,7 +4476,7 @@
|
|
|
4426
4476
|
"name": "MobileConfigV2",
|
|
4427
4477
|
"fields": [
|
|
4428
4478
|
{
|
|
4429
|
-
"name": "
|
|
4479
|
+
"name": "feesByDevice",
|
|
4430
4480
|
"type": {
|
|
4431
4481
|
"vec": {
|
|
4432
4482
|
"defined": "DeviceFeesV1"
|
|
@@ -4473,11 +4523,11 @@
|
|
|
4473
4523
|
"type": "u16"
|
|
4474
4524
|
},
|
|
4475
4525
|
{
|
|
4476
|
-
"name": "
|
|
4526
|
+
"name": "mechanicalDownTilt",
|
|
4477
4527
|
"type": "u16"
|
|
4478
4528
|
},
|
|
4479
4529
|
{
|
|
4480
|
-
"name": "
|
|
4530
|
+
"name": "electricalDownTilt",
|
|
4481
4531
|
"type": "u16"
|
|
4482
4532
|
}
|
|
4483
4533
|
]
|
|
@@ -4486,7 +4536,7 @@
|
|
|
4486
4536
|
"name": "CbrsInfoV0",
|
|
4487
4537
|
"fields": [
|
|
4488
4538
|
{
|
|
4489
|
-
"name": "
|
|
4539
|
+
"name": "radioInfos",
|
|
4490
4540
|
"type": {
|
|
4491
4541
|
"vec": {
|
|
4492
4542
|
"defined": "RadioInfoV0"
|
|
@@ -4595,8 +4645,5 @@
|
|
|
4595
4645
|
"name": "ArithmeticError",
|
|
4596
4646
|
"msg": "Arithmetic error"
|
|
4597
4647
|
}
|
|
4598
|
-
]
|
|
4599
|
-
"metadata": {
|
|
4600
|
-
"address": "hemjuPXBpNvggtaUnN1MwT3wrdhttKEfosTcc2P9Pg8"
|
|
4601
|
-
}
|
|
4648
|
+
]
|
|
4602
4649
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "0.2.9",
|
|
3
3
|
"name": "helium_sub_daos",
|
|
4
4
|
"instructions": [
|
|
5
5
|
{
|
|
@@ -676,6 +676,36 @@
|
|
|
676
676
|
"name": "prevSubDaoEpochInfo",
|
|
677
677
|
"isMut": true,
|
|
678
678
|
"isSigner": false
|
|
679
|
+
},
|
|
680
|
+
{
|
|
681
|
+
"name": "notEmittedCounter",
|
|
682
|
+
"isMut": false,
|
|
683
|
+
"isSigner": false,
|
|
684
|
+
"pda": {
|
|
685
|
+
"seeds": [
|
|
686
|
+
{
|
|
687
|
+
"kind": "const",
|
|
688
|
+
"type": "string",
|
|
689
|
+
"value": "not_emitted_counter"
|
|
690
|
+
},
|
|
691
|
+
{
|
|
692
|
+
"kind": "account",
|
|
693
|
+
"type": "publicKey",
|
|
694
|
+
"account": "Mint",
|
|
695
|
+
"path": "hnt_mint"
|
|
696
|
+
}
|
|
697
|
+
],
|
|
698
|
+
"programId": {
|
|
699
|
+
"kind": "account",
|
|
700
|
+
"type": "publicKey",
|
|
701
|
+
"path": "no_emit_program"
|
|
702
|
+
}
|
|
703
|
+
}
|
|
704
|
+
},
|
|
705
|
+
{
|
|
706
|
+
"name": "noEmitProgram",
|
|
707
|
+
"isMut": false,
|
|
708
|
+
"isSigner": false
|
|
679
709
|
}
|
|
680
710
|
],
|
|
681
711
|
"args": [
|
|
@@ -1333,7 +1363,7 @@
|
|
|
1333
1363
|
},
|
|
1334
1364
|
{
|
|
1335
1365
|
"name": "mint",
|
|
1336
|
-
"isMut":
|
|
1366
|
+
"isMut": true,
|
|
1337
1367
|
"isSigner": false
|
|
1338
1368
|
},
|
|
1339
1369
|
{
|
|
@@ -2150,27 +2180,6 @@
|
|
|
2150
2180
|
],
|
|
2151
2181
|
"args": []
|
|
2152
2182
|
},
|
|
2153
|
-
{
|
|
2154
|
-
"name": "tempResizeAccount",
|
|
2155
|
-
"accounts": [
|
|
2156
|
-
{
|
|
2157
|
-
"name": "payer",
|
|
2158
|
-
"isMut": true,
|
|
2159
|
-
"isSigner": true
|
|
2160
|
-
},
|
|
2161
|
-
{
|
|
2162
|
-
"name": "account",
|
|
2163
|
-
"isMut": true,
|
|
2164
|
-
"isSigner": false
|
|
2165
|
-
},
|
|
2166
|
-
{
|
|
2167
|
-
"name": "systemProgram",
|
|
2168
|
-
"isMut": false,
|
|
2169
|
-
"isSigner": false
|
|
2170
|
-
}
|
|
2171
|
-
],
|
|
2172
|
-
"args": []
|
|
2173
|
-
},
|
|
2174
2183
|
{
|
|
2175
2184
|
"name": "trackVoteV0",
|
|
2176
2185
|
"accounts": [
|
|
@@ -2438,6 +2447,14 @@
|
|
|
2438
2447
|
{
|
|
2439
2448
|
"name": "vehntAtEpochStart",
|
|
2440
2449
|
"type": "u64"
|
|
2450
|
+
},
|
|
2451
|
+
{
|
|
2452
|
+
"name": "cumulativeNotEmitted",
|
|
2453
|
+
"type": "u64"
|
|
2454
|
+
},
|
|
2455
|
+
{
|
|
2456
|
+
"name": "notEmitted",
|
|
2457
|
+
"type": "u64"
|
|
2441
2458
|
}
|
|
2442
2459
|
]
|
|
2443
2460
|
}
|
|
@@ -3279,8 +3296,5 @@
|
|
|
3279
3296
|
"name": "InvalidMarker",
|
|
3280
3297
|
"msg": "Invalid vote marker"
|
|
3281
3298
|
}
|
|
3282
|
-
]
|
|
3283
|
-
"metadata": {
|
|
3284
|
-
"address": "hdaoVTCqhfHHo75XdAMxBKdUqvq1i5bF23sisBqVgGR"
|
|
3285
|
-
}
|
|
3299
|
+
]
|
|
3286
3300
|
}
|
package/lib/cjs/priorityFees.js
CHANGED
|
@@ -95,9 +95,9 @@ const estimateComputeUnits = (connection, tx, retries = 5) => __awaiter(void 0,
|
|
|
95
95
|
yield sleep(500);
|
|
96
96
|
return (0, exports.estimateComputeUnits)(connection, tx, retries - 1);
|
|
97
97
|
}
|
|
98
|
-
// Default to
|
|
98
|
+
// Default to 1m compute if it failed
|
|
99
99
|
if (sim.err) {
|
|
100
|
-
return Math.max(sim.unitsConsumed || 0,
|
|
100
|
+
return Math.max(sim.unitsConsumed || 0, 1000000);
|
|
101
101
|
}
|
|
102
102
|
return sim.unitsConsumed;
|
|
103
103
|
});
|
|
@@ -117,7 +117,16 @@ function withPriorityFees(_a) {
|
|
|
117
117
|
if (!computeUnits) {
|
|
118
118
|
const temp = Object.assign({ instructions, feePayer: rest.feePayer }, rest);
|
|
119
119
|
const tx = yield (0, draft_1.populateMissingDraftInfo)(connection, temp);
|
|
120
|
-
|
|
120
|
+
let ixWithComputeUnits = tx.instructions;
|
|
121
|
+
if (!tx.instructions.some((ix) => ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId))) {
|
|
122
|
+
ixWithComputeUnits = [
|
|
123
|
+
web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
|
|
124
|
+
units: 1000000,
|
|
125
|
+
}),
|
|
126
|
+
...tx.instructions,
|
|
127
|
+
];
|
|
128
|
+
}
|
|
129
|
+
const estimatedFee = yield (0, exports.estimateComputeUnits)(connection, (0, transaction_1.toVersionedTx)(Object.assign(Object.assign({}, tx), { instructions: ixWithComputeUnits })));
|
|
121
130
|
if (estimatedFee) {
|
|
122
131
|
computeUnits = Math.ceil(estimatedFee * (computeScaleUp || 1.1));
|
|
123
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priorityFees.js","sourceRoot":"","sources":["../../src/priorityFees.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"priorityFees.js","sourceRoot":"","sources":["../../src/priorityFees.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/transaction.js
CHANGED
|
@@ -315,7 +315,7 @@ function withRetries(tries, input) {
|
|
|
315
315
|
throw new Error("Failed after retries");
|
|
316
316
|
});
|
|
317
317
|
}
|
|
318
|
-
const TX_BATCH_SIZE =
|
|
318
|
+
const TX_BATCH_SIZE = 100;
|
|
319
319
|
function bulkSendTransactions(provider, txs, onProgress, triesRemaining = 10, // Number of blockhashes to try resending txs with before giving up
|
|
320
320
|
extraSigners = [], maxSignatureBatch = TX_BATCH_SIZE) {
|
|
321
321
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -3302,6 +3302,34 @@
|
|
|
3302
3302
|
}
|
|
3303
3303
|
}
|
|
3304
3304
|
]
|
|
3305
|
+
},
|
|
3306
|
+
{
|
|
3307
|
+
"name": "tempBackfillMobileInfo",
|
|
3308
|
+
"accounts": [
|
|
3309
|
+
{
|
|
3310
|
+
"name": "payer",
|
|
3311
|
+
"isMut": true,
|
|
3312
|
+
"isSigner": true
|
|
3313
|
+
},
|
|
3314
|
+
{
|
|
3315
|
+
"name": "mobileInfo",
|
|
3316
|
+
"isMut": true,
|
|
3317
|
+
"isSigner": false
|
|
3318
|
+
},
|
|
3319
|
+
{
|
|
3320
|
+
"name": "systemProgram",
|
|
3321
|
+
"isMut": false,
|
|
3322
|
+
"isSigner": false
|
|
3323
|
+
}
|
|
3324
|
+
],
|
|
3325
|
+
"args": [
|
|
3326
|
+
{
|
|
3327
|
+
"name": "args",
|
|
3328
|
+
"type": {
|
|
3329
|
+
"defined": "TempBackfillMobileInfoArgs"
|
|
3330
|
+
}
|
|
3331
|
+
}
|
|
3332
|
+
]
|
|
3305
3333
|
}
|
|
3306
3334
|
],
|
|
3307
3335
|
"accounts": [
|
|
@@ -4019,6 +4047,28 @@
|
|
|
4019
4047
|
]
|
|
4020
4048
|
}
|
|
4021
4049
|
},
|
|
4050
|
+
{
|
|
4051
|
+
"name": "TempBackfillMobileInfoArgs",
|
|
4052
|
+
"type": {
|
|
4053
|
+
"kind": "struct",
|
|
4054
|
+
"fields": [
|
|
4055
|
+
{
|
|
4056
|
+
"name": "location",
|
|
4057
|
+
"type": {
|
|
4058
|
+
"option": "u64"
|
|
4059
|
+
}
|
|
4060
|
+
},
|
|
4061
|
+
{
|
|
4062
|
+
"name": "deploymentInfo",
|
|
4063
|
+
"type": {
|
|
4064
|
+
"option": {
|
|
4065
|
+
"defined": "MobileDeploymentInfoV0"
|
|
4066
|
+
}
|
|
4067
|
+
}
|
|
4068
|
+
}
|
|
4069
|
+
]
|
|
4070
|
+
}
|
|
4071
|
+
},
|
|
4022
4072
|
{
|
|
4023
4073
|
"name": "MetadataArgs",
|
|
4024
4074
|
"type": {
|
|
@@ -4379,19 +4429,19 @@
|
|
|
4379
4429
|
"name": "IotConfig",
|
|
4380
4430
|
"fields": [
|
|
4381
4431
|
{
|
|
4382
|
-
"name": "
|
|
4432
|
+
"name": "minGain",
|
|
4383
4433
|
"type": "i32"
|
|
4384
4434
|
},
|
|
4385
4435
|
{
|
|
4386
|
-
"name": "
|
|
4436
|
+
"name": "maxGain",
|
|
4387
4437
|
"type": "i32"
|
|
4388
4438
|
},
|
|
4389
4439
|
{
|
|
4390
|
-
"name": "
|
|
4440
|
+
"name": "fullLocationStakingFee",
|
|
4391
4441
|
"type": "u64"
|
|
4392
4442
|
},
|
|
4393
4443
|
{
|
|
4394
|
-
"name": "
|
|
4444
|
+
"name": "dataonlyLocationStakingFee",
|
|
4395
4445
|
"type": "u64"
|
|
4396
4446
|
}
|
|
4397
4447
|
]
|
|
@@ -4400,11 +4450,11 @@
|
|
|
4400
4450
|
"name": "MobileConfig",
|
|
4401
4451
|
"fields": [
|
|
4402
4452
|
{
|
|
4403
|
-
"name": "
|
|
4453
|
+
"name": "fullLocationStakingFee",
|
|
4404
4454
|
"type": "u64"
|
|
4405
4455
|
},
|
|
4406
4456
|
{
|
|
4407
|
-
"name": "
|
|
4457
|
+
"name": "dataonlyLocationStakingFee",
|
|
4408
4458
|
"type": "u64"
|
|
4409
4459
|
}
|
|
4410
4460
|
]
|
|
@@ -4413,7 +4463,7 @@
|
|
|
4413
4463
|
"name": "MobileConfigV1",
|
|
4414
4464
|
"fields": [
|
|
4415
4465
|
{
|
|
4416
|
-
"name": "
|
|
4466
|
+
"name": "feesByDevice",
|
|
4417
4467
|
"type": {
|
|
4418
4468
|
"vec": {
|
|
4419
4469
|
"defined": "DeviceFeesV0"
|
|
@@ -4426,7 +4476,7 @@
|
|
|
4426
4476
|
"name": "MobileConfigV2",
|
|
4427
4477
|
"fields": [
|
|
4428
4478
|
{
|
|
4429
|
-
"name": "
|
|
4479
|
+
"name": "feesByDevice",
|
|
4430
4480
|
"type": {
|
|
4431
4481
|
"vec": {
|
|
4432
4482
|
"defined": "DeviceFeesV1"
|
|
@@ -4473,11 +4523,11 @@
|
|
|
4473
4523
|
"type": "u16"
|
|
4474
4524
|
},
|
|
4475
4525
|
{
|
|
4476
|
-
"name": "
|
|
4526
|
+
"name": "mechanicalDownTilt",
|
|
4477
4527
|
"type": "u16"
|
|
4478
4528
|
},
|
|
4479
4529
|
{
|
|
4480
|
-
"name": "
|
|
4530
|
+
"name": "electricalDownTilt",
|
|
4481
4531
|
"type": "u16"
|
|
4482
4532
|
}
|
|
4483
4533
|
]
|
|
@@ -4486,7 +4536,7 @@
|
|
|
4486
4536
|
"name": "CbrsInfoV0",
|
|
4487
4537
|
"fields": [
|
|
4488
4538
|
{
|
|
4489
|
-
"name": "
|
|
4539
|
+
"name": "radioInfos",
|
|
4490
4540
|
"type": {
|
|
4491
4541
|
"vec": {
|
|
4492
4542
|
"defined": "RadioInfoV0"
|
|
@@ -4595,8 +4645,5 @@
|
|
|
4595
4645
|
"name": "ArithmeticError",
|
|
4596
4646
|
"msg": "Arithmetic error"
|
|
4597
4647
|
}
|
|
4598
|
-
]
|
|
4599
|
-
"metadata": {
|
|
4600
|
-
"address": "hemjuPXBpNvggtaUnN1MwT3wrdhttKEfosTcc2P9Pg8"
|
|
4601
|
-
}
|
|
4648
|
+
]
|
|
4602
4649
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.
|
|
2
|
+
"version": "0.2.9",
|
|
3
3
|
"name": "helium_sub_daos",
|
|
4
4
|
"instructions": [
|
|
5
5
|
{
|
|
@@ -676,6 +676,36 @@
|
|
|
676
676
|
"name": "prevSubDaoEpochInfo",
|
|
677
677
|
"isMut": true,
|
|
678
678
|
"isSigner": false
|
|
679
|
+
},
|
|
680
|
+
{
|
|
681
|
+
"name": "notEmittedCounter",
|
|
682
|
+
"isMut": false,
|
|
683
|
+
"isSigner": false,
|
|
684
|
+
"pda": {
|
|
685
|
+
"seeds": [
|
|
686
|
+
{
|
|
687
|
+
"kind": "const",
|
|
688
|
+
"type": "string",
|
|
689
|
+
"value": "not_emitted_counter"
|
|
690
|
+
},
|
|
691
|
+
{
|
|
692
|
+
"kind": "account",
|
|
693
|
+
"type": "publicKey",
|
|
694
|
+
"account": "Mint",
|
|
695
|
+
"path": "hnt_mint"
|
|
696
|
+
}
|
|
697
|
+
],
|
|
698
|
+
"programId": {
|
|
699
|
+
"kind": "account",
|
|
700
|
+
"type": "publicKey",
|
|
701
|
+
"path": "no_emit_program"
|
|
702
|
+
}
|
|
703
|
+
}
|
|
704
|
+
},
|
|
705
|
+
{
|
|
706
|
+
"name": "noEmitProgram",
|
|
707
|
+
"isMut": false,
|
|
708
|
+
"isSigner": false
|
|
679
709
|
}
|
|
680
710
|
],
|
|
681
711
|
"args": [
|
|
@@ -1333,7 +1363,7 @@
|
|
|
1333
1363
|
},
|
|
1334
1364
|
{
|
|
1335
1365
|
"name": "mint",
|
|
1336
|
-
"isMut":
|
|
1366
|
+
"isMut": true,
|
|
1337
1367
|
"isSigner": false
|
|
1338
1368
|
},
|
|
1339
1369
|
{
|
|
@@ -2150,27 +2180,6 @@
|
|
|
2150
2180
|
],
|
|
2151
2181
|
"args": []
|
|
2152
2182
|
},
|
|
2153
|
-
{
|
|
2154
|
-
"name": "tempResizeAccount",
|
|
2155
|
-
"accounts": [
|
|
2156
|
-
{
|
|
2157
|
-
"name": "payer",
|
|
2158
|
-
"isMut": true,
|
|
2159
|
-
"isSigner": true
|
|
2160
|
-
},
|
|
2161
|
-
{
|
|
2162
|
-
"name": "account",
|
|
2163
|
-
"isMut": true,
|
|
2164
|
-
"isSigner": false
|
|
2165
|
-
},
|
|
2166
|
-
{
|
|
2167
|
-
"name": "systemProgram",
|
|
2168
|
-
"isMut": false,
|
|
2169
|
-
"isSigner": false
|
|
2170
|
-
}
|
|
2171
|
-
],
|
|
2172
|
-
"args": []
|
|
2173
|
-
},
|
|
2174
2183
|
{
|
|
2175
2184
|
"name": "trackVoteV0",
|
|
2176
2185
|
"accounts": [
|
|
@@ -2438,6 +2447,14 @@
|
|
|
2438
2447
|
{
|
|
2439
2448
|
"name": "vehntAtEpochStart",
|
|
2440
2449
|
"type": "u64"
|
|
2450
|
+
},
|
|
2451
|
+
{
|
|
2452
|
+
"name": "cumulativeNotEmitted",
|
|
2453
|
+
"type": "u64"
|
|
2454
|
+
},
|
|
2455
|
+
{
|
|
2456
|
+
"name": "notEmitted",
|
|
2457
|
+
"type": "u64"
|
|
2441
2458
|
}
|
|
2442
2459
|
]
|
|
2443
2460
|
}
|
|
@@ -3279,8 +3296,5 @@
|
|
|
3279
3296
|
"name": "InvalidMarker",
|
|
3280
3297
|
"msg": "Invalid vote marker"
|
|
3281
3298
|
}
|
|
3282
|
-
]
|
|
3283
|
-
"metadata": {
|
|
3284
|
-
"address": "hdaoVTCqhfHHo75XdAMxBKdUqvq1i5bF23sisBqVgGR"
|
|
3285
|
-
}
|
|
3299
|
+
]
|
|
3286
3300
|
}
|
|
@@ -73,9 +73,9 @@ export const estimateComputeUnits = async (connection, tx, retries = 5) => {
|
|
|
73
73
|
await sleep(500);
|
|
74
74
|
return estimateComputeUnits(connection, tx, retries - 1);
|
|
75
75
|
}
|
|
76
|
-
// Default to
|
|
76
|
+
// Default to 1m compute if it failed
|
|
77
77
|
if (sim.err) {
|
|
78
|
-
return Math.max(sim.unitsConsumed || 0,
|
|
78
|
+
return Math.max(sim.unitsConsumed || 0, 1000000);
|
|
79
79
|
}
|
|
80
80
|
return sim.unitsConsumed;
|
|
81
81
|
};
|
|
@@ -94,7 +94,16 @@ export async function withPriorityFees({ connection, computeUnits, instructions
|
|
|
94
94
|
...rest,
|
|
95
95
|
};
|
|
96
96
|
const tx = await populateMissingDraftInfo(connection, temp);
|
|
97
|
-
|
|
97
|
+
let ixWithComputeUnits = tx.instructions;
|
|
98
|
+
if (!tx.instructions.some((ix) => ix.programId.equals(ComputeBudgetProgram.programId))) {
|
|
99
|
+
ixWithComputeUnits = [
|
|
100
|
+
ComputeBudgetProgram.setComputeUnitLimit({
|
|
101
|
+
units: 1000000,
|
|
102
|
+
}),
|
|
103
|
+
...tx.instructions,
|
|
104
|
+
];
|
|
105
|
+
}
|
|
106
|
+
const estimatedFee = await estimateComputeUnits(connection, toVersionedTx({ ...tx, instructions: ixWithComputeUnits }));
|
|
98
107
|
if (estimatedFee) {
|
|
99
108
|
computeUnits = Math.ceil(estimatedFee * (computeScaleUp || 1.1));
|
|
100
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priorityFees.js","sourceRoot":"","sources":["../../../src/priorityFees.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"priorityFees.js","sourceRoot":"","sources":["../../../src/priorityFees.ts"],"names":[],"mappings":"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"}
|
|
@@ -257,7 +257,7 @@ async function withRetries(tries, input) {
|
|
|
257
257
|
}
|
|
258
258
|
throw new Error("Failed after retries");
|
|
259
259
|
}
|
|
260
|
-
const TX_BATCH_SIZE =
|
|
260
|
+
const TX_BATCH_SIZE = 100;
|
|
261
261
|
export async function bulkSendTransactions(provider, txs, onProgress, triesRemaining = 10, // Number of blockhashes to try resending txs with before giving up
|
|
262
262
|
extraSigners = [], maxSignatureBatch = TX_BATCH_SIZE) {
|
|
263
263
|
let ret = [];
|