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

fix: add burnPercent field to FeeCalculator (#381)

Browse Source
This commit is contained in:
Michael Vines
2019-06-26 13:49:29 -07:00
parent 5d81280c97
commit 684605fd5c
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,7 @@ const GetTotalSupplyRpcResult = jsonRpcResult('number');
const GetRecentBlockhash = jsonRpcResult([
'string',
struct({
burnPercent: 'number',
lamportsPerSignature: 'number',
maxLamportsPerSignature: 'number',
minLamportsPerSignature: 'number',
@ -235,10 +236,14 @@ const GetRecentBlockhash = jsonRpcResult([
/**
* @ignore
*/
const GetRecentBlockhash_015 = jsonRpcResult([
const GetRecentBlockhash_016 = jsonRpcResult([
'string',
struct({
lamportsPerSignature: 'number',
maxLamportsPerSignature: 'number',
minLamportsPerSignature: 'number',
targetLamportsPerSignature: 'number',
targetSignaturesPerSlot: 'number',
}),
]);
@ -548,22 +553,19 @@ export class Connection {
async getRecentBlockhash(): Promise<BlockhashAndFeeCalculator> {
const unsafeRes = await this._rpcRequest('getRecentBlockhash', []);
// Legacy v0.15 response. TODO: Remove in August 2019
// Legacy v0.16 response. TODO: Remove in September 2019
try {
const res_015 = GetRecentBlockhash_015(unsafeRes);
if (res_015.error) {
throw new Error(res_015.error.message);
const res_016 = GetRecentBlockhash_016(unsafeRes);
if (res_016.error) {
throw new Error(res_016.error.message);
}
const [blockhash, feeCalculator] = res_015.result;
feeCalculator.targetSignaturesPerSlot = 42;
feeCalculator.targetLamportsPerSignature =
feeCalculator.lamportsPerSignature;
const [blockhash, feeCalculator] = res_016.result;
feeCalculator.burnPercent = 0;
return [blockhash, feeCalculator];
} catch (e) {
// Not legacy format
}
// End Legacy v0.15 response
// End Legacy v0.16 response
const res = GetRecentBlockhash(unsafeRes);
if (res.error) {