rpc: getdeploymentinfo: include block hash/height

Author: ajtowns

src/rpc/blockchain.cpp

@@ -1611,6 +1611,8 @@ static RPCHelpMan getdeploymentinfo()
         },
         RPCResult{
             RPCResult::Type::OBJ, "", "", {
+                {RPCResult::Type::STR, "hash", "requested block hash (or tip)"},
+                {RPCResult::Type::NUM, "height", "requested block height (or tip)"},
                 {RPCResult::Type::OBJ, "deployments", "", {
                     {RPCResult::Type::OBJ, "xxxx", "name of the deployment", RPCHelpForDeployment}
                 }},
@@ -1638,6 +1640,8 @@ static RPCHelpMan getdeploymentinfo()
             const Consensus::Params& consensusParams = Params().GetConsensus();
 
             UniValue deploymentinfo(UniValue::VOBJ);
+            deploymentinfo.pushKV("hash", tip->GetBlockHash().ToString());
+            deploymentinfo.pushKV("height", tip->nHeight);
             deploymentinfo.pushKV("deployments", DeploymentInfo(tip, consensusParams));
             return deploymentinfo;
         },

test/functional/rpc_blockchain.py

@@ -177,6 +177,8 @@ def check_signalling_deploymentinfo_result(self, gdi_result, height, blockhash,
         assert height >= 144 and height <= 287
 
         assert_equal(gdi_result, {
+          "hash": blockhash,
+          "height": height,
           "deployments": {
             'bip34': {'type': 'buried', 'active': True, 'height': 2},
             'bip66': {'type': 'buried', 'active': True, 'height': 3},