blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: adjust status retry algorithm

This commit is contained in:
Jack May 2020-04-09 15:28:02 -07:00 committed by Michael Vines
parent 2c517c1f3c
commit cd6b48a403
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web3.js/src/util/send-and-confirm-transaction.js
View File

@ -10,6 +10,13 @@ import type {Account} from '../account';
import type {TransactionSignature} from '../transaction';
import {DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND} from '../timing';
const MS_PER_SECOND = 1000;
const MS_PER_SLOT =
(DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND) * MS_PER_SECOND;
const NUM_SEND_RETRIES = 10;
const NUM_STATUS_RETRIES = 10;
/**
* Sign, send and confirm a transaction with recent commitment level
*/
@ -45,7 +52,7 @@ async function _sendAndConfirmTransaction(
): Promise<TransactionSignature> {
const statusCommitment = commitment || connection.commitment || 'max';
let sendRetries = 10;
let sendRetries = NUM_SEND_RETRIES;
let signature;
for (;;) {
@ -54,13 +61,17 @@ async function _sendAndConfirmTransaction(
// Wait up to a couple slots for a confirmation
let status = null;
let statusRetries = 6;
let statusRetries = NUM_STATUS_RETRIES;
for (;;) {
status = (await connection.getSignatureStatus(signature)).value;
if (status) {
if (statusCommitment === 'max' && status.confirmations === null) {
break;
} else if (statusCommitment === 'recent') {
// Recieved a status, if not an error wait for confirmation
statusRetries = NUM_STATUS_RETRIES;
if (
status.err ||
status.confirmations === null ||
(statusCommitment === 'recent' && status.confirmations >= 1)
) {
break;
}
}
@ -69,7 +80,7 @@ async function _sendAndConfirmTransaction(
break;
}
// Sleep for approximately half a slot
await sleep((500 * DEFAULT_TICKS_PER_SLOT) / NUM_TICKS_PER_SECOND);
await sleep(MS_PER_SLOT / 2);
}
if (status) {