machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed the electrs backend support to 'electrs'.

Browse Source
This commit is contained in:
Simon Lindh
2019-12-06 22:37:07 +01:00
parent 90d72175bd
commit 3ddbd33b70
18 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/mempool-config.sample.json
View File

@@ -20,6 +20,6 @@
"BITCOIN_NODE_USER": "",
"BITCOIN_NODE_PASS": "",
"BACKEND_API": "bitcoind",
"ESPLORA_API_URL": "https://www.blockstream.info/api",
"ELECTRS_API_URL": "https://www.blockstream.info/api",
"TX_PER_SECOND_SPAN_SECONDS": 150
}

6
backend/src/api/bitcoin/bitcoin-api-factory.ts
View File

@@ -1,12 +1,12 @@
const config = require('../../../mempool-config.json');
import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
import BitcoindApi from './bitcoind-api';
import EsploraApi from './esplora-api';
import ElectrsApi from './electrs-api';
function factory(): AbstractBitcoinApi {
switch (config.BACKEND_API) {
case 'esplora':
return new EsploraApi();
case 'electrs':
return new ElectrsApi();
case 'bitcoind':
default:
return new BitcoindApi();

34
backend/src/api/bitcoin/esplora-api.ts → backend/src/api/bitcoin/electrs-api.ts
View File

@@ -3,14 +3,14 @@ import { ITransaction, IMempoolInfo, IBlock } from '../../interfaces';
import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
import * as request from 'request';
class EsploraApi implements AbstractBitcoinApi {
class ElectrsApi implements AbstractBitcoinApi {
constructor() {
}
getMempoolInfo(): Promise<IMempoolInfo> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/mempool', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/mempool', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -24,7 +24,7 @@ class EsploraApi implements AbstractBitcoinApi {
getRawMempool(): Promise<ITransaction['txid'][]> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/mempool/txids', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/mempool/txids', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -35,7 +35,7 @@ class EsploraApi implements AbstractBitcoinApi {
getRawTransaction(txId: string): Promise<ITransaction> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/tx/' + txId, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/tx/' + txId, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -50,7 +50,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlockCount(): Promise<number> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/blocks/tip/height', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/blocks/tip/height', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -61,11 +61,11 @@ class EsploraApi implements AbstractBitcoinApi {
getBlockAndTransactions(hash: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/block/' + hash, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/block/' + hash, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
request(config.ESPLORA_API_URL + '/block/' + hash + '/txids', { json: true }, (err2, res2, response2) => {
request(config.ELECTRS_API_URL + '/block/' + hash + '/txids', { json: true }, (err2, res2, response2) => {
if (err2) {
reject(err2);
}
@@ -83,7 +83,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlockHash(height: number): Promise<string> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/block-height/' + height, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/block-height/' + height, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -94,7 +94,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlocks(): Promise<string> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/blocks', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/blocks', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -105,7 +105,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlocksFromHeight(height: number): Promise<string> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/blocks/' + height, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/blocks/' + height, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -116,7 +116,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlock(hash: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/block/' + hash, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/block/' + hash, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -127,7 +127,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlockTransactions(hash: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/block/' + hash + '/txs', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/block/' + hash + '/txs', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -138,7 +138,7 @@ class EsploraApi implements AbstractBitcoinApi {
getBlockTransactionsFromIndex(hash: string, index: number): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/block/' + hash + '/txs/' + index, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/block/' + hash + '/txs/' + index, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -149,7 +149,7 @@ class EsploraApi implements AbstractBitcoinApi {
getAddress(address: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/address/' + address, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/address/' + address, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -160,7 +160,7 @@ class EsploraApi implements AbstractBitcoinApi {
getAddressTransactions(address: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/address/' + address + '/txs', { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/address/' + address + '/txs', { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -171,7 +171,7 @@ class EsploraApi implements AbstractBitcoinApi {
getAddressTransactionsFromLastSeenTxid(address: string, lastSeenTxid: string): Promise<IBlock> {
return new Promise(async (resolve, reject) => {
request(config.ESPLORA_API_URL + '/address/' + address + '/txs/chain/' + lastSeenTxid, { json: true }, (err, res, response) => {
request(config.ELECTRS_API_URL + '/address/' + address + '/txs/chain/' + lastSeenTxid, { json: true }, (err, res, response) => {
if (err) {
reject(err);
}
@@ -181,4 +181,4 @@ class EsploraApi implements AbstractBitcoinApi {
}
}
export default EsploraApi;
export default ElectrsApi;

2
backend/src/api/mempool.ts
View File

@@ -56,7 +56,7 @@ class Mempool {
let totalOut = 0;
transaction.vout.forEach((output) => totalOut += output.value);
if (config.BACKEND_API === 'esplora') {
if (config.BACKEND_API === 'electrs') {
transaction.feePerWeightUnit = (transaction.fee * 100000000) / transaction.weight || 0;
transaction.feePerVsize = (transaction.fee * 100000000) / (transaction.vsize) || 0;
transaction.totalOut = totalOut / 100000000;

2
backend/src/index.ts
View File

@@ -264,7 +264,7 @@ class MempoolSpace {
.get(config.API_ENDPOINT + 'statistics/6m', routes.get6MStatistics.bind(routes))
;
if (config.BACKEND_API === 'esplora') {
if (config.BACKEND_API === 'electrs') {
this.app
.get(config.API_ENDPOINT + 'explorer/blocks', routes.getBlocks)
.get(config.API_ENDPOINT + 'explorer/blocks/:height', routes.getBlocks)