[v19.x] chore: backport v18.2.2 into v19.x properly #5315
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
- Added new LLMQ type `llmq_25_67` - The above LLMQ is added only for Testnet and it is activated with v19 fork. - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [x] I have assigned this pull request to a milestone --------- Co-authored-by: pasta <pasta@dashboost.org>
…lts accordingly (dashpay#5247) This allows us to have a bit more granular control over GetLLMQ results, removes code duplication and also optimises things a tiny bit by replacing "HasLLMQ + GetLLMQParams" calls with simply "GetLLMQParams". Use `optional` in `GetLLMQ`, drop `HasLLMQ`. run tests, reindex on testnet/mainnet n/a - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [x] I have assigned this pull request to a milestone
[v18.2.x] backport: backports and version bump to 18.2.2
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.
We did this previously, but due to it being in a PR that also merged other things, it ended up being merged as a squash commit, when it should be merged via merge commit. This PR resolves that with no-diff. This will allow us to ff master to the v19.x branch. This PR has no diff, only does some git stuff.
Checklist:
For repository code-owners and collaborators only