Skip to content

Commit 87b6383

Browse files
authored
Merge pull request #3333 from UdjinM6/bp20200213
Backport 3332, update release notes
2 parents f23e722 + 818e7a6 commit 87b6383

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

doc/release-notes.md

+3
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ modules were reorganized in separate folders to make navigation through code a b
233233

234234
See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5...dashpay:v0.15.0.0).
235235

236+
- [`9d5c3d12e`](https://github.com/dashpay/dash/commit/9d5c3d12e) Try to actually accept newly created dstx-es into masternode's mempool (#3332)
237+
- [`f23e722da`](https://github.com/dashpay/dash/commit/f23e722da) Switch CLIENT_VERSION_IS_RELEASE to `true` for v0.15 (#3306)
238+
- [`b57f1dac8`](https://github.com/dashpay/dash/commit/b57f1dac8) Update release notes
236239
- [`15c6df583`](https://github.com/dashpay/dash/commit/15c6df583) Bring back "about" menu icon (#3329)
237240
- [`2c30818f7`](https://github.com/dashpay/dash/commit/2c30818f7) Add pubKeyOperator to `quorum info` rpc response (#3327)
238241
- [`2bbf78c1b`](https://github.com/dashpay/dash/commit/2bbf78c1b) Update release-notes.md

src/privatesend/privatesend-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
293293
TRY_LOCK(cs_main, lockMain);
294294
CValidationState validationState;
295295
mempool.PrioritiseTransaction(hashTx, 0.1 * COIN);
296-
if (!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, nullptr, false, maxTxFee, true)) {
296+
if (!lockMain || !AcceptToMemoryPool(mempool, validationState, finalTransaction, false, nullptr, false, maxTxFee)) {
297297
LogPrint(BCLog::PRIVATESEND, "CPrivateSendServer::CommitFinalTransaction -- AcceptToMemoryPool() error: Transaction not valid\n");
298298
SetNull();
299299
// not much we can do in this case, just notify clients

0 commit comments

Comments
 (0)