Merge branch 'beatrice' into 'master'

Merge beatrice to master 2022-04

See merge request PBSA/peerplays!84

.clang-format

@@ -1,6 +1,5 @@
 ---
 Language:        Cpp
-# BasedOnStyle:  LLVM
 AccessModifierOffset: -3
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: false
@@ -12,7 +11,7 @@ AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortLambdasOnASingleLine: None
@@ -57,6 +56,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 6
 ContinuationIndentWidth: 6
 Cpp11BracedListStyle: true
+DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
@@ -69,12 +69,17 @@ IncludeBlocks:   Preserve
 IncludeCategories:
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
+    SortPriority:    0
   - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        3
+    SortPriority:    0
   - Regex:           '.*'
     Priority:        1
+    SortPriority:    0
 IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
 IndentCaseLabels: false
+IndentGotoLabels: false
 IndentPPDirectives: None
 IndentWidth:     3
 IndentWrappedFunctionNames: false
@@ -110,18 +115,22 @@ SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
+SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+SpaceBeforeSquareBrackets: false
+Standard:        Latest
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        3
+UseCRLF:         false
 UseTab:          Never
 ...
 

.gitlab-ci.yml

@@ -19,7 +19,7 @@ build:
     - mkdir build
     - cd build
     - cmake -DCMAKE_BUILD_TYPE=Release ..
-    - make -j4
+    - make -j$(nproc)
   artifacts:
     untracked: true
     paths:
@@ -49,6 +49,7 @@ test:
   dependencies:
     - build
   script:
+    - ./build/libraries/fc/tests/all_tests
     - ./build/tests/betting_test --log_level=message
     - ./build/tests/chain_test --log_level=message
     - ./build/tests/cli_test --log_level=message

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "docs"]
-    path = docs
-    url = https://github.com/bitshares/bitshares-core.wiki.git
-    ignore = dirty
+	path = docs
+	url = https://github.com/bitshares/bitshares-core.wiki.git
+	ignore = dirty
 [submodule "libraries/fc"]
-    path = libraries/fc
-    url = https://github.com/peerplays-network/peerplays-fc.git
-    branch = latest-fc
-    ignore = dirty
+	path = libraries/fc
+	url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
+	branch = latest-fc
+	ignore = dirty

CMakeLists.txt

