Merge #6183: feat: keep llmq_50_60 enabled in Devnets

e3a2cbbd78 clang format fix (Odysseas Gabrielides)
de4238e11b Create release-notes-6183.md (Odysseas Gabrielides)
d65f63c451 enable llmq_50_60 in Devnets (Odysseas Gabrielides)

Pull request description:

  ## Issue being fixed or feature implemented
  LLMQ_50_60 needs to be enabled in Devnets when deploying a larger one.

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes
  no

  ## Checklist:
  - [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
  - [x] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK e3a2cbbd78
  knst:
    utACK e3a2cbbd78

Tree-SHA512: c2b2bb2905a2a1de6710882ae5b8957159232914a20f1389a62de3b5a042f5dcd9cf392ed69586cb81ad601ac50b0474e6d761128696978f61f12088002757de
This commit is contained in:
pasta 2024-10-07 14:57:57 -05:00
commit fa6132fd1d
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
2 changed files with 6 additions and 2 deletions

View File

@ -0,0 +1,4 @@
New functionality
-----------
- LLMQ type LLMQ_50_60 is enabled for Devnet networks. This is needed when testing on a large Devnet.

View File

@ -131,8 +131,8 @@ bool IsQuorumTypeEnabledInternal(Consensus::LLMQType llmqType, gsl::not_null<con
case Consensus::LLMQType::LLMQ_DEVNET:
return true;
case Consensus::LLMQType::LLMQ_50_60:
return !fDIP0024IsActive || !fHaveDIP0024Quorums ||
Params().NetworkIDString() == CBaseChainParams::TESTNET;
return !fDIP0024IsActive || !fHaveDIP0024Quorums || Params().NetworkIDString() == CBaseChainParams::TESTNET ||
Params().NetworkIDString() == CBaseChainParams::DEVNET;
case Consensus::LLMQType::LLMQ_TEST_INSTANTSEND:
return !fDIP0024IsActive || !fHaveDIP0024Quorums ||
consensusParams.llmqTypeDIP0024InstantSend == Consensus::LLMQType::LLMQ_TEST_INSTANTSEND;