Skip to content

Commit 9cfc3a6

Browse files
knstUdjinM6
andauthored
fix: change default quorums for devnet (#5635)
## Issue being fixed or feature implemented To make configuring devnets more error-prune and config file shorter ## What was done? Updated default LLMQ parameters on devnet from 50_60, 60_75, 100_67 to `LLMQ_DEVNET` and `LLMQ_DEVNET_PLATFORM`. ## How Has This Been Tested? not tested yet; would be tested on devnets later with next devnet/release ## Breaking Changes n/a for non-dev-nets; for dev-net other default quorum is used. ## 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 - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone --------- Co-authored-by: UdjinM6 <[email protected]>
1 parent 9a60987 commit 9cfc3a6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/chainparams.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -648,11 +648,11 @@ class CDevNetParams : public CChainParams {
648648
AddLLMQ(Consensus::LLMQType::LLMQ_DEVNET);
649649
AddLLMQ(Consensus::LLMQType::LLMQ_DEVNET_DIP0024);
650650
AddLLMQ(Consensus::LLMQType::LLMQ_DEVNET_PLATFORM);
651-
consensus.llmqTypeChainLocks = Consensus::LLMQType::LLMQ_50_60;
652-
consensus.llmqTypeInstantSend = Consensus::LLMQType::LLMQ_50_60;
653-
consensus.llmqTypeDIP0024InstantSend = Consensus::LLMQType::LLMQ_60_75;
654-
consensus.llmqTypePlatform = Consensus::LLMQType::LLMQ_100_67;
655-
consensus.llmqTypeMnhf = Consensus::LLMQType::LLMQ_50_60;
651+
consensus.llmqTypeChainLocks = Consensus::LLMQType::LLMQ_DEVNET;
652+
consensus.llmqTypeInstantSend = Consensus::LLMQType::LLMQ_DEVNET;
653+
consensus.llmqTypeDIP0024InstantSend = Consensus::LLMQType::LLMQ_DEVNET_DIP0024;
654+
consensus.llmqTypePlatform = Consensus::LLMQType::LLMQ_DEVNET_PLATFORM;
655+
consensus.llmqTypeMnhf = Consensus::LLMQType::LLMQ_DEVNET;
656656
consensus.llmqTypeAssetLocks = consensus.llmqTypePlatform;
657657

658658
UpdateDevnetLLMQChainLocksFromArgs(args);

src/chainparamsbase.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
2323
argsman.AddArg("-dip8params=<activation>", "Override DIP8 activation height (regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
2424
argsman.AddArg("-highsubsidyblocks=<n>", "The number of blocks with a higher than normal subsidy to mine at the start of a chain (default: 0, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
2525
argsman.AddArg("-highsubsidyfactor=<n>", "The factor to multiply the normal block subsidy by while in the highsubsidyblocks window of a chain (default: 1, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
26-
argsman.AddArg("-llmqchainlocks=<quorum name>", "Override the default LLMQ type used for ChainLocks. Allows using ChainLocks with smaller LLMQs. (default: llmq_50_60, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
26+
argsman.AddArg("-llmqchainlocks=<quorum name>", "Override the default LLMQ type used for ChainLocks. Allows using ChainLocks with smaller LLMQs. (default: llmq_devnet, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
2727
argsman.AddArg("-llmqdevnetparams=<size>:<threshold>", "Override the default LLMQ size for the LLMQ_DEVNET quorum (default: 3:2, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
28-
argsman.AddArg("-llmqinstantsend=<quorum name>", "Override the default LLMQ type used for InstantSend. Allows using InstantSend with smaller LLMQs. (default: llmq_50_60, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
29-
argsman.AddArg("-llmqinstantsenddip0024=<quorum name>", "Override the default LLMQ type used for InstantSendDIP0024. (default: llmq_60_75, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
30-
argsman.AddArg("-llmqplatform=<quorum name>", "Override the default LLMQ type used for Platform. (default: llmq_100_67, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
31-
argsman.AddArg("-llmqmnhf=<quorum name>", "Override the default LLMQ type used for EHF. (default: llmq_50_60, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
28+
argsman.AddArg("-llmqinstantsend=<quorum name>", "Override the default LLMQ type used for InstantSend. Allows using InstantSend with smaller LLMQs. (default: llmq_devnet, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
29+
argsman.AddArg("-llmqinstantsenddip0024=<quorum name>", "Override the default LLMQ type used for InstantSendDIP0024. (default: llmq_devnet_dip0024, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
30+
argsman.AddArg("-llmqplatform=<quorum name>", "Override the default LLMQ type used for Platform. (default: llmq_devnet_platform, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
31+
argsman.AddArg("-llmqmnhf=<quorum name>", "Override the default LLMQ type used for EHF. (default: llmq_devnet, devnet-only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
3232
argsman.AddArg("-llmqtestparams=<size>:<threshold>", "Override the default LLMQ size for the LLMQ_TEST quorum (default: 3:2, regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
3333
argsman.AddArg("-llmqtestinstantsendparams=<size>:<threshold>", "Override the default LLMQ size for the LLMQ_TEST_INSTANTSEND quorums (default: 3:2, regtest-only)", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::CHAINPARAMS);
3434
argsman.AddArg("-powtargetspacing=<n>", "Override the default PowTargetSpacing value in seconds (default: 2.5 minutes, devnet-only)", ArgsManager::ALLOW_INT, OptionsCategory::CHAINPARAMS);

0 commit comments

Comments
 (0)