Skip to content

Backports 0.16 pr1-4: other#3106

Merged
UdjinM6 merged 5 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.16-pr1
Jan 4, 2020
Merged

Backports 0.16 pr1-4: other#3106
UdjinM6 merged 5 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.16-pr1

Conversation

@PastaPastaPasta
Copy link
Copy Markdown
Member

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

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

rebased on develop

@PastaPastaPasta
Copy link
Copy Markdown
Member Author

rebased, tests passing locally

Comment thread src/rpc/masternode.cpp Outdated
Comment thread test/functional/mempool_persist.py Outdated
Comment thread contrib/rpm/README.md Outdated
Comment thread test/functional/test_framework/util.py Outdated
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

rebased

@UdjinM6 UdjinM6 added this to the 16 milestone Dec 12, 2019
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread CONTRIBUTING.md Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly ok IMO, just one more thing

Comment thread test/functional/mempool_persist.py Outdated
@UdjinM6 UdjinM6 requested a review from codablock December 21, 2019 18:36
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

backported part of 12917

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Dec 22, 2019

Looks good and gitlab is happy too now 🎉

UdjinM6
UdjinM6 previously approved these changes Dec 22, 2019
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 dismissed their stale review December 31, 2019 14:27

Ooops... needs rebase now

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Dec 31, 2019

@PastaPastaPasta pls make sure to apply fixes from 11179 to new rpc/privatesend.cpp while rebasing i.e. adding parts of 976b51e (as in rpc/masternode.cpp) and dropping okSafe in commands.

Copy link
Copy Markdown

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See inline comments. I prepared fixes as well:
0f46840
fbe7be5
80214e6
9b62a29
All found in my repo.

Comment thread src/wallet/rpcwallet.cpp Outdated
Comment thread src/wallet/rpcwallet.cpp Outdated
Comment thread src/random.cpp
Comment thread src/rpc/masternode.cpp Outdated
Comment thread src/rpc/rpcevo.cpp Outdated
Comment thread src/rpc/rpcevo.cpp Outdated
Comment thread src/rpc/server.cpp Outdated
Comment thread src/rpc/rpcevo.cpp Outdated
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jan 2, 2020

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:

  1. trivial comments/docs/strings updates;
  2. trivial-ish virtual, const, nullptr etc. code changes (and maybe functional tests cleanups too);
  3. rpc changes;
  4. other actual code changes (connman, cli etc.)

Thoughts?

Comment thread src/rpc/server.cpp Outdated
Comment thread src/rpc/server.cpp Outdated
Comment thread src/rpc/rpcevo.cpp Outdated
Comment thread src/rpc/rpcevo.cpp Outdated
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

rebased on backports-0.16-pr1-trivial

@PastaPastaPasta PastaPastaPasta force-pushed the backports-0.16-pr1 branch 2 times, most recently from 45bbaea to d7a22c4 Compare January 2, 2020 22:16
@PastaPastaPasta PastaPastaPasta force-pushed the backports-0.16-pr1 branch 3 times, most recently from ba1ca29 to 15b009b Compare January 2, 2020 22:49
@PastaPastaPasta PastaPastaPasta changed the title Backports 0.16 pr1 Backports 0.16 pr1 other Jan 2, 2020
@PastaPastaPasta PastaPastaPasta changed the title Backports 0.16 pr1 other Backports 0.16 pr1-4: other Jan 2, 2020
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jan 3, 2020

Pls see UdjinM6@442d538

laanwj and others added 5 commits January 3, 2020 08:35
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
@PastaPastaPasta
Copy link
Copy Markdown
Member Author

cherry-picked and squashed

Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jan 3, 2020

ping @codablock (I'd like to merge this one first before merging other PRs).

Copy link
Copy Markdown

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 merged commit e82dfc4 into dashpay:develop Jan 4, 2020
@PastaPastaPasta PastaPastaPasta deleted the backports-0.16-pr1 branch January 4, 2020 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants