Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Graphene Updates and DApp Support #643

Closed
nathanielhourt wants to merge 84 commits from dapp-support into develop
pull from: dapp-support
merge into: Peerplays_Blockchain:develop
Conversation 10 Commits 84 Files changed 376 +1 -193
5 changed files with 1 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 10adf05881 - Show all commits

2
libraries/CMakeLists.txt
View file

@ -4,8 +4,6 @@ add_subdirectory( db )
add_subdirectory( chain )
add_subdirectory( egenesis )
add_subdirectory( net )
#add_subdirectory( p2p )
add_subdirectory( time )
add_subdirectory( utilities )
add_subdirectory( app )
add_subdirectory( plugins )

3
libraries/app/CMakeLists.txt
View file

@ -12,8 +12,7 @@ add_library( graphene_app
)
# need to link graphene_debug_witness because plugins aren't sufficiently isolated #246
#target_link_libraries( graphene_app graphene_market_history graphene_account_history graphene_chain fc graphene_db graphene_net graphene_utilities graphene_debug_witness )
target_link_libraries( graphene_app graphene_market_history graphene_account_history graphene_accounts_list graphene_affiliate_stats graphene_chain fc graphene_db graphene_net graphene_time graphene_utilities graphene_debug_witness graphene_bookie graphene_elasticsearch )
target_link_libraries( graphene_app graphene_market_history graphene_account_history graphene_accounts_list graphene_affiliate_stats graphene_chain fc graphene_db graphene_net graphene_utilities graphene_debug_witness graphene_bookie graphene_elasticsearch )
target_include_directories( graphene_app
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/../egenesis/include" )

17
libraries/time/CMakeLists.txt
View file

@ -1,17 +0,0 @@
file(GLOB HEADERS "include/graphene/time/*.hpp")
add_library( graphene_time
time.cpp
)
target_link_libraries( graphene_time fc )
target_include_directories( graphene_time
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
install( TARGETS
graphene_time
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

46
libraries/time/include/graphene/time/time.hpp
View file

@ -1,46 +0,0 @@
/*
* Copyright (c) 2015 Cryptonomex, Inc., and contributors.
*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#pragma once
#include <fc/optional.hpp>
#include <fc/signals.hpp>
#include <fc/time.hpp>
namespace graphene { namespace time {
typedef fc::signal<void()> time_discontinuity_signal_type;
extern time_discontinuity_signal_type time_discontinuity_signal;
fc::optional<fc::time_point> ntp_time();
fc::time_point now();
fc::time_point nonblocking_now(); // identical to now() but guaranteed not to block
void update_ntp_time();
fc::microseconds ntp_error();
void shutdown_ntp_time();
void start_simulated_time( const fc::time_point sim_time );
void advance_simulated_time_to( const fc::time_point sim_time );
void advance_time( int32_t delta_seconds );
} } // graphene::time

126
libraries/time/time.cpp
View file

@ -1,126 +0,0 @@
/*
* Copyright (c) 2015 Cryptonomex, Inc., and contributors.
*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <graphene/time/time.hpp>
#include <fc/exception/exception.hpp>
#include <fc/network/ntp.hpp>
#include <fc/thread/mutex.hpp>
#include <fc/thread/scoped_lock.hpp>
#include <atomic>
namespace graphene { namespace time {
static int32_t simulated_time = 0;
static int32_t adjusted_time_sec = 0;
time_discontinuity_signal_type time_discontinuity_signal;
namespace detail
{
std::atomic<fc::ntp*> ntp_service(nullptr);
fc::mutex ntp_service_initialization_mutex;
}
fc::optional<fc::time_point> ntp_time()
{
fc::ntp* actual_ntp_service = detail::ntp_service.load();
if (!actual_ntp_service)
{
fc::scoped_lock<fc::mutex> lock(detail::ntp_service_initialization_mutex);
actual_ntp_service = detail::ntp_service.load();
if (!actual_ntp_service)
{
actual_ntp_service = new fc::ntp;
detail::ntp_service.store(actual_ntp_service);
}
}
return actual_ntp_service->get_time();
}
void shutdown_ntp_time()
{
fc::ntp* actual_ntp_service = detail::ntp_service.exchange(nullptr);
delete actual_ntp_service;
}
fc::time_point now()
{
if( simulated_time )
return fc::time_point() + fc::seconds( simulated_time + adjusted_time_sec );
fc::optional<fc::time_point> current_ntp_time = ntp_time();
if( current_ntp_time.valid() )
return *current_ntp_time + fc::seconds( adjusted_time_sec );
else
return fc::time_point::now() + fc::seconds( adjusted_time_sec );
}
fc::time_point nonblocking_now()
{
if (simulated_time)
return fc::time_point() + fc::seconds(simulated_time + adjusted_time_sec);
fc::ntp* actual_ntp_service = detail::ntp_service.load();
fc::optional<fc::time_point> current_ntp_time;
if (actual_ntp_service)
current_ntp_time = actual_ntp_service->get_time();
if (current_ntp_time)
return *current_ntp_time + fc::seconds(adjusted_time_sec);
else
return fc::time_point::now() + fc::seconds(adjusted_time_sec);
}
void update_ntp_time()
{
detail::ntp_service.load()->request_now();
}
fc::microseconds ntp_error()
{
fc::optional<fc::time_point> current_ntp_time = ntp_time();
FC_ASSERT( current_ntp_time, "We don't have NTP time!" );
return *current_ntp_time - fc::time_point::now();
}
void start_simulated_time( const fc::time_point sim_time )
{
simulated_time = sim_time.sec_since_epoch();
adjusted_time_sec = 0;
}
void advance_simulated_time_to( const fc::time_point sim_time )
{
simulated_time = sim_time.sec_since_epoch();
adjusted_time_sec = 0;
}
void advance_time( int32_t delta_seconds )
{
adjusted_time_sec += delta_seconds;
time_discontinuity_signal();
}
} } // graphene::time