Merge branch 'update_2'

DECENTfoundation · Apr 11, 2018 · 44ab2c1 · 44ab2c1
2 parents e08f9a7 + 6d3755d
commit 44ab2c1
Show file tree

Hide file tree

Showing 114 changed files with 8,809 additions and 5,986 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,12 @@ endif()
 
 add_subdirectory( libraries )
 add_subdirectory( programs )
-#add_subdirectory( tests )
+
+set(DECENT_NETWORK_TESTS true)
+
+if(DECENT_NETWORK_TESTS)
+    add_subdirectory( tests )
+endif()
 
 
 if( ENABLE_INSTALLER )

diff --git a/libraries/app/CMakeLists.txt b/libraries/app/CMakeLists.txt
@@ -12,12 +12,10 @@ add_library( graphene_app
            )
 
 # need to link graphene_debug_miner because plugins aren't sufficiently isolated #246
-target_link_libraries( graphene_app  graphene_account_history graphene_chain fc graphene_db graphene_net graphene_time graphene_utilities graphene_debug_miner nlohmann_json package_manager )
+target_link_libraries( graphene_app graphene_account_history graphene_chain fc graphene_db graphene_net graphene_time graphene_utilities graphene_debug_miner decent_seeding nlohmann_json package_manager )
 target_include_directories( graphene_app
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
                             "${CMAKE_CURRENT_SOURCE_DIR}/../egenesis/include"
-                            "${CMAKE_CURRENT_SOURCE_DIR}/../plugins/seeding/include"
-                            "${CMAKE_CURRENT_SOURCE_DIR}/../plugins/messaging/include"
  )
 
 if(MSVC)

diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp
@@ -215,6 +215,7 @@ namespace graphene { namespace app {
                                            const fc::ecc::private_key& seeder_private_key,
                                            const uint64_t free_space,
                                            const uint32_t seeding_price,
+                                           const string seeding_symbol,
                                            const string packages_path,
                                            const string region_code)
     {
@@ -227,6 +228,7 @@ namespace graphene { namespace app {
        seeding_options.seeder_private_key = seeder_private_key;
        seeding_options.free_space = free_space;
        seeding_options.seeding_price = seeding_price;
+       seeding_options.seeding_symbol = seeding_symbol;
        seeding_options.packages_path = packages_path;
        seeding_options.region_code = region_code;
        decent::seeding::seeding_promise->set_value( seeding_options );

diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
@@ -341,8 +341,10 @@ namespace detail {
             {
                auto item = fc::json::from_string(cp).as<std::pair<uint32_t,block_id_type> >();
                loaded_checkpoints[item.first] = item.second;
+               ilog ( "loaded checkpoint ${s} at ${n}", ("s",loaded_checkpoints[item.first])("n", item.first));
             }
          }
+
          _chain_db->add_checkpoints( loaded_checkpoints );
 
          if( _options->count("replay-blockchain") )

diff --git a/libraries/app/impacted.cpp b/libraries/app/impacted.cpp
@@ -43,6 +43,12 @@ struct get_impacted_account_visitor
       _impacted.insert( op.to );
    }
 
+   void operator()( const transfer2_operation& op )
+   {
+      if( op.to.is<account_id_type>() )
+         _impacted.insert( op.to.as<account_id_type>() );
+   }
+
    void operator()( const account_create_operation& op )
    {
       _impacted.insert( op.registrar );