Peerplays SON plugin skeleton

.dockerignore

@@ -0,0 +1,2 @@
+build
+

CMakeLists.txt

@@ -119,7 +119,11 @@ else( WIN32 ) # Apple AND Linux
         message( STATUS "Configuring BitShares on Linux" )
         set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
         set( rt_library rt )
-        set( pthread_library pthread)
+        #set( pthread_library pthread)
+        set(CMAKE_LINKER_FLAGS "-pthread" CACHE STRING "Linker Flags" FORCE)
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINKER_FLAGS}" CACHE STRING "" FORCE)
+        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS}" CACHE STRING "" FORCE)
+        set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_LINKER_FLAGS}" CACHE STRING "" FORCE)
         if ( NOT DEFINED crypto_library )
           # I'm not sure why this is here, I guess someone has openssl and can't detect it with find_package()?
           # if you have a normal install, you can define crypto_library to the empty string to avoid a build error

Dockerfile

@@ -1,44 +1,63 @@
-FROM phusion/baseimage:0.9.19
+FROM ubuntu:18.04
 MAINTAINER PeerPlays Blockchain Standards Association
 
-ENV LANG=en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
 RUN \
     apt-get update -y && \
-    apt-get install -y \
-      g++ \
+      DEBIAN_FRONTEND=noninteractive apt-get install -y \
       autoconf \
+      bash \
+      build-essential \
+      ca-certificates \
       cmake \
+      doxygen \
       git \
+      graphviz \
       libbz2-dev \
-      libreadline-dev \
-      libboost-all-dev \
       libcurl4-openssl-dev \
-      libssl-dev \
       libncurses-dev \
-      doxygen \
-      ca-certificates \
+      libreadline-dev \
+      libssl-dev \
+      libtool \
+      locales \
+      ntp \
+      pkg-config \
+      wget \
     && \
-    apt-get update -y && \
-    apt-get install -y fish && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN \
+    sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    locale-gen
+
+# Compile Boost
+RUN \
+    BOOST_ROOT=$HOME/boost_1_67_0 && \
+    wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.gz/download' -O boost_1_67_0.tar.gz &&\
+    tar -zxvf boost_1_67_0.tar.gz && \
+    cd boost_1_67_0/ && \
+    ./bootstrap.sh "--prefix=$BOOST_ROOT" && \
+    ./b2 install && \
+    cd ..
+
 ADD . /peerplays-core
 WORKDIR /peerplays-core
 
-# Compile
+# Compile Peerplays
 RUN \
