partially revert 668d00d

UdjinM6 · UdjinM6 · commit 140c1cb49fb7 · 2023-06-20T16:11:47.000+03:00
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
@@ -886,18 +886,26 @@ static UniValue verifychainlock(const JSONRPCRequest& request)
     } else {
         nBlockHeight = ParseInt32V(request.params[2], "blockHeight");
         LOCK(cs_main);
-        if (nBlockHeight < 0 || nBlockHeight > ::ChainActive().Height()) {
+        if (nBlockHeight < 0) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
         }
-        pIndex = ::ChainActive()[nBlockHeight];
+        if (nBlockHeight <= ::ChainActive().Height()) {
+            pIndex = ::ChainActive()[nBlockHeight];
+        }
     }
 
-    CHECK_NONFATAL(pIndex != nullptr);
-
     CBLSSignature sig;
-    bool use_legacy_signature = !llmq::utils::IsV19Active(pIndex);
-    if (!sig.SetHexStr(request.params[1].get_str(), use_legacy_signature)) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid signature format");
+    if (pIndex) {
+        bool use_legacy_signature = !llmq::utils::IsV19Active(pIndex);
+        if (!sig.SetHexStr(request.params[1].get_str(), use_legacy_signature)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid signature format");
+        }
+    } else {
+        if (!sig.SetHexStr(request.params[1].get_str(), false) &&
+                !sig.SetHexStr(request.params[1].get_str(), true)
+        ) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid signature format");
+        }
     }
 
     LLMQContext& llmq_ctx = EnsureLLMQContext(request.context);
