From 2866455cfe7e2f76bc097dce53e3f512229881d3 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:55:04 +0200 Subject: [PATCH 1/2] feat: Add LLMQ type 25_67 (6) --- btcjson/dashevocmds.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/btcjson/dashevocmds.go b/btcjson/dashevocmds.go index 7b3a1d2741..6f9240189c 100644 --- a/btcjson/dashevocmds.go +++ b/btcjson/dashevocmds.go @@ -130,6 +130,7 @@ const ( LLMQType_400_85 LLMQType = 3 // 400 members, 340 (85%) threshold, one every 24 hours LLMQType_100_67 LLMQType = 4 // 100 members, 67 (67%) threshold, one per hour LLMQType_60_75 LLMQType = 5 // 60 members, 45 (75%) threshold, one every 12 hours + LLMQType_25_67 LLMQType = 6 // 25 members, 67 (67%) threshold, one per hour LLMQType_TEST LLMQType = 100 // 3 members, 2 (66%) threshold, one per hour LLMQType_DEVNET LLMQType = 101 // 12 members, 6 (50%) threshold, one per hour LLMQType_TEST_V17 LLMQType = 102 // 3 members, 2 (66%) threshold, one per hour @@ -153,6 +154,7 @@ var ( "llmq_400_85": LLMQType_400_85, "llmq_100_67": LLMQType_100_67, "llmq_60_75": LLMQType_60_75, + "llmq_25_67": LLMQType_25_67, "llmq_test": LLMQType_TEST, "llmq_devnet": LLMQType_DEVNET, "llmq_test_v17": LLMQType_TEST_V17, @@ -186,7 +188,7 @@ func (t LLMQType) Name() string { // defined in accordance with DIP-0006. // See https://github.com/dashpay/dips/blob/master/dip-0006/llmq-types.md func (t LLMQType) Validate() error { - if (t >= LLMQType_50_60 && t <= LLMQType_60_75) || (t >= LLMQType_TEST && t <= LLMQType_DEVNET_PLATFORM) { + if (t >= LLMQType_50_60 && t <= LLMQType_25_67) || (t >= LLMQType_TEST && t <= LLMQType_DEVNET_PLATFORM) { return nil } From 5f6609ecffa7e14b4ec132464e7fb93729bd06bd Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Tue, 4 Apr 2023 09:47:37 +0200 Subject: [PATCH 2/2] test(btcjson): update llmq types test --- btcjson/dashevocmds_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/btcjson/dashevocmds_test.go b/btcjson/dashevocmds_test.go index de8edebfab..bc5f68f43e 100644 --- a/btcjson/dashevocmds_test.go +++ b/btcjson/dashevocmds_test.go @@ -188,8 +188,8 @@ func TestLLMQTypeValidate(t *testing.T) { {0, true}, {1, false}, {2, false}, - {5, false}, - {6, true}, + {6, false}, + {7, true}, {99, true}, {100, false}, {105, false},