From 35635c7b9d4745783d55803b1c1c9c7f427ce84c Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 30 Jun 2017 13:10:53 +0200 Subject: [PATCH] Turn off logs for BlockingClient --- core/src/main/java/io/bisq/core/btc/AddressEntryList.java | 1 + .../main/java/io/bisq/core/btc/wallet/BtcWalletService.java | 2 ++ core/src/main/java/io/bisq/core/offer/OpenOfferManager.java | 5 ++--- .../bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java | 2 ++ .../buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java | 2 ++ .../tasks/maker/MakerProcessDepositTxPublishedMessage.java | 1 + .../protocol/tasks/maker/MakerSetupDepositTxListener.java | 1 + .../SellerAsMakerCreatesAndSignsDepositTx.java | 3 +-- .../SellerAsTakerSignAndPublishDepositTx.java | 2 ++ gui/src/main/java/io/bisq/gui/main/MainViewModel.java | 5 ++++- .../gui/main/offer/createoffer/CreateOfferDataModel.java | 4 ++-- .../io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java | 5 +++-- gui/src/main/resources/logback.xml | 3 +++ 13 files changed, 26 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/io/bisq/core/btc/AddressEntryList.java b/core/src/main/java/io/bisq/core/btc/AddressEntryList.java index b92a128e70..cb72581740 100644 --- a/core/src/main/java/io/bisq/core/btc/AddressEntryList.java +++ b/core/src/main/java/io/bisq/core/btc/AddressEntryList.java @@ -125,6 +125,7 @@ public final class AddressEntryList implements PersistableEnvelope, PersistedDat } public void swapToAvailable(AddressEntry addressEntry) { + log.error("swapToAvailable, offer id={}, context={}", addressEntry.getOfferId(), addressEntry.getContext()); boolean changed2 = remove(addressEntry); boolean changed1 = add(new AddressEntry(addressEntry.getKeyPair(), AddressEntry.Context.AVAILABLE)); if (changed1 || changed2) diff --git a/core/src/main/java/io/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/io/bisq/core/btc/wallet/BtcWalletService.java index 6d20d990eb..e399fb5437 100644 --- a/core/src/main/java/io/bisq/core/btc/wallet/BtcWalletService.java +++ b/core/src/main/java/io/bisq/core/btc/wallet/BtcWalletService.java @@ -369,6 +369,7 @@ public class BtcWalletService extends WalletService { } public void swapTradeEntryToAvailableEntry(String offerId, AddressEntry.Context context) { + log.error("swapTradeEntryToAvailableEntry, offerId={}, context={}", offerId, context); Optional addressEntryOptional = getAddressEntryListAsImmutableList().stream() .filter(e -> offerId.equals(e.getOfferId())) .filter(e -> context == e.getContext()) @@ -382,6 +383,7 @@ public class BtcWalletService extends WalletService { } public void resetAddressEntriesForOpenOffer(String offerId) { + log.error("resetAddressEntriesForOpenOffer"); swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.OFFER_FUNDING); swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.RESERVED_FOR_TRADE); } diff --git a/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java index efe0cafe36..f4563ef291 100644 --- a/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java +++ b/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java @@ -29,7 +29,6 @@ import io.bisq.common.proto.network.NetworkEnvelope; import io.bisq.common.proto.persistable.PersistedDataHost; import io.bisq.common.proto.persistable.PersistenceProtoResolver; import io.bisq.common.storage.Storage; -import io.bisq.core.btc.AddressEntry; import io.bisq.core.btc.wallet.BsqWalletService; import io.bisq.core.btc.wallet.BtcWalletService; import io.bisq.core.btc.wallet.TradeWalletService; @@ -337,8 +336,8 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe openOffer.setState(OpenOffer.State.CANCELED); openOffers.remove(openOffer); closedTradableManager.add(openOffer); - btcWalletService.swapTradeEntryToAvailableEntry(offer.getId(), AddressEntry.Context.OFFER_FUNDING); - btcWalletService.swapTradeEntryToAvailableEntry(offer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE); + log.error("removeOpenOffer, offerid={}", offer.getId()); + btcWalletService.resetAddressEntriesForOpenOffer(offer.getId()); resultHandler.handleResult(); }, errorMessageHandler); diff --git a/core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java b/core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java index bad82f351b..b2ae57ee8d 100644 --- a/core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java +++ b/core/src/main/java/io/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java @@ -86,6 +86,7 @@ public class CreateMakerFeeTx extends Task { // tx malleability offer.setOfferFeePaymentTxId(btcTransaction.getHashAsString()); model.setTransaction(btcTransaction); + log.error("CreateMakerFeeTx, offerid={}, OFFER_FUNDING", id); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING); complete(); @@ -113,6 +114,7 @@ public class CreateMakerFeeTx extends Task { checkArgument(transaction.equals(signedTx)); offer.setOfferFeePaymentTxId(transaction.getHashAsString()); model.setTransaction(transaction); + log.error("onSuccess, offerid={}, OFFER_FUNDING", id); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.OFFER_FUNDING); complete(); diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java index 4e9e7fff2a..b06f0d9387 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java @@ -82,6 +82,7 @@ public class BuyerAsTakerSignAndPublishDepositTx extends TradeTask { Timer timeoutTimer = UserThread.runAfter(() -> { log.warn("Broadcast not completed after 5 sec. We go on with the trade protocol."); trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX); + log.error("timeoutTimer, offerid={}, RESERVED_FOR_TRADE", id); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE); complete(); @@ -104,6 +105,7 @@ public class BuyerAsTakerSignAndPublishDepositTx extends TradeTask { log.trace("takerSignAndPublishTx succeeded " + transaction); trade.setDepositTx(transaction); trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX); + log.error("onSuccess, offerid={}, RESERVED_FOR_TRADE", id); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE); complete(); diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java index 15b17a3988..f3e303ebae 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java @@ -60,6 +60,7 @@ public class MakerProcessDepositTxPublishedMessage extends TradeTask { processModel.removeMailboxMessageAfterProcessing(trade); trade.setState(Trade.State.MAKER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG); + log.error("MakerProcessDepositTxPublishedMessage, offerid={}, RESERVED_FOR_TRADE", trade.getId()); processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE); complete(); diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java index bb4c3660e9..5fc5258aff 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java @@ -87,6 +87,7 @@ public class MakerSetupDepositTxListener extends TradeTask { } private void swapReservedForTradeEntry() { + log.error("swapReservedForTradeEntry, offerid={}, RESERVED_FOR_TRADE", trade.getId()); processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE); } diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java index 6fadd0c074..6cf0891459 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java @@ -67,8 +67,7 @@ public class SellerAsMakerCreatesAndSignsDepositTx extends TradeTask { + "\n------------------------------------------------------------\n"); final Coin makerInputAmount = offer.getSellerSecurityDeposit().add(trade.getTradeAmount()); - Optional addressEntryOptional = walletService.getAddressEntry(id, - AddressEntry.Context.MULTI_SIG); + Optional addressEntryOptional = walletService.getAddressEntry(id, AddressEntry.Context.MULTI_SIG); checkArgument(addressEntryOptional.isPresent(), "addressEntryOptional must be present"); AddressEntry makerMultiSigAddressEntry = addressEntryOptional.get(); makerMultiSigAddressEntry.setCoinLockedInMultiSig(makerInputAmount); diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java index 6acee4b94f..6c88ec175a 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java @@ -81,6 +81,7 @@ public class SellerAsTakerSignAndPublishDepositTx extends TradeTask { Timer timeoutTimer = UserThread.runAfter(() -> { log.warn("Broadcast not completed after 5 sec. We go on with the trade protocol."); trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX); + log.error("timeoutTimer, offerid={}, RESERVED_FOR_TRADE", trade.getId()); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE); complete(); @@ -103,6 +104,7 @@ public class SellerAsTakerSignAndPublishDepositTx extends TradeTask { log.trace("takerSignAndPublishTx succeeded " + transaction); trade.setDepositTx(transaction); trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX); + log.error("onSuccess, offerid={}, RESERVED_FOR_TRADE", trade.getId()); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE); complete(); diff --git a/gui/src/main/java/io/bisq/gui/main/MainViewModel.java b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java index f2ccebfd3a..30340ab147 100644 --- a/gui/src/main/java/io/bisq/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java @@ -1037,7 +1037,10 @@ public class MainViewModel implements ViewModel { private void swapPendingOfferFundingEntries() { tradeManager.getAddressEntriesForAvailableBalanceStream() .filter(addressEntry -> addressEntry.getOfferId() != null) - .forEach(addressEntry -> btcWalletService.swapTradeEntryToAvailableEntry(addressEntry.getOfferId(), AddressEntry.Context.OFFER_FUNDING)); + .forEach(addressEntry -> { + log.error("swapPendingOfferFundingEntries, offerid={}, OFFER_FUNDING", addressEntry.getOfferId()); + btcWalletService.swapTradeEntryToAvailableEntry(addressEntry.getOfferId(), AddressEntry.Context.OFFER_FUNDING); + }); } private void updateBalance() { diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java index 3317187e9a..1d3650b979 100644 --- a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -659,8 +659,8 @@ class CreateOfferDataModel extends ActivatableDataModel { } public void swapTradeToSavings() { - btcWalletService.swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.OFFER_FUNDING); - btcWalletService.swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.RESERVED_FOR_TRADE); + log.error("swapTradeToSavings, offerid={}", offerId); + btcWalletService.resetAddressEntriesForOpenOffer(offerId); } private void fillPaymentAccounts() { diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java index 49aede1229..779ac6b3b1 100644 --- a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -256,6 +256,7 @@ class TakeOfferDataModel extends ActivatableDataModel { } public void onClose() { + log.error("onClose"); btcWalletService.resetAddressEntriesForOpenOffer(offer.getId()); } @@ -459,8 +460,8 @@ class TakeOfferDataModel extends ActivatableDataModel { } public void swapTradeToSavings() { - btcWalletService.swapTradeEntryToAvailableEntry(offer.getId(), AddressEntry.Context.OFFER_FUNDING); - btcWalletService.swapTradeEntryToAvailableEntry(offer.getId(), AddressEntry.Context.RESERVED_FOR_TRADE); + log.error("swapTradeToSavings, offerid={}", offer.getId()); + btcWalletService.resetAddressEntriesForOpenOffer(offer.getId()); } /* private void setFeeFromFundingTx(Coin fee) { diff --git a/gui/src/main/resources/logback.xml b/gui/src/main/resources/logback.xml index fedd51fce2..0cb3e0abcf 100644 --- a/gui/src/main/resources/logback.xml +++ b/gui/src/main/resources/logback.xml @@ -24,6 +24,9 @@ + + +