Skip to content

Commit 62de9e9

Browse files
authored
core: poll wallet pool txs on startup (#2186)
1 parent e021715 commit 62de9e9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

core/src/main/java/haveno/core/trade/Trade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ public void initialize(ProcessModelServiceProvider serviceProvider) {
730730
if (isShutDownStarted) return;
731731
if (xmrConnectionService.isConnected()) {
732732
try {
733-
xmrWalletService.doPollWallet(true);
733+
xmrWalletService.doPollWallet();
734734
} catch (Exception e) {
735735
// use default error handling
736736
}
@@ -1905,7 +1905,7 @@ public void processBuyerPayout(String payoutTxId) {
19051905
// poll the main wallet
19061906
log.warn("Processing payout tx for {} {} by polling main wallet", getClass().getSimpleName(), getShortId());
19071907
try {
1908-
xmrWalletService.doPollWallet(true);
1908+
xmrWalletService.doPollWallet();
19091909
} catch (Exception e) {
19101910
// use default error handling
19111911
}

core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ private void initMainWallet() {
13661366
// attempt to sync wallet on startup or open application without syncing
13671367
for (int i = 0; i < MAX_SYNC_ATTEMPTS; i++) {
13681368
try {
1369-
doPollWallet(false);
1369+
doPollWallet();
13701370
break;
13711371
} catch (Exception e) {
13721372
if (isShutDownStarted) return;
@@ -1922,11 +1922,11 @@ private void pollWallet() {
19221922
synchronized (pollLock) {
19231923
if (pollInProgress) return;
19241924
}
1925-
doPollWallet(true);
1925+
doPollWallet();
19261926
}
19271927

19281928
@SuppressWarnings("unused")
1929-
public void doPollWallet(boolean getPoolTxs) {
1929+
public void doPollWallet() {
19301930

19311931
// skip polling after wallet service initialized until all domain services are initialized
19321932
if (isWalletServiceInitialized() && !HavenoUtils.isAllDomainServicesInitialized()) {
@@ -1995,9 +1995,7 @@ public void doPollWallet(boolean getPoolTxs) {
19951995
synchronized (HavenoUtils.getDaemonLock()) {
19961996
if (lastPollTxsTimestamp == 0) lastPollTxsTimestamp = System.currentTimeMillis(); // set initial timestamp
19971997
try {
1998-
MoneroTxQuery query = new MoneroTxQuery().setIncludeOutputs(true);
1999-
if (!getPoolTxs) query.setInTxPool(false);
2000-
cachedTxs = wallet.getTxs(query);
1998+
cachedTxs = wallet.getTxs(new MoneroTxQuery().setIncludeOutputs(true));
20011999
lastPollTxsTimestamp = System.currentTimeMillis();
20022000
} catch (Exception e) { // fetch from pool can fail
20032001
if (!isShutDownStarted && wallet == sourceWallet) {

0 commit comments

Comments
 (0)