Skip to content

[0.13.x] Backport multiple PRs from develop#2685

Merged
codablock merged 8 commits into
dashpay:v0.13.xfrom
codablock:pr_v13_backports
Feb 6, 2019
Merged

[0.13.x] Backport multiple PRs from develop#2685
codablock merged 8 commits into
dashpay:v0.13.xfrom
codablock:pr_v13_backports

Conversation

@codablock
Copy link
Copy Markdown

See individual commits. These are the PRs marked with backport-candidate-v13.

UdjinM6 and others added 7 commits February 5, 2019 07:35
…ashpay#2649)

* Adjust help text of `register*` rpc commands

Copy/paste help for various fields of `register`/`register_prepare` instead of referring to `register_fund`
Adjust description of provided functionality and expected results

* Adjust whitespaces to match in different protx commands

* Add missing results descriptions

* Introduce new helper function GetHelpString to concentrate most of param descriptions in rpcevo in one place

* [MOVEONLY] Move GetHelpString out of #ifdef ENABLE_WALLET/#endif

* static const
…#2673)

Otherwise duplicate-keys checks for deterministic masternodes triggers
for duplicate/identical transactions.
@codablock codablock added this to the 13.0 milestone Feb 5, 2019
@UdjinM6 UdjinM6 modified the milestones: 13.0, 13.1 Feb 5, 2019
@UdjinM6 UdjinM6 changed the base branch from v0.13.0.x to v0.13.x February 5, 2019 15:47
@UdjinM6 UdjinM6 changed the title [0.13.0.x] Backport multiple PRs from develop [0.13.x] Backport multiple PRs from develop Feb 5, 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.

Looks good but I think we need #2678 (added label and updated description there) and we should also bump version first.

@codablock
Copy link
Copy Markdown
Author

Added #2678. Will do the version bump tomorrow...Or can you do that?

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Feb 5, 2019

Or can you do that?

As a separate PR? Sure :) I thought you wanted to keep it all in one but if not I'll do it in a sec.

EDIT: see #2686

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

Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK

@codablock codablock merged commit 34dee23 into dashpay:v0.13.x Feb 6, 2019
@codablock codablock deleted the pr_v13_backports branch February 6, 2019 05:11
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.

3 participants