mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

Browse source
This commit is contained in:
Manfred Karrer 2017-02-28 09:57:14 -05:00
commit 9704619f6b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -828,7 +828,7 @@ public class WalletService {
}
}
if (sendResult != null) {
log.debug("Broadcasting double spending transaction. " + newTransaction);
log.info("Broadcasting double spending transaction. " + sendResult.tx);
Futures.addCallback(sendResult.broadcastComplete, new FutureCallback<Transaction>() {
@Override
public void onSuccess(Transaction result) {
@ -844,6 +844,7 @@ public class WalletService {
});
}
} else {
log.warn("sendResult is null");
errorMessageHandler.handleErrorMessage("We could not find inputs we control in the transaction we want to double spend.");
}
} else if (confidenceType == TransactionConfidence.ConfidenceType.BUILDING) {
@ -1022,16 +1023,19 @@ public class WalletService {
throws InsufficientMoneyException, AddressFormatException {
Wallet.SendRequest sendRequest = Wallet.SendRequest.emptyWallet(new Address(params, toAddress));
sendRequest.aesKey = aesKey;
Wallet.SendResult sendResult = wallet.sendCoins(sendRequest);
sendRequest.feePerKb = FeePolicy.getNonTradeFeePerKb();
Wallet.SendResult sendResult = wallet.sendCoins(sendRequest);
log.info("emptyWallet: " + sendResult.tx);
Futures.addCallback(sendResult.broadcastComplete, new FutureCallback<Transaction>() {
@Override
public void onSuccess(Transaction result) {
log.info("onSuccess Transaction=" + result);
resultHandler.handleResult();
}
@Override
public void onFailure(@NotNull Throwable t) {
log.error("onFailure " + t.toString());
errorMessageHandler.handleErrorMessage(t.getMessage());
}
});