NU custom activation height startup arg. #1747
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-nuparams startup arg added. help message for nuparams startup arg
UPGRADE_TESTDUMMY needs to be always at the end to be inlined with the networkUpgrades vector position.
furszy
changed the title
Fuzzbawls
added
the
Needs Backport
Fuzzbawls
approved these changes
Jul 17, 2020
| @@ -67,6 +68,9 @@ | |||
| #include <signal.h> | |||
| #endif | |||
|
|
|||
| #include <boost/algorithm/string.hpp> | |||
| #include <boost/algorithm/string/split.hpp> | |||
|
|
|||
There was a problem hiding this comment.
nit: no need for a blank line here, could just incorporate these 2 new includes to the ones below.
random-zebra
approved these changes
Jul 22, 2020
There was a problem hiding this comment.
I would prefer the reverse fix in 924a27d (instead of moving the UPGRADE_TESTDUMMY to the end of the enum, move its NUInfo entry in the second position of the NetworkUpgradeInfo vector). Rationale being so its index never changes when we add new network upgrades.
Anyway, this is just a non-blocking nit, and I'm fine with the PR as is.
utACK 78d4f3a
Fuzzbawls
pushed a commit
to Fuzzbawls/PIVX
that referenced
this pull request
Jul 22, 2020
Github-Pull: PIVX-Project#1747 Rebased-From: 866c7d1
Fuzzbawls
pushed a commit
to Fuzzbawls/PIVX
that referenced
this pull request
Jul 22, 2020
-nuparams startup arg added. help message for nuparams startup arg Github-Pull: PIVX-Project#1747 Rebased-From: 2db8a11
Fuzzbawls
pushed a commit
to Fuzzbawls/PIVX
that referenced
this pull request
Jul 22, 2020
UPGRADE_TESTDUMMY needs to be always at the end to be inlined with the networkUpgrades vector position. Github-Pull: PIVX-Project#1747 Rebased-From: 924a27d
Fuzzbawls
pushed a commit
to Fuzzbawls/PIVX
that referenced
this pull request
Jul 22, 2020
Github-Pull: PIVX-Project#1747 Rebased-From: 78d4f3a
furszy
added a commit
that referenced
this pull request
Jul 24, 2020
dd22385 [GUI] Update translations from transifex (Fuzzbawls) 919e060 Solving old, not loaded at startup, transactions notification issue. (furszy) 943d84b NU name words separated by underscore instead of white space. (furszy) fc042f1 Fixing UpgradeIndex position issue. (furszy) 531673c Customize network upgrades activation height for regtest at the startup. (furszy) 1337685 Sapling activation height for regtest (furszy) 15b1052 Miner: Unused reserveKey cleanup (furszy) 566b6fc [GUI] Load persisted transaction filter/sort during start (V3) (Mrs-X) 5d22583 [GUI] Recognize key event for clearing console (Fuzzbawls) 77880e0 GUI: Settings console message moved to read only. (furszy) 6b63591 options model unused signals cleanup (furszy) b9e3859 GUI: Fixing settings display lang initialization (furszy) b434cbf Transaction primitive unused methods cleanup. (furszy) 7f9037f missing validation_zerocoin_legacy added to CMakeLists.txt (furszy) 22bfc12 Move-only: ATMP zerocoin check moved to its own legacy file. (furszy) 24d9ac4 Move-only: DataBaseAccChecksum to zerocoin validation legacy. (furszy) fb2993d Move-only: Move Zerocoin tx disconnection from DisconnectBlock to its own legacy file method. (furszy) eaacd29 Wallet::AddToWallet if walletdb is null, create one and write the tx. (furszy) 609407d Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (furszy) 9aacb38 Prevent multiple calls to CWallet::AvailableCoins (furszy) c0e9b13 Fix insanity of CWalletDB::WriteTx and CWalletTx::WriteToDisk (furszy) Pull request description: backports the following PRs that have been merged since the `4.2` branch-off: #1717 #1733 #1736 #1742 #1741 #1744 #1287 #1751 #1747 #1749 #1763 ACKs for top commit: furszy: utACK dd22385 , ready for 4.2 :) . Tree-SHA512: 38dd47320b8a7de77879240c36dec7588671fc09bc7d4f0be573fb6a33d6d243d4adbf4451bd4b4da9c046fab058c1cb0eb2ec2d97052b4d1171ac959ae5a71f
Fuzzbawls
removed
the
Needs Backport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Few commits decoupled from the Sapling branch.
Included here:
Fixing an upgrade index issue (last commit).
Added the 'nuparams' startup arg to customize the regtest network upgrade activation height (Used in the functional tests).