@@ -83,7 +83,6 @@ LIST(APPEND BOOST_COMPONENTS thread
                              system
                              filesystem
                              program_options
-                             signals
                              serialization
                              chrono
                              unit_test_framework

README.md

@@ -2,95 +2,81 @@ Intro for new developers and witnesses
 ------------------------
 
 This is a quick introduction to get new developers and witnesses up to speed on Peerplays blockchain. It is intended for witnesses plannig to join a live, already deployed blockchain.
-# Building on Ubuntu 18.04 LTS and Installation Instructions
 
- The following dependencies were necessary for a clean install of Ubuntu 18.04 LTS:
 
- ```
- sudo apt-get install autoconf bash build-essential ca-certificates cmake \
-      doxygen git graphviz libbz2-dev libcurl4-openssl-dev libncurses-dev \
-      libreadline-dev libssl-dev libtool libzmq3-dev locales ntp pkg-config \
-      wget
-```
-## Build Boost 1.67.0
+# Building and Installation Instructions
 
+Officially supported OS is Ubuntu 20.04.
 
+Following dependencies are needed for a clean install of Ubuntu 20.04:
 ```
-mkdir $HOME/src
-cd $HOME/src
-export BOOST_ROOT=$HOME/src/boost_1_67_0
-sudo apt-get update
-sudo apt-get install -y autotools-dev build-essential  libbz2-dev libicu-dev python-dev
-wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.bz2/download'\
-     -O boost_1_67_0.tar.bz2
-tar xjf boost_1_67_0.tar.bz2
-cd boost_1_67_0/
-./bootstrap.sh "--prefix=$BOOST_ROOT"
-./b2 install
+sudo apt-get install \
+    apt-utils autoconf bash build-essential ca-certificates clang-format cmake
+    dnsutils doxygen expect git graphviz libboost-all-dev libbz2-dev \
+    libcurl4-openssl-dev libncurses-dev libreadline-dev libsnappy-dev \
+    libssl-dev libtool libzip-dev libzmq3-dev locales mc nano net-tools ntp \
+    openssh-server pkg-config perl python3 python3-jinja2 sudo wget
 ```
 
 
 ## Building Peerplays
 
 ```
+mkdir $HOME/src
 cd $HOME/src
-export BOOST_ROOT=$HOME/src/boost_1_67_0
-git clone https://github.com/peerplays-network/peerplays.git
+git clone https://gitlab.com/PBSA/peerplays.git
 cd peerplays
 git submodule update --init --recursive
+
 # If you want to build Mainnet node
-cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release
+cmake -DCMAKE_BUILD_TYPE=Release
+
 # If you want to build Testnet node
-cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1
+cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1
+
+# Update -j flag depending on your current system specs;
+# Recommended 4GB of RAM per 1 CPU core
+# make -j2 for 8GB RAM
+# make -j4 for 16GB RAM
+# make -j8 for 32GB RAM
 make -j$(nproc)
 
 make install # this can install the executable files under /usr/local
 ```
 
 
-## Docker image
+## Docker images
 
+Install docker, and add current user to docker group.
 ```
-# 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
+```
 
+### Official docker image for Peerplas Mainnet
 
+```
+docker pull datasecuritynode/peerplays:latest
+```
+
+### Building docker image manually
+```
 # Build docker image (from the project root, must be a docker group member)
 docker build -t peerplays .
+```
 
-
-# Start docker image
+### 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.
+Rest of the instructions on starting the chain remains same.
 
 Starting A Peerplays Node
 -----------------
-
-For Ubuntu 14.04 LTS and up users, see
-[this](https://github.com/cryptonomex/graphene/wiki/build-ubuntu) and
-then proceed with:
-
-    git clone https://github.com/peerplays-network/peerplays.git
-    cd peerplays
-    git submodule update --init --recursive
-    cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release .
-    make
-    ./programs/witness_node/witness_node
-
 Launching the witness creates required directories. Next, **stop the witness** and continue.
 
     $ vi witness_node_data_dir/config.ini

clang-format.sh

@@ -3,3 +3,4 @@
 find ./libraries/app -regex ".*[c|h]pp" | xargs clang-format -i
 find ./libraries/chain/hardfork.d -regex ".*hf" | xargs clang-format -i
 find ./libraries/plugins/peerplays_sidechain -regex ".*[c|h]pp" | xargs clang-format -i
+find ./programs/cli_wallet -regex ".*[c|h]pp" | xargs clang-format -i

libraries/app/CMakeLists.txt

@@ -15,7 +15,7 @@ add_library( graphene_app
 #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
                        PUBLIC graphene_net graphene_utilities
-                       graphene_account_history graphene_accounts_list graphene_affiliate_stats graphene_bookie graphene_debug_witness graphene_elasticsearch graphene_es_objects graphene_generate_genesis graphene_market_history )
+                       graphene_account_history graphene_accounts_list graphene_affiliate_stats graphene_bookie graphene_debug_witness graphene_elasticsearch graphene_es_objects graphene_generate_genesis graphene_market_history peerplays_sidechain )
 
 target_include_directories( graphene_app
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"

libraries/app/api.cpp

@@ -106,6 +106,10 @@ void login_api::enable_api(const std::string &api_name) {
       // can only enable this API if the plugin was loaded
       if (_app.get_plugin("affiliate_stats"))
          _affiliate_stats_api = std::make_shared<graphene::affiliate_stats::affiliate_stats_api>(std::ref(_app));
+   } else if (api_name == "sidechain_api") {
+      // can only enable this API if the plugin was loaded
+      if (_app.get_plugin("peerplays_sidechain"))
+         _sidechain_api = std::make_shared<graphene::peerplays_sidechain::sidechain_api>(std::ref(_app));
    }
    return;
 }
@@ -310,6 +314,11 @@ fc::api<graphene::affiliate_stats::affiliate_stats_api> login_api::affiliate_sta
    return *_affiliate_stats_api;
 }
 
+fc::api<graphene::peerplays_sidechain::sidechain_api> login_api::sidechain() const {
+   FC_ASSERT(_sidechain_api);
+   return *_sidechain_api;
+}
+
 vector<order_history_object> history_api::get_fill_order_history(std::string asset_a, std::string asset_b, uint32_t limit) const {
    FC_ASSERT(_app.chain_database());
    const auto &db = *_app.chain_database();

libraries/app/application.cpp

@@ -401,6 +401,7 @@ class application_impl : public net::node_delegate {
             wild_access.allowed_apis.push_back("crypto_api");
             wild_access.allowed_apis.push_back("bookie_api");
             wild_access.allowed_apis.push_back("affiliate_stats_api");
+            wild_access.allowed_apis.push_back("sidechain_api");
             _apiaccess.permission_map["*"] = wild_access;
          }