Merge pull request #2476 from bitshares/samet-fund-impacted-accounts

abitmore · web-flow · commit 7d79c23e46b2 · 2021-06-19T02:58:20.000+02:00
Return owner account for SameT Fund borrow, repay
diff --git a/libraries/chain/include/graphene/chain/samet_fund_evaluator.hpp b/libraries/chain/include/graphene/chain/samet_fund_evaluator.hpp
@@ -28,8 +28,6 @@
 
 namespace graphene { namespace chain {
 
-   class asset_object;
-   class asset_dynamic_data_object;
    class samet_fund_object;
 
    class samet_fund_create_evaluator : public evaluator<samet_fund_create_evaluator>
@@ -69,7 +67,7 @@ namespace graphene { namespace chain {
          using operation_type = samet_fund_borrow_operation;
 
          void_result do_evaluate( const samet_fund_borrow_operation& op );
-         void_result do_apply( const samet_fund_borrow_operation& op ) const;
+         object_id_type do_apply( const samet_fund_borrow_operation& op ) const;
 
          const samet_fund_object* _fund = nullptr;
    };
@@ -80,7 +78,7 @@ namespace graphene { namespace chain {
          using operation_type = samet_fund_repay_operation;
 
          void_result do_evaluate( const samet_fund_repay_operation& op );
-         void_result do_apply( const samet_fund_repay_operation& op ) const;
+         object_id_type do_apply( const samet_fund_repay_operation& op ) const;
 
          const samet_fund_object* _fund = nullptr;
    };
diff --git a/libraries/chain/samet_fund_evaluator.cpp b/libraries/chain/samet_fund_evaluator.cpp
@@ -164,7 +164,7 @@ void_result samet_fund_borrow_evaluator::do_evaluate(const samet_fund_borrow_ope
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
-void_result samet_fund_borrow_evaluator::do_apply( const samet_fund_borrow_operation& op) const
+object_id_type samet_fund_borrow_evaluator::do_apply( const samet_fund_borrow_operation& op) const
 { try {
    database& d = db();
 
@@ -177,7 +177,7 @@ void_result samet_fund_borrow_evaluator::do_apply( const samet_fund_borrow_opera
    // Defensive check
    FC_ASSERT( _fund->balance >= _fund->unpaid_amount, "Should not borrow more than available" );
 
-   return void_result();
+   return _fund->owner_account;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
 void_result samet_fund_repay_evaluator::do_evaluate(const samet_fund_repay_operation& op)
@@ -204,7 +204,7 @@ void_result samet_fund_repay_evaluator::do_evaluate(const samet_fund_repay_opera
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
-void_result samet_fund_repay_evaluator::do_apply( const samet_fund_repay_operation& op) const
+object_id_type samet_fund_repay_evaluator::do_apply( const samet_fund_repay_operation& op) const
 { try {
    database& d = db();
 
@@ -215,7 +215,7 @@ void_result samet_fund_repay_evaluator::do_apply( const samet_fund_repay_operati
       sfo.unpaid_amount -= op.repay_amount.amount;
    });
 
-   return void_result();
+   return _fund->owner_account;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
 } } // graphene::chain
diff --git a/libraries/plugins/account_history/account_history_plugin.cpp b/libraries/plugins/account_history/account_history_plugin.cpp
@@ -135,8 +135,12 @@ void account_history_plugin_impl::update_account_histories( const signed_block&
       if( op.op.is_type< account_create_operation >() )
          impacted.insert( op.result.get<object_id_type>() );
       else
+      {
          operation_get_impacted_accounts( op.op, impacted,
                                           MUST_IGNORE_CUSTOM_OP_REQD_AUTHS( db.head_block_time() ) );
+         if( op.op.is_type< samet_fund_borrow_operation >() || op.op.is_type< samet_fund_repay_operation >() )
+            impacted.insert( op.result.get<object_id_type>() );
+      }
 
       for( auto& a : other )
          for( auto& item : a.account_auths )
diff --git a/libraries/plugins/elasticsearch/elasticsearch_plugin.cpp b/libraries/plugins/elasticsearch/elasticsearch_plugin.cpp
@@ -165,8 +165,12 @@ bool elasticsearch_plugin_impl::update_account_histories( const signed_block& b
       if( op.op.is_type< account_create_operation >() )
          impacted.insert( op.result.get<object_id_type>() );
       else
+      {
          operation_get_impacted_accounts( op.op, impacted,
                                           MUST_IGNORE_CUSTOM_OP_REQD_AUTHS( db.head_block_time() ) );
+         if( op.op.is_type< samet_fund_borrow_operation >() || op.op.is_type< samet_fund_repay_operation >() )
+            impacted.insert( op.result.get<object_id_type>() );
+      }
 
       for( auto& a : other )
          for( auto& item : a.account_auths )
diff --git a/libraries/protocol/include/graphene/protocol/samet_fund.hpp b/libraries/protocol/include/graphene/protocol/samet_fund.hpp
@@ -90,6 +90,7 @@ namespace graphene { namespace protocol {
    /**
     * @brief Borrow from a SameT Fund
     * @ingroup operations
+    * @note The result of this operation is the ID of the owner account of the SameT Fund
     */
    struct samet_fund_borrow_operation : public base_operation
    {
@@ -109,6 +110,7 @@ namespace graphene { namespace protocol {
    /**
     * @brief Repay to a SameT Fund
     * @ingroup operations
+    * @note The result of this operation is the ID of the owner account of the SameT Fund
     */
    struct samet_fund_repay_operation : public base_operation
    {
diff --git a/tests/tests/samet_fund_tests.cpp b/tests/tests/samet_fund_tests.cpp
@@ -1162,4 +1162,68 @@ BOOST_AUTO_TEST_CASE( samet_fund_apis_test )
    }
 }
 
+BOOST_AUTO_TEST_CASE( samet_fund_account_history_test )
+{ try {
+
+      // Pass the hard fork time
+      generate_blocks( HARDFORK_CORE_2351_TIME );
+      set_expiration( db, trx );
+
+      ACTORS((sam)(ted));
+
+      auto init_amount = 10000000 * GRAPHENE_BLOCKCHAIN_PRECISION;
+      fund( sam, asset(init_amount) );
+      fund( ted, asset(init_amount) );
+
+      asset_id_type core_id;
+
+      // create samet funds
+      const samet_fund_object& sfo1 = create_samet_fund( sam_id, core_id, 10000, 10000u ); // fee rate is 1%
+      samet_fund_id_type sf1_id = sfo1.id;
+
+      generate_block();
+
+      // Check history API
+      graphene::app::history_api hist_api(app);
+
+      // Sam's last operation is fund creation
+      auto histories = hist_api.get_relative_account_history( "sam", 0, 1, 0 );
+      BOOST_REQUIRE_EQUAL( histories.size(), 1u );
+      BOOST_CHECK( histories[0].op.is_type<samet_fund_create_operation>() );
+
+      // Ted's last operation is transfer
+      histories = hist_api.get_relative_account_history( "ted", 0, 1, 0 );
+      BOOST_REQUIRE_EQUAL( histories.size(), 1u );
+      BOOST_CHECK( histories[0].op.is_type<transfer_operation>() );
+
+      // Ted borrow and repay
+      {
+         auto bop1 = make_samet_fund_borrow_op( ted_id, sf1_id, asset(1) );
+         auto rop1 = make_samet_fund_repay_op( ted_id, sf1_id, asset(1), asset(1) );
+         trx.operations.clear();
+         trx.operations.push_back(bop1);
+         trx.operations.push_back(rop1);
+         PUSH_TX( db, trx, ~0 );
+      }
+
+      generate_block();
+
+      // Sam's last 2 operations are Ted's borrowing and repayment
+      histories = hist_api.get_relative_account_history( "sam", 0, 2, 0 );
+      BOOST_REQUIRE_EQUAL( histories.size(), 2u );
+      BOOST_CHECK( histories[0].op.is_type<samet_fund_repay_operation>() );
+      BOOST_CHECK( histories[1].op.is_type<samet_fund_borrow_operation>() );
+
+      // Ted's last 2 operations are the same
+      auto histories_ted = hist_api.get_relative_account_history( "ted", 0, 2, 0 );
+      BOOST_REQUIRE_EQUAL( histories_ted.size(), 2u );
+      BOOST_CHECK( histories[0].id == histories_ted[0].id );
+      BOOST_CHECK( histories[1].id == histories_ted[1].id );
+
+   } catch (fc::exception& e) {
+      edump((e.to_detail_string()));
+      throw;
+   }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
