Skip to content

init main wallet with connection applied in same thread #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

init main wallet with connection applied in same thread #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/main/java/haveno/core/offer/OpenOfferManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,7 +1952,6 @@ public void onFault(String errorMessage) {
///////////////////////////////////////////////////////////////////////////////////////////

private void maybeUpdatePersistedOffers() {
// We need to clone to avoid ConcurrentModificationException
List<OpenOffer> openOffersClone = getOpenOffers();
openOffersClone.forEach(originalOpenOffer -> {
Offer originalOffer = originalOpenOffer.getOffer();
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/haveno/core/xmr/wallet/XmrWalletBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public abstract class XmrWalletBase {

// private
private boolean testReconnectOnStartup = false; // test reconnecting on startup while syncing so the wallet is blocked
private String testReconnectMonerod1 = "http://node.community.rino.io:18081";
private String testReconnectMonerod1 = "http://xmr-node.cakewallet.com:18081";
private String testReconnectMonerod2 = "http://nodex.monerujo.io:18081";

public XmrWalletBase() {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,8 +1467,8 @@ private void doMaybeInitMainWallet(boolean sync, int numSyncAttempts) {
log.info("Monero wallet unlocked balance={}, pending balance={}, total balance={}", unlockedBalance, balance.subtract(unlockedBalance), balance);
}

// reapply connection after wallet synced (might reinitialize wallet on new thread)
ThreadUtils.execute(() -> onConnectionChanged(xmrConnectionService.getConnection()), THREAD_ID);
// reapply connection after wallet synced (might reinitialize wallet with proxy)
onConnectionChanged(xmrConnectionService.getConnection());

// reset internal state if main wallet was swapped
resetIfWalletChanged();
Expand Down
Loading