Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 23:03:04 +00:00
Code Issues Projects Releases Wiki Activity

WalletAppKit: Configure the peergroup with candidate peers before adding wallet extensions, as payment channel state can attempt to broadcast a transaction as soon as the state is loaded/instantiated. This ensures the number of min peers required for broadcast is correct at that point.

Browse Source
This commit is contained in:
Mike Hearn 2013-07-24 13:56:12 +02:00
parent a1daaa73be
commit 2a635317c3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
View File

@ -98,7 +98,14 @@ public class WalletAppKit extends AbstractIdleService {
vStore = new SPVBlockStore(params, vChainFile); vStore = new SPVBlockStore(params, vChainFile);
vChain = new BlockChain(params, vStore); vChain = new BlockChain(params, vStore);
vPeerGroup = new PeerGroup(params, vChain); vPeerGroup = new PeerGroup(params, vChain);
// Set up peer addresses or discovery first, so if wallet extensions try to broadcast a transaction
// before we're actually connected the broadcast waits for an appropriate number of connections.
if (vPeerAddresses != null) {
for (PeerAddress addr : vPeerAddresses) vPeerGroup.addAddress(addr);
vPeerAddresses = null;
} else {
vPeerGroup.addPeerDiscovery(new DnsDiscovery(params));
}
if (vWalletFile.exists()) { if (vWalletFile.exists()) {
walletStream = new FileInputStream(vWalletFile); walletStream = new FileInputStream(vWalletFile);
vWallet = new Wallet(params); vWallet = new Wallet(params);
@ -113,12 +120,6 @@ public class WalletAppKit extends AbstractIdleService {
if (vUseAutoSave) vWallet.autosaveToFile(vWalletFile, 1, TimeUnit.SECONDS, null); if (vUseAutoSave) vWallet.autosaveToFile(vWalletFile, 1, TimeUnit.SECONDS, null);
vChain.addWallet(vWallet); vChain.addWallet(vWallet);
vPeerGroup.addWallet(vWallet); vPeerGroup.addWallet(vWallet);
if (vPeerAddresses != null) {
for (PeerAddress addr : vPeerAddresses) vPeerGroup.addAddress(addr);
vPeerAddresses = null;
} else {
vPeerGroup.addPeerDiscovery(new DnsDiscovery(params));
}
vPeerGroup.startAndWait(); vPeerGroup.startAndWait();
vPeerGroup.downloadBlockChain(); vPeerGroup.downloadBlockChain();
// Make sure we shut down cleanly. // Make sure we shut down cleanly.