From 6229708dfdeb856570cf8152af974a8e83eec5a6 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sun, 19 Feb 2023 17:36:09 +0900
Subject: [PATCH 1/6] Fixes #3034
---
.../src/app/components/blocks-list/blocks-list.component.html | 4 ++--
.../lightning-dashboard/lightning-dashboard.component.html | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.html b/frontend/src/app/components/blocks-list/blocks-list.component.html
index ffb5f5f88..71b6b2be2 100644
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -123,8 +123,8 @@
(pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false">
-
-
+
+
diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
index 030019b3c..cb9dc6ecb 100644
--- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
+++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
@@ -102,7 +102,6 @@
Broadcast Transaction
-
From 761edbce9ae5c35baf9ff8071a4f5bce1f0145a2 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sun, 19 Feb 2023 19:08:29 +0900
Subject: [PATCH 2/6] Fix database usage when database is disabled
---
backend/src/api/blocks.ts | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 3f2a7b49e..d110186f5 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -600,9 +600,11 @@ class Blocks {
* Index a block if it's missing from the database. Returns the block after indexing
*/
public async $indexBlock(height: number): Promise {
- const dbBlock = await blocksRepository.$getBlockByHeight(height);
- if (dbBlock != null) {
- return prepareBlock(dbBlock);
+ if (Common.indexingEnabled()) {
+ const dbBlock = await blocksRepository.$getBlockByHeight(height);
+ if (dbBlock !== null) {
+ return prepareBlock(dbBlock);
+ }
}
const blockHash = await bitcoinApi.$getBlockHash(height);
From c1fc60e61e36a106052bbd642a3fb78662727692 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sun, 19 Feb 2023 19:30:55 +0900
Subject: [PATCH 3/6] Wrap duplicate ngIf into a ng-template
---
.../app/components/blocks-list/blocks-list.component.html | 6 ++++--
.../lightning-dashboard/lightning-dashboard.component.html | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.html b/frontend/src/app/components/blocks-list/blocks-list.component.html
index 71b6b2be2..83478c69b 100644
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -123,8 +123,10 @@
(pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false">
-
-
+
+
+
+
diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
index cb9dc6ecb..c12565d6d 100644
--- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
+++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
@@ -102,6 +102,6 @@
Broadcast Transaction
-
+
-
+
\ No newline at end of file
From 66d52c97739d32469a280d2fff0d9c8634035a85 Mon Sep 17 00:00:00 2001
From: nymkappa <9780671+nymkappa@users.noreply.github.com>
Date: Sun, 19 Feb 2023 20:43:51 +0900
Subject: [PATCH 4/6] Update blocks-list.component.html
---
.../src/app/components/blocks-list/blocks-list.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.html b/frontend/src/app/components/blocks-list/blocks-list.component.html
index 83478c69b..22c7e2e9d 100644
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -125,7 +125,7 @@
-
+
From ca15887e4b24d5e76fda4e9bada4216b70e748e4 Mon Sep 17 00:00:00 2001
From: wiz
Date: Mon, 20 Feb 2023 15:58:07 +0900
Subject: [PATCH 5/6] ops: Fix another typo in build script credentials sed
---
production/mempool-build-all | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/production/mempool-build-all b/production/mempool-build-all
index 491c3e0b5..aa764da7d 100755
--- a/production/mempool-build-all
+++ b/production/mempool-build-all
@@ -106,7 +106,7 @@ build_backend()
-e "s!__MEMPOOL_SIGNET_LIGHTNING_PASS__!${MEMPOOL_SIGNET_LIGHTNING_PASS}!" \
-e "s!__MEMPOOL_LIQUID_USER__!${MEMPOOL_LIQUID_USER}!" \
-e "s!__MEMPOOL_LIQUID_PASS__!${MEMPOOL_LIQUID_PASS}!" \
- -e "s!__MEMPOOL_LIQUIDTESTNET_USER__!${LIQUIDTESTNET_USER}!" \
+ -e "s!__MEMPOOL_LIQUIDTESTNET_USER__!${MEMPOOL_LIQUIDTESTNET_USER}!" \
-e "s!__MEMPOOL_LIQUIDTESTNET_PASS__!${MEMPOOL_LIQUIDTESTNET_PASS}!" \
-e "s!__MEMPOOL_BISQ_USER__!${MEMPOOL_BISQ_USER}!" \
-e "s!__MEMPOOL_BISQ_PASS__!${MEMPOOL_BISQ_PASS}!" \
From 85251fcd5c950ae00b292dc020092a96f2df9d77 Mon Sep 17 00:00:00 2001
From: wiz
Date: Mon, 20 Feb 2023 16:09:40 +0900
Subject: [PATCH 6/6] ops: Fix typo in mainnet lightning backend config
---
production/mempool-config.mainnet-lightning.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/production/mempool-config.mainnet-lightning.json b/production/mempool-config.mainnet-lightning.json
index a38509983..5bcadc584 100644
--- a/production/mempool-config.mainnet-lightning.json
+++ b/production/mempool-config.mainnet-lightning.json
@@ -45,6 +45,6 @@
"PORT": 3306,
"USERNAME": "__MEMPOOL_MAINNET_LIGHTNING_USER__",
"PASSWORD": "__MEMPOOL_MAINNET_LIGHTNING_PASS__",
- "PASSWORD": "mempool_mainnet_lightning"
+ "DATABASE": "mempool_mainnet_lightning"
}
}