Merge pull request #9805 from EOSIO/chain_plugin_db_intrinsic

chain_plugin db intrinsic table RPC calls incorrectly handling --lower and --upper in certain scenarios

libraries/chain/include/eosio/chain/backing_store/db_combined.hpp

@@ -457,17 +457,15 @@ namespace detail {
          EOS_ASSERT(begin_key < end_key, database_exception, "Invalid iterator_pair request: begin_key was greater than or equal to end_key.");
          if (is_reverse_) {
             current_ = session.lower_bound(end_key);
-            EOS_ASSERT(current_ != session.end(), database_exception, "iterator_pair: failed to find lower bound of end_key");
             end_ = session.lower_bound(begin_key);
             // since this is reverse iterating, then need to iterate backward if this is a greater-than iterator,
             // to get a greater-than-or-equal reverse iterator
-            if ((*current_).first > end_key) {
+            if (current_ == session.end() || (*current_).first > end_key) {
                --current_;
+               EOS_ASSERT(current_ != session.end(), database_exception, "iterator_pair: failed to find lower bound of end_key");
             }
             // since this is reverse iterating, then need to iterate backward to get a less-than iterator
-            if (end_ != session.end()) {
-               --end_;
-            }
+            --end_;
          }
          else {
             current_ = session.lower_bound(begin_key);

tests/get_table_seckey_tests.cpp

@@ -32,6 +32,34 @@ BOOST_AUTO_TEST_SUITE(get_table_seckey_tests)
 
 using backing_store_ts = boost::mpl::list<TESTER, ROCKSDB_TESTER>;
 
+transaction_trace_ptr
+issue_tokens( TESTER& t, account_name issuer, account_name to, const asset& amount,
+              std::string memo = "", account_name token_contract = "eosio"_n )
+{
+   signed_transaction trx;
+
+   trx.actions.emplace_back( t.get_action( token_contract, "issue"_n,
+                                           vector<permission_level>{{issuer, config::active_name}},
+                                           mutable_variant_object()
+                                             ("to", issuer.to_string())
+                                             ("quantity", amount)
+                                             ("memo", memo)
+   ) );
+
+   trx.actions.emplace_back( t.get_action( token_contract, "transfer"_n,
+                                           vector<permission_level>{{issuer, config::active_name}},
+                                           mutable_variant_object()
+                                             ("from", issuer.to_string())
+                                             ("to", to.to_string())
+                                             ("quantity", amount)
+                                             ("memo", memo)
+   ) );
+
+   t.set_transaction_headers(trx);
+   trx.sign( t.get_private_key( issuer, "active" ), t.control->get_chain_id()  );
+   return t.push_transaction( trx );
+}
+
 BOOST_AUTO_TEST_CASE_TEMPLATE( get_table_next_key_test, TESTER_T, backing_store_ts) { try {
    TESTER_T t;
    t.create_account("test"_n);
@@ -94,4 +122,50 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( get_table_next_key_test, TESTER_T, backing_store_
 
 } FC_LOG_AND_RETHROW() }/// get_table_next_key_test
 
+BOOST_AUTO_TEST_CASE_TEMPLATE( get_table_next_key_reverse_test, TESTER_T, backing_store_ts) { try {
+   TESTER_T t;
+   t.produce_blocks(2);
+
+   t.create_accounts({ "eosio.token"_n, "eosio.ram"_n, "eosio.ramfee"_n, "eosio.stake"_n,
+      "eosio.bpay"_n, "eosio.vpay"_n, "eosio.saving"_n, "eosio.names"_n });
+
+   std::vector<account_name> accs{"inita"_n, "initb"_n, "initc"_n, "initd"_n};
+   t.create_accounts(accs);
+   t.produce_block();
+
+   t.set_code( "eosio"_n, contracts::eosio_token_wasm() );
+   t.set_abi( "eosio"_n, contracts::eosio_token_abi().data() );
+   t.produce_blocks(1);
+
+   // create currency
+   auto act = mutable_variant_object()
+         ("issuer",       "eosio")
+         ("maximum_supply", eosio::chain::asset::from_string("1000000000.0000 SYS"));
+   t.push_action("eosio"_n, "create"_n, "eosio"_n, act );
+
+   // issue
+   for (account_name a: accs) {
+      issue_tokens( t, config::system_account_name, a, eosio::chain::asset::from_string("999.0000 SYS") );
+   }
+   t.produce_blocks(1);
+
+   // iterate over scope
+   eosio::chain_apis::read_only plugin(*(t.control), {}, fc::microseconds::maximum());
+   eosio::chain_apis::read_only::get_table_by_scope_params param{"eosio"_n, "accounts"_n, "inita", "", 10};
+
+   param.lower_bound = "a";
+   param.upper_bound = "z";
+   param.reverse = true;
+   eosio::chain_apis::read_only::get_table_by_scope_result result = plugin.read_only::get_table_by_scope(param);
+   BOOST_REQUIRE_EQUAL(5u, result.rows.size());
+   BOOST_REQUIRE_EQUAL("", result.more);
+
+   BOOST_REQUIRE_EQUAL(name("initd"_n), result.rows[0].scope);
+   BOOST_REQUIRE_EQUAL(name("initc"_n), result.rows[1].scope);
+   BOOST_REQUIRE_EQUAL(name("initb"_n), result.rows[2].scope);
+   BOOST_REQUIRE_EQUAL(name("inita"_n), result.rows[3].scope);
+   BOOST_REQUIRE_EQUAL(name("eosio"_n), result.rows[4].scope);
+
+} FC_LOG_AND_RETHROW() } /// get_scope_test
+
 BOOST_AUTO_TEST_SUITE_END()

tests/get_table_tests.cpp

@@ -116,6 +116,17 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( get_scope_test, TESTER_T, backing_store_ts) { try
       BOOST_REQUIRE_EQUAL(name("initc"_n), result.rows[1].scope);
    }
 
+   param.lower_bound = "initb";
+   param.upper_bound = "inite";
+   param.reverse = true;
+   result = plugin.read_only::get_table_by_scope(param);
+   BOOST_REQUIRE_EQUAL(3u, result.rows.size());
+   BOOST_REQUIRE_EQUAL("", result.more);
+
+   BOOST_REQUIRE_EQUAL(name("initd"_n), result.rows[0].scope);
+   BOOST_REQUIRE_EQUAL(name("initc"_n), result.rows[1].scope);
+   BOOST_REQUIRE_EQUAL(name("initb"_n), result.rows[2].scope);
+
    param.limit = 1;
    result = plugin.read_only::get_table_by_scope(param);
    BOOST_REQUIRE_EQUAL(1u, result.rows.size());