Skip to content

Merge master 0.13.2 into develop #2775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 32 commits into from
Mar 18, 2019
Merged

Merge master 0.13.2 into develop #2775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
332e036
Add checkbox to show only masternodes the wallet has keys for (#2627)
UdjinM6 Jan 15, 2019
3a3586d
Use helper function to produce help text for params of `protx` rpcs (…
UdjinM6 Jan 29, 2019
070ad10
Wait for script checks to finish before messing with txes in Dash-spe…
UdjinM6 Jan 28, 2019
592210d
Bump block stats when adding commitment tx into block (#2654)
UdjinM6 Jan 29, 2019
0d8cc07
Invoke CheckSpecialTx after all normal TX checks have passed (#2673)
codablock Feb 1, 2019
e189163
Add missing help text for `operatorPayoutAddress` (#2679)
UdjinM6 Feb 4, 2019
8961a6a
Stop checking MN protocol version before signalling DIP3 (#2684)
codablock Feb 5, 2019
023f8a0
Fix bench log for payee and special txes (#2678)
UdjinM6 Feb 2, 2019
bd0de48
Bump version to 0.13.1 (#2686)
UdjinM6 Feb 6, 2019
34dee23
Merge pull request #2685 from codablock/pr_v13_backports
codablock Feb 6, 2019
23eb70c
Add getspecialtxes rpc (#2668)
UdjinM6 Jan 30, 2019
6ada90c
Call existsProviderTxConflict after CheckSpecialTx (#2690)
codablock Feb 6, 2019
da5a861
Change the way invalid ProTxes are handled in `addUnchecked` and `exi…
UdjinM6 Feb 6, 2019
68a2d8a
Merge pull request #2688 from codablock/pr_v13_backports
codablock Feb 7, 2019
bac6661
Release notes v0.13.1.0 (#2689)
UdjinM6 Feb 7, 2019
709ab6d
Minimal fix for litemode vs bad-protx-key-not-same issue (#2694)
UdjinM6 Feb 12, 2019
18f087b
Fix some typos in doc/guide-startmany.md (#2711)
felixonmars Feb 17, 2019
1cc47eb
Backport #14701: build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoSt…
PastaPastaPasta Feb 12, 2019
e75f971
Do not process blocks in CDeterministicMNManager before dip3 activati…
UdjinM6 Feb 12, 2019
9e233f3
Fix incorrect usage of begin() when genesis block is requested in "pr…
codablock Feb 12, 2019
f868fbc
Stop g_connman first before deleting it (#2734)
codablock Mar 1, 2019
43612a2
Only include selected TX types into CMerkleBlock (#2737)
codablock Mar 4, 2019
a11e2f9
Add collateraladdress into masternode/protx list rpc output (#2740)
UdjinM6 Mar 6, 2019
0364e03
Implement 2-stage commit for CEvoDB to avoid inconsistencies after cr…
codablock Mar 6, 2019
25222b3
Make -masternodeblsprivkey mandatory when -masternode is given (#2745)
codablock Mar 6, 2019
6374dce
Fix error message for invalid voting addresses (#2747)
codablock Mar 7, 2019
4d62f3c
Merge pull request #2746 from codablock/pr_v13_backport
codablock Mar 8, 2019
9dd16cd
Bump minChainWork and AssumeValid to block #1033120 (#2750)
PastaPastaPasta Mar 8, 2019
fbcb614
[0.13.x] Bump version to 0.13.2 and add release notes (#2749)
codablock Mar 8, 2019
548a489
Move IS block filtering into ConnectBlock (#2766)
codablock Mar 12, 2019
4570079
Add missing entry to changelog (#2769)
codablock Mar 13, 2019
43d1dde
Merge branch 'master' into mergemaster132develop
UdjinM6 Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading