Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 19:56:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug with password protection at fee calculation

Browse source
This commit is contained in:
Manfred Karrer 2016-04-29 10:49:58 +02:00
parent 60289553d5
commit 0a0f5a5659
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -95,6 +95,7 @@ public class WalletService {
public final BooleanProperty shutDownDone = new SimpleBooleanProperty();
private final Storage<Long> storage;
private final Long bloomFilterTweak;
private KeyParameter aesKey;
///////////////////////////////////////////////////////////////////////////////////////////
@ -337,6 +338,10 @@ public class WalletService {
}
}
public void setAesKey(KeyParameter aesKey) {
this.aesKey = aesKey;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Listener
@ -618,7 +623,7 @@ public class WalletService {
AddressEntry.Context context,
Coin fee) throws AddressEntryException, AddressFormatException {
try {
wallet.completeTx(getSendRequest(fromAddress, toAddress, amount, null, context));
wallet.completeTx(getSendRequest(fromAddress, toAddress, amount, aesKey, context));
} catch (InsufficientMoneyException e) {
if (e.missing != null) {
log.trace("missing fee " + e.missing.toFriendlyString());
@ -640,7 +645,7 @@ public class WalletService {
Coin amount,
Coin fee) throws AddressEntryException, AddressFormatException {
try {
wallet.completeTx(getSendRequestForMultipleAddresses(fromAddresses, toAddress, amount, null, null));
wallet.completeTx(getSendRequestForMultipleAddresses(fromAddresses, toAddress, amount, null, aesKey));
} catch (InsufficientMoneyException e) {
if (e.missing != null) {
log.trace("missing fee " + e.missing.toFriendlyString());