machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into simon/remove-included-in-block

Browse Source
This commit is contained in:
wiz 2023-02-20 17:28:05 +09:00 committed by GitHub
commit df578f64ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/api/blocks.ts
View File

@ -600,9 +600,11 @@ class Blocks {
* Index a block if it's missing from the database. Returns the block after indexing * Index a block if it's missing from the database. Returns the block after indexing
*/ */
public async $indexBlock(height: number): Promise<BlockExtended> { public async $indexBlock(height: number): Promise<BlockExtended> {
const dbBlock = await blocksRepository.$getBlockByHeight(height); if (Common.indexingEnabled()) {
if (dbBlock != null) { const dbBlock = await blocksRepository.$getBlockByHeight(height);
return prepareBlock(dbBlock); if (dbBlock !== null) {
return prepareBlock(dbBlock);
}
} }
const blockHash = await bitcoinApi.$getBlockHash(height); const blockHash = await bitcoinApi.$getBlockHash(height);

6
frontend/src/app/components/blocks-list/blocks-list.component.html
View File

@ -123,8 +123,10 @@
(pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false"> (pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false">
</ngb-pagination> </ngb-pagination>
<div class="clearfix"></div> <ng-template [ngIf]="!widget">
<br> <div class="clearfix"></div>
<br>
</ng-template>
</div> </div>
</div> </div>

3
frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
View File

@ -103,6 +103,5 @@
</div> </div>
<br> <br>
</div>
<br> </div>

2
production/mempool-build-all
View File

@ -106,7 +106,7 @@ build_backend()
-e "s!__MEMPOOL_SIGNET_LIGHTNING_PASS__!${MEMPOOL_SIGNET_LIGHTNING_PASS}!" \ -e "s!__MEMPOOL_SIGNET_LIGHTNING_PASS__!${MEMPOOL_SIGNET_LIGHTNING_PASS}!" \
-e "s!__MEMPOOL_LIQUID_USER__!${MEMPOOL_LIQUID_USER}!" \ -e "s!__MEMPOOL_LIQUID_USER__!${MEMPOOL_LIQUID_USER}!" \
-e "s!__MEMPOOL_LIQUID_PASS__!${MEMPOOL_LIQUID_PASS}!" \ -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_LIQUIDTESTNET_PASS__!${MEMPOOL_LIQUIDTESTNET_PASS}!" \
-e "s!__MEMPOOL_BISQ_USER__!${MEMPOOL_BISQ_USER}!" \ -e "s!__MEMPOOL_BISQ_USER__!${MEMPOOL_BISQ_USER}!" \
-e "s!__MEMPOOL_BISQ_PASS__!${MEMPOOL_BISQ_PASS}!" \ -e "s!__MEMPOOL_BISQ_PASS__!${MEMPOOL_BISQ_PASS}!" \

2
production/mempool-config.mainnet-lightning.json
View File

@ -45,6 +45,6 @@
"PORT": 3306, "PORT": 3306,
"USERNAME": "__MEMPOOL_MAINNET_LIGHTNING_USER__", "USERNAME": "__MEMPOOL_MAINNET_LIGHTNING_USER__",
"PASSWORD": "__MEMPOOL_MAINNET_LIGHTNING_PASS__", "PASSWORD": "__MEMPOOL_MAINNET_LIGHTNING_PASS__",
"PASSWORD": "mempool_mainnet_lightning" "DATABASE": "mempool_mainnet_lightning"
} }
} }