nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-12-11 20:33:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

add second seed node

Browse Source
This commit is contained in:
woodser 2023-05-31 17:14:42 -04:00
parent a70fd2b18c
commit 92fb41fffa
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -122,6 +122,15 @@ seednode-local:
--appName=haveno-XMR_LOCAL_Seed_2002 \ --appName=haveno-XMR_LOCAL_Seed_2002 \
--xmrNode=http://localhost:28081 \ --xmrNode=http://localhost:28081 \
seednode2-local:
./haveno-seednode$(APP_EXT) \
--baseCurrencyNetwork=XMR_LOCAL \
--useLocalhostForP2P=true \
--useDevPrivilegeKeys=true \
--nodePort=2003 \
--appName=haveno-XMR_LOCAL_Seed_2003 \
--xmrNode=http://localhost:28081 \
arbitrator-daemon-local: arbitrator-daemon-local:
# Arbitrator needs to be registered before making trades # Arbitrator needs to be registered before making trades
./haveno-daemon$(APP_EXT) \ ./haveno-daemon$(APP_EXT) \

29
core/src/main/java/haveno/core/trade/TradeManager.java
View File

@ -449,22 +449,23 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
xmrWalletService.setTradeManager(this); xmrWalletService.setTradeManager(this);
// process after all wallets initialized // process after all wallets initialized
if (HavenoUtils.havenoSetup == null) throw new IllegalStateException("HavenoSetup is null; is this an improperly registered seed node?"); if (HavenoUtils.havenoSetup != null) { // null for seednode
MonadicBinding<Boolean> walletsInitialized = EasyBind.combine(HavenoUtils.havenoSetup.getWalletInitialized(), persistedTradesInitialized, (a, b) -> a && b); MonadicBinding<Boolean> walletsInitialized = EasyBind.combine(HavenoUtils.havenoSetup.getWalletInitialized(), persistedTradesInitialized, (a, b) -> a && b);
walletsInitialized.subscribe((observable, oldValue, newValue) -> { walletsInitialized.subscribe((observable, oldValue, newValue) -> {
if (!newValue) return; if (!newValue) return;
// thaw unreserved outputs // thaw unreserved outputs
thawUnreservedOutputs(); thawUnreservedOutputs();
// reset any available funded address entries // reset any available funded address entries
xmrWalletService.getAddressEntriesForAvailableBalanceStream() xmrWalletService.getAddressEntriesForAvailableBalanceStream()
.filter(addressEntry -> addressEntry.getOfferId() != null) .filter(addressEntry -> addressEntry.getOfferId() != null)
.forEach(addressEntry -> { .forEach(addressEntry -> {
log.warn("Swapping pending {} entries at startup. offerId={}", addressEntry.getContext(), addressEntry.getOfferId()); log.warn("Swapping pending {} entries at startup. offerId={}", addressEntry.getContext(), addressEntry.getOfferId());
xmrWalletService.swapTradeEntryToAvailableEntry(addressEntry.getOfferId(), addressEntry.getContext()); xmrWalletService.swapTradeEntryToAvailableEntry(addressEntry.getOfferId(), addressEntry.getContext());
}); });
}); });
}
// notify that persisted trades initialized // notify that persisted trades initialized
persistedTradesInitialized.set(true); persistedTradesInitialized.set(true);

2
core/src/main/resources/xmr_local.seednodes
View File

@ -1,3 +1,3 @@
# nodeaddress.onion:port [(@owner,@backup)] # nodeaddress.onion:port [(@owner,@backup)]
localhost:2002 (@devtest1) localhost:2002 (@devtest1)
localhost:3002 (@devtest2) localhost:2003 (@devtest2)

2
core/src/main/resources/xmr_stagenet.seednodes
View File

@ -1,3 +1,3 @@
# nodeaddress.onion:port [(@owner)] # nodeaddress.onion:port [(@owner)]
dl57jitswby4yhzpqpu7pwq6iyqg2x6vkio73araparbftlqoqxhvqad.onion:2002 (@devtest1) dl57jitswby4yhzpqpu7pwq6iyqg2x6vkio73araparbftlqoqxhvqad.onion:2002 (@devtest1)
3cqlkowdu766sto5wrdqpntpsi7kezwkkakc532i6jeiyu7hha726ead.onion:3003 (@devtest1)