Commit Graph

19174 Commits

Author SHA1 Message Date
UdjinM6
7d44272ca3
instantsend: Actually relay islock inv when a tx is received later (#4167)
Extends 19145eba58 idea
2021-05-24 19:15:03 +03:00
UdjinM6
4c23b612f6
Merge pull request #4165 from UdjinM6/merge_master_0.17.0.2
Merge master 0.17.0.2 back into develop
2021-05-24 19:14:37 +03:00
PastaPastaPasta
41a8349d4d
Merge pull request #4166 from kittywhiskers/encodespan
Merge #19628, #19687: change CNetAddr::ip to have flexible size
2021-05-23 12:26:33 -05:00
Kittywhiskers Van Gogh
065cc46b91 Merge #19687: make EncodeBase{32,64} consume Spans 2021-05-23 10:38:05 +05:30
Kittywhiskers Van Gogh
337c15ae25 Merge #19628: change CNetAddr::ip to have flexible size 2021-05-23 10:38:01 +05:30
PastaPastaPasta
b76e7fec1f
Merge pull request #4164 from kittywhiskers/auxprs
Merge #19660, #19373, #19841, #13862, #13866, #17280, #17682 and partial #19326, #14978: Auxiliary Backports
2021-05-21 14:25:27 -05:00
Kittywhiskers Van Gogh
170551bb94 Merge #17682: Update tinyformat to upstream 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
6a73b70131 Merge #17280: Change occurences of c_str() used with size() to data() 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
abffb58b5e Merge #13866: Use _wfopen and _wfreopen on Windows 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
96eaef33ee Merge #13862: drop boost::interprocess::file_lock 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
e3443643f3 Partial #14978: Factor out PSBT utilities from RPCs for use in GUI code; related refactoring
Only contains 162ffefd2f562169725559906601c25c579aa91c
2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
41eaee235e Merge #19841: Implement Keccak and SHA3_256 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
56f1b2d01c Partial #19326: Simplify hash.h interface using Spans 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
01272b159d Merge #19373: Replace HexStr(o.begin(), o.end()) with HexStr(o) 2021-05-20 10:15:17 +05:30
Kittywhiskers Van Gogh
bc2f11f230 Partial #19660: Make HexStr take a span
Comment from 6f7b52ac63a71d2706022ca58d69a1a622e0fa37: "The fix for CPubKey is a part of `#13557: BIP 174 PSBT Serializations and RPCs` which wasn't backported yet"
2021-05-20 10:15:17 +05:30
PastaPastaPasta
2f555f87d1
Merge pull request #4028 from kittywhiskers/asmap
merge #17812, #16702, #16730, #18023: supplying and using asmap to improve IP bucketing in addrman
2021-05-19 18:18:44 -05:00
UdjinM6
8cfd2fc514
Merge branch 'master' into merge_master_0.17.0.2 2021-05-20 00:08:34 +03:00
Kittywhiskers Van Gogh
f3819c4eef Merge #18023: Fix some asmap issues 2021-05-20 00:05:12 +05:30
Kittywhiskers Van Gogh
401098283e Merge #17812: asmap feature refinements and functional tests 2021-05-20 00:05:12 +05:30
Kittywhiskers Van Gogh
4b2b5f78d4 Merge #16702: supplying and using asmap to improve IP bucketing 2021-05-20 00:05:09 +05:30
UdjinM6
79a1b1aa47
Merge pull request #4163 from xdustinface/backport-bls-1.1.0
[v0.17.x] Backport #4162 and bump to v0.17.0.2
2021-05-19 05:00:56 +03:00
xdustinface
139b87f865 doc: Update man page 2021-05-19 03:39:35 +02:00
xdustinface
17b7ab1b63 Bump version to 0.17.0.2 2021-05-19 03:39:35 +02:00
xdustinface
fd9ff7d03c depends: Bump bls-dash to 1.1.0 (#4162) 2021-05-19 03:39:24 +02:00
dustinface
021671bc4e
depends: Bump bls-dash to 1.1.0 (#4162) 2021-05-19 04:20:44 +03:00
UdjinM6
85cf890b3a
Merge pull request #4161 from UdjinM6/upgrade_isdb_on_dip20_v0.17.0.1
[v0.17.x] Backport 4159+4160 and bump to v0.17.0.1
2021-05-19 03:04:25 +03:00
UdjinM6
e0f95ae113
Update man pages 2021-05-19 02:04:24 +03:00
UdjinM6
1536a05d41
Bump version to 0.17.0.1 2021-05-19 02:04:24 +03:00
UdjinM6
3ff90110cb
instantsend: Use NotifyEntryRemoved signal instead of calling CInstantSendManager::TransactionRemovedFromMempool from CTxMemPool::removeUnchecked directly (#4160)
* instantsend: Use `NotifyEntryRemoved` signal instead of calling `CInstantSendManager::TransactionRemovedFromMempool` from `CTxMemPool::removeUnchecked` directly

Fixes potential mempool.cs vs cs_main (in RemoveConflictingLock) deadlock

* Apply suggestions from code review

yay, typso!

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
2021-05-19 02:04:18 +03:00
UdjinM6
cd7cd85fe7
instantsend: Use NotifyEntryRemoved signal instead of calling CInstantSendManager::TransactionRemovedFromMempool from CTxMemPool::removeUnchecked directly (#4160)
* instantsend: Use `NotifyEntryRemoved` signal instead of calling `CInstantSendManager::TransactionRemovedFromMempool` from `CTxMemPool::removeUnchecked` directly

Fixes potential mempool.cs vs cs_main (in RemoveConflictingLock) deadlock

* Apply suggestions from code review

yay, typso!

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>

Co-authored-by: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
2021-05-19 01:02:31 +02:00
UdjinM6
8b831eeb7e
instantsend: Postpone mempool related cleanup fixes until dip0020 activation (#4159)
* instantsend: Upgrade IS db on dip0020 activation

* instantsend: Do not remove islocks for txes removed from mempool until dip0020 is activated

* refactor: introduce fUpgradedDB to avoid excessive locking and checking the state

* llmq: Decouple `fUpgradedDB` from `cs`

* Update src/llmq/quorums_instantsend.cpp

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

* Fix deadlock

Upgrade locks cs_main via GetTransaction

Co-authored-by: xdustinface <xdustinfacex@gmail.com>
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
2021-05-19 00:49:45 +03:00
UdjinM6
a02f8302d9
instantsend: Postpone mempool related cleanup fixes until dip0020 activation (#4159)
* instantsend: Upgrade IS db on dip0020 activation

* instantsend: Do not remove islocks for txes removed from mempool until dip0020 is activated

* refactor: introduce fUpgradedDB to avoid excessive locking and checking the state

* llmq: Decouple `fUpgradedDB` from `cs`

* Update src/llmq/quorums_instantsend.cpp

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

* Fix deadlock

Upgrade locks cs_main via GetTransaction

Co-authored-by: xdustinface <xdustinfacex@gmail.com>
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
2021-05-18 15:29:51 -05:00
Kittywhiskers Van Gogh
6a25151bbd Merge #16730: Support serialization of std::vector<bool> 2021-05-18 22:31:54 +05:30
PastaPastaPasta
0e3aea8c4e
Update CLIENT_VERSION_IS_TRUE in configure.ac (#4148) 2021-05-18 01:02:18 +03:00
UdjinM6
876173241f
doc: Archive v0.16.1.1 release notes, draft v0.17 release notes (#4156)
* doc: Archive 0.16.1.1 release notes

* doc: Draft v0.17 release notes

* Apply suggestions from code review

Co-authored-by: thephez <thephez@users.noreply.github.com>

* tweak downgrade note

* move PS->CJ section down

* Statoshi

* Update doc/release-notes.md

Co-authored-by: thephez <thephez@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

* Add more details about upgrades/downgrades

* 0.17 -> 0.17.0.0

Co-authored-by: thephez <thephez@users.noreply.github.com>
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
2021-05-18 01:01:55 +03:00
UdjinM6
8b1350962d
Merge pull request #4157 from PastaPastaPasta/more-backports
v0.17: additional backports
2021-05-18 00:58:53 +03:00
UdjinM6
d34286fa3e
build: Fix cmake prefix for bls-dash package (#4158) 2021-05-17 16:29:24 -04:00
UdjinM6
288f5976a8
build: Fix cmake prefix for bls-dash package (#4158) 2021-05-17 23:22:48 +03:00
UdjinM6
598932748c qt: Transaltions202105 (#4137)
* Abstract some error specifics away

* `make translate`

* ru

* fi
2021-05-15 20:14:54 -05:00
UdjinM6
45420739c9
Merge pull request #4151 from PastaPastaPasta/0.17-backport-candidates
v17: backport candidates
2021-05-15 23:50:29 +03:00
UdjinM6
f18d4e1d1c instantsend: Remove islocks for rejected/removed txes (#4155)
* instantsend: Resolve block conflicts first and take care of mempool ones later

* refactor: Rename RemoveChainLockConflictingLock -> RemoveConflictingLock

* instantsend: Handle transaction removal from mempool (for all reasons besides inclusion in blocks)

* instantsend: Remove old islocks with no known txes from db (once)

* refactor: Replace magic number with CURRENT_VERSION

* fix: Do not remove islocks for (yet) valid orphans

* Apply suggestions from code review

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
2021-05-14 19:17:50 -05:00
UdjinM6
a89202726f
instantsend: Remove islocks for rejected/removed txes (#4155)
* instantsend: Resolve block conflicts first and take care of mempool ones later

* refactor: Rename RemoveChainLockConflictingLock -> RemoveConflictingLock

* instantsend: Handle transaction removal from mempool (for all reasons besides inclusion in blocks)

* instantsend: Remove old islocks with no known txes from db (once)

* refactor: Replace magic number with CURRENT_VERSION

* fix: Do not remove islocks for (yet) valid orphans

* Apply suggestions from code review

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
2021-05-14 19:17:16 -05:00
UdjinM6
20b71700dc
Merge pull request #4037 from kittywhiskers/serialize
merge #12752, #10785, #17896, #17957, #18021, #18112: serialization improvements
2021-05-15 02:06:43 +03:00
UdjinM6
9f9a08ae80 evo: Fix two mempool issues (#4154)
* evo: Remove all protx-es that refer to a ProRegTx removed from mempool

* tests: Check that removal of ProRegTx causes removal of other protx-es that refer to it

* evo: Consider tx itself a collateral in mempool maps when payload collateral hash is null

* tests: Should not allow a ProRegTx which uses another ProRegTx as an external collateral to enter mempool

Signed-off-by: pasta <pasta@dashboost.org>
2021-05-14 15:00:26 -05:00
Kittywhiskers Van Gogh
027c4653ba depends: update Qt 5.9 source url (#4153) 2021-05-14 13:19:13 -05:00
dustinface
8bd3fd32ca contrib|src: Update hard coded seeds (#4152)
* contrib: Update IPs in nodes_main.txt and nodes_test.txt

Mainnet: 1469339
Testnet: 498026

* src: Update static seeds in chainparamsseeds.h
2021-05-14 13:19:04 -05:00
PastaPastaPasta
5f79a02d26 increase BLOCK_CHAIN_SIZE marginally (#4150) 2021-05-14 13:18:52 -05:00
thephez
b7c47b5729 docs: update bips.md for v0.17 (#4149) 2021-05-14 13:17:40 -05:00
UdjinM6
ad7d23c606 instantsend: Partially revert 3987, add more tests for CL vs IS conflicts (#4146)
* tests: Check that CLs override ISes which invalidated non-CLed blocks earlier

* partial revert 3987: Do not mark blocks which conflict with ISes as "conflicting"
2021-05-14 13:17:40 -05:00
UdjinM6
1f2ad2e69a build: Bump relic to 3a23142be0a5510a3aa93cd6c76fc59d3fc732a5 (#4144) 2021-05-14 13:17:40 -05:00