Skip to content

Commit

Permalink
Merge pull request #6 from mu373/optional-electrum-panel
Browse files Browse the repository at this point in the history
Make Electrum panel optional
  • Loading branch information
mu373 authored May 17, 2024
2 parents 47e70ef + 583cfb1 commit 2ff82d7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 17 deletions.
10 changes: 7 additions & 3 deletions .env.local.sample
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# bitcoind config
# ===== bitcoind config =====
RPC_USER=username
RPC_PASSWORD=password
# BITCOIND_HOST should be your service name for your bitcoind Docker container
# BITCOIND_HOST should be your service name for your bitcoind Docker container
BITCOIND_HOST=bitcoind
BITCOIND_PORT=8332
# ELECTRUM_HOST should be your service name for your Electrum Server (e.g. electrs) Docker container

# ===== Electrum config =====
# Set ENABLE_ELECTRUM_PANEL to TRUE if you would like to show Electrum panel.
ENABLE_ELECTRUM_PANEL=TRUE
# ELECTRUM_HOST should be your service name for your Electrum Server (e.g. electrs) Docker container
ELECTRUM_HOST=electrs
ELECTRUM_PORT=50001
35 changes: 21 additions & 14 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export async function getServerSideProps() {
connectionInCount: 0,
connectionOutCount: 0,
enableElectrumPanel: process.env.ENABLE_ELECTRUM_PANEL === 'TRUE',
electrumHost: process.env.ELECTRUM_HOST,
electrumPort: process.env.ELECTRUM_PORT,
electrumHost: '',
electrumPort: 0,
electrumVersion: null,
electrumBlockHeight: null,
};
Expand Down Expand Up @@ -99,20 +99,27 @@ export async function getServerSideProps() {
console.error('Error fetching mempool info:', error);
}

try {
const electrumVersion = await getElectrumVersion();
props.electrumVersion = electrumVersion;
} catch (error) {
console.error('Error fetching Electrum version:', error);
}
if (props.enableElectrumPanel) {

try {
const electrumBlockHeight = await getElectrumBlockHeight();
props.electrumBlockHeight = electrumBlockHeight;
} catch (error) {
console.error('Error fetching Electrum block height:', error);
props.electrumHost = String(process.env.ELECTRUM_HOST);
props.electrumPort = Number(process.env.ELECTRUM_PORT);

try {
const electrumVersion = await getElectrumVersion();
props.electrumVersion = electrumVersion;
} catch (error) {
console.error('Error fetching Electrum version:', error);
}

try {
const electrumBlockHeight = await getElectrumBlockHeight();
props.electrumBlockHeight = electrumBlockHeight;
} catch (error) {
console.error('Error fetching Electrum block height:', error);
}
}


return { props };
}

Expand Down Expand Up @@ -155,7 +162,7 @@ const BlockInfo: React.FC<any> = (props) => {

<NodePanel data={props}></NodePanel>

<ElectrumPanel data={props}></ElectrumPanel>
{ enableElectrumPanel && <ElectrumPanel data={props}></ElectrumPanel> }

</div>
</div>
Expand Down

0 comments on commit 2ff82d7

Please sign in to comment.