Implement and switch to Feature-Activation-By-Message #159
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
…0.0.10-Z-DexX-ConsensusParamsFeatureActivation Conflicts: src/omnicore/omnicore.cpp
NOTE: this branch requires testnet transactions to be known to the client in order to pass the IsTransactionTypeAllowed test, where previously any transaction type whether known or not would be allowed. As such a previous alert test message that checks for a made up transaction type 99 does not pass the test and forces and abort of the node on testnet. This commit temporarily overrides that behaviour while alternative avenues are considered to maintain the requirement that testnet/regtest only allows known transaction types (a change which I support).
…on startup Note: Without this change LoadActivations() is not permitted to make changes and existing activations cannot be processed on startup.
…0.0.10-Z-DexX-ConsensusParamsFeatureActivation Conflicts: src/omnicore/rules.cpp
|
So what about this? @@ -153,8 +154,10 @@ bool CheckExpiredAlerts(unsigned int curBlock, uint64_t curTime)
bool txLive = (curBlock > (int64_t) expiryValue);
//testnet allows all types of transactions, so override this here for testing
- //txSupported = false; //testing
- //txLive = true; //testing
+ if (isNonMainNet()) {
+ txSupported = true; //testing
+ //txLive = true; //testing
+ } |
dexX7
added a commit
that referenced
this pull request
Aug 4, 2015
0e68ec5 Refinement of feature activation and handling (dexX7) 56529da Permit LoadActivations() to execute activations in non-readonly mode on startup (zathras-crypto) 77cb960 Stop QT history from spamming log with activation packets (zathras-crypto) 3224848 Bypass notice checks for activations on testnet/regtest (zathras-crypto) cdadf29 Fix logicMath_Activation case overwritten by merge (zathras-crypto) 13980bb Make regtest/testnet obey activation heights in their respective consensus params (zathras-crypto) cad9cc6 Override testnet alerting temporarily (zathras-crypto) 64cac92 Rebase feature activations on @dexX7's latest consensus params work (zathras-crypto)
|
I reverted the activation height for the MetaDEx in regtest mode via 78bac14, because the tests otherwise break. |
This was referenced Aug 4, 2015
Ahh sorry should have added the WIP tag... Basically I had in mind to revert that, and move alerting to a standardized payload as suggested in another thread - which would then mean the test alert for tx99 causing the abort would not be processed in 0.0.10 based code... |
|
Haha, this is brilliant. I like it! :) |
zathras-crypto
deleted the
0.0.10-Z-DexX-ConsensusParamsFeatureActivation
branch
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.
This PR serves to introduce the activation of features by broadcasting an activation message as opposed to the current methodology of hardcoded blockheights.
Note: Replaces #129