From 4bac01aad2b21c7ef355c2541e8d26fde66c098d Mon Sep 17 00:00:00 2001 From: Sam Holmes Date: Wed, 22 Jan 2025 15:33:26 -0800 Subject: [PATCH 1/3] Remove unused entry-point files --- src/bch.ts | 15 --------------- src/bsv.ts | 15 --------------- src/btc.ts | 15 --------------- src/firo.ts | 15 --------------- src/ftc.ts | 15 --------------- src/ltc.ts | 15 --------------- src/tbch.ts | 15 --------------- src/tbtc.ts | 15 --------------- src/tbtg.ts | 15 --------------- 9 files changed, 135 deletions(-) delete mode 100644 src/bch.ts delete mode 100644 src/bsv.ts delete mode 100644 src/btc.ts delete mode 100644 src/firo.ts delete mode 100644 src/ftc.ts delete mode 100644 src/ltc.ts delete mode 100644 src/tbch.ts delete mode 100644 src/tbtc.ts delete mode 100644 src/tbtg.ts diff --git a/src/bch.ts b/src/bch.ts deleted file mode 100644 index 8755948e..00000000 --- a/src/bch.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcoincash' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/bsv.ts b/src/bsv.ts deleted file mode 100644 index 8059f176..00000000 --- a/src/bsv.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcoinsv' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/btc.ts b/src/btc.ts deleted file mode 100644 index 2f457c1c..00000000 --- a/src/btc.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcoin' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/firo.ts b/src/firo.ts deleted file mode 100644 index 3f7878d7..00000000 --- a/src/firo.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/zcoin' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/ftc.ts b/src/ftc.ts deleted file mode 100644 index 8e609204..00000000 --- a/src/ftc.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/feathercoin' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/ltc.ts b/src/ltc.ts deleted file mode 100644 index 127d8325..00000000 --- a/src/ltc.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/litecoin' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/tbch.ts b/src/tbch.ts deleted file mode 100644 index d6b432ce..00000000 --- a/src/tbch.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcoincashtestnet' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/tbtc.ts b/src/tbtc.ts deleted file mode 100644 index 6f0ee210..00000000 --- a/src/tbtc.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcointestnet' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin diff --git a/src/tbtg.ts b/src/tbtg.ts deleted file mode 100644 index 2c8a9869..00000000 --- a/src/tbtg.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types' - -import { makeCurrencyPlugin } from './common/plugin/CurrencyPlugin' -import { info } from './common/utxobased/info/bitcoingoldtestnet' - -const plugin = (options: EdgeCorePluginOptions): EdgeCurrencyPlugin => - makeCurrencyPlugin(options, info) - -if (typeof window !== 'undefined') { - window.addEdgeCorePlugins?.({ - [info.currencyInfo.pluginId]: plugin - }) -} - -export default plugin From 5664b6ecc11527fe5bca3ba4de54f928a86d7f40 Mon Sep 17 00:00:00 2001 From: Sam Holmes Date: Wed, 22 Jan 2025 15:33:34 -0800 Subject: [PATCH 2/3] Remove missing servers for internal servers list --- CHANGELOG.md | 2 ++ src/common/plugin/PluginState.ts | 12 +++++++++++- src/common/plugin/ServerScores.ts | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cca84d57..b837acf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- changed: Remove Blockbook servers from persisted internal servers list when updating this list from payload/default servers. + ## 3.5.0 (2025-01-15) - added: Implement `updateInfoPayload` for `EdgeCurrencyEngine` to get currency info updates from info-server. diff --git a/src/common/plugin/PluginState.ts b/src/common/plugin/PluginState.ts index d5e5aa0b..251f1d59 100644 --- a/src/common/plugin/PluginState.ts +++ b/src/common/plugin/PluginState.ts @@ -183,6 +183,8 @@ export function makePluginState(settings: PluginStateSettings): PluginState { }, async refreshServers(updatedCustomServers?: string[]): Promise { + const serverList = getSelectedServerList() + let newServers: string[] if (serverCache.enableCustomServers) { newServers = @@ -200,9 +202,17 @@ export function makePluginState(settings: PluginStateSettings): PluginState { infoPayloadServers : // Use the default servers from info file as final fallback defaultSettings.blockbookServers + + // Remove any server that's not included in the internal servers list. + // This is so we can control removal of poor servers from the + // info-server in real-time. + const missingServers = Object.keys(serverList).filter( + server => !newServers.includes(server) + ) + serverScores.removeServers(serverList, missingServers) } - serverScores.serverScoresLoad(getSelectedServerList(), newServers) + serverScores.serverScoresLoad(serverList, newServers) await saveServerCache() // Tell the engines about the new servers: diff --git a/src/common/plugin/ServerScores.ts b/src/common/plugin/ServerScores.ts index ad1ab4d9..6617ae28 100644 --- a/src/common/plugin/ServerScores.ts +++ b/src/common/plugin/ServerScores.ts @@ -343,4 +343,11 @@ export class ServerScores { return selectedServers } + + removeServers(servers: ServerList, serverUrls: string[]): void { + for (const serverUrl of serverUrls) { + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete servers[serverUrl] + } + } } From 3b65d2f0fbc2284842925043892657dd9efb41bb Mon Sep 17 00:00:00 2001 From: Sam Holmes Date: Mon, 20 Jan 2025 14:48:11 -0800 Subject: [PATCH 3/3] Remove firo.org blockbook server from default settings --- CHANGELOG.md | 1 + src/common/utxobased/info/zcoin.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b837acf6..9b17d29a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - changed: Remove Blockbook servers from persisted internal servers list when updating this list from payload/default servers. +- fixed: Remove blockbook.firo.org Blockbook server form default Blockbook server list. ## 3.5.0 (2025-01-15) diff --git a/src/common/utxobased/info/zcoin.ts b/src/common/utxobased/info/zcoin.ts index 706257a0..0d314078 100644 --- a/src/common/utxobased/info/zcoin.ts +++ b/src/common/utxobased/info/zcoin.ts @@ -32,7 +32,7 @@ export const currencyInfo: EdgeCurrencyInfo = { defaultSettings: { customFeeSettings: ['satPerByte'], blockbookServers: [ - 'wss://blockbook.firo.org', + // 'wss://blockbook.firo.org', 'wss://firo-wusa1.edge.app', 'wss://firo.nownodes.io/wss/%{nowNodesApiKey}' ],