Merge pull request zcash#6963 from str4d/fix-getblocksubsidy

Fix `getblocksubsidy`

Author: str4d

src/consensus/params.cpp

@@ -43,7 +43,7 @@ namespace Consensus {
         },
         {
             .recipient = "Lockbox NU6",
-            .specification = "https://zips.z.cash/draft-nuttycom-funding-allocation",
+            .specification = "https://zips.z.cash/zip-0214",
             .valueNumerator = 12,
             .valueDenominator = 100,
         }
@@ -342,16 +342,16 @@ namespace Consensus {
         }
     }
 
-    std::vector<FSInfo> Params::GetActiveFundingStreams(int nHeight) const
+    std::vector<std::pair<FSInfo, FundingStream>> Params::GetActiveFundingStreams(int nHeight) const
     {
-        std::vector<FSInfo> activeStreams;
+        std::vector<std::pair<FSInfo, FundingStream>> activeStreams;
 
         // Funding streams are disabled if Canopy is not active.
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
             for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
                 auto fs = vFundingStreams[idx];
                 if (fs && nHeight >= fs.value().GetStartHeight() && nHeight < fs.value().GetEndHeight()) {
-                    activeStreams.push_back(FundingStreamInfo[idx]);
+                    activeStreams.push_back(std::make_pair(FundingStreamInfo[idx], fs.value()));
                 }
             }
         }

src/consensus/params.h

@@ -347,7 +347,7 @@ struct Params {
     /**
      * Returns the vector of active funding streams as of the given height.
      */
-    std::vector<FSInfo> GetActiveFundingStreams(int nHeight) const;
+    std::vector<std::pair<FSInfo, FundingStream>> GetActiveFundingStreams(int nHeight) const;
 
     /**
      * Returns the vector of active funding stream elements as of the given height.

src/rpc/mining.cpp

@@ -968,7 +968,7 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
         UniValue lockboxstreams(UniValue::VARR);
         auto fsinfos = consensus.GetActiveFundingStreams(nHeight);
         for (int idx = 0; idx < fsinfos.size(); idx++) {
-            const auto& fsinfo = fsinfos[idx];
+            const auto& fsinfo = fsinfos[idx].first;
             CAmount nStreamAmount = fsinfo.Value(nBlockSubsidy);
 
             UniValue fsobj(UniValue::VOBJ);
@@ -977,8 +977,8 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
             fsobj.pushKV("value", ValueFromAmount(nStreamAmount));
             fsobj.pushKV("valueZat", nStreamAmount);
 
-            auto fs = consensus.vFundingStreams[idx];
-            auto recipient = fs.value().Recipient(consensus, nHeight);
+            auto fs = fsinfos[idx].second;
+            auto recipient = fs.Recipient(consensus, nHeight);
 
             examine(recipient, match {
                 [&](const CScript& scriptPubKey) {

src/wallet/test/rpc_wallet_tests.cpp

@@ -315,8 +315,25 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
         }
     };
 
+    auto check_lockbox_streams = [](UniValue obj, std::vector<std::string> recipients, std::vector<double> amounts) {
+        size_t n = recipients.size();
+        BOOST_REQUIRE_EQUAL(amounts.size(), n);
+        UniValue lockboxstreams = find_value(obj, "lockboxstreams");
+        BOOST_CHECK_EQUAL(lockboxstreams.size(), n);
+        if (lockboxstreams.size() != n) return;
+
+        for (int i = 0; i < n; i++) {
+            UniValue fsobj = lockboxstreams[i];
+            BOOST_CHECK_EQUAL(find_value(fsobj, "recipient").get_str(), recipients[i]);
+            BOOST_CHECK_EQUAL(find_value(fsobj, "specification").get_str(), "https://zips.z.cash/zip-0214");
+            BOOST_CHECK_EQUAL(find_value(fsobj, "value").get_real(), amounts[i]);
+        }
+    };
+
     bool canopyEnabled =
         Params().GetConsensus().vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+    bool nu6Enabled =
+        Params().GetConsensus().vUpgrades[Consensus::UPGRADE_NU6].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
     // slow start + blossom activation + (pre blossom halving - blossom activation) * 2
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 1046400"));
@@ -332,6 +349,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
                                        "t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"
                                    });
     }
+    BOOST_CHECK(find_value(obj, "lockboxstreams").empty());
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726399"));
     obj = retValue.get_obj();
@@ -346,9 +364,27 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
                                        "t3XyYW8yBFRuMnfvm5KLGFbEVz25kckZXym"
                                    });
     }
+    BOOST_CHECK(find_value(obj, "lockboxstreams").empty());
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726400"));
     obj = retValue.get_obj();
+    BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), nu6Enabled ? 1.25 : 1.5625);
+    BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
+    if (nu6Enabled) {
+        check_funding_streams(obj, { "Zcash Community Grants NU6" },
+                                   { 0.125,                       },
+                                   {
+                                       "t3cFfPt1Bcvgez9ZbMBFWeZsskxTkPzGCow"
+                                   });
+        check_lockbox_streams(obj, { "Lockbox NU6" },
+                                   { 0.1875,       });
+    } else {
+        BOOST_CHECK(find_value(obj, "fundingstreams").empty());
+        BOOST_CHECK(find_value(obj, "lockboxstreams").empty());
+    }
+
+    BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 3146400"));
+    obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 1.5625);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
     BOOST_CHECK(find_value(obj, "fundingstreams").empty());