-    ( git submodule sync --recursive || \
-      find `pwd`  -type f -name .git | \
-	while read f; do \
-	  rel="$(echo "${f#$PWD/}" | sed 's=[^/]*/=../=g')"; \
-	  sed -i "s=: .*/.git/=: $rel/=" "$f"; \
-	done && \
-      git submodule sync --recursive ) && \
+    BOOST_ROOT=$HOME/boost_1_67_0 && \
     git submodule update --init --recursive && \
+    mkdir build && \
+    mkdir build/release && \
+    cd build/release && \
     cmake \
+        -DBOOST_ROOT="$BOOST_ROOT" \
         -DCMAKE_BUILD_TYPE=Release \
-        . && \
+        ../.. && \
     make witness_node cli_wallet && \
     install -s programs/witness_node/witness_node programs/cli_wallet/cli_wallet /usr/local/bin && \
     #

README.md

@@ -32,16 +32,44 @@ cd boost_1_67_0/
 ## Building Peerplays
 
 ```
-export BOOST_ROOT=/root/boost_1_67_0
-export CC=gcc-5 ; export CXX=g++-5
 cd $HOME/src
+export BOOST_ROOT=$HOME/src/boost_1_67_0
 git clone https://github.com/peerplays-network/peerplays.git
-mkdir $HOME/peerplays/build; cd $HOME/src/peerplays/build
+cd peerplays
 git submodule update --init --recursive
-cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release ..
+cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release
 make -j$(nproc)
 
-ake install # this can install the executable files under /usr/local
+make install # this can install the executable files under /usr/local
+```
+
+docker build -t peerplays .
+
+## Docker image
+
+```
+# Install docker
+sudo apt install docker.io
+
+
+# Add current user to docker group
+sudo usermod -a -G docker $USER
+# You need to restart your shell session, to apply group membership
+# Type 'groups' to verify that you are a member of a docker group
+
+
+# Build docker image (from the project root, must be a docker group member)
+docker build -t peerplays .
+
+
+# Start docker image
+docker start peerplays
+
+# Exposed ports
+# # rpc service:
+# EXPOSE 8090
+# # p2p service:
+# EXPOSE 1776
 ```
 
  Rest of the instructions on starting the chain remains same.

libraries/chain/include/graphene/chain/vesting_balance_object.hpp

@@ -189,9 +189,9 @@ namespace graphene { namespace chain {
         ordered_non_unique< tag<by_asset_balance>,
            composite_key<
               vesting_balance_object,
-              member_offset<vesting_balance_object, asset_id_type, (size_t) (offset_s(vesting_balance_object,balance) + offset_s(asset,asset_id))>,
+              member_offset<vesting_balance_object, asset_id_type, (size_t) (offsetof(vesting_balance_object,balance) + offsetof(asset,asset_id))>,
               member<vesting_balance_object, vesting_balance_type, &vesting_balance_object::balance_type>,
-              member_offset<vesting_balance_object, share_type, (size_t) (offset_s(vesting_balance_object,balance) + offset_s(asset,amount))>
+              member_offset<vesting_balance_object, share_type, (size_t) (offsetof(vesting_balance_object,balance) + offsetof(asset,amount))>
               //member<vesting_balance_object, account_id_type, &vesting_balance_object::owner>
               //member_offset<vesting_balance_object, account_id_type, (size_t) (offset_s(vesting_balance_object,owner))>
            >,

libraries/net/CMakeLists.txt

@@ -13,7 +13,7 @@ target_link_libraries( graphene_net
   PUBLIC fc graphene_db )
 target_include_directories( graphene_net 
   PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
-  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../chain/include"
+  PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../chain/include" "${CMAKE_CURRENT_BINARY_DIR}/../chain/include"
 )
 
 if(MSVC)

libraries/plugins/CMakeLists.txt

@@ -9,3 +9,4 @@ add_subdirectory( generate_genesis )
 add_subdirectory( generate_uia_sharedrop_genesis )
 add_subdirectory( debug_witness )
 add_subdirectory( snapshot )
+add_subdirectory( peerplays_sidechain )

libraries/plugins/peerplays_sidechain/CMakeLists.txt

@@ -0,0 +1,19 @@
+file(GLOB HEADERS "include/graphene/peerplays_sidechain_history/*.hpp")
+
+add_library( peerplays_sidechain
+             peerplays_sidechain_plugin.cpp
+           )
+
+target_link_libraries( peerplays_sidechain graphene_chain graphene_app )
+target_include_directories( peerplays_sidechain
+                            PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+
+install( TARGETS
+   peerplays_sidechain
+
+   RUNTIME DESTINATION bin
+   LIBRARY DESTINATION lib
+   ARCHIVE DESTINATION lib
+)
+INSTALL( FILES ${HEADERS} DESTINATION "include/graphene/peerplays_sidechain" )
+

libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/peerplays_sidechain_plugin.hpp

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <graphene/app/plugin.hpp>
+#include <graphene/chain/database.hpp>
+#include <graphene/chain/account_object.hpp>
+
+#include <fc/thread/future.hpp>
+
+namespace graphene { namespace peerplays_sidechain {
+using namespace chain;
+
+namespace detail
+{
+    class peerplays_sidechain_plugin_impl;
+}
+
+class peerplays_sidechain_plugin : public graphene::app::plugin
+{
+   public:
+      peerplays_sidechain_plugin();
+      virtual ~peerplays_sidechain_plugin();
+
+      std::string plugin_name()const override;
+      virtual void plugin_set_program_options(
+         boost::program_options::options_description& cli,
+         boost::program_options::options_description& cfg) override;
+      virtual void plugin_initialize(const boost::program_options::variables_map& options) override;
+      virtual void plugin_startup() override;
+
+      std::unique_ptr<detail::peerplays_sidechain_plugin_impl> my;
+};
+
+} } //graphene::peerplays_sidechain_plugin
+

libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp

@@ -0,0 +1,59 @@
+#include <graphene/peerplays_sidechain/peerplays_sidechain_plugin.hpp>
+
+namespace graphene { namespace peerplays_sidechain {
+
+namespace detail
+{
+
+
+class peerplays_sidechain_plugin_impl
+{
+   public:
+      peerplays_sidechain_plugin_impl(peerplays_sidechain_plugin& _plugin)
+         : _self( _plugin )
+      { }
+      virtual ~peerplays_sidechain_plugin_impl();
+
+      peerplays_sidechain_plugin& _self;
+};
+
+peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl()
+{
+   return;
+}
+
+} // end namespace detail
+
+peerplays_sidechain_plugin::peerplays_sidechain_plugin() :
+   my( new detail::peerplays_sidechain_plugin_impl(*this) )
+{
+}
+
+peerplays_sidechain_plugin::~peerplays_sidechain_plugin()
+{
+   return;
+}
+
+std::string peerplays_sidechain_plugin::plugin_name()const
+{
+   return "peerplays_sidechain";
+}
+
+void peerplays_sidechain_plugin::plugin_set_program_options(
+   boost::program_options::options_description& /*cli*/,
+   boost::program_options::options_description& /*cfg*/
+   )
+{
+}
+
+void peerplays_sidechain_plugin::plugin_initialize(const boost::program_options::variables_map& /*options*/)
+{
+   ilog("peerplays sidechain plugin:  plugin_initialize()");
+}
+
+void peerplays_sidechain_plugin::plugin_startup()
+{
+   ilog("peerplays sidechain plugin:  plugin_startup()");
+}
+
+} }

libraries/wallet/CMakeLists.txt

@@ -10,7 +10,7 @@ if( PERL_FOUND AND DOXYGEN_FOUND AND NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja" )
                       COMMAND ${DOXYGEN_EXECUTABLE}
                       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile include/graphene/wallet/wallet.hpp )
   add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp
-                      COMMAND PERLLIB=${CMAKE_CURRENT_SOURCE_DIR} ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_api_documentation.pl ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp.new
+                      COMMAND PERLLIB=${CMAKE_CURRENT_BINARY_DIR} ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_api_documentation.pl ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp.new
 
                       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp.new ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp
                       COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/api_documentation.cpp.new

programs/witness_node/CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 
 # We have to link against graphene_debug_witness because deficiency in our API infrastructure doesn't allow plugins to be fully abstracted #246
 target_link_libraries( witness_node
-                       PRIVATE graphene_app graphene_account_history graphene_affiliate_stats graphene_market_history graphene_witness graphene_chain graphene_debug_witness graphene_bookie graphene_egenesis_full fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
+                       PRIVATE graphene_app graphene_account_history graphene_affiliate_stats graphene_market_history graphene_witness graphene_chain graphene_debug_witness graphene_bookie graphene_egenesis_full fc peerplays_sidechain ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} )
 # also add dependencies to graphene_generate_genesis graphene_generate_uia_sharedrop_genesis if you want those plugins
 
 install( TARGETS

programs/witness_node/main.cpp

@@ -31,6 +31,7 @@
 //#include <graphene/generate_uia_sharedrop_genesis/generate_uia_sharedrop_genesis.hpp>
 #include <graphene/affiliate_stats/affiliate_stats_plugin.hpp>
 #include <graphene/bookie/bookie_plugin.hpp>
+#include <graphene/peerplays_sidechain/peerplays_sidechain_plugin.hpp>
 #include <graphene/utilities/git_revision.hpp>
 //#include <graphene/snapshot/snapshot.hpp>
 
@@ -91,6 +92,7 @@ int main(int argc, char** argv) {
       auto list_plug = node->register_plugin<accounts_list::accounts_list_plugin>();
       auto affiliate_stats_plug = node->register_plugin<affiliate_stats::affiliate_stats_plugin>();
       auto bookie_plug = node->register_plugin<bookie::bookie_plugin>();
+      auto peerplays_sidechain = node->register_plugin<peerplays_sidechain::peerplays_sidechain_plugin>();
 //      auto snapshot_plug = node->register_plugin<snapshot_plugin::snapshot_plugin>();
 
       try

tests/CMakeLists.txt

@@ -33,6 +33,10 @@ file(GLOB BETTING_TESTS "betting/*.cpp")
 add_executable( betting_test ${BETTING_TESTS} ${COMMON_SOURCES} )
 target_link_libraries( betting_test graphene_chain graphene_app graphene_account_history graphene_bookie graphene_egenesis_none fc graphene_wallet ${PLATFORM_SPECIFIC_LIBS} )
 
+file(GLOB PEERPLAYS_SIDECHAIN_TESTS "peerplays_sidechain/*.cpp")
+add_executable( peerplays_sidechain_test ${PEERPLAYS_SIDECHAIN_TESTS} ${COMMON_SOURCES} )
+target_link_libraries( peerplays_sidechain_test graphene_chain graphene_app graphene_account_history graphene_bookie graphene_egenesis_none fc graphene_wallet ${PLATFORM_SPECIFIC_LIBS} )
+
 file(GLOB TOURNAMENT_TESTS "tournament/*.cpp")
 add_executable( tournament_test ${TOURNAMENT_TESTS} ${COMMON_SOURCES} )
 target_link_libraries( tournament_test graphene_chain graphene_app graphene_account_history graphene_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} )

tests/peerplays_sidechain/peerplays_sidechain_tests.cpp

@@ -0,0 +1,20 @@
+#include <boost/test/unit_test.hpp>
+
+#define BOOST_TEST_MODULE Peerplays SON Tests
+
+BOOST_AUTO_TEST_CASE(peerplays_sidechain)
+{
+
+}
+
+#include <cstdlib>
+#include <iostream>
+#include <boost/test/included/unit_test.hpp>
+
+boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
+    std::srand(time(NULL));
+    std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
+
+    return nullptr;
+}
+