[bisq-network/bisq] Merge 1.5.1 to master (#4915)

Tue Dec 8 18:29:50 CET 2020

@ripcurlx This merges 1.5.1. to master but not updating the SNAPSHOT postfix of the version. I leave that for you as I am not sure where it needs to be updated.
Is that really required anyway? 
You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/4915

-- Commit Summary --

  * Bump version number for v1.5.1
  * Apply project format rules (no code change)
  * - revent that a wrong tx is set as deposit tx
  * Fixes https://github.com/bisq-network/bisq/issues/4864
  * add logging of Tx hex
  * Increase timeout for trade protocol task runners from 30 to 60 sec
  * Merge pull request #4883 from chimp1984/prevent-that-a-wrong-tx-is-set-as-deposit-tx
  * Merge pull request #4886 from jmacxx/hotfix/v1.5.1
  * Move MakerRemovesOpenOffer to first task to avoid that if take offer
  * Add uid to trade to make sure that look up for process model cannot
  * Increase max number of log files to 20.
  * Merge pull request #4891 from chimp1984/increase-log-limit
  * Merge pull request #4889 from chimp1984/avoid-case-of-multi-trades-with-same-offer-id
  * Remove checkNotNull for takerFeeTxId
  * Merge pull request #4895 from chimp1984/fix-maker-removes-offer-task
  * Merge pull request #4885 from chimp1984/fix-bug-with-reapplying-past-trade-state
  * Use bitcoinj 0.15.8 (commit dcf8af0)
  * Remove dev log, fix typo in log
  * Merge pull request #4906 from chimp1984/fix-logs
  * Remove paymentAccount from log
  * Remove verbose log
  * Add more logs to AddressEntry domain
  * Remove logs logging absolute path to data directory
  * Apply project format rules (no code change)
  * Add logs of tx in case of exceptions
  * Add "Raw deposit transaction as hex" to details window
  * Merge pull request #4912 from chimp1984/add-serialized-tx-as-hex-to-trade-details
  * Merge pull request #4910 from chimp1984/remove-log-entry
  * Merge pull request #4903 from oscarguindzberg/bloomFilterFix
  * Avoid logging warning at startup
  * Merge pull request #4913 from chimp1984/fix-warning-log-with-address-is-null-at-startup
  * Merge branch 'hotfix/v1.5.1' into merge-1.5.1-to-master

-- File Changes --

    M build.gradle (4)
    M common/src/main/java/bisq/common/app/Log.java (2)
    M common/src/main/java/bisq/common/app/Version.java (2)
    M common/src/main/java/bisq/common/setup/CommonSetup.java (1)
    M core/src/main/java/bisq/core/app/BisqSetup.java (2)
    M core/src/main/java/bisq/core/app/WalletAppSetup.java (2)
    M core/src/main/java/bisq/core/btc/Balances.java (2)
    M core/src/main/java/bisq/core/btc/model/AddressEntry.java (58)
    M core/src/main/java/bisq/core/btc/model/AddressEntryList.java (41)
    M core/src/main/java/bisq/core/btc/setup/WalletConfig.java (1)
    M core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java (3)
    M core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java (34)
    M core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java (170)
    M core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java (2)
    M core/src/main/java/bisq/core/offer/CreateOfferService.java (5)
    M core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java (17)
    M core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java (17)
    M core/src/main/java/bisq/core/trade/BuyerTrade.java (12)
    M core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java (17)
    M core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java (17)
    M core/src/main/java/bisq/core/trade/SellerTrade.java (12)
    M core/src/main/java/bisq/core/trade/Trade.java (19)
    M core/src/main/java/bisq/core/trade/TradeManager.java (35)
    M core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java (6)
    M core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java (6)
    M core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java (6)
    M core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java (4)
    M core/src/main/java/bisq/core/trade/protocol/tasks/SetupPayoutTxListener.java (8)
    M core/src/main/java/bisq/core/trade/protocol/tasks/arbitration/PublishedDelayedPayoutTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java (4)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java (67)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerRemovesOpenOffer.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java (2)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java (3)
    M core/src/main/resources/i18n/displayStrings.properties (1)
    M desktop/package/linux/Dockerfile (2)
    M desktop/package/linux/package.sh (2)
    M desktop/package/linux/release.sh (2)
    M desktop/package/macosx/Info.plist (4)
    M desktop/package/macosx/create_app.sh (2)
    M desktop/package/macosx/finalize.sh (2)
    M desktop/package/macosx/replace_version_number.sh (4)
    M desktop/package/windows/package.bat (2)
    M desktop/package/windows/release.bat (2)
    M desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java (2)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java (20)
    M gradle/witness/gradle-witness.gradle (2)
    M proto/src/main/proto/pb.proto (1)
    M relay/src/main/resources/version.txt (2)
    M seednode/src/main/java/bisq/seednode/SeedNodeMain.java (2)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/4915.patch
https://github.com/bisq-network/bisq/pull/4915.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/4915
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20201208/f44e92e6/attachment.htm>