From 71402f21c602c485c5dd8d28b91a13ce485676ff Mon Sep 17 00:00:00 2001 From: Antoni Spaanderman <56turtle56@gmail.com> Date: Tue, 8 Mar 2022 19:59:18 +0100 Subject: [PATCH] revert "add network regtest" 1f0ae60 --- backend/src/config.ts | 2 +- frontend/mempool-frontend-config.sample.json | 1 - frontend/src/app/app-routing.module.ts | 78 ------------------- .../components/amount/amount.component.html | 3 +- .../bisq-master-page.component.html | 3 +- .../bisq-master-page.component.scss | 4 - .../blockchain-blocks.component.ts | 1 - .../liquid-master-page.component.html | 3 +- .../liquid-master-page.component.scss | 4 - .../master-page/master-page.component.html | 3 +- .../master-page/master-page.component.scss | 4 - frontend/src/app/services/seo.service.ts | 2 - frontend/src/app/services/state.service.ts | 10 +-- frontend/src/resources/regtest-logo.png | 1 - frontend/src/styles.scss | 8 -- 15 files changed, 6 insertions(+), 121 deletions(-) delete mode 120000 frontend/src/resources/regtest-logo.png diff --git a/backend/src/config.ts b/backend/src/config.ts index fbadd8e7f..97c3bb32a 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -2,7 +2,7 @@ const configFile = require('../mempool-config.json'); interface IConfig { MEMPOOL: { - NETWORK: 'mainnet' | 'testnet' | 'signet' | 'regtest' | 'liquid' | 'liquidtestnet'; + NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid' | 'liquidtestnet'; BACKEND: 'esplora' | 'electrum' | 'none'; HTTP_PORT: number; SPAWN_CLUSTER_PROCS: number; diff --git a/frontend/mempool-frontend-config.sample.json b/frontend/mempool-frontend-config.sample.json index aabf5b016..231f1c7c8 100644 --- a/frontend/mempool-frontend-config.sample.json +++ b/frontend/mempool-frontend-config.sample.json @@ -1,7 +1,6 @@ { "TESTNET_ENABLED": false, "SIGNET_ENABLED": false, - "REGTEST_ENABLED": false, "LIQUID_ENABLED": false, "LIQUID_TESTNET_ENABLED": false, "BISQ_ENABLED": false, diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 352a4fbe0..19285fc8f 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -363,84 +363,6 @@ let routes: Routes = [ }, ] }, - { - path: 'regtest', - children: [ - { - path: '', - component: MasterPageComponent, - children: [ - { - path: 'tx/push', - component: PushTransactionComponent, - }, - { - path: '', - component: StartComponent, - children: [ - { - path: '', - component: DashboardComponent - }, - { - path: 'tx/:id', - component: TransactionComponent - }, - { - path: 'block/:id', - component: BlockComponent - }, - { - path: 'mempool-block/:id', - component: MempoolBlockComponent - }, - ], - }, - { - path: 'blocks', - component: LatestBlocksComponent, - }, - { - path: 'graphs', - component: StatisticsComponent, - }, - { - path: 'address/:id', - children: [], - component: AddressComponent - }, - { - path: 'docs/api/:type', - component: DocsComponent - }, - { - path: 'docs/api', - redirectTo: 'docs/api/rest' - }, - { - path: 'docs', - redirectTo: 'docs/api/rest' - }, - { - path: 'api', - redirectTo: 'docs/api/rest' - }, - ], - }, - { - path: 'tv', - component: TelevisionComponent - }, - { - path: 'status', - component: StatusViewComponent - }, - { - path: '**', - redirectTo: '' - }, - ] - }, { path: 'tv', component: TelevisionComponent, diff --git a/frontend/src/app/components/amount/amount.component.html b/frontend/src/app/components/amount/amount.component.html index a3e9ea453..07f669a81 100644 --- a/frontend/src/app/components/amount/amount.component.html +++ b/frontend/src/app/components/amount/amount.component.html @@ -10,7 +10,6 @@ L- tL- t - s - rBTC + sBTC diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html index b063ec42a..cacd38f39 100644 --- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html +++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html @@ -10,7 +10,7 @@ -
+
@@ -18,7 +18,6 @@ Mainnet Signet Testnet - Regtest
Layer 2 Networks
Liquid diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss index bc7c46da7..fabb9e0e9 100644 --- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss +++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss @@ -114,10 +114,6 @@ nav { background-color: #6f1d5d; } -.regtest.active { - background-color: #6f1d5d; -} - .dropdown-divider { border-top: 1px solid #121420; } diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index ed866e571..4352944c6 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -41,7 +41,6 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { 'liquidtestnet': ['#494a4a', '#272e46'], testnet: ['#1d486f', '#183550'], signet: ['#6f1d5d', '#471850'], - regtest: ['#6f1d5d', '#471850'], }; constructor( diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index 9ac3ab5f0..a8d2987a1 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -11,7 +11,7 @@ -
+
@@ -19,7 +19,6 @@ Mainnet Signet Testnet - Regtest
Layer 2 Networks
Bisq diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss index 0bdb5a113..fefa1dd95 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss @@ -114,10 +114,6 @@ nav { background-color: #6f1d5d; } -.regtest.active { - background-color: #6f1d5d; -} - .dropdown-divider { border-top: 1px solid #121420; } diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 322318f30..28db64bbd 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -11,7 +11,7 @@ -
+
@@ -19,7 +19,6 @@ -
Layer 2 Networks
Bisq Liquid diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 78508c606..c2a57432d 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -122,10 +122,6 @@ nav { background-color: #6f1d5d; } -.regtest.active { - background-color: #6f1d5d; -} - .dropdown-divider { border-top: 1px solid #121420; } diff --git a/frontend/src/app/services/seo.service.ts b/frontend/src/app/services/seo.service.ts index 452105dce..fb47b0dc8 100644 --- a/frontend/src/app/services/seo.service.ts +++ b/frontend/src/app/services/seo.service.ts @@ -31,8 +31,6 @@ export class SeoService { return 'mempool - Bitcoin Testnet'; if (this.network === 'signet') return 'mempool - Bitcoin Signet'; - if (this.network === 'regtest') - return 'mempool - Bitcoin Regtest'; if (this.network === 'liquid') return 'mempool - Liquid Network'; if (this.network === 'liquidtestnet') diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 1985cb5c0..5e181063b 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -18,7 +18,6 @@ export interface ILoadingIndicators { [name: string]: number; } export interface Env { TESTNET_ENABLED: boolean; SIGNET_ENABLED: boolean; - REGTEST_ENABLED: boolean; LIQUID_ENABLED: boolean; LIQUID_TESTNET_ENABLED: boolean; BISQ_ENABLED: boolean; @@ -43,7 +42,6 @@ export interface Env { const defaultEnv: Env = { 'TESTNET_ENABLED': false, 'SIGNET_ENABLED': false, - 'REGTEST_ENABLED': false, 'LIQUID_ENABLED': false, 'LIQUID_TESTNET_ENABLED': false, 'BASE_MODULE': 'mempool', @@ -141,7 +139,7 @@ export class StateService { if (this.env.BASE_MODULE !== 'mempool' && this.env.BASE_MODULE !== 'liquid') { return; } - const networkMatches = url.match(/\/(bisq|testnet|liquidtestnet|liquid|signet|regtest)/); + const networkMatches = url.match(/\/(bisq|testnet|liquidtestnet|liquid|signet)/); switch (networkMatches && networkMatches[1]) { case 'liquid': if (this.network !== 'liquid') { @@ -161,12 +159,6 @@ export class StateService { this.networkChanged$.next('signet'); } return; - case 'regtest': - if (this.network !== 'regtest') { - this.network = 'regtest'; - this.networkChanged$.next('regtest'); - } - return; case 'testnet': if (this.network !== 'testnet') { if (this.env.BASE_MODULE === 'liquid') { diff --git a/frontend/src/resources/regtest-logo.png b/frontend/src/resources/regtest-logo.png deleted file mode 120000 index 15dd20db0..000000000 --- a/frontend/src/resources/regtest-logo.png +++ /dev/null @@ -1 +0,0 @@ -signet-logo.png \ No newline at end of file diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index ecbf005f8..66b44518d 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -100,10 +100,6 @@ body { background-color: #6f1d5d !important; } -.navbar-nav.regtest > .active { - background-color: #6f1d5d !important; -} - .navbar-nav.liquidtestnet > .active { background-color: #494a4a !important; } @@ -642,10 +638,6 @@ h1, h2, h3 { background: repeating-linear-gradient(to right, #2d3348, #2d3348 0%, #6f1d5d 0%, #471850 100%); } -.progress-mempool.regtest { - background: repeating-linear-gradient(to right, #2d3348, #2d3348 0%, #6f1d5d 0%, #471850 100%); -} - .progress-mempool.liquid { background: repeating-linear-gradient(to right, #2d3348, #2d3348 0%, #116761 0%, #183550 100%); }