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

Add rpc wallet protection endpoints #4214

Merged
merged 24 commits into from May 18, 2020
Merged

Add rpc wallet protection endpoints #4214

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
de50692
Add rpc wallet protection endpoints
ghubstan Apr 29, 2020
2096275
Handle unlockwallet parameter errors
ghubstan Apr 30, 2020
ca68d05
Add wallet protection methods to printHelp(opts)
ghubstan Apr 30, 2020
c5fcafb
Renamed tempWalletPassword -> tempLockWalletPassword
ghubstan Apr 30, 2020
2a9d1f6
Improve gRPC error handling
ghubstan May 1, 2020
c7a6c87
Refactor grpc wallet service
cbeams May 2, 2020
6334c54
Generalize gRPC exception message cleanup
cbeams May 3, 2020
163061a
Return long vs Tuple2 from CoreWalletService#getAvailableBalance
cbeams May 3, 2020
9164579
Return void vs Tuple2 from CoreWalletService#setWalletPassword
ghubstan May 3, 2020
feafd0c
Return void vs Tuple2 from CoreWalletService#removeWalletPassword
ghubstan May 3, 2020
ab17b67
Remove obsolete try/catch block in #setWalletPassword
cbeams May 3, 2020
ec2ee45
Return void vs Tuple2 from CoreWalletService#lockWallet
ghubstan May 3, 2020
3ef7286
Return void vs Tuple2 from CoreWalletService#unlockWallet
ghubstan May 3, 2020
f5a4ca5
Add missing return statement in CoreWalletService#setWalletPassword
ghubstan May 3, 2020
b0e5da8
Refactor setwalletpassword handling to eliminate duplication
cbeams May 4, 2020
d48f9eb
Tighten up error handling
cbeams May 4, 2020
9b156b8
Remove unlockwallet timeout variable initializer
ghubstan May 4, 2020
fbb025a
Factor out two small duplcated code blocks
ghubstan May 6, 2020
4262f29
Cache temp key and crypter scrypt in unlockwallet
ghubstan May 6, 2020
24248d4
Backup wallets after each encrypt/decrypt operation
ghubstan May 6, 2020
a79ae57
Cache aesKey in unlockwallet, clear it in lockwallet
ghubstan May 7, 2020
9178ad7
Fix unlockwallet timeout override bug
ghubstan May 13, 2020
d53cc38
Wrap comments at 90 chars
cbeams May 8, 2020
7f05f37
Remove unused import
cbeams May 18, 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
3 changes: 2 additions & 1 deletion core/src/main/java/bisq/core/grpc/CoreWalletService.java
View file
Open in desktop
Expand Up @@ -116,7 +116,8 @@ public void unlockWallet(String password, long timeout) {
@Override
public void run() {
if (tempAesKey != null) {
// Do not try to lock wallet after timeout if the user already has via 'lockwallet'.
// 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;
}
Expand Down
1 change: 0 additions & 1 deletion daemon/src/main/java/bisq/daemon/app/BisqDaemonMain.java
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
import bisq.core.app.BisqSetup;
import bisq.core.app.CoreModule;
import bisq.core.grpc.GrpcServer;
import bisq.core.grpc.CoreApi;

import bisq.common.UserThread;
import bisq.common.app.AppModule;
Expand Down