Skip to content
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

Jump to bottom

Resolve issues found in reviewed PRs 4699, 4703, 4711 [, ...] #4731

Merged
merged 20 commits into from Nov 2, 2020
Merged

Resolve issues found in reviewed PRs 4699, 4703, 4711 [, ...] #4731

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a3631a0
Implement api methods 'keepfunds', 'withdrawfunds'
ghubstan Oct 26, 2020
f1db254
Make formatSatoshis visible for testing
ghubstan Oct 27, 2020
b8ae566
Add method for printing current jupiter test name
ghubstan Oct 27, 2020
1e25be5
Test trade closing api methods 'keepfunds' withdrawfunds'
ghubstan Oct 27, 2020
2746b27
Fix apitest dummy payment acct init bug
ghubstan Oct 27, 2020
027a7d5
Stub out canceloffer api method
ghubstan Oct 27, 2020
0f1d4f8
Fix typo
ghubstan Oct 27, 2020
b38507c
Implement api method 'canceloffer'
ghubstan Oct 27, 2020
91a2e2c
Add canceloffer test
ghubstan Oct 27, 2020
8e51e1e
Upgrade jupiterVersion = '5.7.0'
ghubstan Oct 28, 2020
d6524bf
Improve apitest cmd line console logging
ghubstan Oct 28, 2020
2a05203
Remove dead code
ghubstan Oct 28, 2020
f61f148
Refactor api test fixture setup
ghubstan Oct 28, 2020
e8e55d2
Remove redundant ScenarioTest superclass
ghubstan Oct 28, 2020
c2f8db3
Reduce apitest case execution time
ghubstan Oct 28, 2020
0656c57
Add null checks in PendingTradesViewModel
ghubstan Oct 30, 2020
f764e9f
Simplify TradeUtil#getPaymentMethodNameWithCountryCode
ghubstan Oct 30, 2020
3cd3bf0
Fix grammar / typo
ghubstan Oct 30, 2020
c27d5a6
Use Bisq's timer in API's 'unlockwallet timeout(s)'
ghubstan Oct 31, 2020
fcdfc68
Verify closedTradableManager.getTradableById return value is a Trade …
ghubstan Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 17 additions & 23 deletions core/src/main/java/bisq/core/api/CoreWalletsService.java
View file
Open in desktop
Expand Up @@ -23,6 +23,9 @@
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;

import bisq.common.Timer;
import bisq.common.UserThread;

import org.bitcoinj.core.Address;
import org.bitcoinj.core.TransactionConfidence;
import org.bitcoinj.crypto.KeyCrypterScrypt;
Expand All @@ -37,8 +40,6 @@

import java.util.List;
import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
import java.util.function.Function;
import java.util.stream.Collectors;

Expand All @@ -57,7 +58,7 @@ class CoreWalletsService {
private final BtcWalletService btcWalletService;

@Nullable
private TimerTask lockTask;
private Timer lockTimer;

@Nullable
private KeyParameter tempAesKey;
Expand Down Expand Up @@ -190,29 +191,22 @@ void unlockWallet(String password, long timeout) {
if (!walletsManager.checkAESKey(tempAesKey))
throw new IllegalStateException("incorrect password");

if (lockTask != null) {
// The user is overriding a prior unlock timeout. Cancel the existing
// lock TimerTask to prevent it from calling lockWallet() before or after the
// new timer task does.
lockTask.cancel();
// Avoid the synchronized(lock) overhead of an unnecessary lockTask.cancel()
// call the next time 'unlockwallet' is called.
lockTask = null;
if (lockTimer != null) {
// The user has called unlockwallet again, before the prior unlockwallet
// timeout has expired. He's overriding it with a new timeout value.
// Remove the existing lock timer to prevent it from calling lockwallet
// before or after the new one does.
lockTimer.stop();
lockTimer = null;
}

lockTask = new TimerTask() {
@Override
public void run() {
if (tempAesKey != null) {
// Do not try to lock wallet after timeout if the user has already
// done so via 'lockwallet'
log.info("Locking wallet after {} second timeout expired.", timeout);
tempAesKey = null;
}
lockTimer = UserThread.runAfter(() -> {
if (tempAesKey != null) {
// The unlockwallet timeout has expired; re-lock the wallet.
log.info("Locking wallet after {} second timeout expired.", timeout);
tempAesKey = null;
}
};
Timer timer = new Timer("Lock Wallet Timer");
timer.schedule(lockTask, SECONDS.toMillis(timeout));
}, timeout, SECONDS);
}

// Provided for automated wallet protection method testing, despite the
Expand Down