Slow down retries on Electrs errors in the main mempool loop.

This commit is contained in:
softsimon 2020-10-18 21:47:47 +07:00
parent 2ba7cd9ebd
commit 49f70ca28a
No known key found for this signature in database
GPG Key ID: 488D7DCFB5A430D7
4 changed files with 161 additions and 165 deletions

View File

@ -11,7 +11,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/mempool', { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getMempoolInfo error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -32,7 +32,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/mempool/txids', { json: true, timeout: 10000, forever: true }, (err, res, response) => {
if (err) {
reject(err);
reject('getRawMempool error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -50,7 +50,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/tx/' + txId, { json: true, timeout: 10000, forever: true }, (err, res, response) => {
if (err) {
reject(err);
reject('getRawTransaction error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -68,7 +68,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/blocks/tip/height', { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getBlockHeightTip error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -82,7 +82,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/block/' + hash + '/txids', { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getTxIdsForBlock error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -100,7 +100,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/block-height/' + height, { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getBlockHash error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -114,7 +114,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/blocks/' + height, { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getBlocksFromHeight error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {
@ -128,7 +128,7 @@ class ElectrsApi {
return new Promise((resolve, reject) => {
request(config.ELECTRS_API_URL + '/block/' + hash, { json: true, timeout: 10000 }, (err, res, response) => {
if (err) {
reject(err);
reject('getBlock error: ' + err.message || err);
} else if (res.statusCode !== 200) {
reject(response);
} else {

View File

@ -25,8 +25,7 @@ class Blocks {
this.newBlockCallbacks.push(fn);
}
public async updateBlocks() {
try {
public async $updateBlocks() {
const blockHeightTip = await bitcoinApi.getBlockHeightTip();
if (this.blocks.length === 0) {
@ -100,10 +99,6 @@ class Blocks {
this.newBlockCallbacks.forEach((cb) => cb(block, txIds, transactions));
}
}
} catch (err) {
logger.err('updateBlocks error' + err);
}
}
public getLastDifficultyAdjustmentTime(): number {

View File

@ -47,12 +47,8 @@ class Mempool {
}
}
public async updateMemPoolInfo() {
try {
public async $updateMemPoolInfo() {
this.mempoolInfo = await bitcoinApi.getMempoolInfo();
} catch (e) {
logger.err('Error getMempoolInfo ' + e.message || e);
}
}
public getMempoolInfo(): MempoolInfo | undefined {
@ -93,13 +89,12 @@ class Mempool {
}
}
public async updateMempool() {
public async $updateMempool() {
logger.debug('Updating mempool');
const start = new Date().getTime();
let hasChange: boolean = false;
const currentMempoolSize = Object.keys(this.mempoolCache).length;
let txCount = 0;
try {
const transactions = await bitcoinApi.getRawMempool();
const diff = transactions.length - currentMempoolSize;
const newTransactions: TransactionExtended[] = [];
@ -184,9 +179,6 @@ class Mempool {
const time = end - start;
logger.debug(`New mempool size: ${Object.keys(newMempool).length} Change: ${diff}`);
logger.debug('Mempool updated in ' + time / 1000 + ' seconds');
} catch (err) {
logger.err('getRawMempool error. ' + err.message || err);
}
}
private updateTxPerSecond() {

View File

@ -27,6 +27,7 @@ class Server {
private wss: WebSocket.Server | undefined;
private server: https.Server | http.Server | undefined;
private app: Express;
private retryOnElectrsErrorAfterSeconds = 5;
constructor() {
this.app = express();
@ -114,10 +115,18 @@ class Server {
}
async runMempoolIntervalFunctions() {
await memPool.updateMemPoolInfo();
await blocks.updateBlocks();
await memPool.updateMempool();
try {
await memPool.$updateMemPoolInfo();
await blocks.$updateBlocks();
await memPool.$updateMempool();
setTimeout(this.runMempoolIntervalFunctions.bind(this), config.ELECTRS_POLL_RATE_MS);
this.retryOnElectrsErrorAfterSeconds = 5;
} catch (e) {
this.retryOnElectrsErrorAfterSeconds *= 2;
this.retryOnElectrsErrorAfterSeconds = Math.min(this.retryOnElectrsErrorAfterSeconds, 3600);
logger.warn(`runMempoolIntervalFunctions error: ${(e.message || e)}. Retrying in ${this.retryOnElectrsErrorAfterSeconds} sec.`);
setTimeout(this.runMempoolIntervalFunctions.bind(this), 1000 * this.retryOnElectrsErrorAfterSeconds);
}
}
setUpWebsocketHandling() {