Added attrs index fixes, change default, add v27

src/masternodes/govvariables/attributes.cpp

@@ -626,7 +626,7 @@ Res ATTRIBUTES::Import(const UniValue & val) {
 // Keys to exclude when using the legacy filter mode, to keep things the 
 // same as pre 2.7.x versions, to reduce noise. Eventually, the APIs that 
 // cause too much noise can be deprecated and this code removed.
-std::set<uint32_t> legacyTokenKeysBlacklist = {
+std::set<uint32_t> attrsVersion27TokenHiddenSet = {
     TokenKeys::LoanCollateralEnabled,
     TokenKeys::LoanCollateralFactor,
     TokenKeys::LoanMintingEnabled,
@@ -644,12 +644,12 @@ UniValue ATTRIBUTES::ExportFiltered(GovVarsFilter filter, const std::string &pre
         if (!attrV0) {
             continue;
         }
-        if (filter == GovVarsFilter::LiveAttributes && 
+        if (filter == GovVarsFilter::Version2Dot7 && 
             attrV0->type != AttributeTypes::Live) {
                 continue;
-        } else if (filter == GovVarsFilter::Legacy) {
+        } else if (filter == GovVarsFilter::) {
             if (attrV0->type == AttributeTypes::Token && 
-            legacyTokenKeysBlacklist.find(attrV0->key) != legacyTokenKeysBlacklist.end()) 
+            attrsVersion27TokenHiddenSet.find(attrV0->key) != attrsVersion27TokenHiddenSet.end()) 
                 continue;
         }
         try {

src/masternodes/govvariables/attributes.h

@@ -136,12 +136,12 @@ using CAttributeType = boost::variant<CDataStructureV0, CDataStructureV1>;
 using CAttributeValue = boost::variant<bool, CAmount, CBalances, CTokenPayback, CTokenCurrencyPair, OracleSplits, DescendantValue, AscendantValue>;
 
 enum GovVarsFilter {
-    Legacy,
     All,
     NoAttributes,
     AttributesOnly,
     PrefixedAttributes,
     LiveAttributes,
+    Version2Dot7,
 };
 
 class ATTRIBUTES : public GovVariable, public AutoRegistrator<GovVariable, ATTRIBUTES>

src/masternodes/mn_rpc.cpp

@@ -693,7 +693,7 @@ UniValue listgovs(const JSONRPCRequest& request) {
                "\nReturns information about all governance variables including pending changes\n",
                {
                    {"prefix", RPCArg::Type::STR, RPCArg::Optional::OMITTED,
-                       "One of all, gov, live. Defaults to the legacy view. Any other string is treated as\n"
+                       "One of all, gov, attrs, live. Defaults to the all view. Any other string is treated as\n"
                        "a prefix of attributes to filter with. `v0/` is assumed if not explicitly provided."},
                },
                RPCResult{
@@ -712,7 +712,7 @@ UniValue listgovs(const JSONRPCRequest& request) {
                },
     }.Check(request);
 
-    GovVarsFilter mode{GovVarsFilter::Legacy};
+    GovVarsFilter mode{GovVarsFilter::All};
     std::string prefix;
     if (request.params.size() > 0) {
         prefix = request.params[0].getValStr();
@@ -724,12 +724,16 @@ UniValue listgovs(const JSONRPCRequest& request) {
             mode = GovVarsFilter::NoAttributes;
         } else if (prefix == "attrs") {
             mode = GovVarsFilter::AttributesOnly;
-
+        } else if (prefix == "v/2.7") {
+            // Undocumented. Make be removed or deprecated without notice. 
+            // Only here for unforeseen compatibility concern downstream
+            // for transitions.
+            mode = GovVarsFilter::Version2Dot7;
         } else if (prefix == "live") {
             mode = GovVarsFilter::LiveAttributes;
         } else {
             mode = GovVarsFilter::PrefixedAttributes;
-            const std::regex versionRegex("v[0-9].*");
+            const std::regex versionRegex("^v[0-9].*");
             if (!std::regex_match(prefix.begin(), prefix.end(), versionRegex)) {
                 prefix = "v0/" + prefix;
             }

test/functional/feature_token_split.py

@@ -253,7 +253,7 @@ def check_token_split(self, token_id, token_symbol, token_suffix, multiplier, mi
         assert_equal(result['destructionHeight'], self.nodes[0].getblockcount())
 
         # Check old token in Gov vars
-        result = self.nodes[0].listgovs("all")[8][0]['ATTRIBUTES']
+        result = self.nodes[0].listgovs("attrs")[0][0]['ATTRIBUTES']
         assert(f'v0/token/{token_id}/fixed_interval_price_id' not in result)
         if collateral:
             assert(f'v0/token/{token_id}/loan_collateral_enabled' not in result)
@@ -316,7 +316,7 @@ def check_pool_split(self, pool_id, pool_symbol, token_id, token_symbol, token_s
         assert_equal(result['rewardLoanPct'], Decimal('0.00000000'))
 
         # Validate old Gov vars removed
-        result = self.nodes[0].listgovs("all")[8][0]['ATTRIBUTES']
+        result = self.nodes[0].listgovs("attrs")[0][0]['ATTRIBUTES']
         assert(f'v0/poolpairs/{pool_id}/token_a_fee_pct' not in result)
         assert(f'v0/poolpairs/{pool_id}/token_b_fee_pct' not in result)
         assert(f'v0/token/{token_id}/dex_in_fee_pct' not in result)
@@ -617,7 +617,7 @@ def check_govvar_deletion(self):
         self.nodes[0].generate(1)
 
         # Check splits
-        result = self.nodes[0].listgovs("all")[8][0]['ATTRIBUTES']
+        result = self.nodes[0].listgovs("attrs")[0][0]['ATTRIBUTES']
         assert_equal(result[f'v0/oracles/splits/{split_height}'], f'{self.idTSLA}/2,')
         assert_equal(result[f'v0/oracles/splits/500000'], f'{self.idTSLA}/2,')
         assert_equal(result[f'v0/oracles/splits/1000000'], f'{self.idTSLA}/2,{self.idNVDA}/2,')
@@ -626,7 +626,7 @@ def check_govvar_deletion(self):
         self.nodes[0].generate(1)
 
         # Check TSLA entries removed
-        result = self.nodes[0].listgovs("all")[8][0]['ATTRIBUTES']
+        result = self.nodes[0].listgovs("attrs")[0][0]['ATTRIBUTES']
         assert(f'v0/oracles/splits/{split_height}' not in result)
         assert(f'v0/oracles/splits/500000' not in result)
         assert_equal(result[f'v0/oracles/splits/1000000'], f'{self.idNVDA}/2,')