<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/bisq-network/bisq/pull/4918'>https://github.com/bisq-network/bisq/pull/4918</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Bump version number for v1.5.1</li>
<li>Apply project format rules (no code change)</li>
<li>- revent that a wrong tx is set as deposit tx</li>
<li>Fixes https://github.com/bisq-network/bisq/issues/4864</li>
<li>add logging of Tx hex</li>
<li>Increase timeout for trade protocol task runners from 30 to 60 sec</li>
<li>Merge pull request #4883 from chimp1984/prevent-that-a-wrong-tx-is-set-as-deposit-tx</li>
<li>Merge pull request #4886 from jmacxx/hotfix/v1.5.1</li>
<li>Move MakerRemovesOpenOffer to first task to avoid that if take offer</li>
<li>Add uid to trade to make sure that look up for process model cannot</li>
<li>Increase max number of log files to 20.</li>
<li>Merge pull request #4891 from chimp1984/increase-log-limit</li>
<li>Merge pull request #4889 from chimp1984/avoid-case-of-multi-trades-with-same-offer-id</li>
<li>Remove checkNotNull for takerFeeTxId</li>
<li>Merge pull request #4895 from chimp1984/fix-maker-removes-offer-task</li>
<li>Merge pull request #4885 from chimp1984/fix-bug-with-reapplying-past-trade-state</li>
<li>Use bitcoinj 0.15.8 (commit dcf8af0)</li>
<li>Remove dev log, fix typo in log</li>
<li>Merge pull request #4906 from chimp1984/fix-logs</li>
<li>Remove paymentAccount from log</li>
<li>Remove verbose log</li>
<li>Add more logs to AddressEntry domain</li>
<li>Remove logs logging absolute path to data directory</li>
<li>Apply project format rules (no code change)</li>
<li>Add logs of tx in case of exceptions</li>
<li>Add "Raw deposit transaction as hex" to details window</li>
<li>Merge pull request #4912 from chimp1984/add-serialized-tx-as-hex-to-trade-details</li>
<li>Merge pull request #4910 from chimp1984/remove-log-entry</li>
<li>Merge pull request #4903 from oscarguindzberg/bloomFilterFix</li>
<li>Avoid logging warning at startup</li>
<li>Merge pull request #4913 from chimp1984/fix-warning-log-with-address-is-null-at-startup</li>
<li>Revert to SNAPSHOT version</li>
<li>Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.1</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-49a96e7eea8a94af862798a45174e6ac43eb4f8b4bd40759b5da63ba31ec3ef7">build.gradle</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-b804e37dd36c86438c6173990ba860808393bebadfdbe46babbc60c779445d29">common/src/main/java/bisq/common/app/Log.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-2e7033ee8063a8c889ac6f9317f0dd411805e21ab2d45cb46ec707e3d9f12f4c">common/src/main/java/bisq/common/app/Version.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-d35e469930acfb7304a64f4f79c686dd55991465153306efa29c6c8e5a9b31da">common/src/main/java/bisq/common/setup/CommonSetup.java</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-0acc7d00f8368b0f79485d84162b2beb9487b061fd2d31aeb529e06d7c10d299">core/src/main/java/bisq/core/app/BisqSetup.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-9a6f03d75ea99c40f1246b9f34cabb964bea2fc57f7e7267deb2a90b05969e63">core/src/main/java/bisq/core/app/WalletAppSetup.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-dc1f9cb827b6b1801bd28e17eccd8431e01e86f9cc3cf38d9746719ae57508a5">core/src/main/java/bisq/core/btc/Balances.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-a0a115e1e0d8099694144619f5bf039ee2b038e9137c43bacfb62a7fb1602e4d">core/src/main/java/bisq/core/btc/model/AddressEntry.java</a>
(58)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-5a4c1078481e57b710b7bfecef9826e7870c277244aaefea729d96e662e8af7e">core/src/main/java/bisq/core/btc/model/AddressEntryList.java</a>
(41)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-3b2440cf0088e50ee4befa9b6ea071cc40c003764e3368f0adb141b9aea3073e">core/src/main/java/bisq/core/btc/setup/WalletConfig.java</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-ad1ae5fe768f7b1b85d73655e580b4799d29c71eaa7fed3363c43c5418fd116a">core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-75820b5165905d1e3a47d5fe31e4b5dba017c6b25a322aad955ffa592a67b362">core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java</a>
(34)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-2208e815b409a18e37c6d0f1404c9df056762391ac619a3a64b957029dad68e1">core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java</a>
(170)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-ca999ccd160a616d7fd42ed8bb22d2603bc02c0520ec6751d35ca07cd51e5f98">core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-1dd9914e3d0450d8cc1aaa2f15afa9836051911a41ecb287a813f9cd4f9f5afd">core/src/main/java/bisq/core/offer/CreateOfferService.java</a>
(5)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-bc2fd4b602e03da39a1b97d012811d253a5ef30425087dbb4b78ece9a7c48c70">core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-1ac5005f0e418723e39a11db766a5f4a207c41663a82f6ef4c9ef28dcef37f24">core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-9e2eea7453141e8b993c77922c49f50bcccda25e12e298082103c209803c3104">core/src/main/java/bisq/core/trade/BuyerTrade.java</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-399b15889d9c4c66695dc456b39cba0a0c8ce8535d772572cac0539d1e03ef3a">core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-7876d451a45b6723a0fd038a7e1bd6e9887ea8e551a6c2420a3591777cc1ee58">core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java</a>
(17)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-4c5f18455ef2f3d6ca88a42f90a0d9a8b14e171d425291d00d1906535952fac5">core/src/main/java/bisq/core/trade/SellerTrade.java</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-0399e1caaadecbe847e18f0eda2ca8bf60f9777bc3bc30840e3af493601260b1">core/src/main/java/bisq/core/trade/Trade.java</a>
(19)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-4c53004633c87a847cb5cb8296acfcff56882b3c4c502b9ee8d16ca3d81881cb">core/src/main/java/bisq/core/trade/TradeManager.java</a>
(35)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-32e782f261a8a670fced61b0c439df772fccfe84e1fdee8f52d43a692e4dcb7c">core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-03a40388a2ba08e9369bef2da7384c8fe8a0f9f7592a542e535ad473e9f9ae8a">core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-1e7d1b2468cf6bdecbccae4911c80c477a3a33aca995507365a4582d8cd84a1c">core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java</a>
(6)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-2483eed70c31f52fd4c639e9e157d92aeba5ce044a1acd039a51c49498d6aa38">core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-8d23c85a8f98e22217f104cde889c862e815a61b9f5c02996ec342e10c2ae4e5">core/src/main/java/bisq/core/trade/protocol/tasks/SetupPayoutTxListener.java</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-bdc42a6654821632284ecaf0712abb5ced3c8f6844dc13d63e972bac6df95689">core/src/main/java/bisq/core/trade/protocol/tasks/arbitration/PublishedDelayedPayoutTx.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-27c9be225f5c82e3caab312f6206ccddd7a1c672764fdf1d018bd4d69fc7118c">core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-9ad0b6b75e28d8a0331ac0d8d11803cf61e6d68bbc61da3a0ee2a9563e5d3ef8">core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-e2f35c4d278aa1e9dc089aca7de1f9792ca81c31f1cc9f62305fa6ce2d8ceaa3">core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java</a>
(67)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-0fefac563214e121b40ff47a1dd203418147307565f2eeef66054d9edeb688ac">core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-7e9275e958ec5c25866b75090f3cf5e688d01b2d13dc5ddd7f4a071e2b05bba4">core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-ca4804f8373704c57521a7570761112f7da1e2d4885bd36625e11211a9137a4e">core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerRemovesOpenOffer.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-f73eccda3d628fc4884fc1b006b8c511c2f72d74893c435dc18f16310a43725e">core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-1f11665bffe7fac0e34bd6bb615b8282c214baaedb81b7c0c803c23cc39140fc">core/src/main/java/bisq/core/trade/protocol/tasks/mediation/ProcessMediatedPayoutTxPublishedMessage.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-441839ce8f6a0ce565367662c9437901c9968b60704dad46f13b55b3217eeea2">core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-d6ffb9a14075f2fa86f6cce06c125fb3e0724d5f1206cc9537492369529a303d">core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-dd9ec47b40ab794541022ff79531e83953cbccd542d6491f491533a5a7312456">core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-a6cc570e0f56a36136791beae8f497706216230467708be9343344cd953e5f08">core/src/main/resources/i18n/displayStrings.properties</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-5f1ca61656f8722b60f2e10de89a4ab324e31f860898d4f2274285c74ce41730">desktop/package/linux/Dockerfile</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-4d344bb6872466475b5c0882cd5c71b4ae3220ac4a4fc01af338a9b5c8a8b8c0">desktop/package/linux/package.sh</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-cfa1567cd99efd84a3945a244cbe23abbbe979bb03446ca5a7da6912910c19c9">desktop/package/linux/release.sh</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-d82d03551cbd9831863bde0cfadaa446dbae792c3099fd2733c3450ef97df5f1">desktop/package/macosx/Info.plist</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-9c45bfbaf583cac49ab820a59c2ff06466ecaf7b56d3aa907b588cf7e82f887b">desktop/package/macosx/create_app.sh</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-b50714866cd3fad3211ddae2f37dfadbdc4f87fc5acc849cb981a796c007019f">desktop/package/macosx/finalize.sh</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-776c0e58e63550e588401fb43b6a31a5042080ca9cdeb3d1d0b278c46a36b96f">desktop/package/macosx/insert_snapshot_version.sh</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-7736376b8d79a111fcc1d73a2e675ab7c8a5d0ab71bb86b618f474ba25e1c331">desktop/package/macosx/replace_version_number.sh</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-9e0c18f75a88b702b5344fa7ca6ecac3b075e177f5ca837a9f36581b073b8576">desktop/package/windows/package.bat</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-d843afda98c263e259c27f5ad596538514dd8fad736639167fbbb01f19773255">desktop/package/windows/release.bat</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-e80a275fb99bce9c523138bec6cbb5949be5b522fa800e8de1bc2e8fe3d2c627">desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-05dd42f811971fd710447d354bb018666cbb56dc76d95f64e07ba9e800b512d3">desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java</a>
(20)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-33fe0e084fc9da780801d3a024857640ac47aee9b96ad6ab7d866786a326ed26">gradle/witness/gradle-witness.gradle</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-51dcd1d852312df65738ff2bd493fdb0f187f50fb7d7324158c8b57fc1de7da7">proto/src/main/proto/pb.proto</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-af2b40396568466d2236a7845df444dff083796378566abc46a0457dc0582213">relay/src/main/resources/version.txt</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/4918/files#diff-15e2368ce0507e626f2d209110670b97ad633599233e0d9a74ae79a46356356b">seednode/src/main/java/bisq/seednode/SeedNodeMain.java</a>
(2)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/4918.patch'>https://github.com/bisq-network/bisq/pull/4918.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/4918.diff'>https://github.com/bisq-network/bisq/pull/4918.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/4918">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNUPRJRO4KH62OZAHFDST2KVHANCNFSM4USRSJ3A">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNSYLWH5YINDBLXTATTST2KVHA5CNFSM4USRSJ3KYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4LKJQ2YQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/4918",
"url": "https://github.com/bisq-network/bisq/pull/4918",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>