feat: rpc submitchainlock short circuit if possible and always return…

… best height
dashpay · Jan 9, 2024 · 2292f73 · 2292f73
1 parent 8be260a
commit 2292f73
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
@@ -1017,21 +1017,23 @@ static UniValue submitchainlock(const JSONRPCRequest& request)
     if (nBlockHeight <= 0) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid block height");
     }
+    const LLMQContext& llmq_ctx = EnsureLLMQContext(EnsureAnyNodeContext(request.context));
+    const int32_t bestCLHeight = llmq_ctx.clhandler->GetBestChainLock().getHeight();
+    if (nBlockHeight <= bestCLHeight) return bestCLHeight;
 
     CBLSSignature sig;
     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");
     }
 
 
-    const LLMQContext& llmq_ctx = EnsureLLMQContext(EnsureAnyNodeContext(request.context));
     auto clsig = llmq::CChainLockSig(nBlockHeight, nBlockHash, sig);
     if (!llmq_ctx.clhandler->VerifyChainLock(clsig)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid signature");
     }
 
     llmq_ctx.clhandler->ProcessNewChainLock(-1, clsig, ::SerializeHash(clsig));
-    return true;
+    return llmq_ctx.clhandler->GetBestChainLock().getHeight();
 }