From 416f7b45654669f815714b3672c8a44a5d0131ba Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 30 Oct 2025 10:32:51 +0000 Subject: [PATCH] remove config.MEMPOOL.MIN_RECOMMENDED_FEE --- backend/src/__fixtures__/mempool-config.template.json | 3 +-- backend/src/__tests__/config.test.ts | 3 +-- backend/src/api/fee-api.ts | 7 +++---- backend/src/config.ts | 2 -- docker/backend/mempool-config.json | 3 +-- docker/backend/start.sh | 2 -- production/mempool-config.mainnet.json | 3 +-- production/mempool-config.signet.json | 3 +-- production/mempool-config.testnet.json | 3 +-- production/mempool-config.testnet4.json | 3 +-- 10 files changed, 10 insertions(+), 22 deletions(-) diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 93f66ca12..0ca5654a5 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -38,8 +38,7 @@ "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, "ALLOW_UNREACHABLE": true, "PRICE_UPDATES_PER_HOUR": 1, - "MAX_TRACKED_ADDRESSES": 1, - "MIN_RECOMMENDED_FEE": 1 + "MAX_TRACKED_ADDRESSES": 1 }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index bb21e8509..23b3dd346 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -51,8 +51,7 @@ describe('Mempool Backend Config', () => { MAX_PUSH_TX_SIZE_WEIGHT: 400000, ALLOW_UNREACHABLE: true, PRICE_UPDATES_PER_HOUR: 1, - MAX_TRACKED_ADDRESSES: 1, - MIN_RECOMMENDED_FEE: 1, + MAX_TRACKED_ADDRESSES: 1 }); expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true }); diff --git a/backend/src/api/fee-api.ts b/backend/src/api/fee-api.ts index 2a1a26efe..2edb8c0e4 100644 --- a/backend/src/api/fee-api.ts +++ b/backend/src/api/fee-api.ts @@ -17,7 +17,6 @@ interface RecommendedFees { class FeeApi { constructor() { } - defaultFee = isLiquid ? 0.1 : config.MEMPOOL.MIN_RECOMMENDED_FEE; minimumIncrement = isLiquid ? 0.1 : 1; public getRecommendedFee(): RecommendedFees { @@ -35,9 +34,9 @@ class FeeApi { return this.calculateRecommendedFee(pBlocks, mPool, minimum, 0.001); } - public calculateRecommendedFee(pBlocks: MempoolBlock[], mPool: IBitcoinApi.MempoolInfo, minimumRecommendation: number = this.defaultFee, minIncrement: number = this.minimumIncrement): RecommendedFees { + public calculateRecommendedFee(pBlocks: MempoolBlock[], mPool: IBitcoinApi.MempoolInfo, minimumRecommendation: number = 0, minIncrement: number = this.minimumIncrement): RecommendedFees { const purgeRate = this.roundUpToNearest(mPool.mempoolminfee * 100000, minIncrement); - const minimumFee = Math.max(purgeRate, minimumRecommendation, config.MEMPOOL.MIN_RECOMMENDED_FEE, minIncrement); + const minimumFee = Math.max(purgeRate, minimumRecommendation, minIncrement); if (!pBlocks.length) { return { @@ -76,7 +75,7 @@ class FeeApi { }; } - private optimizeMedianFee(pBlock: MempoolBlock, nextBlock: MempoolBlock | undefined, previousFee?: number, minFee: number = this.defaultFee, minIncrement: number = this.minimumIncrement): number { + private optimizeMedianFee(pBlock: MempoolBlock, nextBlock: MempoolBlock | undefined, previousFee: number | undefined, minFee: number, minIncrement: number = this.minimumIncrement): number { const useFee = previousFee ? (pBlock.medianFee + previousFee) / 2 : pBlock.medianFee; if (pBlock.blockVSize <= 500000 || pBlock.medianFee < minFee) { return minFee; diff --git a/backend/src/config.ts b/backend/src/config.ts index f3260e788..3fe3db2ee 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -43,7 +43,6 @@ interface IConfig { ALLOW_UNREACHABLE: boolean; PRICE_UPDATES_PER_HOUR: number; MAX_TRACKED_ADDRESSES: number; - MIN_RECOMMENDED_FEE: number; }; ESPLORA: { REST_API_URL: string; @@ -215,7 +214,6 @@ const defaults: IConfig = { 'ALLOW_UNREACHABLE': true, 'PRICE_UPDATES_PER_HOUR': 1, 'MAX_TRACKED_ADDRESSES': 1, - 'MIN_RECOMMENDED_FEE': 1, }, 'ESPLORA': { 'REST_API_URL': 'http://127.0.0.1:3000', diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 08b684f82..ee8e329a6 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -38,8 +38,7 @@ "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__", "POOLS_UPDATE_DELAY": __MEMPOOL_POOLS_UPDATE_DELAY__, "PRICE_UPDATES_PER_HOUR": __MEMPOOL_PRICE_UPDATES_PER_HOUR__, - "MAX_TRACKED_ADDRESSES": __MEMPOOL_MAX_TRACKED_ADDRESSES__, - "MIN_RECOMMENDED_FEE": __MEMPOOL_MIN_RECOMMENDED_FEE__ + "MAX_TRACKED_ADDRESSES": __MEMPOOL_MAX_TRACKED_ADDRESSES__ }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 88f4b3161..ae0bc616f 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -40,7 +40,6 @@ __MEMPOOL_MAX_PUSH_TX_SIZE_WEIGHT__=${MEMPOOL_MAX_PUSH_TX_SIZE_WEIGHT:=4000000} __MEMPOOL_ALLOW_UNREACHABLE__=${MEMPOOL_ALLOW_UNREACHABLE:=true} __MEMPOOL_PRICE_UPDATES_PER_HOUR__=${MEMPOOL_PRICE_UPDATES_PER_HOUR:=1} __MEMPOOL_MAX_TRACKED_ADDRESSES__=${MEMPOOL_MAX_TRACKED_ADDRESSES:=1} -__MEMPOOL_MIN_RECOMMENDED_FEE__=${MEMPOOL_MIN_RECOMMENDED_FEE:=1} # CORE_RPC __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} @@ -205,7 +204,6 @@ sed -i "s!__MEMPOOL_MAX_PUSH_TX_SIZE_WEIGHT__!${__MEMPOOL_MAX_PUSH_TX_SIZE_WEIGH sed -i "s!__MEMPOOL_ALLOW_UNREACHABLE__!${__MEMPOOL_ALLOW_UNREACHABLE__}!g" mempool-config.json sed -i "s!__MEMPOOL_PRICE_UPDATES_PER_HOUR__!${__MEMPOOL_PRICE_UPDATES_PER_HOUR__}!g" mempool-config.json sed -i "s!__MEMPOOL_MAX_TRACKED_ADDRESSES__!${__MEMPOOL_MAX_TRACKED_ADDRESSES__}!g" mempool-config.json -sed -i "s!__MEMPOOL_MIN_RECOMMENDED_FEE__!${__MEMPOOL_MIN_RECOMMENDED_FEE__}!g" mempool-config.json sed -i "s!__CORE_RPC_HOST__!${__CORE_RPC_HOST__}!g" mempool-config.json sed -i "s!__CORE_RPC_PORT__!${__CORE_RPC_PORT__}!g" mempool-config.json diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index 301bd0f3f..87f58f916 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -23,8 +23,7 @@ "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, "ALLOW_UNREACHABLE": true, "PRICE_UPDATES_PER_HOUR": 12, - "MAX_TRACKED_ADDRESSES": 10, - "MIN_RECOMMENDED_TX_FEE": 0.1 + "MAX_TRACKED_ADDRESSES": 10 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.signet.json b/production/mempool-config.signet.json index d4c45d133..952845ae9 100644 --- a/production/mempool-config.signet.json +++ b/production/mempool-config.signet.json @@ -16,8 +16,7 @@ "DISK_CACHE_BLOCK_INTERVAL": 1, "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, "ALLOW_UNREACHABLE": true, - "MAX_TRACKED_ADDRESSES": 10, - "MIN_RECOMMENDED_TX_FEE": 0.1 + "MAX_TRACKED_ADDRESSES": 10 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.testnet.json b/production/mempool-config.testnet.json index 54be5c20e..5f9f3abb9 100644 --- a/production/mempool-config.testnet.json +++ b/production/mempool-config.testnet.json @@ -16,8 +16,7 @@ "DISK_CACHE_BLOCK_INTERVAL": 1, "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, "ALLOW_UNREACHABLE": true, - "MAX_TRACKED_ADDRESSES": 10, - "MIN_RECOMMENDED_TX_FEE": 0.1 + "MAX_TRACKED_ADDRESSES": 10 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.testnet4.json b/production/mempool-config.testnet4.json index 98f255c68..2e79309ed 100644 --- a/production/mempool-config.testnet4.json +++ b/production/mempool-config.testnet4.json @@ -16,8 +16,7 @@ "DISK_CACHE_BLOCK_INTERVAL": 1, "MAX_PUSH_TX_SIZE_WEIGHT": 4000000, "ALLOW_UNREACHABLE": true, - "MAX_TRACKED_ADDRESSES": 10, - "MIN_RECOMMENDED_FEE": 0.1 + "MAX_TRACKED_ADDRESSES": 10 }, "SYSLOG" : { "MIN_PRIORITY": "debug"