sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-01-27 02:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cormorant: skip waiting for ibd to complete when networkactive is false

Browse source
This commit is contained in:
Craig Raw 2025-01-14 14:15:44 +02:00
parent d07a5f0a01
commit bd0aca66b5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java
View file

@ -114,7 +114,7 @@ public class BitcoindClient {
tip = blockHeader.getBlockHeader(); tip = blockHeader.getBlockHeader();
timer.schedule(new PollTask(), 5000, 5000); timer.schedule(new PollTask(), 5000, 5000);
if(blockchainInfo.initialblockdownload()) { if(blockchainInfo.initialblockdownload() && networkInfo.networkactive()) {
syncingLock.lock(); syncingLock.lock();
try { try {
syncing = true; syncing = true;

2
src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/NetworkInfo.java
View file

@ -3,6 +3,6 @@ package com.sparrowwallet.sparrow.net.cormorant.bitcoind;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public record NetworkInfo(int version, String subversion) { public record NetworkInfo(int version, String subversion, boolean networkactive) {
} }

2
src/main/java/com/sparrowwallet/sparrow/net/cormorant/electrum/ElectrumServerService.java
View file

@ -45,7 +45,7 @@ public class ElectrumServerService {
@JsonRpcMethod("server.banner") @JsonRpcMethod("server.banner")
public String getServerBanner() { public String getServerBanner() {
return Cormorant.SERVER_NAME + " " + SparrowWallet.APP_VERSION + "\n" + bitcoindClient.getNetworkInfo().subversion(); return Cormorant.SERVER_NAME + " " + SparrowWallet.APP_VERSION + "\n" + bitcoindClient.getNetworkInfo().subversion() + (bitcoindClient.getNetworkInfo().networkactive() ? "" : " (disconnected)");
} }
@JsonRpcMethod("blockchain.estimatefee") @JsonRpcMethod("blockchain.estimatefee")