gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: repair key handling in _getSignData and add Nonce live test

Browse Source
This commit is contained in:
Tyera Eulberg
2020-01-07 17:57:56 -07:00
committed by Michael Vines
parent bd0a9348f4
commit aea0e83a40
4 changed files with 165 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
web3.js/src/connection.js
View File

@ -1224,59 +1224,63 @@ export class Connection {
transaction: Transaction,
...signers: Array<Account>
): Promise<TransactionSignature> {
for (;;) {
// Attempt to use a recent blockhash for up to 30 seconds
const seconds = new Date().getSeconds();
if (
this._blockhashInfo.recentBlockhash != null &&
this._blockhashInfo.seconds < seconds + 30
) {
transaction.recentBlockhash = this._blockhashInfo.recentBlockhash;
transaction.sign(...signers);
if (!transaction.signature) {
throw new Error('!signature'); // should never happen
}
// If the signature of this transaction has not been seen before with the
// current recentBlockhash, all done.
const signature = transaction.signature.toString();
if (!this._blockhashInfo.transactionSignatures.includes(signature)) {
this._blockhashInfo.transactionSignatures.push(signature);
if (this._disableBlockhashCaching) {
this._blockhashInfo.seconds = -1;
}
break;
}
}
// Fetch a new blockhash
let attempts = 0;
const startTime = Date.now();
if (transaction.nonceInfo) {
transaction.sign(...signers);
} else {
for (;;) {
const [
recentBlockhash,
//feeCalculator,
] = await this.getRecentBlockhash();
// Attempt to use a recent blockhash for up to 30 seconds
const seconds = new Date().getSeconds();
if (
this._blockhashInfo.recentBlockhash != null &&
this._blockhashInfo.seconds < seconds + 30
) {
transaction.recentBlockhash = this._blockhashInfo.recentBlockhash;
transaction.sign(...signers);
if (!transaction.signature) {
throw new Error('!signature'); // should never happen
}
if (this._blockhashInfo.recentBlockhash != recentBlockhash) {
this._blockhashInfo = {
// If the signature of this transaction has not been seen before with the
// current recentBlockhash, all done.
const signature = transaction.signature.toString();
if (!this._blockhashInfo.transactionSignatures.includes(signature)) {
this._blockhashInfo.transactionSignatures.push(signature);
if (this._disableBlockhashCaching) {
this._blockhashInfo.seconds = -1;
}
break;
}
}
// Fetch a new blockhash
let attempts = 0;
const startTime = Date.now();
for (;;) {
const [
recentBlockhash,
seconds: new Date().getSeconds(),
transactionSignatures: [],
};
break;
}
if (attempts === 50) {
throw new Error(
`Unable to obtain a new blockhash after ${Date.now() -
startTime}ms`,
);
}
//feeCalculator,
] = await this.getRecentBlockhash();
// Sleep for approximately half a slot
await sleep((500 * DEFAULT_TICKS_PER_SLOT) / NUM_TICKS_PER_SECOND);
if (this._blockhashInfo.recentBlockhash != recentBlockhash) {
this._blockhashInfo = {
recentBlockhash,
seconds: new Date().getSeconds(),
transactionSignatures: [],
};
break;
}
if (attempts === 50) {
throw new Error(
`Unable to obtain a new blockhash after ${Date.now() -
startTime}ms`,
);
}
++attempts;
// Sleep for approximately half a slot
await sleep((500 * DEFAULT_TICKS_PER_SLOT) / NUM_TICKS_PER_SECOND);
++attempts;
}
}
}