Backports 0.16 pr1-4: other#3106
Conversation
8836221 to
7eeaa67
Compare
|
rebased on develop |
7eeaa67 to
028a254
Compare
|
rebased, tests passing locally |
df4bea3 to
d8bc24f
Compare
bdc0ffe to
7d34323
Compare
|
rebased |
UdjinM6
left a comment
There was a problem hiding this comment.
Pls see UdjinM6@f6c8fb7, UdjinM6@593d310, UdjinM6@ff9e6bf, UdjinM6@9acbfb3 and a suggestion below
|
backported part of 12917 |
|
Looks good and gitlab is happy too now 🎉 |
|
@PastaPastaPasta pls make sure to apply fixes from 11179 to new |
60e719e to
659856f
Compare
|
Well, this PR became pretty messy imo... It feels like we should really split it into a couple of separate ones (and squash fixes into original "merge bitcoin#xxx" commits while doing so). I would propose smth like:
Thoughts? |
659856f to
bcc4b27
Compare
|
rebased on backports-0.16-pr1-trivial |
45bbaea to
d7a22c4
Compare
ba1ca29 to
15b009b
Compare
31c8b16 to
6ac77d4
Compare
|
Pls see UdjinM6@442d538 |
8f2f1e0 wallet: Avoid second mapWallet lookup (João Barbosa) Pull request description: All calls to `mapWallet.count()` have the intent to detect if a `txid` exists and most are followed by a second lookup to retrieve the `CWalletTx`. This PR replaces all `mapWallet.count()` calls with `mapWallet.find()` to avoid the second lookup. Tree-SHA512: 96b7de7f5520ebf789a1aec1949a4e9c74e13683869cee012f717e5be8e51097d068e2347a36e89097c9a89f1ed1a1529db71760dac9b572e36a3e9ac1155f29 More of 11039
…that will not return b82c55a Add attribute [[noreturn]] (C++11) to functions that will not return (practicalswift) Pull request description: Add attribute `[[noreturn]]` (C++11) to functions that will not return. Rationale: * Reduce the number of false positives/false negatives from static analyzers with regards to things such as unused or unreachable code * Potentially enable additional compiler optimizations Tree-SHA512: 899683fe8b2fcf19bd334352271d368b46b805be9d426aac1808335fd95732d6d7078d3296951b9879196f3f6e3ec0fdb7695d0afdc3fbe4dd78a2ca70e91ff7 Signed-off-by: Pasta <pasta@dashboost.org> Fixes for bitcoin#10843 backport 10843 continued Signed-off-by: Pasta <pasta@dashboost.org>
…rks. a473eff [bench] Replace 0.00(000)1 with MICRO/MILLI #defines in validation.cpp. (Karl-Johan Alm) 5f850b0 [bench] Include ms/blk stats in Connect* benchmarks. (Karl-Johan Alm) Pull request description: Display the average per block runtime for the various benchmarked times in the block connect functions to give an overview of long(er) term time distribution statistics. Tree-SHA512: 3d6f24f6b9e3dbb448a647e2cda8e7b90ad6a16d4821f49f426a8e1ebc3ce5a0cf0a8cde82213e293affba441615702dfe50822c8c818e282af03bfe383d83e0 More of 10303
352d582 Add vConnect to CConnman::Options (Marko Bencun) Pull request description: Split the "-connect" argument parsing out of CConnman and put it into AppInitMain(). Tree-SHA512: f2d3efc4e2c5808ff98696ea20dd96df599bc472ed5afc9c3eea305d94c36a6ab50c632aa05396c7c34d1917d91b1e7ccd725656ff2631e2a36d9eac477455dc
…generic "cancelable" ee4d149 Drop upgrade-cancel callback registration for a generic "resumeable" (Matt Corallo) Pull request description: Instead of passing a StartShutdown reference all the way up from txdb, give ShowProgress a "cancelable" boolean, as StartShutdown is pretty much always what you'll want to use to cancel. Use the same boolean to allow cancel during initial block verification. Tree-SHA512: 515817aaa4b9e3e856200e00be9c2d44ecfa2d4f288fe3e02116105fe85de2650c13076ee7e45396ec1ce6ab45e53b0477cddda7cfdee5b3bd0589cb81a4c346
c0b94c3 to
2aa7ca5
Compare
|
cherry-picked and squashed |
|
ping @codablock (I'd like to merge this one first before merging other PRs). |
based on #3102, but I figured since this one is a lilttle big, it'd be nice to get it out there for you to enjoy reviewing