mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2024-12-31 18:54:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1062 from mempool/simon/liquidtestnet-backend-fix

Browse Source 
Fix backend support for 'liquidtestnet' network
This commit is contained in:
wiz 2021-12-30 21:56:55 +00:00 committed by GitHub
commit dd49ff0084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/api/common.ts
View File

@ -109,7 +109,8 @@ export class Common {
totalFees += tx.bestDescendant.fee; totalFees += tx.bestDescendant.fee;
} }
tx.effectiveFeePerVsize = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, totalFees / (totalWeight / 4)); tx.effectiveFeePerVsize = Math.max(config.MEMPOOL.NETWORK === 'liquid'
|| config.MEMPOOL.NETWORK === 'liquidtestnet' ? 0.1 : 1, totalFees / (totalWeight / 4));
tx.cpfpChecked = true; tx.cpfpChecked = true;
return { return {

2
backend/src/api/database-migration.ts
View File

@ -127,7 +127,7 @@ class DatabaseMigration {
const queries: string[] = []; const queries: string[] = [];
if (version < 1) { if (version < 1) {
if (config.MEMPOOL.NETWORK !== 'liquid') { if (config.MEMPOOL.NETWORK !== 'liquid' && config.MEMPOOL.NETWORK !== 'liquidtestnet') {
queries.push(`UPDATE statistics SET queries.push(`UPDATE statistics SET
vsize_1 = vsize_1 + vsize_2, vsize_2 = vsize_3, vsize_1 = vsize_1 + vsize_2, vsize_2 = vsize_3,
vsize_3 = vsize_4, vsize_4 = vsize_5, vsize_3 = vsize_4, vsize_4 = vsize_5,

2
backend/src/api/fee-api.ts
View File

@ -6,7 +6,7 @@ import projectedBlocks from './mempool-blocks';
class FeeApi { class FeeApi {
constructor() { } constructor() { }
defaultFee = config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1; defaultFee = config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet' ? 0.1 : 1;
public getRecommendedFee() { public getRecommendedFee() {
const pBlocks = projectedBlocks.getMempoolBlocks(); const pBlocks = projectedBlocks.getMempoolBlocks();

6
backend/src/api/statistics.ts
View File

@ -90,9 +90,11 @@ class Statistics {
memPoolArray.forEach((transaction) => { memPoolArray.forEach((transaction) => {
for (let i = 0; i < logFees.length; i++) { for (let i = 0; i < logFees.length; i++) {
if ( if (
(config.MEMPOOL.NETWORK === 'liquid' && (i === lastItem || transaction.effectiveFeePerVsize * 10 < logFees[i + 1])) ((config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet')
&& (i === lastItem || transaction.effectiveFeePerVsize * 10 < logFees[i + 1]))
|| ||
(config.MEMPOOL.NETWORK !== 'liquid' && (i === lastItem || transaction.effectiveFeePerVsize < logFees[i + 1])) ((config.MEMPOOL.NETWORK !== 'liquid' && config.MEMPOOL.NETWORK !== 'liquidtestnet')
&& (i === lastItem || transaction.effectiveFeePerVsize < logFees[i + 1]))
) { ) {
if (weightVsizeFees[logFees[i]]) { if (weightVsizeFees[logFees[i]]) {
weightVsizeFees[logFees[i]] += transaction.vsize; weightVsizeFees[logFees[i]] += transaction.vsize;

3
backend/src/api/transaction-utils.ts
View File

@ -31,7 +31,8 @@ class TransactionUtils {
// @ts-ignore // @ts-ignore
return transaction; return transaction;
} }
const feePerVbytes = Math.max(config.MEMPOOL.NETWORK === 'liquid' ? 0.1 : 1, (transaction.fee || 0) / (transaction.weight / 4)); const feePerVbytes = Math.max(config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet' ? 0.1 : 1,
(transaction.fee || 0) / (transaction.weight / 4));
const transactionExtended: TransactionExtended = Object.assign({ const transactionExtended: TransactionExtended = Object.assign({
vsize: Math.round(transaction.weight / 4), vsize: Math.round(transaction.weight / 4),
feePerVsize: feePerVbytes, feePerVsize: feePerVbytes,

8
backend/src/index.ts
View File

@ -96,7 +96,7 @@ class Server {
statistics.startStatistics(); statistics.startStatistics();
} }
if (config.MEMPOOL.NETWORK === 'liquid') { if (config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet') {
icons.loadIcons(); icons.loadIcons();
} }
@ -156,7 +156,7 @@ class Server {
if (this.wss) { if (this.wss) {
websocketHandler.setWebsocketServer(this.wss); websocketHandler.setWebsocketServer(this.wss);
} }
if (config.MEMPOOL.NETWORK === 'liquid' && config.DATABASE.ENABLED) { if ((config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet') && config.DATABASE.ENABLED) {
blocks.setNewBlockCallback(async () => { blocks.setNewBlockCallback(async () => {
try { try {
await elementsParser.$parse(); await elementsParser.$parse();
@ -283,14 +283,14 @@ class Server {
; ;
} }
if (config.MEMPOOL.NETWORK === 'liquid') { if (config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet') {
this.app this.app
.get(config.MEMPOOL.API_URL_PREFIX + 'assets/icons', routes.getAllLiquidIcon) .get(config.MEMPOOL.API_URL_PREFIX + 'assets/icons', routes.getAllLiquidIcon)
.get(config.MEMPOOL.API_URL_PREFIX + 'asset/:assetId/icon', routes.getLiquidIcon) .get(config.MEMPOOL.API_URL_PREFIX + 'asset/:assetId/icon', routes.getLiquidIcon)
; ;
} }
if (config.MEMPOOL.NETWORK === 'liquid' && config.DATABASE.ENABLED) { if ((config.MEMPOOL.NETWORK === 'liquid' || config.MEMPOOL.NETWORK === 'liquidtestnet') && config.DATABASE.ENABLED) {
this.app this.app
.get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/month', routes.$getElementsPegsByMonth) .get(config.MEMPOOL.API_URL_PREFIX + 'liquid/pegs/month', routes.$getElementsPegsByMonth)
; ;