1465 1479 1573 1669 1692 460 hf fixes

.clang-format

@@ -1,5 +1,6 @@
 ---
 Language:        Cpp
+# BasedOnStyle:  LLVM
 AccessModifierOffset: -3
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: false
@@ -11,7 +12,7 @@ AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortLambdasOnASingleLine: None
@@ -56,7 +57,6 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 6
 ContinuationIndentWidth: 6
 Cpp11BracedListStyle: true
-DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
@@ -69,17 +69,12 @@ 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
@@ -115,22 +110,18 @@ 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
-SpaceBeforeSquareBrackets: false
-Standard:        Latest
+Standard:        Cpp11
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        3
-UseCRLF:         false
 UseTab:          Never
 ...
 

.gitignore

@@ -14,7 +14,6 @@ data
 CMakeDoxyfile.in
 
 build
-build__*
 
 libraries/utilities/git_revision.cpp
 

.gitlab-ci.yml

@@ -8,11 +8,8 @@ include:
 stages:
   - build
   - test
-  - dockerize
-  - python-test
-  - deploy
 
-build-mainnet:
+build:
   stage: build
   script:
     - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
@@ -32,140 +29,13 @@ build-mainnet:
   tags:
     - builder
 
-test-mainnet:
+test:
   stage: test
   dependencies:
-    - build-mainnet
+    - 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
   tags:
     - builder
-
-dockerize-mainnet:
-  stage: dockerize
-  variables:
-    IMAGE: $CI_REGISTRY_IMAGE/mainnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
-  before_script:
-    - docker info
-    - docker builder prune -a -f
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-    - docker build --no-cache -t $IMAGE .
-    - docker push $IMAGE
-  after_script:
-    - docker rmi $IMAGE
-  tags:
-    - builder
-  timeout:
-    3h
-
-build-testnet:
-  stage: build
-  script:
-    - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
-    - git submodule sync
-    - git submodule update --init --recursive
-    - rm -rf build
-    - mkdir build
-    - cd build
-    - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1 ..
-    - make -j$(nproc)
-  artifacts:
-    untracked: true
-    paths:
-      - build/libraries/
-      - build/programs/
-      - build/tests/
-  when: manual
-  tags:
-    - builder
-
-deploy-testnet:
-  stage: deploy
-  dependencies:
-    - build-testnet
-  script:
-    - sudo systemctl stop witness
-    - rm $WORK_DIR/peerplays/witness_node || true
-    - cp build/programs/witness_node/witness_node $WORK_DIR/peerplays/
-    - sudo systemctl restart witness
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-      when: always
-  environment:
-    name: devnet
-    url: $DEVNET_URL
-  tags: 
-    - devnet
-
-test-testnet:
-  stage: test
-  dependencies:
-    - build-testnet
-  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
-  tags:
-    - builder
-  when:
-    manual
-  timeout:
-    1h
-
-dockerize-testnet:
-  stage: dockerize
-  variables:
-    IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
-  before_script:
-    - docker info
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-    - docker build --no-cache -t $IMAGE .
-    - docker push $IMAGE
-  after_script:
-    - docker rmi $IMAGE
-  tags:
-    - builder
-  when:
-    manual
-  timeout:
-    3h
-
-test-e2e:
-  stage: python-test
-  variables:
-    IMAGE: $CI_REGISTRY_IMAGE/mainnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
-  before_script:
-    - docker info
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  script:
-    - git clone https://gitlab.com/PBSA/tools-libs/peerplays-utils.git
-    - cd peerplays-utils/peerplays-qa-environment
-    - git checkout origin/feature/python-e2e-tests-for-CI
-    - cd e2e-tests/
-    - python3 -m venv venv
-    - source venv/bin/activate
-    - pip3 install -r requirements.txt
-    - docker-compose down --remove-orphans
-    - docker ps -a
-    - docker pull $IMAGE
-    - docker tag $IMAGE peerplays-base:latest
-    - docker image ls -a
-    - docker-compose build
-    - python3 main.py --start all
-    - docker ps -a
-    - python3 -m pytest test_btc_init_state.py test_hive_inital_state.py test_pp_inital_state.py
-    - python3 main.py --stop
-    - deactivate
-    - docker ps -a
-  after_script:
-    - docker rmi $(docker images -a | grep -v 'hive-for-peerplays\|ethereum-for-peerplays\|bitcoin-for-peerplays\|ubuntu-for-peerplays' | awk '{print $3}')
-  tags:
-    - python-tests
-  when:
-    manual

.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://gitlab.com/PBSA/tools-libs/peerplays-fc.git
-	branch = develop
-	ignore = dirty
+    path = libraries/fc
+    url = https://github.com/peerplays-network/peerplays-fc.git
+    branch = latest-fc
+    ignore = dirty

.sonarcloud.properties

@@ -1,10 +0,0 @@
-sonar.projectKey=peerplays-network_peerplays
-sonar.organization=peerplays-network
-
-# This is the name and version displayed in the SonarCloud UI.
-sonar.projectName=peerplays
-
-# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-sonar.sources=.
-
-sonar.host.url=https://sonarcloud.io

CMakeDoxyfile.in

@@ -11,7 +11,6 @@ OUTPUT_DIRECTORY       = @DOXYGEN_OUTPUT_DIRECTORY@
 CREATE_SUBDIRS         = @DOXYGEN_CREATE_SUBDIRS@
 ALLOW_UNICODE_NAMES    = @DOXYGEN_ALLOW_UNICODE_NAMES@
 OUTPUT_LANGUAGE        = @DOXYGEN_OUTPUT_LANGUAGE@
-OUTPUT_TEXT_DIRECTION  = @DOXYGEN_OUTPUT_TEXT_DIRECTION@
 BRIEF_MEMBER_DESC      = @DOXYGEN_BRIEF_MEMBER_DESC@
 REPEAT_BRIEF           = @DOXYGEN_REPEAT_BRIEF@
 ABBREVIATE_BRIEF       = @DOXYGEN_ABBREVIATE_BRIEF@
@@ -22,7 +21,6 @@ STRIP_FROM_PATH        = @DOXYGEN_STRIP_FROM_PATH@
 STRIP_FROM_INC_PATH    = @DOXYGEN_STRIP_FROM_INC_PATH@
 SHORT_NAMES            = @DOXYGEN_SHORT_NAMES@
 JAVADOC_AUTOBRIEF      = @DOXYGEN_JAVADOC_AUTOBRIEF@
-JAVADOC_BANNER         = @DOXYGEN_JAVADOC_BANNER@
 QT_AUTOBRIEF           = @DOXYGEN_QT_AUTOBRIEF@
 MULTILINE_CPP_IS_BRIEF = @DOXYGEN_MULTILINE_CPP_IS_BRIEF@
 INHERIT_DOCS           = @DOXYGEN_INHERIT_DOCS@
@@ -34,7 +32,6 @@ OPTIMIZE_OUTPUT_FOR_C  = @DOXYGEN_OPTIMIZE_OUTPUT_FOR_C@
 OPTIMIZE_OUTPUT_JAVA   = @DOXYGEN_OPTIMIZE_OUTPUT_JAVA@
 OPTIMIZE_FOR_FORTRAN   = @DOXYGEN_OPTIMIZE_FOR_FORTRAN@
 OPTIMIZE_OUTPUT_VHDL   = @DOXYGEN_OPTIMIZE_OUTPUT_VHDL@
-OPTIMIZE_OUTPUT_SLICE  = @DOXYGEN_OPTIMIZE_OUTPUT_SLICE@
 EXTENSION_MAPPING      = @DOXYGEN_EXTENSION_MAPPING@
 MARKDOWN_SUPPORT       = @DOXYGEN_MARKDOWN_SUPPORT@
 TOC_INCLUDE_HEADINGS   = @DOXYGEN_TOC_INCLUDE_HEADINGS@
@@ -52,7 +49,6 @@ TYPEDEF_HIDES_STRUCT   = @DOXYGEN_TYPEDEF_HIDES_STRUCT@
 LOOKUP_CACHE_SIZE      = @DOXYGEN_LOOKUP_CACHE_SIZE@
 EXTRACT_ALL            = @DOXYGEN_EXTRACT_ALL@
 EXTRACT_PRIVATE        = @DOXYGEN_EXTRACT_PRIVATE@
-EXTRACT_PRIV_VIRTUAL   = @DOXYGEN_EXTRACT_PRIV_VIRTUAL@
 EXTRACT_PACKAGE        = @DOXYGEN_EXTRACT_PACKAGE@
 EXTRACT_STATIC         = @DOXYGEN_EXTRACT_STATIC@
 EXTRACT_LOCAL_CLASSES  = @DOXYGEN_EXTRACT_LOCAL_CLASSES@
@@ -124,7 +120,6 @@ USE_HTAGS              = @DOXYGEN_USE_HTAGS@
 VERBATIM_HEADERS       = @DOXYGEN_VERBATIM_HEADERS@
 CLANG_ASSISTED_PARSING = @DOXYGEN_CLANG_ASSISTED_PARSING@
 CLANG_OPTIONS          = @DOXYGEN_CLANG_OPTIONS@
-CLANG_DATABASE_PATH    = @DOXYGEN_CLANG_DATABASE_PATH@
 ALPHABETICAL_INDEX     = @DOXYGEN_ALPHABETICAL_INDEX@
 COLS_IN_ALPHA_INDEX    = @DOXYGEN_COLS_IN_ALPHA_INDEX@
 IGNORE_PREFIX          = @DOXYGEN_IGNORE_PREFIX@
@@ -140,7 +135,6 @@ HTML_COLORSTYLE_HUE    = @DOXYGEN_HTML_COLORSTYLE_HUE@
 HTML_COLORSTYLE_SAT    = @DOXYGEN_HTML_COLORSTYLE_SAT@
 HTML_COLORSTYLE_GAMMA  = @DOXYGEN_HTML_COLORSTYLE_GAMMA@
 HTML_TIMESTAMP         = @DOXYGEN_HTML_TIMESTAMP@
-HTML_DYNAMIC_MENUS     = @DOXYGEN_HTML_DYNAMIC_MENUS@
 HTML_DYNAMIC_SECTIONS  = @DOXYGEN_HTML_DYNAMIC_SECTIONS@
 HTML_INDEX_NUM_ENTRIES = @DOXYGEN_HTML_INDEX_NUM_ENTRIES@
 GENERATE_DOCSET        = @DOXYGEN_GENERATE_DOCSET@
@@ -188,7 +182,6 @@ GENERATE_LATEX         = @DOXYGEN_GENERATE_LATEX@
 LATEX_OUTPUT           = @DOXYGEN_LATEX_OUTPUT@
 LATEX_CMD_NAME         = @DOXYGEN_LATEX_CMD_NAME@
 MAKEINDEX_CMD_NAME     = @DOXYGEN_MAKEINDEX_CMD_NAME@
-LATEX_MAKEINDEX_CMD    = @DOXYGEN_LATEX_MAKEINDEX_CMD@
 COMPACT_LATEX          = @DOXYGEN_COMPACT_LATEX@
 PAPER_TYPE             = @DOXYGEN_PAPER_TYPE@
 EXTRA_PACKAGES         = @DOXYGEN_EXTRA_PACKAGES@
@@ -203,7 +196,6 @@ LATEX_HIDE_INDICES     = @DOXYGEN_LATEX_HIDE_INDICES@
 LATEX_SOURCE_CODE      = @DOXYGEN_LATEX_SOURCE_CODE@
 LATEX_BIB_STYLE        = @DOXYGEN_LATEX_BIB_STYLE@
 LATEX_TIMESTAMP        = @DOXYGEN_LATEX_TIMESTAMP@
-LATEX_EMOJI_DIRECTORY  = @DOXYGEN_LATEX_EMOJI_DIRECTORY@
 GENERATE_RTF           = @DOXYGEN_GENERATE_RTF@
 RTF_OUTPUT             = @DOXYGEN_RTF_OUTPUT@
 COMPACT_RTF            = @DOXYGEN_COMPACT_RTF@
@@ -219,7 +211,6 @@ MAN_LINKS              = @DOXYGEN_MAN_LINKS@
 GENERATE_XML           = @DOXYGEN_GENERATE_XML@
 XML_OUTPUT             = @DOXYGEN_XML_OUTPUT@
 XML_PROGRAMLISTING     = @DOXYGEN_XML_PROGRAMLISTING@
-XML_NS_MEMB_FILE_SCOPE = @DOXYGEN_XML_NS_MEMB_FILE_SCOPE@
 GENERATE_DOCBOOK       = @DOXYGEN_GENERATE_DOCBOOK@
 DOCBOOK_OUTPUT         = @DOXYGEN_DOCBOOK_OUTPUT@
 DOCBOOK_PROGRAMLISTING = @DOXYGEN_DOCBOOK_PROGRAMLISTING@
@@ -242,7 +233,9 @@ GENERATE_TAGFILE       = @DOXYGEN_GENERATE_TAGFILE@
 ALLEXTERNALS           = @DOXYGEN_ALLEXTERNALS@
 EXTERNAL_GROUPS        = @DOXYGEN_EXTERNAL_GROUPS@
 EXTERNAL_PAGES         = @DOXYGEN_EXTERNAL_PAGES@
+PERL_PATH              = @DOXYGEN_PERL_PATH@
 CLASS_DIAGRAMS         = @DOXYGEN_CLASS_DIAGRAMS@
+MSCGEN_PATH            = @DOXYGEN_MSCGEN_PATH@
 DIA_PATH               = @DOXYGEN_DIA_PATH@
 HIDE_UNDOC_RELATIONS   = @DOXYGEN_HIDE_UNDOC_RELATIONS@
 HAVE_DOT               = @DOXYGEN_HAVE_DOT@

CMakeLists.txt

@@ -22,37 +22,6 @@ endif()
 
 list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
-function(get_linux_lsb_release_information)
-    find_program(LSB_RELEASE_EXEC lsb_release)
-    if(NOT LSB_RELEASE_EXEC)
-        message(FATAL_ERROR "Could not detect lsb_release executable, can not gather required information")
-    endif()
-
-    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --release OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename OUTPUT_VARIABLE LSB_RELEASE_CODENAME_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    set(LSB_RELEASE_ID_SHORT "${LSB_RELEASE_ID_SHORT}" PARENT_SCOPE)
-    set(LSB_RELEASE_VERSION_SHORT "${LSB_RELEASE_VERSION_SHORT}" PARENT_SCOPE)
-    set(LSB_RELEASE_CODENAME_SHORT "${LSB_RELEASE_CODENAME_SHORT}" PARENT_SCOPE)
-endfunction()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        find_package(cppzmq)
-        target_link_libraries(cppzmq)
-
-	get_linux_lsb_release_information()
-	message(STATUS "Linux ${LSB_RELEASE_ID_SHORT} ${LSB_RELEASE_VERSION_SHORT} ${LSB_RELEASE_CODENAME_SHORT}")
-	string(REGEX MATCHALL "([0-9]+)" arg_list ${LSB_RELEASE_VERSION_SHORT})
-	list( LENGTH arg_list listlen )
-	if (NOT listlen)
-		message(FATAL_ERROR "Could not detect Ubuntu version")
-	endif()
-	list(GET arg_list 0 output)
-	message("Ubuntu version is: ${output}")
-	add_definitions(-DPEERPLAYS_UBUNTU_VERSION=${output})
-endif()
-
 # function to help with cUrl
 macro(FIND_CURL)
    if (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB)
@@ -82,16 +51,7 @@ macro(FIND_CURL)
 endmacro()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
-
-if (BUILD_PEERPLAYS_TESTNET)
-   set(GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/genesis-testnet.json" CACHE PATH "location of the genesis.json to embed in the executable" )
-   #add_compile_definitions(BUILD_PEERPLAYS_TESTNET=1)
-   add_definitions(-DBUILD_PEERPLAYS_TESTNET=1)
-   message ("\n====================\nBuilding for Testnet\n====================\n")
-else (BUILD_PEERPLAYS_TESTNET)
-   set(GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/genesis-mainnet.json" CACHE PATH "location of the genesis.json to embed in the executable" )
-   message ("\n====================\nBuilding for Mainnet\n====================\n")
-endif (BUILD_PEERPLAYS_TESTNET)
+set(GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/genesis.json" CACHE PATH "location of the genesis.json to embed in the executable" )
 
 #set (ENABLE_INSTALLER 1)
 #set (USE_PCH 1)
@@ -114,6 +74,7 @@ LIST(APPEND BOOST_COMPONENTS thread
                              system
                              filesystem
                              program_options
+                             signals
                              serialization
                              chrono
                              unit_test_framework
@@ -281,7 +242,3 @@ endif(LINUX)
  include(CPack)
 endif(ENABLE_INSTALLER)
 
-unset(GRAPHENE_EGENESIS_JSON)
-unset(GRAPHENE_EGENESIS_JSON CACHE)
-unset(BUILD_PEERPLAYS_TESTNET)
-unset(BUILD_PEERPLAYS_TESTNET CACHE)

Dockerfile

@@ -1,218 +1,96 @@
-FROM ubuntu:20.04
+FROM ubuntu:18.04
+MAINTAINER PeerPlays Blockchain Standards Association
 
-#===============================================================================
-# Ubuntu setup
-#===============================================================================
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
 
 RUN \
     apt-get update -y && \
       DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      apt-utils \
       autoconf \
       bash \
-      bison \
       build-essential \
       ca-certificates \
+      cmake \
       dnsutils \
-      expect \
-      flex \
+      doxygen \
       git \
       graphviz \
       libbz2-dev \
       libcurl4-openssl-dev \
       libncurses-dev \
-      libsnappy-dev \
+      libreadline-dev \
       libssl-dev \
       libtool \
-      libzip-dev \
+      libzmq3-dev \
       locales \
-      lsb-release \
-      mc \
-      nano \
-      net-tools \
       ntp \
-      openssh-server \
       pkg-config \
-      python3 \
-      python3-jinja2 \
-      sudo \
-      systemd-coredump \
-      wget
-
-ENV HOME /home/peerplays
-RUN useradd -rm -d /home/peerplays -s /bin/bash -g root -G sudo -u 1000 peerplays
-RUN echo "peerplays  ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/peerplays
-RUN chmod 440 /etc/sudoers.d/peerplays
-
-RUN service ssh start
-RUN echo 'peerplays:peerplays' | chpasswd
-
-# SSH
-EXPOSE 22
-
-WORKDIR /home/peerplays/src
-
-#===============================================================================
-# Boost setup
-#===============================================================================
+      wget \
+    && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN \
-    wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \
-    tar -xzf boost_1_72_0.tar.gz && \
-    cd boost_1_72_0 && \
-    ./bootstrap.sh && \
+    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 && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
+    cd ..
 
-#===============================================================================
-# cmake setup
-#===============================================================================
+ADD . /peerplays-core
+WORKDIR /peerplays-core
 
+# Compile Peerplays
 RUN \
-    wget https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
-    chmod 755 ./cmake-3.24.2-linux-x86_64.sh && \
-    ./cmake-3.24.2-linux-x86_64.sh --prefix=/usr --skip-license && \
-    cmake --version && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# libzmq setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.4.tar.gz && \
-    tar -xzvf v4.3.4.tar.gz && \
-    cd libzmq-4.3.4 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) && \
-    make install && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# cppzmq setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/zeromq/cppzmq/archive/refs/tags/v4.9.0.tar.gz && \
-    tar -xzvf v4.9.0.tar.gz && \
-    cd cppzmq-4.9.0 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) && \
-    make install && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# gsl setup
-#===============================================================================
-
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libpcre3-dev
-
-RUN \
-    wget https://github.com/imatix/gsl/archive/refs/tags/v4.1.4.tar.gz && \
-    tar -xzvf v4.1.4.tar.gz && \
-    cd gsl-4.1.4 && \
-    make -j$(nproc) && \
-    make install && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# libbitcoin-build setup
-# libbitcoin-explorer setup
-#===============================================================================
-
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libsodium-dev
-
-RUN \
-    git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \
-    cd libbitcoin-explorer && \
-    ./install.sh && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# Doxygen setup
-#===============================================================================
-
-RUN \
-    sudo apt install -y bison flex && \
-    wget https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_8_17.tar.gz && \
-    tar -xvf Release_1_8_17.tar.gz && \
-    cd doxygen-Release_1_8_17 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) install && \
-    ldconfig
-
-#===============================================================================
-# Perl setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/Perl/perl5/archive/refs/tags/v5.30.0.tar.gz && \
-    tar -xvf v5.30.0.tar.gz && \
-    cd perl5-5.30.0 && \
-    ./Configure -des && \
-    make -j$(nproc) install && \
-    ldconfig
-
-#===============================================================================
-# Peerplays setup
-#===============================================================================
-
-## Clone Peerplays
-#RUN \
-#    git clone https://gitlab.com/PBSA/peerplays.git && \
-#    cd peerplays && \
-#    git checkout develop && \
-#    git submodule update --init --recursive && \
-#    git branch --show-current && \
-#    git log --oneline -n 5
-
-# Add local source
-ADD . peerplays
-
-# Configure Peerplays
-RUN \
-    cd peerplays && \
+    BOOST_ROOT=$HOME/boost_1_67_0 && \
+    git submodule sync --recursive && \
     git submodule update --init --recursive && \
-    git log --oneline -n 5 && \
     mkdir build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release ..
+    mkdir build/release && \
+    cd build/release && \
+    cmake \
+        -DBOOST_ROOT="$BOOST_ROOT" \
+        -DCMAKE_BUILD_TYPE=Debug \
+        ../.. && \
+    make witness_node cli_wallet && \
+    install -s programs/witness_node/witness_node programs/cli_wallet/cli_wallet /usr/local/bin && \
+    #
+    # Obtain version
+    mkdir /etc/peerplays && \
+    git rev-parse --short HEAD > /etc/peerplays/version && \
+    cd / && \
+    rm -rf /peerplays-core
 
-# Build Peerplays
-RUN \
-    cd peerplays/build && \
-    make -j$(nproc) cli_wallet witness_node
+# Home directory $HOME
+WORKDIR /
+RUN useradd -s /bin/bash -m -d /var/lib/peerplays peerplays
+ENV HOME /var/lib/peerplays
+RUN chown peerplays:peerplays -R /var/lib/peerplays
 
-WORKDIR /home/peerplays/peerplays-network
+# Volume
+VOLUME ["/var/lib/peerplays", "/etc/peerplays"]
 
-# Setup Peerplays runimage
-RUN \
-    ln -s /home/peerplays/src/peerplays/build/programs/cli_wallet/cli_wallet ./ && \
-    ln -s /home/peerplays/src/peerplays/build/programs/witness_node/witness_node ./
-
-RUN ./witness_node --create-genesis-json genesis.json && \
-    rm genesis.json
-
-RUN chown peerplays:root -R /home/peerplays/peerplays-network
-
-# Peerplays RPC
+# rpc service:
 EXPOSE 8090
-# Peerplays P2P:
-EXPOSE 9777
+# p2p service:
+EXPOSE 1776
 
-# Peerplays
-CMD ["./witness_node", "-d", "./witness_node_data_dir"]
+# default exec/config files
+ADD docker/default_config.ini /etc/peerplays/config.ini
+ADD docker/peerplaysentry.sh /usr/local/bin/peerplaysentry.sh
+RUN chmod a+x /usr/local/bin/peerplaysentry.sh
+
+# Make Docker send SIGINT instead of SIGTERM to the daemon
+STOPSIGNAL SIGINT
+
+# default execute entry
+CMD ["/usr/local/bin/peerplaysentry.sh"]

Dockerfile.18.04

@@ -1,219 +0,0 @@
-FROM ubuntu:18.04
-
-#===============================================================================
-# Ubuntu setup
-#===============================================================================
-
-RUN \
-    apt-get update -y && \
-      DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      apt-utils \
-      autoconf \
-      bash \
-      bison \
-      build-essential \
-      ca-certificates \
-      dnsutils \
-      expect \
-      flex \
-      git \
-      graphviz \
-      libbz2-dev \
-      libcurl4-openssl-dev \
-      libncurses-dev \
-      libsnappy-dev \
-      libssl-dev \
-      libtool \
-      libzip-dev \
-      locales \
-      lsb-release \
-      mc \
-      nano \
-      net-tools \
-      ntp \
-      openssh-server \
-      pkg-config \
-      python3 \
-      python3-jinja2 \
-      sudo \
-      systemd-coredump \
-      wget
-
-ENV HOME /home/peerplays
-RUN useradd -rm -d /home/peerplays -s /bin/bash -g root -G sudo -u 1000 peerplays
-RUN echo "peerplays  ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/peerplays
-RUN chmod 440 /etc/sudoers.d/peerplays
-
-RUN service ssh start
-RUN echo 'peerplays:peerplays' | chpasswd
-
-# SSH
-EXPOSE 22
-
-WORKDIR /home/peerplays/src
-
-#===============================================================================
-# Boost setup
-#===============================================================================
-
-RUN \
-    wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \
-    tar -xzf boost_1_72_0.tar.gz && \
-    cd boost_1_72_0 && \
-    ./bootstrap.sh && \
-    ./b2 install && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# cmake setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
-    chmod 755 ./cmake-3.24.2-linux-x86_64.sh && \
-    ./cmake-3.24.2-linux-x86_64.sh --prefix=/usr --skip-license && \
-    cmake --version && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# libzmq setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.4.tar.gz && \
-    tar -xzvf v4.3.4.tar.gz && \
-    cd libzmq-4.3.4 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) && \
-    make install && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# cppzmq setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/zeromq/cppzmq/archive/refs/tags/v4.9.0.tar.gz && \
-    tar -xzvf v4.9.0.tar.gz && \
-    cd cppzmq-4.9.0 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) && \
-    make install && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# gsl setup
-#===============================================================================
-
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libpcre3-dev
-
-RUN \
-    wget https://github.com/imatix/gsl/archive/refs/tags/v4.1.4.tar.gz && \
-    tar -xzvf v4.1.4.tar.gz && \
-    cd gsl-4.1.4 && \
-    make -j$(nproc) && \
-    make install && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# libbitcoin-build setup
-# libbitcoin-explorer setup
-#===============================================================================
-
-RUN \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libsodium-dev
-
-RUN \
-    git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \
-    cd libbitcoin-explorer && \
-    ./install.sh && \
-    ldconfig && \
-    rm -rf /home/peerplays/src/*
-
-#===============================================================================
-# Doxygen setup
-#===============================================================================
-
-RUN \
-    sudo apt install -y bison flex && \
-    wget https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_8_17.tar.gz && \
-    tar -xvf Release_1_8_17.tar.gz && \
-    cd doxygen-Release_1_8_17 && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j$(nproc) install && \
-    ldconfig
-
-#===============================================================================
-# Perl setup
-#===============================================================================
-
-RUN \
-    wget https://github.com/Perl/perl5/archive/refs/tags/v5.30.0.tar.gz && \
-    tar -xvf v5.30.0.tar.gz && \
-    cd perl5-5.30.0 && \
-    ./Configure -des && \
-    make -j$(nproc) install && \
-    ldconfig
-
-#===============================================================================
-# Peerplays setup
-#===============================================================================
-
-## Clone Peerplays
-#RUN \
-#    git clone https://gitlab.com/PBSA/peerplays.git && \
-#    cd peerplays && \
-#    git checkout develop && \
-#    git submodule update --init --recursive && \
-#    git branch --show-current && \
-#    git log --oneline -n 5
-
-# Add local source
-ADD . peerplays
-
-# Configure Peerplays
-RUN \
-    cd peerplays && \
-    git submodule update --init --recursive && \
-    git symbolic-ref --short HEAD && \
-    git log --oneline -n 5 && \
-    mkdir build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release ..
-
-# Build Peerplays
-RUN \
-    cd peerplays/build && \
-    make -j$(nproc) cli_wallet witness_node
-
-WORKDIR /home/peerplays/peerplays-network
-
-# Setup Peerplays runimage
-RUN \
-    ln -s /home/peerplays/src/peerplays/build/programs/cli_wallet/cli_wallet ./ && \
-    ln -s /home/peerplays/src/peerplays/build/programs/witness_node/witness_node ./
-
-RUN ./witness_node --create-genesis-json genesis.json && \
-    rm genesis.json
-
-RUN chown peerplays:root -R /home/peerplays/peerplays-network
-
-# Peerplays RPC
-EXPOSE 8090
-# Peerplays P2P:
-EXPOSE 9777
-
-# Peerplays
-CMD ["./witness_node", "-d", "./witness_node_data_dir"]

README.md

@@ -2,186 +2,93 @@ 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 are Ubuntu 20.04 and Ubuntu 18.04.
-
-## Ubuntu 20.04 and 18.04
-
-Following dependencies are needed for a clean install of Ubuntu 20.04 and Ubuntu 18.04:
 ```
-sudo apt-get install \
-    autoconf bash bison build-essential ca-certificates dnsutils expect flex git \
-    graphviz libbz2-dev libcurl4-openssl-dev libncurses-dev libpcre3-dev \
-    libsnappy-dev libsodium-dev libssl-dev libtool libzip-dev locales lsb-release \
-    mc nano net-tools ntp openssh-server pkg-config python3 python3-jinja2 sudo \
-    systemd-coredump wget
+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
 ```
 
-Boost libraries setup:
-```
-wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
-tar -xzf boost_1_72_0.tar.gz boost_1_72_0
-cd boost_1_72_0
-./bootstrap.sh
-./b2
-sudo ./b2 install
-sudo ldconfig
-```
 
-cmake setup:
-```
-wget https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh
-chmod 755 ./cmake-3.24.2-linux-x86_64.sh
-sudo ./cmake-3.24.2-linux-x86_64.sh --prefix=/usr --skip-license
-cmake --version
-```
+## Building Peerplays
 
-libzmq setup:
 ```
-wget https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.4.tar.gz
-tar -xzvf v4.3.4.tar.gz
-cd libzmq-4.3.4
-mkdir build
-cd build
-cmake ..
-make -j$(nproc)
-sudo make install
-sudo ldconfig
-```
-
-cppzmq setup:
-```
-wget https://github.com/zeromq/cppzmq/archive/refs/tags/v4.9.0.tar.gz
-tar -xzvf v4.9.0.tar.gz
-cd cppzmq-4.9.0
-mkdir build
-cd build
-cmake ..
-make -j$(nproc)
-sudo make install
-sudo ldconfig
-```
-
-gsl setup:
-```
-wget https://github.com/imatix/gsl/archive/refs/tags/v4.1.4.tar.gz
-tar -xzvf v4.1.4.tar.gz
-cd gsl-4.1.4
-make -j$(nproc)
-sudo make install
-sudo ldconfig
-```
-
-libbitcoin-explorer setup:
-```
-git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git
-cd libbitcoin-explorer
-sudo ./install.sh
-sudo ldconfig
-```
-
-Doxygen setup:
-```
-wget https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_8_17.tar.gz
-tar -xvf Release_1_8_17.tar.gz
-cd doxygen-Release_1_8_17
-mkdir build
-cd build
-cmake ..
-make -j$(nproc)
-sudo make install
-sudo ldconfig
-```
-
-Perl setup:
-```
-wget https://github.com/Perl/perl5/archive/refs/tags/v5.30.0.tar.gz
-tar -xvf v5.30.0.tar.gz
-cd perl5-5.30.0
-./Configure -des
-make -j$(nproc)
-sudo make install
-sudo ldconfig
-```
-
-Building Peerplays
-```
-git clone https://gitlab.com/PBSA/peerplays.git
+cd $HOME/src
+export BOOST_ROOT=$HOME/src/boost_1_67_0
+git clone https://github.com/peerplays-network/peerplays.git
 cd peerplays
 git submodule update --init --recursive
-
-# If you want to build Mainnet node
-cmake -DCMAKE_BUILD_TYPE=Release
-
-# If you want to build Testnet node
-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
+cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release
 make -j$(nproc)
 
-sudo make install # this can install the executable files under /usr/local
+make install # this can install the executable files under /usr/local
 ```
 
-## Docker images
+docker build -t peerplays .
+
+## Docker image
 
-Install docker, and add current user to docker group.
 ```
+# Install docker
 sudo apt install docker.io
-sudo usermod -a -G docker $USER
 
+
+# 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
 ```
 
-### Official docker image for Peerplas Mainnet
-
-```
-docker pull datasecuritynode/peerplays:latest
-```
-
-### Building docker images manually
-```
-# Checkout the code
-git clone https://gitlab.com/PBSA/peerplays.git
-cd peerplays
-
-# Checkout the branch you want
-# E.g.
-# git checkout beatrice
-# git checkout develop
-git checkout master
-
-git submodule update --init --recursive
-
-# Execute from the project root, must be a docker group member
-
-# Build docker image, using Ubuntu 20.04 base
-docker build --no-cache -f Dockerfile -t peerplays .
-
-# Build docker image, using Ubuntu 18.04 base
-docker build --no-cache -f Dockerfile.18.04 -t peerplays-18-04 .
-```
-
-### Start docker image
-```
-# Start docker image, using Ubuntu 20.04 base
-docker run peerplays:latest
-
-# Start docker image, using Ubuntu 18.04 base
-docker run peerplays-18-04:latest
-```
-
-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

bkup_CMakeCache.txt

@@ -0,0 +1,794 @@
+# This is the CMakeCache file.
+# For build in directory: /home/pbattu/git/18.04/peerplays
+# It was generated by CMake: /usr/bin/cmake
+# You can edit this file to change values found and used by cmake.
+# If you do not want to change any of the values, simply exit the editor.
+# If you do want to change a value, simply edit, save, and exit the editor.
+# The syntax for the file is as follows:
+# KEY:TYPE=VALUE
+# KEY is the name of a variable in the cache.
+# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
+# VALUE is the current value for the KEY.
+
+########################
+# EXTERNAL cache entries
+########################
+
+//No help, variable specified on the command line.
+BOOST_ROOT:PATH=/home/pbattu/git/18.04/boost_1_67_0
+
+//The threading library used by boost-thread
+BOOST_THREAD_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpthread.so
+
+//Build bitshares executables (witness node, cli wallet, etc)
+BUILD_BITSHARES_PROGRAMS:BOOL=TRUE
+
+//Build bitshares unit tests
+BUILD_BITSHARES_TESTS:BOOL=TRUE
+
+//Build websocketpp examples.
+BUILD_EXAMPLES:BOOL=OFF
+
+//Build websocketpp tests.
+BUILD_TESTS:BOOL=OFF
+
+//Value Computed by CMake
+BitShares_BINARY_DIR:STATIC=/home/pbattu/git/18.04/peerplays
+
+//Value Computed by CMake
+BitShares_SOURCE_DIR:STATIC=/home/pbattu/git/18.04/peerplays
+
+//Boost chrono library (debug)
+Boost_CHRONO_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_chrono.a
+
+//Boost chrono library (release)
+Boost_CHRONO_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_chrono.a
+
+//Boost context library (debug)
+Boost_CONTEXT_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_context.a
+
+//Boost context library (release)
+Boost_CONTEXT_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_context.a
+
+//Boost coroutine library (debug)
+Boost_COROUTINE_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_coroutine.a
+
+//Boost coroutine library (release)
+Boost_COROUTINE_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_coroutine.a
+
+//Boost date_time library (debug)
+Boost_DATE_TIME_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_date_time.a
+
+//Boost date_time library (release)
+Boost_DATE_TIME_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_date_time.a
+
+//The directory containing a CMake configuration file for Boost.
+Boost_DIR:PATH=Boost_DIR-NOTFOUND
+
+//Boost filesystem library (debug)
+Boost_FILESYSTEM_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_filesystem.a
+
+//Boost filesystem library (release)
+Boost_FILESYSTEM_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_filesystem.a
+
+//Path to a file.
+Boost_INCLUDE_DIR:PATH=/home/pbattu/git/18.04/boost_1_67_0/include
+
+//Boost iostreams library (debug)
+Boost_IOSTREAMS_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_iostreams.a
+
+//Boost iostreams library (release)
+Boost_IOSTREAMS_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_iostreams.a
+
+//Boost library directory
+Boost_LIBRARY_DIR:PATH=/home/pbattu/git/18.04/boost_1_67_0/lib
+
+//Boost library directory DEBUG
+Boost_LIBRARY_DIR_DEBUG:PATH=/home/pbattu/git/18.04/boost_1_67_0/lib
+
+//Boost library directory RELEASE
+Boost_LIBRARY_DIR_RELEASE:PATH=/home/pbattu/git/18.04/boost_1_67_0/lib
+
+//Boost locale library (debug)
+Boost_LOCALE_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_locale.a
+
+//Boost locale library (release)
+Boost_LOCALE_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_locale.a
+
+//Boost program_options library (debug)
+Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_program_options.a
+
+//Boost program_options library (release)
+Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_program_options.a
+
+//Boost serialization library (debug)
+Boost_SERIALIZATION_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_serialization.a
+
+//Boost serialization library (release)
+Boost_SERIALIZATION_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_serialization.a
+
+//Boost signals library (debug)
+Boost_SIGNALS_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_signals.a
+
+//Boost signals library (release)
+Boost_SIGNALS_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_signals.a
+
+//Boost system library (debug)
+Boost_SYSTEM_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_system.a
+
+//Boost system library (release)
+Boost_SYSTEM_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_system.a
+
+//Boost thread library (debug)
+Boost_THREAD_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_thread.a
+
+//Boost thread library (release)
+Boost_THREAD_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_thread.a
+
+//Boost unit_test_framework library (debug)
+Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_unit_test_framework.a
+
+//Boost unit_test_framework library (release)
+Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE:FILEPATH=/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_unit_test_framework.a
+
+//ON or OFF
+Boost_USE_STATIC_LIBS:STRING=ON
+
+//Path to a program.
+CMAKE_AR:FILEPATH=/usr/bin/ar
+
+//Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
+// CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
+CMAKE_BUILD_TYPE:STRING=Debug
+
+//Enable/Disable color output during build.
+CMAKE_COLOR_MAKEFILE:BOOL=ON
+
+//Configurations
+CMAKE_CONFIGURATION_TYPES:STRING=Release;RelWithDebInfo;Debug
+
+//CXX compiler
+CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++-5
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-5
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-5
+
+//Flags used by the compiler during all build types.
+CMAKE_CXX_FLAGS:STRING=
+
+//Flags used by the compiler during debug builds.
+CMAKE_CXX_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the compiler during release builds for minimum
+// size.
+CMAKE_CXX_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the compiler during release builds.
+CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the compiler during release builds with debug info.
+CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//C compiler
+CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc-5
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-5
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-5
+
+//Flags used by the compiler during all build types.
+CMAKE_C_FLAGS:STRING=
+
+//Flags used by the compiler during debug builds.
+CMAKE_C_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the compiler during release builds for minimum
+// size.
+CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the compiler during release builds.
+CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the compiler during release builds with debug info.
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//Flags used by the linker.
+CMAKE_EXE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Enable/Disable output of compile commands during generation.
+CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
+
+//Install path prefix, prepended onto install directories.
+CMAKE_INSTALL_PREFIX:PATH=/usr/local
+
+//Path to a program.
+CMAKE_LINKER:FILEPATH=/usr/bin/ld
+
+//Path to a program.
+CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
+
+//Flags used by the linker during the creation of modules.
+CMAKE_MODULE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_NM:FILEPATH=/usr/bin/nm
+
+//Path to a program.
+CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
+
+//Path to a program.
+CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
+
+//Value Computed by CMake
+CMAKE_PROJECT_NAME:STATIC=BitShares
+
+//Path to a program.
+CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
+
+//Flags used by the linker during the creation of dll's.
+CMAKE_SHARED_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//If set, runtime paths are not added when installing shared libraries,
+// but are added when building.
+CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
+
+//If set, runtime paths are not added when using shared libraries.
+CMAKE_SKIP_RPATH:BOOL=NO
+
+//Flags used by the linker during the creation of static libraries.
+CMAKE_STATIC_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during debug builds.
+CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during release minsize builds.
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during release builds.
+CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_STRIP:FILEPATH=/usr/bin/strip
+
+//If this value is on, makefiles will be generated without the
+// .SILENT directive, and all commands will be echoed to the console
+// during the make.  This is useful for debugging only. With Visual
+// Studio IDE projects all commands are done without /nologo.
+CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
+
+//Path to a library.
+CURSES_CURSES_LIBRARY:FILEPATH=CURSES_CURSES_LIBRARY-NOTFOUND
+
+//Path to a library.
+CURSES_FORM_LIBRARY:FILEPATH=CURSES_FORM_LIBRARY-NOTFOUND
+
+//Path to a file.
+CURSES_INCLUDE_PATH:PATH=CURSES_INCLUDE_PATH-NOTFOUND
+
+//Path to a library.
+CURSES_NCURSES_LIBRARY:FILEPATH=CURSES_NCURSES_LIBRARY-NOTFOUND
+
+//Dot tool for use with Doxygen
+DOXYGEN_DOT_EXECUTABLE:FILEPATH=DOXYGEN_DOT_EXECUTABLE-NOTFOUND
+
+//Doxygen documentation generation tool (http://www.doxygen.org)
+DOXYGEN_EXECUTABLE:FILEPATH=DOXYGEN_EXECUTABLE-NOTFOUND
+
+//secp256k1 or openssl or mixed
+ECC_IMPL:STRING=secp256k1
+
+//Build BitShares for code coverage analysis
+ENABLE_COVERAGE_TESTING:BOOL=FALSE
+
+//Build websocketpp with CPP11 features enabled.
+ENABLE_CPP11:BOOL=ON
+
+//TRUE to try to use full zlib for compression, FALSE to use miniz.c
+FC_USE_FULL_ZLIB:BOOL=FALSE
+
+//Git command line client
+GIT_EXECUTABLE:FILEPATH=/usr/bin/git
+
+//location of the genesis.json to embed in the executable
+GRAPHENE_EGENESIS_JSON:PATH=/home/pbattu/git/18.04/peerplays/genesis.json
+
+//The directory containing a CMake configuration file for Gperftools.
+Gperftools_DIR:PATH=Gperftools_DIR-NOTFOUND
+
+//Installation directory for CMake files
+INSTALL_CMAKE_DIR:PATH=lib/cmake/websocketpp
+
+//Installation directory for header files
+INSTALL_INCLUDE_DIR:PATH=include
+
+//Log long API calls over websocket (ON OR OFF)
+LOG_LONG_API:BOOL=ON
+
+//Max API execution time in ms
+LOG_LONG_API_MAX_MS:STRING=1000
+
+//API execution time in ms at which to warn
+LOG_LONG_API_WARN_MS:STRING=750
+
+//Path to a library.
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libcrypto.a
+
+//Path to a file.
+OPENSSL_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+OPENSSL_SSL_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libssl.a
+
+//Path to a program.
+PERL_EXECUTABLE:FILEPATH=/usr/bin/perl
+
+//pkg-config executable
+PKG_CONFIG_EXECUTABLE:FILEPATH=/usr/bin/pkg-config
+
+//Path to a file.
+READLINE_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+READLINE_LIBRARIES:FILEPATH=/usr/lib/x86_64-linux-gnu/libreadline.so
+
+//Path to a file.
+Readline_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+Readline_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libreadline.so
+
+//Path to a file.
+Readline_ROOT_DIR:PATH=/usr
+
+//OFF
+UNITY_BUILD:BOOL=OFF
+
+//Path to a file.
+ZLIB_INCLUDE_DIR:PATH=/usr/include
+
+//Path to a library.
+ZLIB_LIBRARY_DEBUG:FILEPATH=ZLIB_LIBRARY_DEBUG-NOTFOUND
+
+//Path to a library.
+ZLIB_LIBRARY_RELEASE:FILEPATH=/usr/lib/x86_64-linux-gnu/libz.so
+
+//Value Computed by CMake
+fc_BINARY_DIR:STATIC=/home/pbattu/git/18.04/peerplays/libraries/fc
+
+//Dependencies for the target
+fc_LIB_DEPENDS:STATIC=general;-L/usr/local/lib;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_thread.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_date_time.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_filesystem.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_system.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_program_options.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_signals.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_serialization.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_chrono.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_unit_test_framework.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_context.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_locale.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_iostreams.a;general;/home/pbattu/git/18.04/boost_1_67_0/lib/libboost_coroutine.a;general;/usr/lib/x86_64-linux-gnu/libpthread.so;general;/usr/lib/x86_64-linux-gnu/libssl.a;general;/usr/lib/x86_64-linux-gnu/libcrypto.a;general;/usr/lib/x86_64-linux-gnu/libz.so;general;dl;general;rt;general;/usr/lib/x86_64-linux-gnu/libreadline.so;general;secp256k1;
+
+//Value Computed by CMake
+fc_SOURCE_DIR:STATIC=/home/pbattu/git/18.04/peerplays/libraries/fc
+
+//Dependencies for the target
+graphene_account_history_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_accounts_list_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_affiliate_stats_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_app_LIB_DEPENDS:STATIC=general;graphene_market_history;general;graphene_account_history;general;graphene_accounts_list;general;graphene_affiliate_stats;general;graphene_chain;general;fc;general;graphene_db;general;graphene_net;general;graphene_time;general;graphene_utilities;general;graphene_debug_witness;general;graphene_bookie;
+
+//Dependencies for the target
+graphene_bookie_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_chain_LIB_DEPENDS:STATIC=general;fc;general;graphene_db;
+
+//Dependencies for the target
+graphene_db_LIB_DEPENDS:STATIC=general;fc;
+
+//Dependencies for the target
+graphene_debug_witness_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_delayed_node_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_egenesis_brief_LIB_DEPENDS:STATIC=general;graphene_chain;general;fc;
+
+//Dependencies for the target
+graphene_egenesis_full_LIB_DEPENDS:STATIC=general;graphene_chain;general;fc;
+
+//Dependencies for the target
+graphene_egenesis_none_LIB_DEPENDS:STATIC=general;graphene_chain;general;fc;
+
+//Dependencies for the target
+graphene_generate_genesis_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;general;graphene_time;
+
+//Dependencies for the target
+graphene_generate_uia_sharedrop_genesis_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;general;graphene_time;
+
+//Dependencies for the target
+graphene_market_history_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_net_LIB_DEPENDS:STATIC=general;fc;general;graphene_db;
+
+//Dependencies for the target
+graphene_snapshot_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Dependencies for the target
+graphene_time_LIB_DEPENDS:STATIC=general;fc;
+
+//Dependencies for the target
+graphene_utilities_LIB_DEPENDS:STATIC=general;fc;
+
+//Dependencies for the target
+graphene_wallet_LIB_DEPENDS:STATIC=general;graphene_app;general;graphene_net;general;graphene_chain;general;graphene_utilities;general;fc;general;dl;
+
+//Dependencies for the target
+graphene_witness_LIB_DEPENDS:STATIC=general;graphene_chain;general;graphene_app;
+
+//Value Computed by CMake
+websocketpp_BINARY_DIR:STATIC=/home/pbattu/git/18.04/peerplays/libraries/fc/vendor/websocketpp
+
+//Value Computed by CMake
+websocketpp_SOURCE_DIR:STATIC=/home/pbattu/git/18.04/peerplays/libraries/fc/vendor/websocketpp
+
+
+########################
+# INTERNAL cache entries
+########################
+
+//ADVANCED property for variable: BOOST_ROOT
+BOOST_ROOT-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_CHRONO_LIBRARY_DEBUG
+Boost_CHRONO_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_CHRONO_LIBRARY_RELEASE
+Boost_CHRONO_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_CONTEXT_LIBRARY_DEBUG
+Boost_CONTEXT_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_CONTEXT_LIBRARY_RELEASE
+Boost_CONTEXT_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_COROUTINE_LIBRARY_DEBUG
+Boost_COROUTINE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_COROUTINE_LIBRARY_RELEASE
+Boost_COROUTINE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_DATE_TIME_LIBRARY_DEBUG
+Boost_DATE_TIME_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_DATE_TIME_LIBRARY_RELEASE
+Boost_DATE_TIME_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_DIR
+Boost_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_FILESYSTEM_LIBRARY_DEBUG
+Boost_FILESYSTEM_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_FILESYSTEM_LIBRARY_RELEASE
+Boost_FILESYSTEM_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_INCLUDE_DIR
+Boost_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_IOSTREAMS_LIBRARY_DEBUG
+Boost_IOSTREAMS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_IOSTREAMS_LIBRARY_RELEASE
+Boost_IOSTREAMS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_LIBRARY_DIR
+Boost_LIBRARY_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_LIBRARY_DIR_DEBUG
+Boost_LIBRARY_DIR_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_LIBRARY_DIR_RELEASE
+Boost_LIBRARY_DIR_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_LOCALE_LIBRARY_DEBUG
+Boost_LOCALE_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_LOCALE_LIBRARY_RELEASE
+Boost_LOCALE_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG
+Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE
+Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SERIALIZATION_LIBRARY_DEBUG
+Boost_SERIALIZATION_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SERIALIZATION_LIBRARY_RELEASE
+Boost_SERIALIZATION_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SIGNALS_LIBRARY_DEBUG
+Boost_SIGNALS_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SIGNALS_LIBRARY_RELEASE
+Boost_SIGNALS_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_DEBUG
+Boost_SYSTEM_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_SYSTEM_LIBRARY_RELEASE
+Boost_SYSTEM_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_THREAD_LIBRARY_DEBUG
+Boost_THREAD_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_THREAD_LIBRARY_RELEASE
+Boost_THREAD_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG
+Boost_UNIT_TEST_FRAMEWORK_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE
+Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_AR
+CMAKE_AR-ADVANCED:INTERNAL=1
+//This is the directory where this CMakeCache.txt was created
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/pbattu/git/18.04/peerplays
+//Major version of cmake used to create the current loaded cache
+CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
+//Minor version of cmake used to create the current loaded cache
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=10
+//Patch version of cmake used to create the current loaded cache
+CMAKE_CACHE_PATCH_VERSION:INTERNAL=2
+//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
+CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
+//Path to CMake executable.
+CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
+//Path to cpack program executable.
+CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
+//Path to ctest program executable.
+CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
+//ADVANCED property for variable: CMAKE_CXX_COMPILER
+CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR
+CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB
+CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS
+CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
+CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
+CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
+CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
+CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER
+CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_AR
+CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB
+CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS
+CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
+CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
+CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
+CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Executable file format
+CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
+CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
+CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1
+//Name of external makefile project generator.
+CMAKE_EXTRA_GENERATOR:INTERNAL=
+//Name of generator.
+CMAKE_GENERATOR:INTERNAL=Unix Makefiles
+//Name of generator platform.
+CMAKE_GENERATOR_PLATFORM:INTERNAL=
+//Name of generator toolset.
+CMAKE_GENERATOR_TOOLSET:INTERNAL=
+//Have symbol pthread_create
+CMAKE_HAVE_LIBC_CREATE:INTERNAL=
+//Have library pthreads
+CMAKE_HAVE_PTHREADS_CREATE:INTERNAL=
+//Have library pthread
+CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
+//Have include pthread.h
+CMAKE_HAVE_PTHREAD_H:INTERNAL=1
+//Source directory with the top level CMakeLists.txt file for this
+// project
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/pbattu/git/18.04/peerplays
+//Install .so files without execute permission.
+CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
+//ADVANCED property for variable: CMAKE_LINKER
+CMAKE_LINKER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
+CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
+CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_NM
+CMAKE_NM-ADVANCED:INTERNAL=1
+//number of local generators
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=37
+//ADVANCED property for variable: CMAKE_OBJCOPY
+CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_OBJDUMP
+CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
+//Platform information initialized
+CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_RANLIB
+CMAKE_RANLIB-ADVANCED:INTERNAL=1
+//Path to CMake installation.
+CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.10
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
+CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
+CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_RPATH
+CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
+CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
+CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
+CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STRIP
+CMAKE_STRIP-ADVANCED:INTERNAL=1
+//uname command
+CMAKE_UNAME:INTERNAL=/bin/uname
+//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
+CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CURSES_CURSES_LIBRARY
+CURSES_CURSES_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CURSES_FORM_LIBRARY
+CURSES_FORM_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CURSES_INCLUDE_PATH
+CURSES_INCLUDE_PATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CURSES_NCURSES_LIBRARY
+CURSES_NCURSES_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: DOXYGEN_DOT_EXECUTABLE
+DOXYGEN_DOT_EXECUTABLE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: DOXYGEN_EXECUTABLE
+DOXYGEN_EXECUTABLE-ADVANCED:INTERNAL=1
+//Details about finding OpenSSL
+FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL:INTERNAL=[/usr/lib/x86_64-linux-gnu/libcrypto.a][/usr/include][v1.1.0g()]
+//Details about finding Perl
+FIND_PACKAGE_MESSAGE_DETAILS_Perl:INTERNAL=[/usr/bin/perl][v5.26.1()]
+//Details about finding Readline
+FIND_PACKAGE_MESSAGE_DETAILS_Readline:INTERNAL=[/usr/include][/usr/lib/x86_64-linux-gnu/libreadline.so][v()]
+//Details about finding Threads
+FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()]
+//Details about finding ZLIB
+FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib/x86_64-linux-gnu/libz.so][/usr/include][v1.2.11()]
+//ADVANCED property for variable: GIT_EXECUTABLE
+GIT_EXECUTABLE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OPENSSL_CRYPTO_LIBRARY
+OPENSSL_CRYPTO_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OPENSSL_INCLUDE_DIR
+OPENSSL_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OPENSSL_SSL_LIBRARY
+OPENSSL_SSL_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: PERL_EXECUTABLE
+PERL_EXECUTABLE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: PKG_CONFIG_EXECUTABLE
+PKG_CONFIG_EXECUTABLE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Readline_INCLUDE_DIR
+Readline_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Readline_LIBRARY
+Readline_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: Readline_ROOT_DIR
+Readline_ROOT_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: ZLIB_INCLUDE_DIR
+ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: ZLIB_LIBRARY_DEBUG
+ZLIB_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: ZLIB_LIBRARY_RELEASE
+ZLIB_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
+//Last used BOOST_ROOT value.
+_BOOST_ROOT_LAST:INTERNAL=/home/pbattu/git/18.04/boost_1_67_0
+//Components requested for this build tree.
+_Boost_COMPONENTS_SEARCHED:INTERNAL=chrono;context;coroutine;date_time;filesystem;iostreams;locale;program_options;serialization;signals;system;thread;unit_test_framework
+//Last used Boost_INCLUDE_DIR value.
+_Boost_INCLUDE_DIR_LAST:INTERNAL=/home/pbattu/git/18.04/boost_1_67_0/include
+//Last used Boost_LIBRARY_DIR_DEBUG value.
+_Boost_LIBRARY_DIR_DEBUG_LAST:INTERNAL=/home/pbattu/git/18.04/boost_1_67_0/lib
+//Last used Boost_LIBRARY_DIR value.
+_Boost_LIBRARY_DIR_LAST:INTERNAL=/home/pbattu/git/18.04/boost_1_67_0/lib
+//Last used Boost_LIBRARY_DIR_RELEASE value.
+_Boost_LIBRARY_DIR_RELEASE_LAST:INTERNAL=/home/pbattu/git/18.04/boost_1_67_0/lib
+//Last used Boost_NAMESPACE value.
+_Boost_NAMESPACE_LAST:INTERNAL=boost
+//Last used Boost_USE_MULTITHREADED value.
+_Boost_USE_MULTITHREADED_LAST:INTERNAL=TRUE
+//Last used Boost_USE_STATIC_LIBS value.
+_Boost_USE_STATIC_LIBS_LAST:INTERNAL=ON
+_OPENSSL_CFLAGS:INTERNAL=
+_OPENSSL_CFLAGS_I:INTERNAL=
+_OPENSSL_CFLAGS_OTHER:INTERNAL=
+_OPENSSL_FOUND:INTERNAL=1
+_OPENSSL_INCLUDEDIR:INTERNAL=/usr/include
+_OPENSSL_INCLUDE_DIRS:INTERNAL=
+_OPENSSL_LDFLAGS:INTERNAL=-lssl;-lcrypto
+_OPENSSL_LDFLAGS_OTHER:INTERNAL=
+_OPENSSL_LIBDIR:INTERNAL=/usr/lib/x86_64-linux-gnu
+_OPENSSL_LIBRARIES:INTERNAL=ssl;crypto
+_OPENSSL_LIBRARY_DIRS:INTERNAL=
+_OPENSSL_LIBS:INTERNAL=
+_OPENSSL_LIBS_L:INTERNAL=
+_OPENSSL_LIBS_OTHER:INTERNAL=
+_OPENSSL_LIBS_PATHS:INTERNAL=
+_OPENSSL_PREFIX:INTERNAL=/usr
+_OPENSSL_STATIC_CFLAGS:INTERNAL=
+_OPENSSL_STATIC_CFLAGS_I:INTERNAL=
+_OPENSSL_STATIC_CFLAGS_OTHER:INTERNAL=
+_OPENSSL_STATIC_INCLUDE_DIRS:INTERNAL=
+_OPENSSL_STATIC_LDFLAGS:INTERNAL=-lssl;-ldl;-lcrypto;-ldl
+_OPENSSL_STATIC_LDFLAGS_OTHER:INTERNAL=
+_OPENSSL_STATIC_LIBDIR:INTERNAL=
+_OPENSSL_STATIC_LIBRARIES:INTERNAL=ssl;dl;crypto;dl
+_OPENSSL_STATIC_LIBRARY_DIRS:INTERNAL=
+_OPENSSL_STATIC_LIBS:INTERNAL=
+_OPENSSL_STATIC_LIBS_L:INTERNAL=
+_OPENSSL_STATIC_LIBS_OTHER:INTERNAL=
+_OPENSSL_STATIC_LIBS_PATHS:INTERNAL=
+_OPENSSL_VERSION:INTERNAL=1.1.0g
+_OPENSSL_openssl_INCLUDEDIR:INTERNAL=
+_OPENSSL_openssl_LIBDIR:INTERNAL=
+_OPENSSL_openssl_PREFIX:INTERNAL=
+_OPENSSL_openssl_VERSION:INTERNAL=
+__pkg_config_arguments__OPENSSL:INTERNAL=QUIET;openssl
+__pkg_config_checked__OPENSSL:INTERNAL=1
+prefix_result:INTERNAL=/usr/lib/x86_64-linux-gnu
+

clang-format.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-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

docker/default_config.ini

@@ -0,0 +1,61 @@
+# Endpoint for P2P node to listen on
+p2p-endpoint = 0.0.0.0:9090
+
+# P2P nodes to connect to on startup (may specify multiple times)
+# seed-node = 
+
+# JSON array of P2P nodes to connect to on startup
+# seed-nodes = 
+
+# Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.
+# checkpoint = 
+
+# Endpoint for websocket RPC to listen on
+rpc-endpoint = 0.0.0.0:8090
+
+# Endpoint for TLS websocket RPC to listen on
+# rpc-tls-endpoint = 
+
+# The TLS certificate file for this server
+# server-pem = 
+
+# Password for this certificate
+# server-pem-password = 
+
+# File to read Genesis State from
+# genesis-json = 
+
+# Block signing key to use for init witnesses, overrides genesis file
+# dbg-init-key = 
+
+# JSON file specifying API permissions
+# api-access = 
+
+# Enable block production, even if the chain is stale.
+enable-stale-production = false
+
+# Percent of witnesses (0-99) that must be participating in order to produce blocks
+required-participation = false
+
+# ID of witness controlled by this node (e.g. "1.6.5", quotes are required, may specify multiple times)
+# witness-id = 
+
+# Tuple of [PublicKey, WIF private key] (may specify multiple times)
+# private-key = ["BTS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV","5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"]
+
+# Account ID to track history for (may specify multiple times)
+# track-account = 
+
+# Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers
+# bucket-size = [15,60,300,3600,86400]
+bucket-size = [60,300,900,1800,3600,14400,86400]
+# for 1 min, 5 mins, 30 mins, 1h, 4 hs and 1 day. i think this should be the default.
+
+# How far back in time to track history for each bucket size, measured in the number of buckets (default: 1000)
+history-per-size = 1000
+
+# Max amount of operations to store in the database, per account (drastically reduces RAM requirements)
+max-ops-per-account = 1000
+
+# Remove old operation history # objects from RAM
+partial-operations = true

docker/peerplaysentry.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+PEERPLAYSD="/usr/local/bin/witness_node"
+
+# For blockchain download
+VERSION=`cat /etc/peerplays/version`
+
+## Supported Environmental Variables
+#
+#   * $PEERPLAYSD_SEED_NODES
+#   * $PEERPLAYSD_RPC_ENDPOINT
+#   * $PEERPLAYSD_PLUGINS
+#   * $PEERPLAYSD_REPLAY
+#   * $PEERPLAYSD_RESYNC
+#   * $PEERPLAYSD_P2P_ENDPOINT
+#   * $PEERPLAYSD_WITNESS_ID
+#   * $PEERPLAYSD_PRIVATE_KEY
+#   * $PEERPLAYSD_DEBUG_PRIVATE_KEY
+#   * $PEERPLAYSD_TRACK_ACCOUNTS
+#   * $PEERPLAYSD_PARTIAL_OPERATIONS
+#   * $PEERPLAYSD_MAX_OPS_PER_ACCOUNT
+#   * $PEERPLAYSD_TRUSTED_NODE
+#
+
+ARGS=""
+# Translate environmental variables
+if [[ ! -z "$PEERPLAYSD_SEED_NODES" ]]; then
+    for NODE in $PEERPLAYSD_SEED_NODES ; do
+        ARGS+=" --seed-node=$NODE"
+    done
+fi
+if [[ ! -z "$PEERPLAYSD_RPC_ENDPOINT" ]]; then
+    ARGS+=" --rpc-endpoint=${PEERPLAYSD_RPC_ENDPOINT}"
+fi
+
+if [[ ! -z "$PEERPLAYSD_REPLAY" ]]; then
+    ARGS+=" --replay-blockchain"
+fi
+
+if [[ ! -z "$PEERPLAYSD_RESYNC" ]]; then
+    ARGS+=" --resync-blockchain"
+fi
+
+if [[ ! -z "$PEERPLAYSD_P2P_ENDPOINT" ]]; then
+    ARGS+=" --p2p-endpoint=${PEERPLAYSD_P2P_ENDPOINT}"
+fi
+
+if [[ ! -z "$PEERPLAYSD_WITNESS_ID" ]]; then
+    ARGS+=" --witness-id=$PEERPLAYSD_WITNESS_ID"
+fi
+
+if [[ ! -z "$PEERPLAYSD_PRIVATE_KEY" ]]; then
+    ARGS+=" --private-key=$PEERPLAYSD_PRIVATE_KEY"
+fi
+
+if [[ ! -z "$PEERPLAYSD_DEBUG_PRIVATE_KEY" ]]; then
+    ARGS+=" --debug-private-key=$PEERPLAYSD_DEBUG_PRIVATE_KEY"
+fi
+
+if [[ ! -z "$PEERPLAYSD_TRACK_ACCOUNTS" ]]; then
+    for ACCOUNT in $PEERPLAYSD_TRACK_ACCOUNTS ; do
+        ARGS+=" --track-account=$ACCOUNT"
+    done
+fi
+
+if [[ ! -z "$PEERPLAYSD_PARTIAL_OPERATIONS" ]]; then
+    ARGS+=" --partial-operations=${PEERPLAYSD_PARTIAL_OPERATIONS}"
+fi
+
+if [[ ! -z "$PEERPLAYSD_MAX_OPS_PER_ACCOUNT" ]]; then
+    ARGS+=" --max-ops-per-account=${PEERPLAYSD_MAX_OPS_PER_ACCOUNT}"
+fi
+
+if [[ ! -z "$PEERPLAYSD_TRUSTED_NODE" ]]; then
+    ARGS+=" --trusted-node=${PEERPLAYSD_TRUSTED_NODE}"
+fi
+
+## Link the peerplays config file into home
+## This link has been created in Dockerfile, already
+ln -f -s /etc/peerplays/config.ini /var/lib/peerplays
+
+# Plugins need to be provided in a space-separated list, which
+# makes it necessary to write it like this
+if [[ ! -z "$PEERPLAYSD_PLUGINS" ]]; then
+   $PEERPLAYSD --data-dir ${HOME} ${ARGS} ${PEERPLAYSD_ARGS} --plugins "${PEERPLAYSD_PLUGINS}"
+else
+   $PEERPLAYSD --data-dir ${HOME} ${ARGS} ${PEERPLAYSD_ARGS}
+fi

docs

@@ -1 +1 @@
-Subproject commit 1e924950c2f92b166c34ceb294e8b8c4997a6c4e
+Subproject commit 8df8f66389853df73ab8f6dd73981be2a6957df8

libraries/CMakeLists.txt

@@ -5,7 +5,6 @@ add_subdirectory( egenesis )
 add_subdirectory( fc )
 add_subdirectory( net )
 add_subdirectory( plugins )
-add_subdirectory( sha3 )
 add_subdirectory( time )
 add_subdirectory( utilities )
 add_subdirectory( wallet )

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 peerplays_sidechain )
+                       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 )
 
 target_include_directories( graphene_app
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include"
@@ -55,3 +55,4 @@ INSTALL( TARGETS
    LIBRARY DESTINATION lib
    ARCHIVE DESTINATION lib
 )
+

libraries/app/config_util.cpp

@@ -25,36 +25,36 @@
 #include <graphene/app/config_util.hpp>
 #include <graphene/chain/config.hpp>
 
+#include <fc/reflect/variant.hpp>
+#include <fc/string.hpp>
 #include <fc/exception/exception.hpp>
 #include <fc/log/console_appender.hpp>
 #include <fc/log/file_appender.hpp>
 #include <fc/log/logger_config.hpp>
-#include <fc/reflect/variant.hpp>
-#include <fc/string.hpp>
 
-#include <boost/algorithm/string.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/property_tree/ini_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <fstream>
 
 namespace bpo = boost::program_options;
 
-class deduplicator {
+class deduplicator
+{
 public:
-   deduplicator() :
-         modifier(nullptr) {
-   }
+   deduplicator() : modifier(nullptr) {}
 
-   deduplicator(const boost::shared_ptr<bpo::option_description> (*mod_fn)(const boost::shared_ptr<bpo::option_description> &)) :
-         modifier(mod_fn) {
-   }
+   deduplicator(const boost::shared_ptr<bpo::option_description> (*mod_fn)(const boost::shared_ptr<bpo::option_description>&))
+   : modifier(mod_fn) {}
 
-   const boost::shared_ptr<bpo::option_description> next(const boost::shared_ptr<bpo::option_description> &o) {
+   const boost::shared_ptr<bpo::option_description> next(const boost::shared_ptr<bpo::option_description>& o)
+   {
       const std::string name = o->long_name();
-      if (seen.find(name) != seen.end())
+      if( seen.find( name ) != seen.end() )
          return nullptr;
       seen.insert(name);
       return modifier ? modifier(o) : o;
@@ -62,14 +62,15 @@ public:
 
 private:
    boost::container::flat_set<std::string> seen;
-   const boost::shared_ptr<bpo::option_description> (*modifier)(const boost::shared_ptr<bpo::option_description> &);
+   const boost::shared_ptr<bpo::option_description> (*modifier)(const boost::shared_ptr<bpo::option_description>&);
 };
 
 // Currently, you can only specify the filenames and logging levels, which
 // are all most users would want to change.  At a later time, options can
 // be added to control rotation intervals, compression, and other seldom-
 // used features
-static void write_default_logging_config_to_stream(std::ostream &out) {
+static void write_default_logging_config_to_stream(std::ostream& out)
+{
    out << "# declare an appender named \"stderr\" that writes messages to the console\n"
           "[log.console_appender.stderr]\n"
           "stream=std_error\n\n"
@@ -114,22 +115,26 @@ static void write_default_logging_config_to_stream(std::ostream &out) {
 
 // logging config is too complicated to be parsed by boost::program_options,
 // so we do it by hand
-static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path &config_ini_filename) {
-   try {
+static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const fc::path& config_ini_filename)
+{
+   try
+   {
       fc::logging_config logging_config;
       bool found_logging_config = false;
 
       boost::property_tree::ptree config_ini_tree;
       boost::property_tree::ini_parser::read_ini(config_ini_filename.preferred_string().c_str(), config_ini_tree);
-      for (const auto &section : config_ini_tree) {
-         const std::string &section_name = section.first;
-         const boost::property_tree::ptree &section_tree = section.second;
+      for (const auto& section : config_ini_tree)
+      {
+         const std::string& section_name = section.first;
+         const boost::property_tree::ptree& section_tree = section.second;
 
          const std::string console_appender_section_prefix = "log.console_appender.";
          const std::string file_appender_section_prefix = "log.file_appender.";
          const std::string logger_section_prefix = "logger.";
 
-         if (boost::starts_with(section_name, console_appender_section_prefix)) {
+         if (boost::starts_with(section_name, console_appender_section_prefix))
+         {
             std::string console_appender_name = section_name.substr(console_appender_section_prefix.length());
             std::string stream_name = section_tree.get<std::string>("stream");
 
@@ -137,18 +142,20 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
             // stdout/stderr will be taken from ini file, everything else hard-coded here
             fc::console_appender::config console_appender_config;
             console_appender_config.level_colors.emplace_back(
-                  fc::console_appender::level_color(fc::log_level::debug,
-                                                    fc::console_appender::color::green));
+            fc::console_appender::level_color(fc::log_level::debug,
+                                              fc::console_appender::color::green));
             console_appender_config.level_colors.emplace_back(
-                  fc::console_appender::level_color(fc::log_level::warn,
-                                                    fc::console_appender::color::brown));
+            fc::console_appender::level_color(fc::log_level::warn,
+                                              fc::console_appender::color::brown));
             console_appender_config.level_colors.emplace_back(
-                  fc::console_appender::level_color(fc::log_level::error,
-                                                    fc::console_appender::color::cyan));
+            fc::console_appender::level_color(fc::log_level::error,
+                                              fc::console_appender::color::cyan));
             console_appender_config.stream = fc::variant(stream_name).as<fc::console_appender::stream::type>(GRAPHENE_MAX_NESTED_OBJECTS);
             logging_config.appenders.push_back(fc::appender_config(console_appender_name, "console", fc::variant(console_appender_config, GRAPHENE_MAX_NESTED_OBJECTS)));
             found_logging_config = true;
-         } else if (boost::starts_with(section_name, file_appender_section_prefix)) {
+         }
+         else if (boost::starts_with(section_name, file_appender_section_prefix))
+         {
             std::string file_appender_name = section_name.substr(file_appender_section_prefix.length());
             fc::path file_name = section_tree.get<std::string>("filename");
             if (file_name.is_relative())
@@ -167,7 +174,9 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
             file_appender_config.rotation_limit = fc::days(limit);
             logging_config.appenders.push_back(fc::appender_config(file_appender_name, "file", fc::variant(file_appender_config, GRAPHENE_MAX_NESTED_OBJECTS)));
             found_logging_config = true;
-         } else if (boost::starts_with(section_name, logger_section_prefix)) {
+         }
+         else if (boost::starts_with(section_name, logger_section_prefix))
+         {
             std::string logger_name = section_name.substr(logger_section_prefix.length());
             std::string level_string = section_tree.get<std::string>("level");
             std::string appenders_string = section_tree.get<std::string>("appenders");
@@ -188,66 +197,74 @@ static fc::optional<fc::logging_config> load_logging_config_from_ini_file(const
    FC_RETHROW_EXCEPTIONS(warn, "")
 }
 
-static const boost::shared_ptr<bpo::option_description> new_option_description(const std::string &name, const bpo::value_semantic *value, const std::string &description) {
+static const boost::shared_ptr<bpo::option_description> new_option_description( const std::string& name, const bpo::value_semantic* value, const std::string& description )
+{
    bpo::options_description helper("");
-   helper.add_options()(name.c_str(), value, description.c_str());
+   helper.add_options()( name.c_str(), value, description.c_str() );
    return helper.options()[0];
 }
 
-static void load_config_file(const fc::path &config_ini_path, const bpo::options_description &cfg_options,
-                             bpo::variables_map &options) {
+
+static void load_config_file(const fc::path& config_ini_path, const bpo::options_description& cfg_options,
+                             bpo::variables_map& options )
+{
    deduplicator dedup;
    bpo::options_description unique_options("Graphene Witness Node");
-   for (const boost::shared_ptr<bpo::option_description> opt : cfg_options.options()) {
+   for( const boost::shared_ptr<bpo::option_description> opt : cfg_options.options() )
+   {
       const boost::shared_ptr<bpo::option_description> od = dedup.next(opt);
-      if (!od)
-         continue;
-      unique_options.add(od);
+      if( !od ) continue;
+      unique_options.add( od );
    }
 
    // get the basic options
    bpo::store(bpo::parse_config_file<char>(config_ini_path.preferred_string().c_str(),
-                                           unique_options, true),
-              options);
+                                           unique_options, true), options);
 }
 
-static bool load_logging_config_file(const fc::path &config_ini_path) {
+static bool load_logging_config_file(const fc::path& config_ini_path)
+{
    // try to get logging options from the config file.
-   try {
+   try
+   {
       fc::optional<fc::logging_config> logging_config = load_logging_config_from_ini_file(config_ini_path);
-      if (logging_config) {
+      if (logging_config)
+      {
          fc::configure_logging(*logging_config);
          return true;
       }
-   } catch (const fc::exception &ex) {
+   }
+   catch (const fc::exception& ex)
+   {
       wlog("Error parsing logging config from logging config file ${config}, using default config", ("config", config_ini_path.preferred_string()));
    }
    return false;
 }
 
-static void create_new_config_file(const fc::path &config_ini_path, const fc::path &data_dir,
-                                   const bpo::options_description &cfg_options) {
+static void create_new_config_file(const fc::path& config_ini_path, const fc::path& data_dir,
+                                   const bpo::options_description& cfg_options )
+{
    ilog("Writing new config file at ${path}", ("path", config_ini_path));
-   if (!fc::exists(data_dir))
+   if( !fc::exists(data_dir) )
       fc::create_directories(data_dir);
 
-   auto modify_option_defaults = [](const boost::shared_ptr<bpo::option_description> &o) -> const boost::shared_ptr<bpo::option_description> {
-      const std::string &name = o->long_name();
-      if (name == "partial-operations")
-         return new_option_description(name, bpo::value<bool>()->default_value(true), o->description());
-      if (name == "max-ops-per-account")
-         return new_option_description(name, bpo::value<int>()->default_value(100), o->description());
-      return o;
+   auto modify_option_defaults = [](const boost::shared_ptr<bpo::option_description>& o) -> const boost::shared_ptr<bpo::option_description> {
+       const std::string& name = o->long_name();
+       if( name == "partial-operations" )
+          return new_option_description(name, bpo::value<bool>()->default_value(true), o->description() );
+       if( name == "max-ops-per-account" )
+          return new_option_description(name, bpo::value<int>()->default_value(100), o->description() );
+       return o;
    };
    deduplicator dedup(modify_option_defaults);
    std::ofstream out_cfg(config_ini_path.preferred_string());
-   std::string plugin_header_surrounding(78, '=');
-   for (const boost::shared_ptr<bpo::option_description> opt : cfg_options.options()) {
+   std::string plugin_header_surrounding( 78, '=' );
+   for( const boost::shared_ptr<bpo::option_description> opt : cfg_options.options() )
+   {
       const boost::shared_ptr<bpo::option_description> od = dedup.next(opt);
-      if (!od)
-         continue;
+      if( !od ) continue;
 
-      if (od->long_name().find("plugin-cfg-header-") == 0) // it's a plugin header
+      if( od->long_name().find("plugin-cfg-header-") == 0 ) // it's a plugin header
       {
          out_cfg << "\n";
          out_cfg << "# " << plugin_header_surrounding << "\n";
@@ -257,21 +274,20 @@ static void create_new_config_file(const fc::path &config_ini_path, const fc::pa
          continue;
       }
 
-      if (!od->description().empty())
+      if( !od->description().empty() )
          out_cfg << "# " << od->description() << "\n";
       boost::any store;
-      if (!od->semantic()->apply_default(store))
+      if( !od->semantic()->apply_default(store) )
          out_cfg << "# " << od->long_name() << " = \n";
       else {
          auto example = od->format_parameter();
-         if (example.empty())
+         if( example.empty() )
             // This is a boolean switch
-            out_cfg << od->long_name() << " = "
-                    << "false\n";
+            out_cfg << od->long_name() << " = " << "false\n";
          else {
             // The string is formatted "arg (=<interesting part>)"
             example.erase(0, 6);
-            example.erase(example.length() - 1);
+            example.erase(example.length()-1);
             out_cfg << od->long_name() << " = " << example << "\n";
          }
       }
@@ -288,9 +304,11 @@ static void create_new_config_file(const fc::path &config_ini_path, const fc::pa
    out_cfg.close();
 }
 
-static void create_logging_config_file(const fc::path &config_ini_path, const fc::path &data_dir) {
+static void create_logging_config_file(const fc::path& config_ini_path, const fc::path& data_dir)
+{
    ilog("Writing new config file at ${path}", ("path", config_ini_path));
-   if (!exists(data_dir)) {
+   if (!exists(data_dir))
+   {
       create_directories(data_dir);
    }
 
@@ -301,29 +319,36 @@ static void create_logging_config_file(const fc::path &config_ini_path, const fc
 
 namespace graphene { namespace app {
 
-void load_configuration_options(const fc::path &data_dir, const bpo::options_description &cfg_options, bpo::variables_map &options) {
-   const auto config_ini_path = data_dir / "config.ini";
-   const auto logging_ini_path = data_dir / "logging.ini";
+   void load_configuration_options(const fc::path& data_dir, const bpo::options_description& cfg_options, bpo::variables_map& options)
+   {
+      const auto config_ini_path = data_dir / "config.ini";
+      const auto logging_ini_path = data_dir / "logging.ini";
 
-   if (!exists(config_ini_path) && fc::exists(logging_ini_path)) {
-      // this is an uncommon case
-      create_new_config_file(config_ini_path, data_dir, cfg_options);
-   } else if (!exists(config_ini_path)) {
-      // create default config.ini and logging.ini
-      create_new_config_file(config_ini_path, data_dir, cfg_options);
-      create_logging_config_file(logging_ini_path, data_dir);
+      if(!exists(config_ini_path) && fc::exists(logging_ini_path))
+      {
+         // this is an uncommon case
+         create_new_config_file(config_ini_path, data_dir, cfg_options);
+      }
+      else if(!exists(config_ini_path))
+      {
+         // create default config.ini and logging.ini
+         create_new_config_file(config_ini_path, data_dir, cfg_options);
+         create_logging_config_file(logging_ini_path, data_dir);
+      }
+
+      // load witness node configuration
+      load_config_file(config_ini_path, cfg_options, options);
+
+      // load logging configuration
+      if (fc::exists(logging_ini_path))
+      {
+         load_logging_config_file(logging_ini_path);
+      }
+      else
+      {
+         // this is the legacy config.ini case
+         load_logging_config_file(config_ini_path);
+      }
    }
 
-   // load witness node configuration
-   load_config_file(config_ini_path, cfg_options, options);
-
-   // load logging configuration
-   if (fc::exists(logging_ini_path)) {
-      load_logging_config_file(logging_ini_path);
-   } else {
-      // this is the legacy config.ini case
-      load_logging_config_file(config_ini_path);
-   }
-}
-
-}} // namespace graphene::app
+} } // graphene::app

libraries/app/include/graphene/app/api.hpp

@@ -25,23 +25,24 @@
 
 #include <graphene/app/database_api.hpp>
 
-#include <graphene/chain/protocol/confidential.hpp>
 #include <graphene/chain/protocol/types.hpp>
+#include <graphene/chain/protocol/confidential.hpp>
+
+#include <graphene/market_history/market_history_plugin.hpp>
+#include <graphene/accounts_list/accounts_list_plugin.hpp>
+
+#include <graphene/elasticsearch/elasticsearch_plugin.hpp>
+
+#include <graphene/debug_witness/debug_api.hpp>
+#include <graphene/affiliate_stats/affiliate_stats_api.hpp>
+#include <graphene/bookie/bookie_api.hpp>
 
 #include <graphene/net/node.hpp>
 
-#include <graphene/accounts_list/accounts_list_plugin.hpp>
-#include <graphene/affiliate_stats/affiliate_stats_api.hpp>
-#include <graphene/bookie/bookie_api.hpp>
-#include <graphene/debug_witness/debug_api.hpp>
-#include <graphene/elasticsearch/elasticsearch_plugin.hpp>
-#include <graphene/market_history/market_history_plugin.hpp>
-#include <graphene/peerplays_sidechain/sidechain_api.hpp>
-
 #include <fc/api.hpp>
+#include <fc/optional.hpp>
 #include <fc/crypto/elliptic.hpp>
 #include <fc/network/ip.hpp>
-#include <fc/optional.hpp>
 
 #include <boost/container/flat_set.hpp>
 
@@ -51,415 +52,456 @@
 #include <vector>
 
 namespace graphene { namespace app {
-using namespace graphene::chain;
-using namespace graphene::market_history;
-using namespace graphene::accounts_list;
-using namespace fc::ecc;
-using namespace std;
+   using namespace graphene::chain;
+   using namespace graphene::market_history;
+   using namespace graphene::accounts_list;
+   using namespace fc::ecc;
+   using namespace std;
 
-class application;
+   class application;
 
-struct verify_range_result {
-   bool success;
-   uint64_t min_val;
-   uint64_t max_val;
-};
-
-struct verify_range_proof_rewind_result {
-   bool success;
-   uint64_t min_val;
-   uint64_t max_val;
-   uint64_t value_out;
-   fc::ecc::blind_factor_type blind_out;
-   string message_out;
-};
-
-struct account_asset_balance {
-   string name;
-   account_id_type account_id;
-   share_type amount;
-};
-struct asset_holders {
-   asset_id_type asset_id;
-   int count;
-};
-
-/**
- * @brief The history_api class implements the RPC API for account history
- *
- * This API contains methods to access account histories
- */
-class history_api {
-public:
-   history_api(application &app) :
-         _app(app),
-         database_api(std::ref(*app.chain_database())) {
-   }
-
-   /**
-    * @brief Get operations relevant to the specificed account
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param stop ID of the earliest operation to retrieve
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start ID of the most recent operation to retrieve
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
-   vector<operation_history_object> get_account_history(const std::string account_id_or_name,
-                                                        operation_history_id_type stop = operation_history_id_type(),
-                                                        unsigned limit = 100,
-                                                        operation_history_id_type start = operation_history_id_type()) const;
-
-   /**
-    * @brief Get only asked operations relevant to the specified account
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param operation_id The ID of the operation we want to get operations in the account( 0 = transfer , 1 = limit order create, ...)
-    * @param stop ID of the earliest operation to retrieve
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start ID of the most recent operation to retrieve
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
-   vector<operation_history_object> get_account_history_operations(const std::string account_id_or_name,
-                                                                   int operation_id,
-                                                                   operation_history_id_type start = operation_history_id_type(),
-                                                                   operation_history_id_type stop = operation_history_id_type(),
-                                                                   unsigned limit = 100) const;
-
-   /**
-    * @breif Get operations relevant to the specified account referenced
-    * by an event numbering specific to the account. The current number of operations
-    * for the account can be found in the account statistics (or use 0 for start).
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param stop Sequence number of earliest operation. 0 is default and will
-    * query 'limit' number of operations.
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start Sequence number of the most recent operation to retrieve.
-    * 0 is default, which will start querying from the most recent operation.
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
-   vector<operation_history_object> get_relative_account_history(const std::string account_id_or_name,
-                                                                 uint32_t stop = 0,
-                                                                 unsigned limit = 100,
-                                                                 uint32_t start = 0) const;
-
-   vector<order_history_object> get_fill_order_history(std::string asset_a, std::string asset_b, uint32_t limit) const;
-   vector<bucket_object> get_market_history(std::string asset_a, std::string asset_b, uint32_t bucket_seconds,
-                                            fc::time_point_sec start, fc::time_point_sec end) const;
-   vector<account_balance_object> list_core_accounts() const;
-   flat_set<uint32_t> get_market_history_buckets() const;
-   uint32_t api_limit_get_account_history_operations = 100;
-   uint32_t api_limit_get_account_history = 100;
-   uint32_t api_limit_get_relative_account_history = 100;
-
-private:
-   application &_app;
-   graphene::app::database_api database_api;
-};
-
-/**
- * @brief Block api
- */
-class block_api {
-public:
-   block_api(graphene::chain::database &db);
-   ~block_api();
-
-   vector<optional<signed_block>> get_blocks(uint32_t block_num_from, uint32_t block_num_to) const;
-
-private:
-   graphene::chain::database &_db;
-};
-
-/**
- * @brief The network_broadcast_api class allows broadcasting of transactions.
- */
-class network_broadcast_api : public std::enable_shared_from_this<network_broadcast_api> {
-public:
-   network_broadcast_api(application &a);
-
-   struct transaction_confirmation {
-      transaction_id_type id;
-      uint32_t block_num;
-      uint32_t trx_num;
-      processed_transaction trx;
+   struct verify_range_result
+   {
+      bool        success;
+      uint64_t    min_val;
+      uint64_t    max_val;
+   };
+   
+   struct verify_range_proof_rewind_result
+   {
+      bool                          success;
+      uint64_t                      min_val;
+      uint64_t                      max_val;
+      uint64_t                      value_out;
+      fc::ecc::blind_factor_type    blind_out;
+      string                        message_out;
    };
 
-   typedef std::function<void(variant /*transaction_confirmation*/)> confirmation_callback;
-
+   struct account_asset_balance
+   {
+      string          name;
+      account_id_type account_id;
+      share_type      amount;
+   };
+   struct asset_holders
+   {
+      asset_id_type   asset_id;
+      int             count;
+   };
+   
    /**
-    * @brief Broadcast a transaction to the network
-    * @param trx The transaction to broadcast
+    * @brief The history_api class implements the RPC API for account history
     *
-    * The transaction will be checked for validity in the local database prior to broadcasting. If it fails to
-    * apply locally, an error will be thrown and the transaction will not be broadcast.
+    * This API contains methods to access account histories
     */
-   void broadcast_transaction(const signed_transaction &trx);
+   class history_api
+   {
+      public:
+         history_api(application& app)
+               :_app(app), database_api( std::ref(*app.chain_database())) {}
 
-   /** this version of broadcast transaction registers a callback method that will be called when the transaction is
-    * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
-    * block.
-    */
-   void broadcast_transaction_with_callback(confirmation_callback cb, const signed_transaction &trx);
+         /**
+          * @brief Get operations relevant to the specificed account
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param stop ID of the earliest operation to retrieve
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start ID of the most recent operation to retrieve
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
+         vector<operation_history_object> get_account_history(const std::string account_id_or_name,
+                                                              operation_history_id_type stop = operation_history_id_type(),
+                                                              unsigned limit = 100,
+                                                              operation_history_id_type start = operation_history_id_type())const;
 
-   /** this version of broadcast transaction registers a callback method that will be called when the transaction is
-    * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
-    * block.
-    */
-   fc::variant broadcast_transaction_synchronous(const signed_transaction &trx);
+         /**
+          * @brief Get only asked operations relevant to the specified account
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param operation_id The ID of the operation we want to get operations in the account( 0 = transfer , 1 = limit order create, ...)
+          * @param stop ID of the earliest operation to retrieve
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start ID of the most recent operation to retrieve
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
+         vector<operation_history_object> get_account_history_operations(const std::string account_id_or_name,
+                                                                         int operation_id,
+                                                                         operation_history_id_type start = operation_history_id_type(),
+                                                                         operation_history_id_type stop = operation_history_id_type(),
+                                                                         unsigned limit = 100)const;
 
-   void broadcast_block(const signed_block &block);
+         /**
+          * @breif Get operations relevant to the specified account referenced
+          * by an event numbering specific to the account. The current number of operations
+          * for the account can be found in the account statistics (or use 0 for start).
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param stop Sequence number of earliest operation. 0 is default and will
+          * query 'limit' number of operations.
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start Sequence number of the most recent operation to retrieve.
+          * 0 is default, which will start querying from the most recent operation.
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
+         vector<operation_history_object> get_relative_account_history( const std::string account_id_or_name,
+                                                                        uint32_t stop = 0,
+                                                                        unsigned limit = 100,
+                                                                        uint32_t start = 0) const;
+
+         vector<order_history_object> get_fill_order_history( std::string asset_a, std::string asset_b, uint32_t limit )const;
+         vector<bucket_object> get_market_history( std::string asset_a, std::string asset_b, uint32_t bucket_seconds,
+                                                   fc::time_point_sec start, fc::time_point_sec end )const;
+         vector<account_balance_object> list_core_accounts()const;
+         flat_set<uint32_t> get_market_history_buckets()const;
+         uint32_t api_limit_get_account_history_operations = 100;
+         uint32_t api_limit_get_account_history = 100;
+         uint32_t api_limit_get_relative_account_history = 100;
+      private:
+           application& _app;
+           graphene::app::database_api database_api;
+   };
 
    /**
-    * @brief Not reflected, thus not accessible to API clients.
-    *
-    * This function is registered to receive the applied_block
-    * signal from the chain database when a block is received.
-    * It then dispatches callbacks to clients who have requested
-    * to be notified when a particular txid is included in a block.
+    * @brief Block api
     */
-   void on_applied_block(const signed_block &b);
+   class block_api
+   {
+   public:
+      block_api(graphene::chain::database& db);
+      ~block_api();
 
-private:
-   boost::signals2::scoped_connection _applied_block_connection;
-   map<transaction_id_type, confirmation_callback> _callbacks;
-   application &_app;
-};
+      vector<optional<signed_block>> get_blocks(uint32_t block_num_from, uint32_t block_num_to)const;
+
+   private:
+      graphene::chain::database& _db;
+   };
 
-/**
- * @brief The network_node_api class allows maintenance of p2p connections.
- */
-class network_node_api {
-public:
-   network_node_api(application &a);
 
    /**
-    * @brief Return general network information, such as p2p port
+    * @brief The network_broadcast_api class allows broadcasting of transactions.
     */
-   fc::variant_object get_info() const;
+   class network_broadcast_api : public std::enable_shared_from_this<network_broadcast_api>
+   {
+      public:
+         network_broadcast_api(application& a);
+
+         struct transaction_confirmation
+         {
+            transaction_id_type   id;
+            uint32_t              block_num;
+            uint32_t              trx_num;
+            processed_transaction trx;
+         };
+
+         typedef std::function<void(variant/*transaction_confirmation*/)> confirmation_callback;
+
+         /**
+          * @brief Broadcast a transaction to the network
+          * @param trx The transaction to broadcast
+          *
+          * The transaction will be checked for validity in the local database prior to broadcasting. If it fails to
+          * apply locally, an error will be thrown and the transaction will not be broadcast.
+          */
+         void broadcast_transaction(const signed_transaction& trx);
+
+         /** this version of broadcast transaction registers a callback method that will be called when the transaction is
+          * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
+          * block.
+          */
+         void broadcast_transaction_with_callback( confirmation_callback cb, const signed_transaction& trx);
+
+         /** this version of broadcast transaction registers a callback method that will be called when the transaction is
+          * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
+          * block.
+          */
+         fc::variant broadcast_transaction_synchronous(const signed_transaction& trx);
+
+         void broadcast_block( const signed_block& block );
+
+         /**
+          * @brief Not reflected, thus not accessible to API clients.
+          *
+          * This function is registered to receive the applied_block
+          * signal from the chain database when a block is received.
+          * It then dispatches callbacks to clients who have requested
+          * to be notified when a particular txid is included in a block.
+          */
+         void on_applied_block( const signed_block& b );
+      private:
+         boost::signals2::scoped_connection             _applied_block_connection;
+         map<transaction_id_type,confirmation_callback> _callbacks;
+         application&                                   _app;
+   };
 
    /**
-    * @brief add_node Connect to a new peer
-    * @param ep The IP/Port of the peer to connect to
+    * @brief The network_node_api class allows maintenance of p2p connections.
     */
-   void add_node(const fc::ip::endpoint &ep);
+   class network_node_api
+   {
+      public:
+         network_node_api(application& a);
+
+         /**
+          * @brief Return general network information, such as p2p port
+          */
+         fc::variant_object get_info() const;
+
+         /**
+          * @brief add_node Connect to a new peer
+          * @param ep The IP/Port of the peer to connect to
+          */
+         void add_node(const fc::ip::endpoint& ep);
+
+         /**
+          * @brief Get status of all current connections to peers
+          */
+         std::vector<net::peer_status> get_connected_peers() const;
+
+         /**
+          * @brief Get advanced node parameters, such as desired and max
+          *        number of connections
+          */
+         fc::variant_object get_advanced_node_parameters() const;
+
+         /**
+          * @brief Set advanced node parameters, such as desired and max
+          *        number of connections
+          * @param params a JSON object containing the name/value pairs for the parameters to set
+          */
+         void set_advanced_node_parameters(const fc::variant_object& params);
+
+         /**
+          * @brief Return list of potential peers
+          */
+         std::vector<net::potential_peer_record> get_potential_peers() const;
+
+         /**
+          * @brief Return list of pending transactions.
+          */
+         map<transaction_id_type, signed_transaction> list_pending_transactions() const;
+
+         /**
+          * @brief Subscribes caller for notifications about pending transactions.
+          * @param callback a functional object which will be called when new transaction is created. 
+          */
+         void subscribe_to_pending_transactions(std::function<void(const variant&)> callback);
+
+         /**
+          * @brief Unsubscribes caller from notifications about pending transactions.
+          */
+         void unsubscribe_from_pending_transactions();
+
+      private:
+         application& _app;
+         map<transaction_id_type, signed_transaction> _pending_transactions;
+         boost::signals2::scoped_connection _pending_trx_connection;
+         boost::signals2::scoped_connection _applied_block_connection;
+         std::function<void(const variant&)> _on_pending_transaction;
+   };
+   
+   class crypto_api
+   {
+      public:
+         crypto_api();         
+
+         fc::ecc::commitment_type blind( const fc::ecc::blind_factor_type& blind, uint64_t value );
+         
+         fc::ecc::blind_factor_type blind_sum( const std::vector<blind_factor_type>& blinds_in, uint32_t non_neg );
+         
+         bool verify_sum( const std::vector<commitment_type>& commits_in, const std::vector<commitment_type>& neg_commits_in, int64_t excess );
+         
+         verify_range_result verify_range( const fc::ecc::commitment_type& commit, const std::vector<char>& proof );
+         
+         std::vector<char> range_proof_sign( uint64_t min_value, 
+                                             const commitment_type& commit, 
+                                             const blind_factor_type& commit_blind, 
+                                             const blind_factor_type& nonce,
+                                             int8_t base10_exp,
+                                             uint8_t min_bits,
+                                             uint64_t actual_value );
+                                       
+         
+         verify_range_proof_rewind_result verify_range_proof_rewind( const blind_factor_type& nonce,
+                                                                     const fc::ecc::commitment_type& commit, 
+                                                                     const std::vector<char>& proof );
+         
+                                         
+         range_proof_info range_get_info( const std::vector<char>& proof );
+   };
 
    /**
-    * @brief Get status of all current connections to peers
+    * @brief
     */
-   std::vector<net::peer_status> get_connected_peers() const;
+   class asset_api
+   {
+      public:
+         asset_api(graphene::app::application& app);
+         ~asset_api();
 
-   /**
-    * @brief Get advanced node parameters, such as desired and max
-    *        number of connections
-    */
-   fc::variant_object get_advanced_node_parameters() const;
+         /**
+          * @brief Get asset holders for a specific asset
+          * @param asset The specific asset id or symbol
+          * @param start The start index
+          * @param limit Maximum limit must not exceed 100
+          * @return A list of asset holders for the specified asset
+          */
+         vector<account_asset_balance> get_asset_holders( std::string asset, uint32_t start, uint32_t limit  )const;
 
-   /**
-    * @brief Set advanced node parameters, such as desired and max
-    *        number of connections
-    * @param params a JSON object containing the name/value pairs for the parameters to set
-    */
-   void set_advanced_node_parameters(const fc::variant_object &params);
+         /**
+          * @brief Get asset holders count for a specific asset
+          * @param asset The specific asset id or symbol
+          * @return Holders count for the specified asset
+          */
+         int get_asset_holders_count( std::string asset )const;
 
-   /**
-    * @brief Return list of potential peers
-    */
-   std::vector<net::potential_peer_record> get_potential_peers() const;
+         /**
+          * @brief Get all asset holders
+          * @return A list of all asset holders
+          */
+         vector<asset_holders> get_all_asset_holders() const;
 
-   /**
-    * @brief Return list of pending transactions.
-    */
-   map<transaction_id_type, signed_transaction> list_pending_transactions() const;
-
-   /**
-    * @brief Subscribes caller for notifications about pending transactions.
-    * @param callback a functional object which will be called when new transaction is created.
-    */
-   void subscribe_to_pending_transactions(std::function<void(const variant &)> callback);
-
-   /**
-    * @brief Unsubscribes caller from notifications about pending transactions.
-    */
-   void unsubscribe_from_pending_transactions();
-
-private:
-   application &_app;
-   map<transaction_id_type, signed_transaction> _pending_transactions;
-   boost::signals2::scoped_connection _pending_trx_connection;
-   boost::signals2::scoped_connection _applied_block_connection;
-   std::function<void(const variant &)> _on_pending_transaction;
-};
-
-/**
- * @brief
- */
-class asset_api {
-public:
-   asset_api(graphene::app::application &app);
-   ~asset_api();
-
-   /**
-    * @brief Get asset holders for a specific asset
-    * @param asset The specific asset id or symbol
-    * @param start The start index
-    * @param limit Maximum limit must not exceed 100
-    * @return A list of asset holders for the specified asset
-    */
-   vector<account_asset_balance> get_asset_holders(std::string asset, uint32_t start, uint32_t limit) const;
-
-   /**
-    * @brief Get asset holders count for a specific asset
-    * @param asset The specific asset id or symbol
-    * @return Holders count for the specified asset
-    */
-   int get_asset_holders_count(std::string asset) const;
-
-   /**
-    * @brief Get all asset holders
-    * @return A list of all asset holders
-    */
-   vector<asset_holders> get_all_asset_holders() const;
-
-   uint32_t api_limit_get_asset_holders = 100;
-
-private:
-   graphene::app::application &_app;
-   graphene::chain::database &_db;
-   graphene::app::database_api database_api;
-};
-}} // namespace graphene::app
+         uint32_t api_limit_get_asset_holders = 100;
+      private:
+         graphene::app::application& _app;
+         graphene::chain::database& _db;
+         graphene::app::database_api database_api;
+   };
+} } // graphene::app
 
 extern template class fc::api<graphene::app::block_api>;
 extern template class fc::api<graphene::app::network_broadcast_api>;
 extern template class fc::api<graphene::app::network_node_api>;
 extern template class fc::api<graphene::app::history_api>;
+extern template class fc::api<graphene::app::crypto_api>;
 extern template class fc::api<graphene::app::asset_api>;
 extern template class fc::api<graphene::debug_witness::debug_api>;
 
 namespace graphene { namespace app {
-/**
- * @brief The login_api class implements the bottom layer of the RPC API
- *
- * All other APIs must be requested from this API.
- */
-class login_api {
-public:
-   login_api(application &a);
-   ~login_api();
-
    /**
-    * @brief Authenticate to the RPC server
-    * @param user Username to login with
-    * @param password Password to login with
-    * @return True if logged in successfully; false otherwise
+    * @brief The login_api class implements the bottom layer of the RPC API
     *
-    * @note This must be called prior to requesting other APIs. Other APIs may not be accessible until the client
-    * has sucessfully authenticated.
+    * All other APIs must be requested from this API.
     */
-   bool login(const string &user, const string &password);
-   /// @brief Retrieve the network block API
-   fc::api<block_api> block() const;
-   /// @brief Retrieve the network broadcast API
-   fc::api<network_broadcast_api> network_broadcast() const;
-   /// @brief Retrieve the database API
-   fc::api<database_api> database() const;
-   /// @brief Retrieve the history API
-   fc::api<history_api> history() const;
-   /// @brief Retrieve the network node API
-   fc::api<network_node_api> network_node() const;
-   /// @brief Retrieve the asset API
-   fc::api<asset_api> asset() const;
-   /// @brief Retrieve the debug API (if available)
-   fc::api<graphene::debug_witness::debug_api> debug() const;
-   /// @brief Retrieve the bookie API (if available)
-   fc::api<graphene::bookie::bookie_api> bookie() const;
-   /// @brief Retrieve the affiliate_stats API (if available)
-   fc::api<graphene::affiliate_stats::affiliate_stats_api> affiliate_stats() const;
-   /// @brief Retrieve the sidechain_api API (if available)
-   fc::api<graphene::peerplays_sidechain::sidechain_api> sidechain() const;
+   class login_api
+   {
+      public:
+         login_api(application& a);
+         ~login_api();
 
-   /// @brief Called to enable an API, not reflected.
-   void enable_api(const string &api_name);
+         /**
+          * @brief Authenticate to the RPC server
+          * @param user Username to login with
+          * @param password Password to login with
+          * @return True if logged in successfully; false otherwise
+          *
+          * @note This must be called prior to requesting other APIs. Other APIs may not be accessible until the client
+          * has sucessfully authenticated.
+          */
+         bool login(const string& user, const string& password);
+         /// @brief Retrieve the network block API
+         fc::api<block_api> block()const;
+         /// @brief Retrieve the network broadcast API
+         fc::api<network_broadcast_api> network_broadcast()const;
+         /// @brief Retrieve the database API
+         fc::api<database_api> database()const;
+         /// @brief Retrieve the history API
+         fc::api<history_api> history()const;
+         /// @brief Retrieve the network node API
+         fc::api<network_node_api> network_node()const;
+         /// @brief Retrieve the cryptography API
+         fc::api<crypto_api> crypto()const;
+         /// @brief Retrieve the asset API
+         fc::api<asset_api> asset()const;
+         /// @brief Retrieve the debug API (if available)
+         fc::api<graphene::debug_witness::debug_api> debug()const;
+         /// @brief Retrieve the bookie API (if available)
+         fc::api<graphene::bookie::bookie_api> bookie()const;
+         /// @brief Retrieve the affiliate_stats API (if available)
+         fc::api<graphene::affiliate_stats::affiliate_stats_api> affiliate_stats()const;
 
-private:
-   application &_app;
-   optional<fc::api<block_api>> _block_api;
-   optional<fc::api<database_api>> _database_api;
-   optional<fc::api<network_broadcast_api>> _network_broadcast_api;
-   optional<fc::api<network_node_api>> _network_node_api;
-   optional<fc::api<history_api>> _history_api;
-   optional<fc::api<asset_api>> _asset_api;
-   optional<fc::api<graphene::debug_witness::debug_api>> _debug_api;
-   optional<fc::api<graphene::bookie::bookie_api>> _bookie_api;
-   optional<fc::api<graphene::affiliate_stats::affiliate_stats_api>> _affiliate_stats_api;
-   optional<fc::api<graphene::peerplays_sidechain::sidechain_api>> _sidechain_api;
-};
+         /// @brief Called to enable an API, not reflected.
+         void enable_api( const string& api_name );
+      private:
 
-}} // namespace graphene::app
+         application& _app;
+         optional< fc::api<block_api> > _block_api;
+         optional< fc::api<database_api> > _database_api;
+         optional< fc::api<network_broadcast_api> > _network_broadcast_api;
+         optional< fc::api<network_node_api> > _network_node_api;
+         optional< fc::api<history_api> >  _history_api;
+         optional< fc::api<crypto_api> > _crypto_api;
+         optional< fc::api<asset_api> > _asset_api;
+         optional< fc::api<graphene::debug_witness::debug_api> > _debug_api;
+         optional< fc::api<graphene::bookie::bookie_api> > _bookie_api;
+         optional< fc::api<graphene::affiliate_stats::affiliate_stats_api> > _affiliate_stats_api;
+   };
+
+}}  // graphene::app
 
 extern template class fc::api<graphene::app::login_api>;
 
-// clang-format off
+FC_REFLECT( graphene::app::network_broadcast_api::transaction_confirmation,
+        (id)(block_num)(trx_num)(trx) )
+FC_REFLECT( graphene::app::verify_range_result,
+        (success)(min_val)(max_val) )
+FC_REFLECT( graphene::app::verify_range_proof_rewind_result,
+        (success)(min_val)(max_val)(value_out)(blind_out)(message_out) )
+//FC_REFLECT_TYPENAME( fc::ecc::compact_signature );
+//FC_REFLECT_TYPENAME( fc::ecc::commitment_type );
 
-FC_REFLECT(graphene::app::network_broadcast_api::transaction_confirmation,
-      (id)(block_num)(trx_num)(trx))
-
-FC_REFLECT(graphene::app::verify_range_result,
-      (success)(min_val)(max_val))
-
-FC_REFLECT(graphene::app::verify_range_proof_rewind_result,
-      (success)(min_val)(max_val)(value_out)(blind_out)(message_out))
-
-FC_REFLECT(graphene::app::account_asset_balance,
-      (name)(account_id)(amount));
-
-FC_REFLECT(graphene::app::asset_holders,
-      (asset_id)(count));
+FC_REFLECT( graphene::app::account_asset_balance, (name)(account_id)(amount) );
+FC_REFLECT( graphene::app::asset_holders, (asset_id)(count) );
 
 FC_API(graphene::app::history_api,
-      (get_account_history)
-      (get_account_history_operations)
-      (get_relative_account_history)
-      (get_fill_order_history)
-      (get_market_history)
-      (get_market_history_buckets)
-      (list_core_accounts))
-
+       (get_account_history)
+       (get_account_history_operations)
+       (get_relative_account_history)
+       (get_fill_order_history)
+       (get_market_history)
+       (get_market_history_buckets)
+       (list_core_accounts)
+     )
 FC_API(graphene::app::block_api,
-      (get_blocks))
-
+       (get_blocks)
+     )
 FC_API(graphene::app::network_broadcast_api,
-      (broadcast_transaction)
-      (broadcast_transaction_with_callback)
-      (broadcast_transaction_synchronous)
-      (broadcast_block))
-
+       (broadcast_transaction)
+       (broadcast_transaction_with_callback)
+       (broadcast_transaction_synchronous)
+       (broadcast_block)
+     )
 FC_API(graphene::app::network_node_api,
-      (get_info)
-      (add_node)
-      (get_connected_peers)
-      (get_potential_peers)
-      (get_advanced_node_parameters)
-      (set_advanced_node_parameters)
-      (list_pending_transactions)
-      (subscribe_to_pending_transactions)
-      (unsubscribe_from_pending_transactions))
-
+       (get_info)
+       (add_node)
+       (get_connected_peers)
+       (get_potential_peers)
+       (get_advanced_node_parameters)
+       (set_advanced_node_parameters)
+       (list_pending_transactions)
+       (subscribe_to_pending_transactions)
+       (unsubscribe_from_pending_transactions)
+     )
+FC_API(graphene::app::crypto_api,
+       (blind)
+       (blind_sum)
+       (verify_sum)
+       (verify_range)
+       (range_proof_sign)
+       (verify_range_proof_rewind)
+       (range_get_info)
+     )
 FC_API(graphene::app::asset_api,
-      (get_asset_holders)
-      (get_asset_holders_count)
-      (get_all_asset_holders))
-
+       (get_asset_holders)
+	   (get_asset_holders_count)
+       (get_all_asset_holders)
+     )
 FC_API(graphene::app::login_api,
-      (login)
-      (block)
-      (network_broadcast)
-      (database)
-      (history)
-      (network_node)
-      (asset)
-      (debug)
-      (bookie)
-      (affiliate_stats)
-      (sidechain))
-
-// clang-format on
+       (login)
+       (block)
+       (network_broadcast)
+       (database)
+       (history)
+       (network_node)
+       (crypto)
+       (asset)
+       (debug)
+       (bookie)
+       (affiliate_stats)
+     )

libraries/app/include/graphene/app/api_access.hpp

@@ -31,26 +31,26 @@
 
 namespace graphene { namespace app {
 
-struct api_access_info {
+struct api_access_info
+{
    std::string password_hash_b64;
    std::string password_salt_b64;
-   std::vector<std::string> allowed_apis;
+   std::vector< std::string > allowed_apis;
 };
 
-struct api_access {
-   std::map<std::string, api_access_info> permission_map;
+struct api_access
+{
+   std::map< std::string, api_access_info > permission_map;
 };
 
-}} // namespace graphene::app
-
-// clang-format off
+} } // graphene::app
 
 FC_REFLECT( graphene::app::api_access_info,
-      (password_hash_b64)
-      (password_salt_b64)
-      (allowed_apis))
+    (password_hash_b64)
+    (password_salt_b64)
+    (allowed_apis)
+   )
 
 FC_REFLECT( graphene::app::api_access,
-      (permission_map))
-
-// clang-format on
+    (permission_map)
+   )

libraries/app/include/graphene/app/application.hpp

@@ -24,86 +24,89 @@
 #pragma once
 
 #include <graphene/app/api_access.hpp>
-#include <graphene/chain/database.hpp>
 #include <graphene/net/node.hpp>
+#include <graphene/chain/database.hpp>
 
 #include <boost/program_options.hpp>
 
 namespace graphene { namespace app {
-namespace detail {
-class application_impl;
-}
-using std::string;
+   namespace detail { class application_impl; }
+   using std::string;
 
-class abstract_plugin;
+   class abstract_plugin;
 
-class application {
-public:
-   application();
-   ~application();
+   class application
+   {
+      public:
+         application();
+         ~application();
 
-   void set_program_options(boost::program_options::options_description &cli,
-                            boost::program_options::options_description &cfg) const;
-   void initialize(const fc::path &data_dir, const boost::program_options::variables_map &options);
-   void initialize_plugins(const boost::program_options::variables_map &options);
-   void startup();
-   void shutdown();
-   void startup_plugins();
-   void shutdown_plugins();
+         void set_program_options( boost::program_options::options_description& command_line_options,
+                                   boost::program_options::options_description& configuration_file_options )const;
+         void initialize(const fc::path& data_dir, const boost::program_options::variables_map&options);
+         void initialize_plugins( const boost::program_options::variables_map& options );
+         void startup();
+         void shutdown();
+         void startup_plugins();
+         void shutdown_plugins();
 
-   template <typename PluginType>
-   std::shared_ptr<PluginType> register_plugin() {
-      auto plug = std::make_shared<PluginType>();
-      plug->plugin_set_app(this);
+         template<typename PluginType>
+         std::shared_ptr<PluginType> register_plugin()
+         {
+            auto plug = std::make_shared<PluginType>();
+            plug->plugin_set_app(this);
 
-      boost::program_options::options_description plugin_cli_options(plug->plugin_name() + " plugin. " + plug->plugin_description() + "\nOptions"), plugin_cfg_options;
-      plug->plugin_set_program_options(plugin_cli_options, plugin_cfg_options);
-      if (!plugin_cli_options.options().empty())
-         _cli_options.add(plugin_cli_options);
+            boost::program_options::options_description plugin_cli_options(plug->plugin_name() + " plugin. " + plug->plugin_description() + "\nOptions"), plugin_cfg_options;
+            //boost::program_options::options_description plugin_cli_options("Options for plugin " + plug->plugin_name()), plugin_cfg_options;
+            plug->plugin_set_program_options(plugin_cli_options, plugin_cfg_options);
+            if( !plugin_cli_options.options().empty() )
+               _cli_options.add(plugin_cli_options);
 
-      if (!plugin_cfg_options.options().empty()) {
-         std::string header_name = "plugin-cfg-header-" + plug->plugin_name();
-         std::string header_desc = plug->plugin_name() + " plugin options";
-         _cfg_options.add_options()(header_name.c_str(), header_desc.c_str());
-         _cfg_options.add(plugin_cfg_options);
-      }
+            if( !plugin_cfg_options.options().empty() )
+            {
+               std::string header_name = "plugin-cfg-header-" + plug->plugin_name();
+               std::string header_desc = plug->plugin_name() + " plugin options";
+               _cfg_options.add_options()(header_name.c_str(), header_desc.c_str());
+               _cfg_options.add(plugin_cfg_options);
+            }
 
-      add_available_plugin(plug);
-      return plug;
-   }
-   std::shared_ptr<abstract_plugin> get_plugin(const string &name) const;
+            add_available_plugin( plug );
+            return plug;
+         }
+         std::shared_ptr<abstract_plugin> get_plugin( const string& name )const;
 
-   template <typename PluginType>
-   std::shared_ptr<PluginType> get_plugin(const string &name) const {
-      std::shared_ptr<abstract_plugin> abs_plugin = get_plugin(name);
-      std::shared_ptr<PluginType> result = std::dynamic_pointer_cast<PluginType>(abs_plugin);
-      FC_ASSERT(result != std::shared_ptr<PluginType>());
-      return result;
-   }
+         template<typename PluginType>
+         std::shared_ptr<PluginType> get_plugin( const string& name ) const
+         {
+            std::shared_ptr<abstract_plugin> abs_plugin = get_plugin( name );
+            std::shared_ptr<PluginType> result = std::dynamic_pointer_cast<PluginType>( abs_plugin );
+            FC_ASSERT( result != std::shared_ptr<PluginType>() );
+            return result;
+         }
 
-   net::node_ptr p2p_node();
-   std::shared_ptr<chain::database> chain_database() const;
+         net::node_ptr                    p2p_node();
+         std::shared_ptr<chain::database> chain_database()const;
 
-   void set_block_production(bool producing_blocks);
-   fc::optional<api_access_info> get_api_access_info(const string &username) const;
-   void set_api_access_info(const string &username, api_access_info &&permissions);
+         void set_block_production(bool producing_blocks);
+         fc::optional< api_access_info > get_api_access_info( const string& username )const;
+         void set_api_access_info(const string& username, api_access_info&& permissions);
 
-   bool is_finished_syncing() const;
-   /// Emitted when syncing finishes (is_finished_syncing will return true)
-   boost::signals2::signal<void()> syncing_finished;
+         bool is_finished_syncing()const;
+         /// Emitted when syncing finishes (is_finished_syncing will return true)
+         boost::signals2::signal<void()> syncing_finished;
 
-   void enable_plugin(const string &name);
+         void enable_plugin( const string& name );
 
-   bool is_plugin_enabled(const string &name) const;
+         bool is_plugin_enabled(const string& name) const;
 
-   std::shared_ptr<fc::thread> elasticsearch_thread;
+         std::shared_ptr<fc::thread> elasticsearch_thread;
 
-private:
-   void add_available_plugin(std::shared_ptr<abstract_plugin> p);
-   std::shared_ptr<detail::application_impl> my;
+   private:
+         void add_available_plugin( std::shared_ptr<abstract_plugin> p );
+         std::shared_ptr<detail::application_impl> my;
 
-   boost::program_options::options_description _cli_options;
-   boost::program_options::options_description _cfg_options;
-};
+         boost::program_options::options_description _cli_options;
+         boost::program_options::options_description _cfg_options;
+   };
 
-}} // namespace graphene::app
+} }

libraries/app/include/graphene/app/config_util.hpp

@@ -23,12 +23,12 @@
  */
 #pragma once
 
-#include <boost/program_options.hpp>
 #include <fc/filesystem.hpp>
+#include <boost/program_options.hpp>
 
 namespace graphene { namespace app {
 
-void load_configuration_options(const fc::path &data_dir, const boost::program_options::options_description &cfg_options,
-                                boost::program_options::variables_map &options);
+   void load_configuration_options(const fc::path &data_dir, const boost::program_options::options_description &cfg_options,
+                           boost::program_options::variables_map &options);
 
-}} // namespace graphene::app
+} } // graphene::app

libraries/app/include/graphene/app/full_account.hpp

@@ -24,53 +24,51 @@
 #pragma once
 
 #include <graphene/chain/account_object.hpp>
-#include <graphene/chain/market_evaluator.hpp>
 #include <graphene/chain/vesting_balance_object.hpp>
+#include <graphene/chain/market_evaluator.hpp>
 #include <graphene/chain/withdraw_permission_object.hpp>
 
 namespace graphene { namespace app {
-using namespace graphene::chain;
+   using namespace graphene::chain;
 
-struct full_account {
-   account_object account;
-   account_statistics_object statistics;
-   string registrar_name;
-   string referrer_name;
-   string lifetime_referrer_name;
-   vector<variant> votes;
-   optional<vesting_balance_object> cashback_balance;
-   vector<account_balance_object> balances;
-   vector<vesting_balance_object> vesting_balances;
-   vector<limit_order_object> limit_orders;
-   vector<call_order_object> call_orders;
-   vector<force_settlement_object> settle_orders;
-   vector<proposal_object> proposals;
-   vector<asset_id_type> assets;
-   vector<withdraw_permission_object> withdraws;
-   //      vector<pending_dividend_payout_balance_object> pending_dividend_payments;
-   vector<pending_dividend_payout_balance_for_holder_object> pending_dividend_payments;
-};
+   struct full_account
+   {
+      account_object                   account;
+      account_statistics_object        statistics;
+      string                           registrar_name;
+      string                           referrer_name;
+      string                           lifetime_referrer_name;
+      vector<variant>                  votes;
+      optional<vesting_balance_object> cashback_balance;
+      vector<account_balance_object>   balances;
+      vector<vesting_balance_object>   vesting_balances;
+      vector<limit_order_object>       limit_orders;
+      vector<call_order_object>        call_orders;
+      vector<force_settlement_object>  settle_orders;
+      vector<proposal_object>          proposals;
+      vector<asset_id_type>            assets;
+      vector<withdraw_permission_object> withdraws;
+//      vector<pending_dividend_payout_balance_object> pending_dividend_payments;
+      vector<pending_dividend_payout_balance_for_holder_object> pending_dividend_payments;
+   };
 
-}} // namespace graphene::app
+} }
 
-// clang-format off
-
-FC_REFLECT(graphene::app::full_account,
-      (account)
-      (statistics)
-      (registrar_name)
-      (referrer_name)
-      (lifetime_referrer_name)
-      (votes)
-      (cashback_balance)
-      (balances)
-      (vesting_balances)
-      (limit_orders)
-      (call_orders)
-      (settle_orders)
-      (proposals)
-      (assets)
-      (withdraws)
-      (pending_dividend_payments))
-
-// clang-format on
+FC_REFLECT( graphene::app::full_account,
+            (account)
+            (statistics)
+            (registrar_name)
+            (referrer_name)
+            (lifetime_referrer_name)
+            (votes)
+            (cashback_balance)
+            (balances)
+            (vesting_balances)
+            (limit_orders)
+            (call_orders)
+            (settle_orders)
+            (proposals)
+            (assets)
+            (withdraws)
+            (pending_dividend_payments)
+          )

libraries/app/include/graphene/app/plugin.hpp

@@ -30,119 +30,118 @@
 
 namespace graphene { namespace app {
 
-class abstract_plugin {
-public:
-   virtual ~abstract_plugin() {
-   }
-   virtual std::string plugin_name() const = 0;
-   virtual std::string plugin_description() const = 0;
+class abstract_plugin
+{
+   public:
+      virtual ~abstract_plugin(){}
+      virtual std::string plugin_name()const = 0;
+      virtual std::string plugin_description()const = 0;
 
-   /**
-    * @brief Perform early startup routines and register plugin indexes, callbacks, etc.
-    *
-    * Plugins MUST supply a method initialize() which will be called early in the application startup. This method
-    * should contain early setup code such as initializing variables, adding indexes to the database, registering
-    * callback methods from the database, adding APIs, etc., as well as applying any options in the @ref options map
-    *
-    * This method is called BEFORE the database is open, therefore any routines which require any chain state MUST
-    * NOT be called by this method. These routines should be performed in startup() instead.
-    *
-    * @param options The options passed to the application, via configuration files or command line
-    */
-   virtual void plugin_initialize(const boost::program_options::variables_map &options) = 0;
+      /**
+       * @brief Perform early startup routines and register plugin indexes, callbacks, etc.
+       *
+       * Plugins MUST supply a method initialize() which will be called early in the application startup. This method
+       * should contain early setup code such as initializing variables, adding indexes to the database, registering
+       * callback methods from the database, adding APIs, etc., as well as applying any options in the @ref options map
+       *
+       * This method is called BEFORE the database is open, therefore any routines which require any chain state MUST
+       * NOT be called by this method. These routines should be performed in startup() instead.
+       *
+       * @param options The options passed to the application, via configuration files or command line
+       */
+      virtual void plugin_initialize( const boost::program_options::variables_map& options ) = 0;
 
-   /**
-    * @brief Begin normal runtime operations
-    *
-    * Plugins MUST supply a method startup() which will be called at the end of application startup. This method
-    * should contain code which schedules any tasks, or requires chain state.
-    */
-   virtual void plugin_startup() = 0;
+      /**
+       * @brief Begin normal runtime operations
+       *
+       * Plugins MUST supply a method startup() which will be called at the end of application startup. This method
+       * should contain code which schedules any tasks, or requires chain state.
+       */
+      virtual void plugin_startup() = 0;
 
-   /**
-    * @brief Cleanly shut down the plugin.
-    *
-    * This is called to request a clean shutdown (e.g. due to SIGINT or SIGTERM).
-    */
-   virtual void plugin_shutdown() = 0;
+      /**
+       * @brief Cleanly shut down the plugin.
+       *
+       * This is called to request a clean shutdown (e.g. due to SIGINT or SIGTERM).
+       */
+      virtual void plugin_shutdown() = 0;
 
-   /**
-    * @brief Register the application instance with the plugin.
-    *
-    * This is called by the framework to set the application.
-    */
-   virtual void plugin_set_app(application *a) = 0;
+      /**
+       * @brief Register the application instance with the plugin.
+       *
+       * This is called by the framework to set the application.
+       */
+      virtual void plugin_set_app( application* a ) = 0;
 
-   /**
-    * @brief Fill in command line parameters used by the plugin.
-    *
-    * @param command_line_options All options this plugin supports taking on the command-line
-    * @param config_file_options All options this plugin supports storing in a configuration file
-    *
-    * This method populates its arguments with any
-    * command-line and configuration file options the plugin supports.
-    * If a plugin does not need these options, it
-    * may simply provide an empty implementation of this method.
-    */
-   virtual void plugin_set_program_options(boost::program_options::options_description &command_line_options,
-                                           boost::program_options::options_description &config_file_options) = 0;
+      /**
+       * @brief Fill in command line parameters used by the plugin.
+       *
+       * @param command_line_options All options this plugin supports taking on the command-line
+       * @param config_file_options All options this plugin supports storing in a configuration file
+       *
+       * This method populates its arguments with any
+       * command-line and configuration file options the plugin supports.
+       * If a plugin does not need these options, it
+       * may simply provide an empty implementation of this method.
+       */
+      virtual void plugin_set_program_options(
+         boost::program_options::options_description& command_line_options,
+         boost::program_options::options_description& config_file_options
+         ) = 0;
 };
 
 /**
  * Provides basic default implementations of abstract_plugin functions.
  */
 
-class plugin : public abstract_plugin {
-public:
-   plugin();
-   virtual ~plugin() override;
+class plugin : public abstract_plugin
+{
+   public:
+      plugin();
+      virtual ~plugin() override;
 
-   virtual std::string plugin_name() const override;
-   virtual std::string plugin_description() const override;
-   virtual void plugin_initialize(const boost::program_options::variables_map &options) override;
-   virtual void plugin_startup() override;
-   virtual void plugin_shutdown() override;
-   virtual void plugin_set_app(application *app) override;
-   virtual void plugin_set_program_options(boost::program_options::options_description &command_line_options,
-                                           boost::program_options::options_description &config_file_options) override;
+      virtual std::string plugin_name()const override;
+      virtual std::string plugin_description()const override;
+      virtual void plugin_initialize( const boost::program_options::variables_map& options ) override;
+      virtual void plugin_startup() override;
+      virtual void plugin_shutdown() override;
+      virtual void plugin_set_app( application* app ) override;
+      virtual void plugin_set_program_options(
+         boost::program_options::options_description& command_line_options,
+         boost::program_options::options_description& config_file_options
+         ) override;
 
-   chain::database &database() {
-      return *app().chain_database();
-   }
-   application &app() const {
-      assert(_app);
-      return *_app;
-   }
+      chain::database& database() { return *app().chain_database(); }
+      application& app()const { assert(_app); return *_app; }
+   protected:
+      net::node& p2p_node() { return *app().p2p_node(); }
 
-protected:
-   net::node &p2p_node() {
-      return *app().p2p_node();
-   }
-
-private:
-   application *_app = nullptr;
+   private:
+      application* _app = nullptr;
 };
 
 /// @group Some useful tools for boost::program_options arguments using vectors of JSON strings
 /// @{
-template <typename T>
-T dejsonify(const string &s, uint32_t max_depth) {
+template<typename T>
+T dejsonify(const string& s, uint32_t max_depth)
+{
    return fc::json::from_string(s).as<T>(max_depth);
 }
 
 namespace impl {
-template <typename T>
-T dejsonify(const string &s) {
-   return graphene::app::dejsonify<T>(s, GRAPHENE_MAX_NESTED_OBJECTS);
+   template<typename T>
+   T dejsonify( const string& s )
+   {
+      return graphene::app::dejsonify<T>( s, GRAPHENE_MAX_NESTED_OBJECTS );
+   }
 }
-} // namespace impl
 
 #define DEFAULT_VALUE_VECTOR(value) default_value({fc::json::to_string(value)}, fc::json::to_string(value))
-#define LOAD_VALUE_SET(options, name, container, type)                                                                          \
-   if (options.count(name)) {                                                                                                   \
-      const std::vector<std::string> &ops = options[name].as<std::vector<std::string>>();                                       \
+#define LOAD_VALUE_SET(options, name, container, type) \
+if( options.count(name) ) { \
+      const std::vector<std::string>& ops = options[name].as<std::vector<std::string>>(); \
       std::transform(ops.begin(), ops.end(), std::inserter(container, container.end()), &graphene::app::impl::dejsonify<type>); \
-   }
+}
 /// @}
 
-}} // namespace graphene::app
+} } //graphene::app

libraries/app/plugin.cpp

@@ -27,44 +27,54 @@
 
 namespace graphene { namespace app {
 
-plugin::plugin() {
+plugin::plugin()
+{
    _app = nullptr;
    return;
 }
 
-plugin::~plugin() {
+plugin::~plugin()
+{
    return;
 }
 
-std::string plugin::plugin_name() const {
+std::string plugin::plugin_name()const
+{
    return "<unknown plugin>";
 }
 
-std::string plugin::plugin_description() const {
+std::string plugin::plugin_description()const
+{
    return "<no description>";
 }
 
-void plugin::plugin_initialize(const boost::program_options::variables_map &options) {
+void plugin::plugin_initialize( const boost::program_options::variables_map& options )
+{
    return;
 }
 
-void plugin::plugin_startup() {
+void plugin::plugin_startup()
+{
    return;
 }
 
-void plugin::plugin_shutdown() {
+void plugin::plugin_shutdown()
+{
    return;
 }
 
-void plugin::plugin_set_app(application *app) {
+void plugin::plugin_set_app( application* app )
+{
    _app = app;
    return;
 }
 
 void plugin::plugin_set_program_options(
-      boost::program_options::options_description &cli,
-      boost::program_options::options_description &cfg) {
+   boost::program_options::options_description& command_line_options,
+   boost::program_options::options_description& config_file_options
+)
+{
    return;
 }
 
-}} // namespace graphene::app
+} } // graphene::app

libraries/chain/account_evaluator.cpp

@@ -53,54 +53,7 @@ void verify_authority_accounts( const database& db, const authority& a )
    }
 }
 
-// Overwrites the num_son values from the origin to the destination for those sidechains which are found in the origin.
-// Keeps the values of num_son for the sidechains which are found in the destination, but not in the origin.
-// Returns false if an error is detected.
-bool merge_num_sons( flat_map<sidechain_type, uint16_t>& destination,
-                     const flat_map<sidechain_type, uint16_t>& origin,
-                     fc::optional<time_point_sec> head_block_time = {})
-{
-   const auto active_sidechains = head_block_time.valid() ? active_sidechain_types(*head_block_time) : all_sidechain_types;
-   bool success = true;
-
-   for (const auto &ns : origin)
-   {
-      destination[ns.first] = ns.second;
-      if (active_sidechains.find(ns.first) == active_sidechains.end())
-      {
-         success = false;
-      }
-   }
-
-   return success;
-}
-
-flat_map<sidechain_type, uint16_t> count_SON_votes_per_sidechain( const flat_set<vote_id_type>& votes )
-{
-   flat_map<sidechain_type, uint16_t> SON_votes_per_sidechain = account_options::ext::empty_num_son();
-
-   for (const auto &vote : votes)
-   {
-      switch (vote.type())
-     {
-      case vote_id_type::son_bitcoin:
-         SON_votes_per_sidechain[sidechain_type::bitcoin]++;
-         break;
-      case vote_id_type::son_hive:
-         SON_votes_per_sidechain[sidechain_type::hive]++;
-         break;
-      case vote_id_type::son_ethereum:
-         SON_votes_per_sidechain[sidechain_type::ethereum]++;
-         break;
-      default:
-         break;
-      }
-   }
-
-   return SON_votes_per_sidechain;
-}
-
-void verify_account_votes( const database& db, const account_options& options, fc::optional<account_object> account = {} )
+void verify_account_votes( const database& db, const account_options& options )
 {
    // ensure account's votes satisfy requirements
    // NB only the part of vote checking that requires chain state is here,
@@ -109,47 +62,10 @@ void verify_account_votes( const database& db, const account_options& options, f
    const auto& gpo = db.get_global_properties();
    const auto& chain_params = gpo.parameters;
 
-   FC_ASSERT( db.find_object(options.voting_account), "Invalid proxy account specified." );
-
    FC_ASSERT( options.num_witness <= chain_params.maximum_witness_count,
               "Voted for more witnesses than currently allowed (${c})", ("c", chain_params.maximum_witness_count) );
    FC_ASSERT( options.num_committee <= chain_params.maximum_committee_count,
               "Voted for more committee members than currently allowed (${c})", ("c", chain_params.maximum_committee_count) );
-   FC_ASSERT( chain_params.extensions.value.maximum_son_count.valid() , "Invalid maximum son count" );
-
-   flat_map<sidechain_type, uint16_t> merged_num_sons = account_options::ext::empty_num_son();
-
-   // Merge with existing account if exists
-   if ( account.valid() && account->options.extensions.value.num_son.valid())
-   {
-      merge_num_sons( merged_num_sons, *account->options.extensions.value.num_son, db.head_block_time() );
-   }
-
-   // Apply update operation on top
-   if ( options.extensions.value.num_son.valid() )
-   {
-      merge_num_sons( merged_num_sons, *options.extensions.value.num_son, db.head_block_time() );
-   }
-
-   for(const auto& num_sons : merged_num_sons)
-   {
-      FC_ASSERT( num_sons.second <= *chain_params.extensions.value.maximum_son_count,
-                "Voted for more sons than currently allowed (${c})", ("c", *chain_params.extensions.value.maximum_son_count) );
-   }
-
-   // Count the votes for SONs and confirm that the account did not vote for less SONs than num_son
-   flat_map<sidechain_type, uint16_t> SON_votes_per_sidechain = count_SON_votes_per_sidechain(options.votes);
-
-   for (const auto& number_of_votes : SON_votes_per_sidechain)
-   {
-      // Number of votes of account_options are also checked in account_options::do_evaluate,
-      // but there we are checking the value before merging num_sons, so the values should be checked again
-      const auto sidechain = number_of_votes.first;
-      FC_ASSERT( number_of_votes.second >= merged_num_sons[sidechain],
-                "Voted for less sons than specified in num_son (votes ${v} < num_son ${ns}) for sidechain ${s}",
-                ("v", number_of_votes.second) ("ns", merged_num_sons[sidechain]) ("s", sidechain) );
-   }
-
    FC_ASSERT( db.find_object(options.voting_account), "Invalid proxy account specified." );
 
    uint32_t max_vote_id = gpo.next_available_vote_id;
@@ -263,13 +179,6 @@ object_id_type account_create_evaluator::do_apply( const account_create_operatio
       obj.owner            = o.owner;
       obj.active           = o.active;
       obj.options          = o.options;
-
-      obj.options.extensions.value.num_son = account_options::ext::empty_num_son();
-      if ( o.options.extensions.value.num_son.valid() )
-      {
-         merge_num_sons( *obj.options.extensions.value.num_son, *o.options.extensions.value.num_son );
-      }
-
       obj.statistics = d.create<account_statistics_object>([&obj](account_statistics_object& s){
                            s.owner = obj.id;
                            s.name = obj.name;
@@ -369,7 +278,7 @@ void_result account_update_evaluator::do_evaluate( const account_update_operatio
    acnt = &o.account(d);
 
    if( o.new_options.valid() )
-      verify_account_votes( d, *o.new_options, *acnt );
+      verify_account_votes( d, *o.new_options );
 
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
@@ -408,31 +317,7 @@ void_result account_update_evaluator::do_apply( const account_update_operation&
          a.active = *o.active;
          a.top_n_control_flags = 0;
       }
-
-      // New num_son structure initialized to 0
-      flat_map<sidechain_type, uint16_t> new_num_son = account_options::ext::empty_num_son();
-
-      // If num_son of existing object is valid, we should merge the existing data
-      if ( a.options.extensions.value.num_son.valid() )
-      {
-         merge_num_sons( new_num_son, *a.options.extensions.value.num_son );
-      }
-
-      // If num_son of the operation are valid, they should merge the existing data
-      if ( o.new_options )
-      {
-         const auto new_options = *o.new_options;
-
-         if ( new_options.extensions.value.num_son.valid() )
-         {
-            merge_num_sons( new_num_son, *new_options.extensions.value.num_son );
-         }
-
-         a.options = *o.new_options;
-      }
-
-      a.options.extensions.value.num_son = new_num_son;
-
+      if( o.new_options ) a.options = *o.new_options;
       if( o.extensions.value.owner_special_authority.valid() )
       {
          a.owner_special_authority = *(o.extensions.value.owner_special_authority);

libraries/chain/asset_evaluator.cpp

@@ -42,7 +42,8 @@ void_result asset_create_evaluator::do_evaluate( const asset_create_operation& o
 
    database& d = db();
 
-   FC_ASSERT(d.is_asset_creation_allowed(op.symbol), "Asset creation not allowed at current time");
+   if (d.head_block_time() < HARDFORK_SON_TIME)
+      FC_ASSERT(op.symbol != "BTC", "BTC asset creation before SON hardfork");
 
    const auto& chain_parameters = d.get_global_properties().parameters;
    FC_ASSERT( op.common_options.whitelist_authorities.size() <= chain_parameters.maximum_asset_whitelist_authorities );
@@ -190,8 +191,6 @@ void_result lottery_asset_create_evaluator::do_evaluate( const lottery_asset_cre
 
    database& d = db();
 
-   FC_ASSERT(d.is_asset_creation_allowed(op.symbol), "Lottery asset creation not allowed at current time");
-
    const auto& chain_parameters = d.get_global_properties().parameters;
    FC_ASSERT( op.common_options.whitelist_authorities.size() <= chain_parameters.maximum_asset_whitelist_authorities );
    FC_ASSERT( op.common_options.blacklist_authorities.size() <= chain_parameters.maximum_asset_whitelist_authorities );
@@ -482,7 +481,7 @@ void_result asset_update_evaluator::do_apply(const asset_update_operation& o)
    database& d = db();
 
    // If we are now disabling force settlements, cancel all open force settlement orders
-   if( o.new_options.flags & disable_force_settle && asset_to_update->can_force_settle() )
+   if( (o.new_options.flags & disable_force_settle) && asset_to_update->can_force_settle() )
    {
       const auto& idx = d.get_index_type<force_settlement_index>().indices().get<by_expiration>();
       // Funky iteration code because we're removing objects as we go. We have to re-initialize itr every loop instead
@@ -490,7 +489,7 @@ void_result asset_update_evaluator::do_apply(const asset_update_operation& o)
       for( auto itr = idx.lower_bound(o.asset_to_update);
            itr != idx.end() && itr->settlement_asset_id() == o.asset_to_update;
            itr = idx.lower_bound(o.asset_to_update) )
-         d.cancel_order(*itr);
+         d.cancel_settle_order(*itr);
    }
 
    // For market-issued assets, if core change rate changed, update flag in bitasset data
@@ -516,57 +515,366 @@ void_result asset_update_evaluator::do_apply(const asset_update_operation& o)
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
-void_result asset_update_bitasset_evaluator::do_evaluate(const asset_update_bitasset_operation& o)
+/****************
+ * Loop through assets, looking for ones that are backed by the asset being changed. When found,
+ * perform checks to verify validity
+ *
+ * @param d the database
+ * @param op the bitasset update operation being performed
+ * @param new_backing_asset
+ * @param true if after hf 922/931 (if nothing triggers, this and the logic that depends on it
+ *    should be removed).
+ */
+void check_children_of_bitasset(database& d, const asset_update_bitasset_operation& op,
+      const asset_object& new_backing_asset, bool after_hf_922_931)
+{
+   // no need to do these checks if the new backing asset is CORE
+   if ( new_backing_asset.get_id() == asset_id_type() )
+      return;
+
+   // loop through all assets that have this asset as a backing asset
+   const auto& idx = d.get_index_type<asset_index>().indices().get<by_type>();
+
+   for( auto itr = idx.lower_bound(true); itr != idx.end(); ++itr )
+   {
+      const auto& child = *itr;
+      if ( child.bitasset_data(d).options.short_backing_asset == op.asset_to_update )
+      {
+         if ( after_hf_922_931 )
+         {
+            FC_ASSERT( child.get_id() != op.new_options.short_backing_asset,
+                  "A BitAsset would be invalidated by changing this backing asset ('A' backed by 'B' backed by 'A')." );
+
+            FC_ASSERT( child.issuer != GRAPHENE_COMMITTEE_ACCOUNT,
+                  "A blockchain-controlled market asset would be invalidated by changing this backing asset." );
+
+            FC_ASSERT( !new_backing_asset.is_market_issued(),
+                  "A non-blockchain controlled BitAsset would be invalidated by changing this backing asset.");
+
+         }
+         else
+         {
+            if( child.get_id() == op.new_options.short_backing_asset )
+            {
+               wlog( "Before hf-922-931, modified an asset to be backed by another, but would cause a continuous "
+                     "loop. A cannot be backed by B which is backed by A." );
+               return;
+            }
+
+            if( child.issuer == GRAPHENE_COMMITTEE_ACCOUNT )
+            {
+               wlog( "before hf-922-931, modified an asset to be backed by a non-CORE, but this asset "
+                        "is a backing asset for a committee-issued asset. This occurred at block ${b}",
+                        ("b", d.head_block_num()));
+               return;
+            }
+            else
+            {
+               if ( new_backing_asset.is_market_issued() ) { // a.k.a. !UIA
+                  wlog( "before hf-922-931, modified an asset to be backed by an MPA, but this asset "
+                        "is a backing asset for another MPA, which would cause MPA backed by MPA backed by MPA. "
+                        "This occurred at block ${b}",
+                        ("b", d.head_block_num()));
+                  return;
+               }
+            } // if child.issuer
+         } // if hf 922/931
+      } // if this child is backed by the asset being adjusted
+   } // for each asset
+} // check_children_of_bitasset
+
+void_result asset_update_bitasset_evaluator::do_evaluate(const asset_update_bitasset_operation& op)
 { try {
    database& d = db();
 
-   const asset_object& a = o.asset_to_update(d);
+   const asset_object& asset_obj = op.asset_to_update(d);
 
-   FC_ASSERT(a.is_market_issued(), "Cannot update BitAsset-specific settings on a non-BitAsset.");
+   FC_ASSERT( asset_obj.is_market_issued(), "Cannot update BitAsset-specific settings on a non-BitAsset." );
 
-   const asset_bitasset_data_object& b = a.bitasset_data(d);
-   FC_ASSERT( !b.has_settlement(), "Cannot update a bitasset after a settlement has executed" );
-   if( o.new_options.short_backing_asset != b.options.short_backing_asset )
+   FC_ASSERT( op.issuer == asset_obj.issuer, "Only asset issuer can update bitasset_data of the asset." );
+
+   const asset_bitasset_data_object& current_bitasset_data = asset_obj.bitasset_data(d);
+
+   FC_ASSERT( !current_bitasset_data.has_settlement(), "Cannot update a bitasset after a global settlement has executed" );
+
+   bool after_hf_core_922_931 = ( d.get_dynamic_global_properties().next_maintenance_time > HARDFORK_CORE_922_931_TIME );
+
+   // Are we changing the backing asset?
+   if( op.new_options.short_backing_asset != current_bitasset_data.options.short_backing_asset )
    {
-      FC_ASSERT(a.dynamic_asset_data_id(d).current_supply == 0);
-      FC_ASSERT(d.find_object(o.new_options.short_backing_asset));
+      FC_ASSERT( asset_obj.dynamic_asset_data_id(d).current_supply == 0,
+                 "Cannot update a bitasset if there is already a current supply." );
 
-      if( a.issuer == GRAPHENE_COMMITTEE_ACCOUNT )
+      const asset_object& new_backing_asset = op.new_options.short_backing_asset(d); // check if the asset exists
+
+      if( after_hf_core_922_931 ) // TODO remove this check after hard fork if things in `else` did not occur
       {
-         const asset_object& backing = a.bitasset_data(d).options.short_backing_asset(d);
-         if( backing.is_market_issued() )
+         FC_ASSERT( op.new_options.short_backing_asset != asset_obj.get_id(),
+                    "Cannot update an asset to be backed by itself." );
+
+         if( current_bitasset_data.is_prediction_market )
          {
-            const asset_object& backing_backing = backing.bitasset_data(d).options.short_backing_asset(d);
-            FC_ASSERT( backing_backing.get_id() == asset_id_type(),
-                       "May not create a blockchain-controlled market asset which is not backed by CORE.");
-         } else
-            FC_ASSERT( backing.get_id() == asset_id_type(),
-                       "May not create a blockchain-controlled market asset which is not backed by CORE.");
+            FC_ASSERT( asset_obj.precision == new_backing_asset.precision,
+                       "The precision of the asset and backing asset must be equal." );
+         }
+
+         if( asset_obj.issuer == GRAPHENE_COMMITTEE_ACCOUNT )
+         {
+            if( new_backing_asset.is_market_issued() )
+            {
+               FC_ASSERT( new_backing_asset.bitasset_data(d).options.short_backing_asset == asset_id_type(),
+                          "May not modify a blockchain-controlled market asset to be backed by an asset which is not "
+                          "backed by CORE." );
+
+               check_children_of_bitasset( d, op, new_backing_asset, after_hf_core_922_931 );
+            }
+            else
+            {
+               FC_ASSERT( new_backing_asset.get_id() == asset_id_type(),
+                          "May not modify a blockchain-controlled market asset to be backed by an asset which is not "
+                          "market issued asset nor CORE." );
+            }
+         }
+         else
+         {
+            // not a committee issued asset
+
+            // If we're changing to a backing_asset that is not CORE, we need to look at any
+            // asset ( "CHILD" ) that has this one as a backing asset. If CHILD is committee-owned,
+            // the change is not allowed. If CHILD is user-owned, then this asset's backing
+            // asset must be either CORE or a UIA.
+            if ( new_backing_asset.get_id() != asset_id_type() ) // not backed by CORE
+            {
+               check_children_of_bitasset( d, op, new_backing_asset, after_hf_core_922_931 );
+            }
+
+         }
+
+         // Check if the new backing asset is itself backed by something. It must be CORE or a UIA
+         if ( new_backing_asset.is_market_issued() )
+         {
+            const asset_object& backing_backing_asset = new_backing_asset.bitasset_data(d).asset_id(d);
+            FC_ASSERT( !backing_backing_asset.is_market_issued(), "A BitAsset cannot be backed by a BitAsset that itself "
+                  "is backed by a BitAsset.");
+         }
+      }
+      else // prior to HF 922 / 931
+      {
+         // code to check if issues occurred before hard fork. TODO cleanup after hard fork
+         if( op.new_options.short_backing_asset == asset_obj.get_id() )
+         {
+            wlog( "before hf-922-931, op.new_options.short_backing_asset == asset_obj.get_id() at block ${b}",
+                  ("b",d.head_block_num()) );
+         }
+         if( current_bitasset_data.is_prediction_market && asset_obj.precision != new_backing_asset.precision )
+         {
+            wlog( "before hf-922-931, for a PM, asset_obj.precision != new_backing_asset.precision at block ${b}",
+                  ("b",d.head_block_num()) );
+         }
+
+         if( asset_obj.issuer == GRAPHENE_COMMITTEE_ACCOUNT )
+         {
+            // code to check if issues occurred before hard fork. TODO cleanup after hard fork
+            if( new_backing_asset.is_market_issued() )
+            {
+               if( new_backing_asset.bitasset_data(d).options.short_backing_asset != asset_id_type() )
+                  wlog( "before hf-922-931, modified a blockchain-controlled market asset to be backed by an asset "
+                        "which is not backed by CORE at block ${b}",
+                        ("b",d.head_block_num()) );
+
+               check_children_of_bitasset( d, op, new_backing_asset, after_hf_core_922_931 );
+            }
+            else
+            {
+               if( new_backing_asset.get_id() != asset_id_type() )
+                  wlog( "before hf-922-931, modified a blockchain-controlled market asset to be backed by an asset "
+                        "which is not market issued asset nor CORE at block ${b}",
+                        ("b",d.head_block_num()) );
+            }
+
+            //prior to HF 922_931, these checks were mistakenly using the old backing_asset
+            const asset_object& old_backing_asset = current_bitasset_data.options.short_backing_asset(d);
+
+            if( old_backing_asset.is_market_issued() )
+            {
+               FC_ASSERT( old_backing_asset.bitasset_data(d).options.short_backing_asset == asset_id_type(),
+                          "May not modify a blockchain-controlled market asset to be backed by an asset which is not "
+                          "backed by CORE." );
+            }
+            else
+            {
+               FC_ASSERT( old_backing_asset.get_id() == asset_id_type(),
+                          "May not modify a blockchain-controlled market asset to be backed by an asset which is not "
+                          "market issued asset nor CORE." );
+            }
+         }
+         else
+         {
+            // not a committee issued asset
+
+            // If we're changing to a backing_asset that is not CORE, we need to look at any
+            // asset ( "CHILD" ) that has this one as a backing asset. If CHILD is committee-owned,
+            // the change is not allowed. If CHILD is user-owned, then this asset's backing
+            // asset must be either CORE or a UIA.
+            if ( new_backing_asset.get_id() != asset_id_type() ) // not backed by CORE
+            {
+               check_children_of_bitasset( d, op, new_backing_asset, after_hf_core_922_931 );
+            }
+         }
+         // if the new backing asset is backed by something which is not CORE and not a UIA, this is not allowed
+         // Check if the new backing asset is itself backed by something. It must be CORE or a UIA
+         if ( new_backing_asset.is_market_issued() )
+         {
+            const asset_object& backing_backing_asset = new_backing_asset.bitasset_data(d).asset_id(d);
+            if ( backing_backing_asset.get_id() != asset_id_type() )
+            {
+               if ( backing_backing_asset.is_market_issued() )
+               {
+                  wlog( "before hf-922-931, a BitAsset cannot be backed by a BitAsset that itself "
+                        "is backed by a BitAsset. This occurred at block ${b}",
+                        ("b", d.head_block_num() ) );
+               }
+            } // not core
+         } // if market issued
       }
    }
 
-   bitasset_to_update = &b;
-   FC_ASSERT( o.issuer == a.issuer, "", ("o.issuer", o.issuer)("a.issuer", a.issuer) );
+   const auto& chain_parameters = d.get_global_properties().parameters;
+   if( after_hf_core_922_931 ) // TODO remove this check after hard fork if things in `else` did not occur
+   {
+      FC_ASSERT( op.new_options.feed_lifetime_sec > chain_parameters.block_interval,
+            "Feed lifetime must exceed block interval." );
+      FC_ASSERT( op.new_options.force_settlement_delay_sec > chain_parameters.block_interval,
+            "Force settlement delay must exceed block interval." );
+   }
+   else // code to check if issues occurred before hard fork. TODO cleanup after hard fork
+   {
+      if( op.new_options.feed_lifetime_sec <= chain_parameters.block_interval )
+         wlog( "before hf-922-931, op.new_options.feed_lifetime_sec <= chain_parameters.block_interval at block ${b}",
+               ("b",d.head_block_num()) );
+      if( op.new_options.force_settlement_delay_sec <= chain_parameters.block_interval )
+         wlog( "before hf-922-931, op.new_options.force_settlement_delay_sec <= chain_parameters.block_interval at block ${b}",
+               ("b",d.head_block_num()) );
+   }
+
+   bitasset_to_update = &current_bitasset_data;
+   asset_to_update = &asset_obj;
 
    return void_result();
-} FC_CAPTURE_AND_RETHROW( (o) ) }
+} FC_CAPTURE_AND_RETHROW( (op) ) }
 
-void_result asset_update_bitasset_evaluator::do_apply(const asset_update_bitasset_operation& o)
-{ try {
-   bool should_update_feeds = false;
+/*******
+ * @brief Apply requested changes to bitasset options
+ *
+ * This applies the requested changes to the bitasset object. It also cleans up the
+ * releated feeds
+ *
+ * @param op the requested operation
+ * @param db the database
+ * @param bdo the actual database object
+ * @param asset_to_update the asset_object related to this bitasset_data_object
+ * @returns true if the feed price is changed, and after hf core-868-890
+ */
+static bool update_bitasset_object_options(
+      const asset_update_bitasset_operation& op, database& db,
+      asset_bitasset_data_object& bdo, const asset_object& asset_to_update )
+{
+   const fc::time_point_sec& next_maint_time = db.get_dynamic_global_properties().next_maintenance_time;
+   bool after_hf_core_868_890 = ( next_maint_time > HARDFORK_CORE_868_890_TIME );
    // If the minimum number of feeds to calculate a median has changed, we need to recalculate the median
-   if( o.new_options.minimum_feeds != bitasset_to_update->options.minimum_feeds )
+   bool should_update_feeds = false;
+   if( op.new_options.minimum_feeds != bdo.options.minimum_feeds )
       should_update_feeds = true;
 
-   db().modify(*bitasset_to_update, [&](asset_bitasset_data_object& b) {
-      b.options = o.new_options;
+   // after hardfork core-868-890, we also should call update_median_feeds if the feed_lifetime_sec changed
+   if( after_hf_core_868_890
+         && op.new_options.feed_lifetime_sec != bdo.options.feed_lifetime_sec )
+   {
+      should_update_feeds = true;
+   }
 
-      if( should_update_feeds )
-         b.update_median_feeds(db().head_block_time());
-   });
+   // feeds must be reset if the backing asset is changed after hardfork core-868-890
+   bool backing_asset_changed = false;
+   bool is_witness_or_committee_fed = false;
+   if( after_hf_core_868_890
+         && op.new_options.short_backing_asset != bdo.options.short_backing_asset )
+   {
+      backing_asset_changed = true;
+      should_update_feeds = true;
+      if ( asset_to_update.options.flags & (witness_fed_asset | committee_fed_asset) )
+         is_witness_or_committee_fed = true;
+   }
 
-   return void_result();
-} FC_CAPTURE_AND_RETHROW( (o) ) }
+   bdo.options = op.new_options;
+
+   // are we modifying the underlying? If so, reset the feeds
+   if (backing_asset_changed)
+   {
+      if ( is_witness_or_committee_fed )
+      {
+         bdo.feeds.clear();
+      }
+      else
+      {
+         // for non-witness-feeding and non-committee-feeding assets, modify all feeds
+         // published by producers to nothing, since we can't simply remove them. For more information:
+         // https://github.com/bitshares/bitshares-core/pull/832#issuecomment-384112633
+         for(auto& current_feed : bdo.feeds)
+         {
+            current_feed.second.second.settlement_price = price();
+         }
+      }
+   }
+
+   if( should_update_feeds )
+   {
+      const auto old_feed = bdo.current_feed;
+      bdo.update_median_feeds( db.head_block_time(), next_maint_time );
+
+      // TODO review and refactor / cleanup after hard fork:
+      //      1. if hf_core_868_890 and core-935 occurred at same time
+      //      2. if wlog did not actually get called
+
+      // We need to call check_call_orders if the price feed changes after hardfork core-935
+      if( next_maint_time > HARDFORK_CORE_935_TIME )
+         return ( !( old_feed == bdo.current_feed ) );
+
+      // We need to call check_call_orders if the settlement price changes after hardfork core-868-890
+      if( after_hf_core_868_890 )
+      {
+         if( old_feed.settlement_price != bdo.current_feed.settlement_price )
+            return true;
+         else
+         {
+            if( !( old_feed == bdo.current_feed ) )
+               wlog( "Settlement price did not change but current_feed changed at block ${b}", ("b",db.head_block_num()) );
+         }
+      }
+   }
+
+   return false;
+}
+
+void_result asset_update_bitasset_evaluator::do_apply(const asset_update_bitasset_operation& op)
+{
+   try
+   {
+      auto& db_conn = db();
+      const auto& asset_being_updated = (*asset_to_update);
+      bool to_check_call_orders = false;
+
+      db_conn.modify( *bitasset_to_update,
+                      [&op, &asset_being_updated, &to_check_call_orders, &db_conn]( asset_bitasset_data_object& bdo )
+      {
+         to_check_call_orders = update_bitasset_object_options( op, db_conn, bdo, asset_being_updated );
+      });
+
+      if( to_check_call_orders )
+         db_conn.check_call_orders( asset_being_updated );
+
+      return void_result();
+   } FC_CAPTURE_AND_RETHROW( (op) )
+}
 
 void_result asset_update_dividend_evaluator::do_evaluate(const asset_update_dividend_operation& o)
 { try {
@@ -653,6 +961,7 @@ void_result asset_update_feed_producers_evaluator::do_evaluate(const asset_updat
 
 void_result asset_update_feed_producers_evaluator::do_apply(const asset_update_feed_producers_evaluator::operation_type& o)
 { try {
+   const auto next_maint_time = db().get_dynamic_global_properties().next_maintenance_time;
    db().modify(*bitasset_to_update, [&](asset_bitasset_data_object& a) {
       //This is tricky because I have a set of publishers coming in, but a map of publisher to feed is stored.
       //I need to update the map such that the keys match the new publishers, but not munge the old price feeds from
@@ -669,7 +978,7 @@ void_result asset_update_feed_producers_evaluator::do_apply(const asset_update_f
       for( auto itr = o.new_feed_producers.begin(); itr != o.new_feed_producers.end(); ++itr )
          if( !a.feeds.count(*itr) )
             a.feeds[*itr];
-      a.update_median_feeds(db().head_block_time());
+      a.update_median_feeds(db().head_block_time(), next_maint_time);
    });
    db().check_call_orders( o.asset_to_update(db()) );
 
@@ -684,6 +993,13 @@ void_result asset_global_settle_evaluator::do_evaluate(const asset_global_settle
    FC_ASSERT(asset_to_settle->can_global_settle());
    FC_ASSERT(asset_to_settle->issuer == op.issuer );
    FC_ASSERT(asset_to_settle->dynamic_data(d).current_supply > 0);
+
+   const asset_bitasset_data_object* bitasset_data  = &asset_to_settle->bitasset_data(d);
+   if( bitasset_data->is_prediction_market ) {
+      /// if there is a settlement for this asset, then no further global settle may be taken and
+      FC_ASSERT( !bitasset_data->has_settlement(),"This asset has settlement, cannot global settle twice" );
+   }
+
    const auto& idx = d.get_index_type<call_order_index>().indices().get<by_collateral>();
    assert( !idx.empty() );
    auto itr = idx.lower_bound(boost::make_tuple(price::min(asset_to_settle->bitasset_data(d).options.short_backing_asset,
@@ -727,25 +1043,49 @@ operation_result asset_settle_evaluator::do_apply(const asset_settle_evaluator::
    const auto& bitasset = asset_to_settle->bitasset_data(d);
    if( bitasset.has_settlement() )
    {
-      auto settled_amount = op.amount * bitasset.settlement_price;
-      FC_ASSERT( settled_amount.amount <= bitasset.settlement_fund );
-
-      d.modify( bitasset, [&]( asset_bitasset_data_object& obj ){
-                obj.settlement_fund -= settled_amount.amount;
-                });
-
-      d.adjust_balance(op.account, settled_amount);
-
       const auto& mia_dyn = asset_to_settle->dynamic_asset_data_id(d);
+      auto settled_amount = op.amount * bitasset.settlement_price;
+      if( op.amount.amount == mia_dyn.current_supply )
+         settled_amount.amount = bitasset.settlement_fund; // avoid rounding problems
+      else
+         FC_ASSERT( settled_amount.amount < bitasset.settlement_fund );
+      
+      if( settled_amount.amount == 0 && !bitasset.is_prediction_market )
+      {
+         if( d.get_dynamic_global_properties().next_maintenance_time > HARDFORK_CORE_184_TIME )
+            FC_THROW( "Settle amount is too small to receive anything due to rounding" );
+         else // TODO remove this warning after hard fork core-184
+            wlog( "Something for nothing issue (#184, variant F) occurred at block #${block}", ("block",d.head_block_num()) );
+      }
+
+      asset pays = op.amount;
+      if( op.amount.amount != mia_dyn.current_supply
+            && settled_amount.amount != 0
+            && d.get_dynamic_global_properties().next_maintenance_time > HARDFORK_CORE_342_TIME )
+      {
+         pays = settled_amount.multiply_and_round_up( bitasset.settlement_price );
+      }
+
+      d.adjust_balance( op.account, -pays );
+
+      if( settled_amount.amount > 0 )
+      {
+         d.modify( bitasset, [&]( asset_bitasset_data_object& obj ){
+            obj.settlement_fund -= settled_amount.amount;
+         });
+
+         d.adjust_balance( op.account, settled_amount );
+      }
 
       d.modify( mia_dyn, [&]( asset_dynamic_data_object& obj ){
-                obj.current_supply -= op.amount.amount;
-                });
+         obj.current_supply -= pays.amount;
+      });
 
       return settled_amount;
    }
    else
    {
+      d.adjust_balance( op.account, -op.amount );
       return d.create<force_settlement_object>([&](force_settlement_object& s) {
          s.owner = op.account;
          s.balance = op.amount;
@@ -763,7 +1103,10 @@ void_result asset_publish_feeds_evaluator::do_evaluate(const asset_publish_feed_
    FC_ASSERT(base.is_market_issued());
 
    const asset_bitasset_data_object& bitasset = base.bitasset_data(d);
-   FC_ASSERT( !bitasset.has_settlement(), "No further feeds may be published after a settlement event" );
+   if( bitasset.is_prediction_market || d.head_block_time() <= HARDFORK_CORE_216_TIME )
+   {
+      FC_ASSERT( !bitasset.has_settlement(), "No further feeds may be published after a settlement event" );
+   }
 
    FC_ASSERT( o.feed.settlement_price.quote.asset_id == bitasset.options.short_backing_asset );
    if( d.head_block_time() > HARDFORK_480_TIME )
@@ -802,19 +1145,52 @@ void_result asset_publish_feeds_evaluator::do_apply(const asset_publish_feed_ope
 { try {
 
    database& d = db();
+   const auto head_time = d.head_block_time();
+   const auto next_maint_time = d.get_dynamic_global_properties().next_maintenance_time;
 
    const asset_object& base = o.asset_id(d);
    const asset_bitasset_data_object& bad = base.bitasset_data(d);
 
    auto old_feed =  bad.current_feed;
    // Store medians for this asset
-   d.modify(bad , [&o,&d](asset_bitasset_data_object& a) {
-      a.feeds[o.publisher] = make_pair(d.head_block_time(), o.feed);
-      a.update_median_feeds(d.head_block_time());
+   d.modify( bad , [&o,head_time,next_maint_time](asset_bitasset_data_object& a) {
+      a.feeds[o.publisher] = make_pair( head_time, o.feed );
+      a.update_median_feeds( head_time, next_maint_time );
    });
 
    if( !(old_feed == bad.current_feed) )
+   {
+      // Check whether need to revive the asset and proceed if need
+      if( bad.has_settlement() // has globally settled, implies head_block_time > HARDFORK_CORE_216_TIME
+          && !bad.current_feed.settlement_price.is_null() ) // has a valid feed
+      {
+         bool should_revive = false;
+         const auto& mia_dyn = base.dynamic_asset_data_id(d);
+         if( mia_dyn.current_supply == 0 ) // if current supply is zero, revive the asset
+            should_revive = true;
+         else // if current supply is not zero, when collateral ratio of settlement fund is greater than MCR, revive the asset
+         {
+            if( next_maint_time <= HARDFORK_CORE_1270_TIME )
+            {
+               // before core-1270 hard fork, calculate call_price and compare to median feed
+               if( ~price::call_price( asset(mia_dyn.current_supply, o.asset_id),
+                                       asset(bad.settlement_fund, bad.options.short_backing_asset),
+                                       bad.current_feed.maintenance_collateral_ratio ) < bad.current_feed.settlement_price )
+                  should_revive = true;
+            }
+            else
+            {
+               // after core-1270 hard fork, calculate collateralization and compare to maintenance_collateralization
+               if( price( asset( bad.settlement_fund, bad.options.short_backing_asset ),
+                          asset( mia_dyn.current_supply, o.asset_id ) ) > bad.current_maintenance_collateralization )
+                  should_revive = true;
+            }
+         }
+         if( should_revive )
+            d.revive_bitasset(base);
+      }
       db().check_call_orders(base);
+   }
 
    return void_result();
 } FC_CAPTURE_AND_RETHROW((o)) }

libraries/chain/asset_object.cpp

@@ -44,10 +44,13 @@ share_type asset_bitasset_data_object::max_force_settlement_volume(share_type cu
    return volume.to_uint64();
 }
 
-void asset_bitasset_data_object::update_median_feeds(time_point_sec current_time)
+void graphene::chain::asset_bitasset_data_object::update_median_feeds( time_point_sec current_time,
+                                                                       time_point_sec next_maintenance_time )
 {
+   bool after_core_hardfork_1270 = ( next_maintenance_time > HARDFORK_CORE_1270_TIME ); // call price caching issue
    current_feed_publication_time = current_time;
    vector<std::reference_wrapper<const price_feed>> current_feeds;
+   // find feeds that were alive at current_time
    for( const pair<account_id_type, pair<time_point_sec,price_feed>>& f : feeds )
    {
       if( (current_time - f.second.first).to_seconds() < options.feed_lifetime_sec &&
@@ -65,13 +68,18 @@ void asset_bitasset_data_object::update_median_feeds(time_point_sec current_time
       feed_cer_updated = false; // new median cer is null, won't update asset_object anyway, set to false for better performance
       current_feed_publication_time = current_time;
       current_feed = price_feed();
+      if( after_core_hardfork_1270 )
+         current_maintenance_collateralization = price();
       return;
    }
    if( current_feeds.size() == 1 )
    {
       if( current_feed.core_exchange_rate != current_feeds.front().get().core_exchange_rate )
          feed_cer_updated = true;
-      current_feed = std::move(current_feeds.front());
+      current_feed = current_feeds.front();
+      // Note: perhaps can defer updating current_maintenance_collateralization for better performance
+      if( after_core_hardfork_1270 )
+         current_maintenance_collateralization = current_feed.maintenance_collateralization();
       return;
    }
 
@@ -92,6 +100,9 @@ void asset_bitasset_data_object::update_median_feeds(time_point_sec current_time
    if( current_feed.core_exchange_rate != median_feed.core_exchange_rate )
       feed_cer_updated = true;
    current_feed = median_feed;
+   // Note: perhaps can defer updating current_maintenance_collateralization for better performance
+   if( after_core_hardfork_1270 )
+      current_maintenance_collateralization = current_feed.maintenance_collateralization();
 }
 
 

libraries/chain/betting_market_group_object.cpp

@@ -541,7 +541,7 @@ void betting_market_group_object::dispatch_new_status(database& db, betting_mark
 
 } } // graphene::chain
 
-namespace fc {
+namespace fc { 
    // Manually reflect betting_market_group_object to variant to properly reflect "state"
    void to_variant(const graphene::chain::betting_market_group_object& betting_market_group_obj, fc::variant& v, uint32_t max_depth)
    {

libraries/chain/betting_market_object.cpp

@@ -466,7 +466,7 @@ void betting_market_object::on_canceled_event(database& db)
 
 } } // graphene::chain
 
-namespace fc {
+namespace fc { 
    // Manually reflect betting_market_object to variant to properly reflect "state"
    void to_variant(const graphene::chain::betting_market_object& event_obj, fc::variant& v, uint32_t max_depth)
    {
@@ -493,3 +493,4 @@ namespace fc {
       const_cast<int*>(event_obj.my->state_machine.current_state())[0] = (int)status;
    }
 } //end namespace fc
+

libraries/chain/block_database.cpp

@@ -76,10 +76,6 @@ void block_database::flush()
 
 void block_database::store( const block_id_type& _id, const signed_block& b )
 {
-   if (true == replay_mode){
-       return;
-   }
-
    block_id_type id = _id;
    if( id == block_id_type() )
    {
@@ -103,15 +99,8 @@ void block_database::remove( const block_id_type& id )
    index_entry e;
    auto index_pos = sizeof(e)*block_header::num_from_id(id);
    _block_num_to_pos.seekg( 0, _block_num_to_pos.end );
-
-   std::streampos s_pos = _block_num_to_pos.tellg();
-   if (-1 == s_pos){ 
-      FC_THROW_EXCEPTION(fc::key_not_found_exception, "Block ${id} not contained in block database, _block_num_to_pos.tellg failed", ("id", id));
-   }
-
-   if ( static_cast<uint32_t>(s_pos) <= index_pos ){
+   if ( _block_num_to_pos.tellg() <= index_pos )
       FC_THROW_EXCEPTION(fc::key_not_found_exception, "Block ${id} not contained in block database", ("id", id));
-   }
 
    _block_num_to_pos.seekg( index_pos );
    _block_num_to_pos.read( (char*)&e, sizeof(e) );
@@ -125,27 +114,20 @@ void block_database::remove( const block_id_type& id )
 } FC_CAPTURE_AND_RETHROW( (id) ) }
 
 bool block_database::contains( const block_id_type& id )const
-{ try {
+{
    if( id == block_id_type() )
       return false;
 
    index_entry e;
    auto index_pos = sizeof(e)*block_header::num_from_id(id);
    _block_num_to_pos.seekg( 0, _block_num_to_pos.end );
-
-   std::streampos s_pos = _block_num_to_pos.tellg();
-   if (-1 == s_pos){
-      FC_THROW_EXCEPTION(fc::key_not_found_exception, "Block ${id} not contained in block database, _block_num_to_pos.tellg failed", ("id", id));
-   }
-
-   if ( static_cast<uint32_t>(s_pos) < index_pos + sizeof(e) )
+   if ( _block_num_to_pos.tellg() < index_pos + sizeof(e) )
       return false;
-
    _block_num_to_pos.seekg( index_pos );
    _block_num_to_pos.read( (char*)&e, sizeof(e) );
 
    return e.block_id == id && e.block_size > 0;
-} FC_CAPTURE_AND_RETHROW( (id) ) }
+}
 
 block_id_type block_database::fetch_block_id( uint32_t block_num )const
 {
@@ -170,13 +152,7 @@ optional<signed_block> block_database::fetch_optional( const block_id_type& id )
       index_entry e;
       auto index_pos = sizeof(e)*block_header::num_from_id(id);
       _block_num_to_pos.seekg( 0, _block_num_to_pos.end );
-      std::streampos s_pos = _block_num_to_pos.tellg();
-
-      if (-1 == s_pos){
-         FC_THROW_EXCEPTION(fc::key_not_found_exception, "Block ${id} not contained in block database, _block_num_to_pos.tellg failed", ("id", id));
-      }
-
-      if ( static_cast<uint32_t>(s_pos) <= index_pos )
+      if ( _block_num_to_pos.tellg() <= index_pos )
          return {};
 
       _block_num_to_pos.seekg( index_pos );
@@ -208,12 +184,7 @@ optional<signed_block> block_database::fetch_by_number( uint32_t block_num )cons
       index_entry e;
       auto index_pos = sizeof(e)*block_num;
       _block_num_to_pos.seekg( 0, _block_num_to_pos.end );
-      std::streampos s_pos = _block_num_to_pos.tellg();
-      if (-1 == s_pos){
-         FC_THROW_EXCEPTION(fc::key_not_found_exception, "Block ${block_num} not contained in block database, _block_num_to_pos.tellg failed", ("block_num", block_num));
-      }
-
-      if ( static_cast<uint32_t>(s_pos) <= index_pos )
+      if ( _block_num_to_pos.tellg() <= index_pos )
          return {};
 
       _block_num_to_pos.seekg( index_pos, _block_num_to_pos.beg );
@@ -242,11 +213,7 @@ optional<index_entry> block_database::last_index_entry()const {
 
       _block_num_to_pos.seekg( 0, _block_num_to_pos.end );
       std::streampos pos = _block_num_to_pos.tellg();
-      if (-1 == pos){
-         FC_THROW_EXCEPTION(fc::key_not_found_exception, "last_index_entry tellg failed");
-      }
-
-      if( static_cast<size_t>(pos) < sizeof(index_entry) )
+      if( pos < sizeof(index_entry) )
          return optional<index_entry>();
 
       pos -= pos % sizeof(index_entry);
@@ -259,7 +226,7 @@ optional<index_entry> block_database::last_index_entry()const {
          _block_num_to_pos.seekg( pos );
          _block_num_to_pos.read( (char*)&e, sizeof(e) );
          if( _block_num_to_pos.gcount() == sizeof(e) && e.block_size > 0
-                && e.block_pos + static_cast<uint64_t>(e.block_size) <= static_cast<uint64_t>(blocks_size) )
+                && e.block_pos + e.block_size <= blocks_size )
             try
             {
                vector<char> data( e.block_size );
@@ -304,9 +271,4 @@ optional<block_id_type> block_database::last_id()const
    return optional<block_id_type>();
 }
 
-void block_database::set_replay_mode(bool mode)
-{
-   replay_mode = mode;
-}
-
 } }

libraries/chain/confidential_evaluator.cpp

@@ -33,163 +33,149 @@ namespace graphene { namespace chain {
 
 void_result transfer_to_blind_evaluator::do_evaluate( const transfer_to_blind_operation& o )
 { try {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME )
-  {
-     const auto& atype = o.amount.asset_id(d);
-     FC_ASSERT( atype.allow_confidential() );
-     FC_ASSERT( !atype.is_transfer_restricted() );
-     FC_ASSERT( !(atype.options.flags & white_list) );
+   const auto& d = db();
 
-     for( const auto& out : o.outputs )
-     {
-        for( const auto& a : out.owner.account_auths )
-           a.first(d); // verify all accounts exist and are valid
-     }
-  }
+   const auto& atype = o.amount.asset_id(db()); 
+   FC_ASSERT( atype.allow_confidential() );
+   FC_ASSERT( !atype.is_transfer_restricted() );
+   FC_ASSERT( !(atype.options.flags & white_list) );
 
-  return void_result();
+   for( const auto& out : o.outputs )
+   {
+      for( const auto& a : out.owner.account_auths )
+         a.first(d); // verify all accounts exist and are valid
+   }
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
 
-void_result transfer_to_blind_evaluator::do_apply( const transfer_to_blind_operation& o )
+void_result transfer_to_blind_evaluator::do_apply( const transfer_to_blind_operation& o ) 
 { try {
-  if( db().head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     db().adjust_balance(o.from, -o.amount);
+   db().adjust_balance( o.from, -o.amount ); 
 
-     const auto &add = o.amount.asset_id(db()).dynamic_asset_data_id(db()); // verify fee is a legit asset
-     db().modify(add, [&](asset_dynamic_data_object &obj) {
-        obj.confidential_supply += o.amount.amount;
-        FC_ASSERT(obj.confidential_supply >= 0);
-     });
-     for (const auto &out : o.outputs) {
-        db().create<blinded_balance_object>([&](blinded_balance_object &obj) {
-           obj.asset_id = o.amount.asset_id;
-           obj.owner = out.owner;
-           obj.commitment = out.commitment;
-        });
-     }
-  }
-  return void_result();
+   const auto& add = o.amount.asset_id(db()).dynamic_asset_data_id(db());  // verify fee is a legit asset 
+   db().modify( add, [&]( asset_dynamic_data_object& obj ){
+      obj.confidential_supply += o.amount.amount;
+      FC_ASSERT( obj.confidential_supply >= 0 );
+   });
+   for( const auto& out : o.outputs )
+   {
+      db().create<blinded_balance_object>( [&]( blinded_balance_object& obj ){
+          obj.asset_id   = o.amount.asset_id;
+          obj.owner      = out.owner;
+          obj.commitment = out.commitment;
+      });
+   }
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
 void transfer_to_blind_evaluator::pay_fee()
 {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     if (d.head_block_time() >= HARDFORK_563_TIME)
-        pay_fba_fee(fba_accumulator_id_transfer_to_blind);
-     else
-        generic_evaluator::pay_fee();
-  }
+   if( db().head_block_time() >= HARDFORK_563_TIME )
+      pay_fba_fee( fba_accumulator_id_transfer_to_blind );
+   else
+      generic_evaluator::pay_fee();
 }
 
 void_result transfer_from_blind_evaluator::do_evaluate( const transfer_from_blind_operation& o )
 { try {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     o.fee.asset_id(d); // verify fee is a legit asset
-     const auto &bbi = d.get_index_type<blinded_balance_index>();
-     const auto &cidx = bbi.indices().get<by_commitment>();
-     for (const auto &in : o.inputs) {
-        auto itr = cidx.find(in.commitment);
-        FC_ASSERT(itr != cidx.end());
-        FC_ASSERT(itr->asset_id == o.fee.asset_id);
-        FC_ASSERT(itr->owner == in.owner);
-     }
-  }
-  return void_result();
+   const auto& d = db();
+   o.fee.asset_id(d);  // verify fee is a legit asset 
+   const auto& bbi = d.get_index_type<blinded_balance_index>();
+   const auto& cidx = bbi.indices().get<by_commitment>();
+   for( const auto& in : o.inputs )
+   {
+      auto itr = cidx.find( in.commitment );
+      FC_ASSERT( itr != cidx.end() );
+      FC_ASSERT( itr->asset_id == o.fee.asset_id );
+      FC_ASSERT( itr->owner == in.owner );
+   }
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
-void_result transfer_from_blind_evaluator::do_apply( const transfer_from_blind_operation& o )
+void_result transfer_from_blind_evaluator::do_apply( const transfer_from_blind_operation& o ) 
 { try {
-  if( db().head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     db().adjust_balance(o.fee_payer(), o.fee);
-     db().adjust_balance(o.to, o.amount);
-     const auto &bbi = db().get_index_type<blinded_balance_index>();
-     const auto &cidx = bbi.indices().get<by_commitment>();
-     for (const auto &in : o.inputs) {
-        auto itr = cidx.find(in.commitment);
-        FC_ASSERT(itr != cidx.end());
-        db().remove(*itr);
-     }
-     const auto &add = o.amount.asset_id(db()).dynamic_asset_data_id(db()); // verify fee is a legit asset
-     db().modify(add, [&](asset_dynamic_data_object &obj) {
-        obj.confidential_supply -= o.amount.amount + o.fee.amount;
-        FC_ASSERT(obj.confidential_supply >= 0);
-     });
-  }
-  return void_result();
+   db().adjust_balance( o.fee_payer(), o.fee ); 
+   db().adjust_balance( o.to, o.amount ); 
+   const auto& bbi = db().get_index_type<blinded_balance_index>();
+   const auto& cidx = bbi.indices().get<by_commitment>();
+   for( const auto& in : o.inputs )
+   {
+      auto itr = cidx.find( in.commitment );
+      FC_ASSERT( itr != cidx.end() );
+      db().remove( *itr );
+   }
+   const auto& add = o.amount.asset_id(db()).dynamic_asset_data_id(db());  // verify fee is a legit asset 
+   db().modify( add, [&]( asset_dynamic_data_object& obj ){
+      obj.confidential_supply -= o.amount.amount + o.fee.amount;
+      FC_ASSERT( obj.confidential_supply >= 0 );
+   });
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
 void transfer_from_blind_evaluator::pay_fee()
 {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     if (d.head_block_time() >= HARDFORK_563_TIME)
-        pay_fba_fee(fba_accumulator_id_transfer_from_blind);
-     else
-        generic_evaluator::pay_fee();
-  }
+   if( db().head_block_time() >= HARDFORK_563_TIME )
+      pay_fba_fee( fba_accumulator_id_transfer_from_blind );
+   else
+      generic_evaluator::pay_fee();
 }
 
 void_result blind_transfer_evaluator::do_evaluate( const blind_transfer_operation& o )
 { try {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     o.fee.asset_id(d); // verify fee is a legit asset
-     const auto &bbi = d.get_index_type<blinded_balance_index>();
-     const auto &cidx = bbi.indices().get<by_commitment>();
-     for (const auto &out : o.outputs) {
-        for (const auto &a : out.owner.account_auths)
-           a.first(d); // verify all accounts exist and are valid
-     }
-     for (const auto &in : o.inputs) {
-        auto itr = cidx.find(in.commitment);
-        GRAPHENE_ASSERT(itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment", in.commitment));
-        FC_ASSERT(itr->asset_id == o.fee.asset_id);
-        FC_ASSERT(itr->owner == in.owner);
-     }
-  }
-  return void_result();
+   const auto& d = db();
+   o.fee.asset_id(db());  // verify fee is a legit asset 
+   const auto& bbi = db().get_index_type<blinded_balance_index>();
+   const auto& cidx = bbi.indices().get<by_commitment>();
+   for( const auto& out : o.outputs )
+   {
+      for( const auto& a : out.owner.account_auths )
+         a.first(d); // verify all accounts exist and are valid
+   }
+   for( const auto& in : o.inputs )
+   {
+      auto itr = cidx.find( in.commitment );
+      GRAPHENE_ASSERT( itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment",in.commitment) );
+      FC_ASSERT( itr->asset_id == o.fee.asset_id );
+      FC_ASSERT( itr->owner == in.owner );
+   }
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
-void_result blind_transfer_evaluator::do_apply( const blind_transfer_operation& o )
+void_result blind_transfer_evaluator::do_apply( const blind_transfer_operation& o ) 
 { try {
-  if( db().head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     db().adjust_balance(o.fee_payer(), o.fee); // deposit the fee to the temp account
-     const auto &bbi = db().get_index_type<blinded_balance_index>();
-     const auto &cidx = bbi.indices().get<by_commitment>();
-     for (const auto &in : o.inputs) {
-        auto itr = cidx.find(in.commitment);
-        GRAPHENE_ASSERT(itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment", in.commitment));
-        db().remove(*itr);
-     }
-     for (const auto &out : o.outputs) {
-        db().create<blinded_balance_object>([&](blinded_balance_object &obj) {
-           obj.asset_id = o.fee.asset_id;
-           obj.owner = out.owner;
-           obj.commitment = out.commitment;
-        });
-     }
-     const auto &add = o.fee.asset_id(db()).dynamic_asset_data_id(db());
-     db().modify(add, [&](asset_dynamic_data_object &obj) {
-        obj.confidential_supply -= o.fee.amount;
-        FC_ASSERT(obj.confidential_supply >= 0);
-     });
-  }
-  return void_result();
+   db().adjust_balance( o.fee_payer(), o.fee ); // deposit the fee to the temp account
+   const auto& bbi = db().get_index_type<blinded_balance_index>();
+   const auto& cidx = bbi.indices().get<by_commitment>();
+   for( const auto& in : o.inputs )
+   {
+      auto itr = cidx.find( in.commitment );
+      GRAPHENE_ASSERT( itr != cidx.end(), blind_transfer_unknown_commitment, "", ("commitment",in.commitment) );
+      db().remove( *itr );
+   }
+   for( const auto& out : o.outputs )
+   {
+      db().create<blinded_balance_object>( [&]( blinded_balance_object& obj ){
+          obj.asset_id   = o.fee.asset_id;
+          obj.owner      = out.owner;
+          obj.commitment = out.commitment;
+      });
+   }
+   const auto& add = o.fee.asset_id(db()).dynamic_asset_data_id(db());  
+   db().modify( add, [&]( asset_dynamic_data_object& obj ){
+      obj.confidential_supply -= o.fee.amount;
+      FC_ASSERT( obj.confidential_supply >= 0 );
+   });
+
+   return void_result();
 } FC_CAPTURE_AND_RETHROW( (o) ) }
 
 void blind_transfer_evaluator::pay_fee()
 {
-  const auto& d = db();
-  if( d.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-     if (d.head_block_time() >= HARDFORK_563_TIME)
-        pay_fba_fee(fba_accumulator_id_blind_transfer);
-     else
-        generic_evaluator::pay_fee();
-  }
+   if( db().head_block_time() >= HARDFORK_563_TIME )
+      pay_fba_fee( fba_accumulator_id_blind_transfer );
+   else
+      generic_evaluator::pay_fee();
 }
 
 } } // graphene::chain

libraries/chain/db_block.cpp

@@ -40,10 +40,8 @@
 #include <graphene/chain/exceptions.hpp>
 #include <graphene/chain/evaluator.hpp>
 #include <graphene/chain/witness_schedule_object.hpp>
-#include <graphene/db/object_database.hpp>
 #include <fc/crypto/digest.hpp>
 
-#include <boost/filesystem.hpp>
 
 namespace {
 
@@ -162,13 +160,10 @@ void database::check_transaction_for_duplicated_operations(const signed_transact
       existed_operations_digests.insert( proposed_operations_digests.begin(), proposed_operations_digests.end() );
    });
 
+   for (auto& pending_transaction: _pending_tx)
    {
-      const std::lock_guard<std::mutex> pending_tx_lock{_pending_tx_mutex};
-      for (auto &pending_transaction : _pending_tx)
-      {
-         auto proposed_operations_digests = gather_proposed_operations_digests(pending_transaction);
-         existed_operations_digests.insert(proposed_operations_digests.begin(), proposed_operations_digests.end());
-      }
+      auto proposed_operations_digests = gather_proposed_operations_digests(pending_transaction);
+      existed_operations_digests.insert(proposed_operations_digests.begin(), proposed_operations_digests.end());
    }
 
    auto proposed_operations_digests = gather_proposed_operations_digests(trx);
@@ -190,12 +185,7 @@ bool database::push_block(const signed_block& new_block, uint32_t skip)
    bool result;
    detail::with_skip_flags( *this, skip, [&]()
    {
-      std::vector<processed_transaction> pending_tx = [this] {
-         const std::lock_guard<std::mutex> pending_tx_lock{_pending_tx_mutex};
-         return std::move(_pending_tx);
-      }();
-
-      detail::without_pending_transactions( *this, std::move(pending_tx),
+      detail::without_pending_transactions( *this, std::move(_pending_tx),
       [&]()
       {
          result = _push_block(new_block);
@@ -206,9 +196,6 @@ bool database::push_block(const signed_block& new_block, uint32_t skip)
 
 bool database::_push_block(const signed_block& new_block)
 { try {
-   boost::filesystem::space_info si = boost::filesystem::space(get_data_dir());
-   FC_ASSERT((si.available) > 104857600, "Rejecting block due to low disk space"); // 104857600 bytes = 100 MB
-
    uint32_t skip = get_node_properties().skip_flags;
    const auto now = fc::time_point::now().sec_since_epoch();
 
@@ -395,26 +382,17 @@ processed_transaction database::_push_transaction( const signed_transaction& trx
 {
    // If this is the first transaction pushed after applying a block, start a new undo session.
    // This allows us to quickly rewind to the clean state of the head block, in case a new block arrives.
-   {
-      const std::lock_guard<std::mutex> pending_tx_session_lock{_pending_tx_session_mutex};
-      if (!_pending_tx_session.valid()) {
-         const std::lock_guard<std::mutex> undo_db_lock{_undo_db_mutex};
-         _pending_tx_session = _undo_db.start_undo_session();
-      }
-   }
+   if( !_pending_tx_session.valid() )
+      _pending_tx_session = _undo_db.start_undo_session();
 
    // Create a temporary undo session as a child of _pending_tx_session.
    // The temporary session will be discarded by the destructor if
    // _apply_transaction fails.  If we make it to merge(), we
    // apply the changes.
 
-   const std::lock_guard<std::mutex> undo_db_lock{_undo_db_mutex};
    auto temp_session = _undo_db.start_undo_session();
-   auto processed_trx = _apply_transaction(trx);
-   {
-      const std::lock_guard<std::mutex> pending_tx_lock{_pending_tx_mutex};
-      _pending_tx.push_back(processed_trx);
-   }
+   auto processed_trx = _apply_transaction( trx );
+   _pending_tx.push_back(processed_trx);
 
    // notify_changed_objects();
    // The transaction applied successfully. Merge its changes into the pending block session.
@@ -427,7 +405,6 @@ processed_transaction database::_push_transaction( const signed_transaction& trx
 
 processed_transaction database::validate_transaction( const signed_transaction& trx )
 {
-   const std::lock_guard<std::mutex> undo_db_lock{_undo_db_mutex};
    auto session = _undo_db.start_undo_session();
    return _apply_transaction( trx );
 }
@@ -456,12 +433,7 @@ processed_transaction database::push_proposal(const proposal_object& proposal)
       {
          for( size_t i=old_applied_ops_size,n=_applied_ops.size(); i<n; i++ )
          {
-            if(_applied_ops[i].valid()) {
-               ilog("removing failed operation from applied_ops: ${op}", ("op", *(_applied_ops[i])));
-            }
-            else{
-               ilog("Can't remove failed operation from applied_ops (operation is not valid), op_id : ${op_id}", ("op_id", i));
-            }
+            ilog( "removing failed operation from applied_ops: ${op}", ("op", *(_applied_ops[i])) );
             _applied_ops[i].reset();
          }
       }
@@ -527,52 +499,47 @@ signed_block database::_generate_block(
    // the value of the "when" variable is known, which means we need to
    // re-apply pending transactions in this method.
    //
-   {
-      const std::lock_guard<std::mutex> pending_tx_session_lock{_pending_tx_session_mutex};
-      _pending_tx_session.reset();
-      _pending_tx_session = _undo_db.start_undo_session();
-   }
+   _pending_tx_session.reset();
+   _pending_tx_session = _undo_db.start_undo_session();
 
    uint64_t postponed_tx_count = 0;
    // pop pending state (reset to head block state)
+   for( const processed_transaction& tx : _pending_tx )
    {
-      const std::lock_guard<std::mutex> pending_tx_lock{_pending_tx_mutex};
-      for (const processed_transaction &tx : _pending_tx) {
-         size_t new_total_size = total_block_size + fc::raw::pack_size(tx);
+      size_t new_total_size = total_block_size + fc::raw::pack_size( tx );
 
-         // postpone transaction if it would make block too big
-         if (new_total_size >= maximum_block_size) {
-            postponed_tx_count++;
-            continue;
-         }
+      // postpone transaction if it would make block too big
+      if( new_total_size >= maximum_block_size )
+      {
+         postponed_tx_count++;
+         continue;
+      }
 
-         try {
-            auto temp_session = _undo_db.start_undo_session();
-            processed_transaction ptx = _apply_transaction(tx);
-            temp_session.merge();
+      try
+      {
+         auto temp_session = _undo_db.start_undo_session();
+         processed_transaction ptx = _apply_transaction( tx );
+         temp_session.merge();
 
-            // We have to recompute pack_size(ptx) because it may be different
-            // than pack_size(tx) (i.e. if one or more results increased
-            // their size)
-            total_block_size += fc::raw::pack_size(ptx);
-            pending_block.transactions.push_back(ptx);
-         } catch (const fc::exception &e) {
-            // Do nothing, transaction will not be re-applied
-            wlog("Transaction was not processed while generating block due to ${e}", ("e", e));
-            wlog("The transaction was ${t}", ("t", tx));
-         }
+         // We have to recompute pack_size(ptx) because it may be different
+         // than pack_size(tx) (i.e. if one or more results increased
+         // their size)
+         total_block_size += fc::raw::pack_size( ptx );
+         pending_block.transactions.push_back( ptx );
+      }
+      catch ( const fc::exception& e )
+      {
+         // Do nothing, transaction will not be re-applied
+         wlog( "Transaction was not processed while generating block due to ${e}", ("e", e) );
+         wlog( "The transaction was ${t}", ("t", tx) );
       }
    }
-
    if( postponed_tx_count > 0 )
    {
       wlog( "Postponed ${n} transactions due to block size limit", ("n", postponed_tx_count) );
    }
 
-   {
-      const std::lock_guard<std::mutex> pending_tx_session_lock{_pending_tx_session_mutex};
-      _pending_tx_session.reset();
-   }
+   _pending_tx_session.reset();
 
    // We have temporarily broken the invariant that
    // _pending_tx_session is the result of applying _pending_tx, as
@@ -620,11 +587,7 @@ signed_block database::_generate_block(
  */
 void database::pop_block()
 { try {
-   {
-      const std::lock_guard<std::mutex> pending_tx_session_lock{_pending_tx_session_mutex};
-      _pending_tx_session.reset();
-   }
-
+   _pending_tx_session.reset();
    auto head_id = head_block_id();
    optional<signed_block> head_block = fetch_block_by_id( head_id );
    GRAPHENE_ASSERT( head_block.valid(), pop_empty_chain, "there are no blocks to pop" );
@@ -638,8 +601,6 @@ void database::pop_block()
 
 void database::clear_pending()
 { try {
-   const std::lock_guard<std::mutex> pending_tx_lock{_pending_tx_mutex};
-   const std::lock_guard<std::mutex> pending_tx_session_lock{_pending_tx_session_mutex};
    assert( (_pending_tx.size() == 0) || _pending_tx_session.valid() );
    _pending_tx.clear();
    _pending_tx_session.reset();
@@ -658,7 +619,7 @@ uint32_t database::push_applied_operation( const operation& op )
 void database::set_applied_operation_result( uint32_t op_id, const operation_result& result )
 {
    assert( op_id < _applied_ops.size() );
-   if( _applied_ops[op_id].valid() )
+   if( _applied_ops[op_id] )
       _applied_ops[op_id]->result = result;
    else
    {
@@ -739,11 +700,8 @@ void database::_apply_block( const signed_block& next_block )
 
    if (global_props.parameters.witness_schedule_algorithm == GRAPHENE_WITNESS_SCHEDULED_ALGORITHM) {
       update_witness_schedule(next_block);
-
-      for(const auto& active_sons : global_props.active_sons) {
-         if(!active_sons.second.empty()) {
-            update_son_schedule(active_sons.first, next_block);
-         }
+      if(global_props.active_sons.size() > 0) {
+         update_son_schedule(next_block);
       }
    }
 
@@ -758,7 +716,7 @@ void database::_apply_block( const signed_block& next_block )
 
    check_ending_lotteries();
    check_ending_nft_lotteries();
-
+   
    create_block_summary(next_block);
    place_delayed_bets(); // must happen after update_global_dynamic_data() updates the time
    clear_expired_transactions();
@@ -776,15 +734,11 @@ void database::_apply_block( const signed_block& next_block )
    // TODO:  figure out if we could collapse this function into
    // update_global_dynamic_data() as perhaps these methods only need
    // to be called for header validation?
-
    update_maintenance_flag( maint_needed );
    if (global_props.parameters.witness_schedule_algorithm == GRAPHENE_WITNESS_SHUFFLED_ALGORITHM) {
       update_witness_schedule();
-
-      for(const auto& active_sidechain_type : active_sidechain_types(dynamic_global_props.time)) {
-         if(global_props.active_sons.at(active_sidechain_type).size() > 0) {
-            update_son_schedule(active_sidechain_type);
-         }
+      if(global_props.active_sons.size() > 0) {
+         update_son_schedule();
       }
    }
 
@@ -852,7 +806,7 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx
          return get_account_custom_authorities(id, op);
       };
       trx.verify_authority( chain_id, get_active, get_owner, get_custom,
-                            true,
+                            MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(head_block_time()),
                             get_global_properties().parameters.max_authority_depth );
    }
 
@@ -873,6 +827,9 @@ processed_transaction database::_apply_transaction(const signed_transaction& trx
       FC_ASSERT( trx.expiration <= now + chain_parameters.maximum_time_until_expiration, "",
                  ("trx.expiration",trx.expiration)("now",now)("max_til_exp",chain_parameters.maximum_time_until_expiration));
       FC_ASSERT( now <= trx.expiration, "", ("now",now)("trx.exp",trx.expiration) );
+      FC_ASSERT( head_block_time() <= HARDFORK_CORE_1573_TIME
+            || trx.get_packed_size() <= chain_parameters.maximum_transaction_size,
+            "Transaction exceeds maximum transaction size." );
    }
 
    //Insert transaction into unique transactions database.

libraries/chain/db_debug.cpp

@@ -43,6 +43,7 @@ void database::debug_dump()
 
    const auto& balance_index = db.get_index_type<account_balance_index>().indices();
    const auto& statistics_index = db.get_index_type<account_stats_index>().indices();
+   const auto& bids = db.get_index_type<collateral_bid_index>().indices();
    map<asset_id_type,share_type> total_balances;
    map<asset_id_type,share_type> total_debts;
    share_type core_in_orders;
@@ -58,6 +59,8 @@ void database::debug_dump()
     //  idump(("statistics")(s));
       reported_core_in_orders += s.total_core_in_orders;
    }
+   for( const collateral_bid_object& b : bids )
+      total_balances[b.inv_swan_price.base.asset_id] += b.inv_swan_price.base.amount;
    for( const limit_order_object& o : db.get_index_type<limit_order_index>().indices() )
    {
  //     idump(("limit_order")(o));

libraries/chain/db_getter.cpp

@@ -222,32 +222,17 @@ std::set<son_id_type> database::get_sons_to_be_deregistered()
 
    for( auto& son : son_idx )
    {
-      bool need_to_be_deregistered = true;
-      for(const auto& status : son.statuses)
+      if(son.status == son_status::in_maintenance)
       {
-         const auto& sidechain = status.first;
-         if(status.second != son_status::in_maintenance)
-            need_to_be_deregistered = false;
-
-         if(need_to_be_deregistered)
+         auto stats = son.statistics(*this);
+         // TODO : We need to add a function that returns if we can deregister SON 
+         // i.e. with introduction of PW code, we have to make a decision if the SON 
+         // is needed for release of funds from the PW
+         if(head_block_time() - stats.last_down_timestamp >= fc::seconds(get_global_properties().parameters.son_deregister_time()))
          {
-            auto stats = son.statistics(*this);
-
-            // TODO : We need to add a function that returns if we can deregister SON
-            // i.e. with introduction of PW code, we have to make a decision if the SON
-            // is needed for release of funds from the PW
-            if(stats.last_active_timestamp.contains(sidechain)) {
-               if (head_block_time() - stats.last_active_timestamp.at(sidechain) < fc::seconds(get_global_properties().parameters.son_deregister_time())) {
-                  need_to_be_deregistered = false;
-               }
-            }
+            ret.insert(son.id);
          }
       }
-
-      if(need_to_be_deregistered)
-      {
-         ret.insert(son.id);
-      }
    }
    return ret;
 }
@@ -304,50 +289,28 @@ bool database::is_son_dereg_valid( son_id_type son_id )
       return false;
    }
 
-   bool status_son_dereg_valid = true;
-   for (const auto &active_sidechain_type : active_sidechain_types(head_block_time())) {
-      if(son->statuses.at(active_sidechain_type) != son_status::in_maintenance)
-         status_son_dereg_valid = false;
-
-      if(status_son_dereg_valid)
-      {
-         if(son->statistics(*this).last_active_timestamp.contains(active_sidechain_type)) {
-            if (head_block_time() - son->statistics(*this).last_active_timestamp.at(active_sidechain_type) < fc::seconds(get_global_properties().parameters.son_deregister_time())) {
-               status_son_dereg_valid = false;
-            }
-         }
-      }
-   }
-
-   return status_son_dereg_valid;
+   return (son->status == son_status::in_maintenance &&
+                (head_block_time() - son->statistics(*this).last_down_timestamp >= fc::seconds(get_global_properties().parameters.son_deregister_time())));
 }
 
-bool database::is_son_active( sidechain_type type, son_id_type son_id )
+bool database::is_son_active( son_id_type son_id )
 {
    const auto& son_idx = get_index_type<son_index>().indices().get< by_id >();
    auto son = son_idx.find( son_id );
-   if(son == son_idx.end()) {
+   if(son == son_idx.end())
+   {
       return false;
    }
 
    const global_property_object& gpo = get_global_properties();
-   if(!gpo.active_sons.contains(type)) {
-      return false;
-   }
-
-   const auto& gpo_as = gpo.active_sons.at(type);
    vector<son_id_type> active_son_ids;
-   active_son_ids.reserve(gpo_as.size());
-   std::transform(gpo_as.cbegin(), gpo_as.cend(),
+   active_son_ids.reserve(gpo.active_sons.size());
+   std::transform(gpo.active_sons.begin(), gpo.active_sons.end(),
                   std::inserter(active_son_ids, active_son_ids.end()),
-                  [](const son_sidechain_info& swi) {
+                  [](const son_info& swi) {
       return swi.son_id;
    });
 
-   if(active_son_ids.empty()) {
-      return false;
-   }
-
    auto it_son = std::find(active_son_ids.begin(), active_son_ids.end(), son_id);
    return (it_son != active_son_ids.end());
 }
@@ -384,16 +347,4 @@ vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum
    return v;
 }
 
-bool database::is_asset_creation_allowed(const string &symbol)
-{
-   if (symbol == "BTC")
-   {
-      if (head_block_time() < HARDFORK_SON_TIME)
-         return false;
-   }
-   return true;
-}
-
-}
-
-}
+} }

libraries/chain/db_init.cpp

@@ -327,56 +327,13 @@ void database::initialize_evaluators()
    register_evaluator<sidechain_transaction_send_evaluator>();
    register_evaluator<sidechain_transaction_settle_evaluator>();
    register_evaluator<random_number_store_evaluator>();
-}
-
-
-void database::initialize_hardforks()
-{
-  _hardfork_times.emplace_back(HARDFORK_357_TIME);
-  _hardfork_times.emplace_back(HARDFORK_359_TIME);
-  _hardfork_times.emplace_back(HARDFORK_385_TIME);
-  _hardfork_times.emplace_back(HARDFORK_409_TIME);
-  _hardfork_times.emplace_back(HARDFORK_413_TIME);
-  _hardfork_times.emplace_back(HARDFORK_415_TIME);
-  _hardfork_times.emplace_back(HARDFORK_416_TIME);
-  _hardfork_times.emplace_back(HARDFORK_419_TIME);
-  _hardfork_times.emplace_back(HARDFORK_436_TIME);
-  _hardfork_times.emplace_back(HARDFORK_445_TIME);
-  _hardfork_times.emplace_back(HARDFORK_453_TIME);
-  _hardfork_times.emplace_back(HARDFORK_480_TIME);
-  _hardfork_times.emplace_back(HARDFORK_483_TIME);
-  _hardfork_times.emplace_back(HARDFORK_516_TIME);
-  _hardfork_times.emplace_back(HARDFORK_533_TIME);
-  _hardfork_times.emplace_back(HARDFORK_538_TIME);
-  _hardfork_times.emplace_back(HARDFORK_555_TIME);
-  _hardfork_times.emplace_back(HARDFORK_563_TIME);
-  _hardfork_times.emplace_back(HARDFORK_572_TIME);
-  _hardfork_times.emplace_back(HARDFORK_599_TIME);
-  _hardfork_times.emplace_back(HARDFORK_607_TIME);
-  _hardfork_times.emplace_back(HARDFORK_613_TIME);
-  _hardfork_times.emplace_back(HARDFORK_615_TIME);
-  _hardfork_times.emplace_back(HARDFORK_999_TIME);
-  _hardfork_times.emplace_back(HARDFORK_1000_TIME);
-  _hardfork_times.emplace_back(HARDFORK_1001_TIME);
-  _hardfork_times.emplace_back(HARDFORK_5050_1_TIME);
-  _hardfork_times.emplace_back(HARDFORK_CORE_429_TIME);
-  _hardfork_times.emplace_back(HARDFORK_GPOS_TIME);
-  _hardfork_times.emplace_back(HARDFORK_NFT_TIME);
-  _hardfork_times.emplace_back(HARDFORK_SON_FOR_HIVE_TIME);
-  _hardfork_times.emplace_back(HARDFORK_SON_TIME);
-  _hardfork_times.emplace_back(HARDFORK_SON2_TIME);
-  _hardfork_times.emplace_back(HARDFORK_SON_FOR_ETHEREUM_TIME);
-  _hardfork_times.emplace_back(HARDFORK_SWEEPS_TIME);
-
-  std::sort(_hardfork_times.begin(), _hardfork_times.end());
+   register_evaluator<bid_collateral_evaluator>();
 }
 
 void database::initialize_indexes()
 {
    reset_indexes();
-
-   const std::lock_guard<std::mutex> undo_db_lock{_undo_db_mutex};
-   _undo_db.set_max_size(GRAPHENE_MIN_UNDO_HISTORY);
+   _undo_db.set_max_size( GRAPHENE_MIN_UNDO_HISTORY );
 
    //Protocol object indexes
    add_index< primary_index<asset_index, 13> >(); // 8192 assets per chunk
@@ -463,6 +420,7 @@ void database::initialize_indexes()
    add_index< primary_index<nft_lottery_balance_index                     > >();
    add_index< primary_index<son_stats_index                               > >();
    add_index< primary_index<random_number_index                           > >();
+   add_index< primary_index<collateral_bid_index                          > >();
 
 }
 
@@ -476,9 +434,7 @@ void database::init_genesis(const genesis_state_type& genesis_state)
    FC_ASSERT(genesis_state.initial_active_witnesses <= genesis_state.initial_witness_candidates.size(),
              "initial_active_witnesses is larger than the number of candidate witnesses.");
 
-   const std::lock_guard<std::mutex> undo_db_lock{_undo_db_mutex};
    _undo_db.disable();
-
    struct auth_inhibitor {
       auth_inhibitor(database& db) : db(db), old_flags(db.node_properties().skip_flags)
       { db.node_properties().skip_flags |= skip_authority_check; }
@@ -1104,9 +1060,8 @@ void database::init_genesis(const genesis_state_type& genesis_state)
    FC_ASSERT( _p_witness_schedule_obj->id == witness_schedule_id_type() );
 
       // Initialize witness schedule
-
 #ifndef NDEBUG
-   const son_schedule_object& ssobitcoin =
+   const son_schedule_object& sso =
 #endif
    create<son_schedule_object>([&](son_schedule_object& _sso)
    {
@@ -1115,64 +1070,24 @@ void database::init_genesis(const genesis_state_type& genesis_state)
 
       witness_scheduler_rng rng(_sso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV);
 
-      auto init_bitcoin_sons = get_global_properties().active_sons.at(sidechain_type::bitcoin);
+      auto init_witnesses = get_global_properties().active_witnesses;
 
       _sso.scheduler = son_scheduler();
-      _sso.scheduler._min_token_count = std::max(int(init_bitcoin_sons.size()) / 2, 1);
+      _sso.scheduler._min_token_count = std::max(int(init_witnesses.size()) / 2, 1);
+
 
       _sso.last_scheduling_block = 0;
 
       _sso.recent_slots_filled = fc::uint128::max_value();
    });
-   assert( ssobitcoin.id == son_schedule_id_type(get_son_schedule_id(sidechain_type::bitcoin)) );
-
-#ifndef NDEBUG
-   const son_schedule_object& ssoethereum =
-#endif
-   create<son_schedule_object>([&](son_schedule_object& _sso)
-   {
-      // for scheduled
-      memset(_sso.rng_seed.begin(), 0, _sso.rng_seed.size());
-
-      witness_scheduler_rng rng(_sso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV);
-
-      auto init_ethereum_sons = get_global_properties().active_sons.at(sidechain_type::ethereum);
-
-      _sso.scheduler = son_scheduler();
-      _sso.scheduler._min_token_count = std::max(int(init_ethereum_sons.size()) / 2, 1);
-
-      _sso.last_scheduling_block = 0;
-
-      _sso.recent_slots_filled = fc::uint128::max_value();
-   });
-   assert( ssoethereum.id == son_schedule_id_type(get_son_schedule_id(sidechain_type::ethereum)) );
-
-#ifndef NDEBUG
-   const son_schedule_object& ssohive =
-#endif
-   create<son_schedule_object>([&](son_schedule_object& _sso)
-   {
-      // for scheduled
-      memset(_sso.rng_seed.begin(), 0, _sso.rng_seed.size());
-
-      witness_scheduler_rng rng(_sso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV);
-
-      auto init_hive_sons = get_global_properties().active_sons.at(sidechain_type::hive);
-
-      _sso.scheduler = son_scheduler();
-      _sso.scheduler._min_token_count = std::max(int(init_hive_sons.size()) / 2, 1);
-
-      _sso.last_scheduling_block = 0;
-
-      _sso.recent_slots_filled = fc::uint128::max_value();
-   });
-   assert( ssohive.id == son_schedule_id_type(get_son_schedule_id(sidechain_type::hive)) );
+   assert( sso.id == son_schedule_id_type() );
 
    // Enable fees
    modify(get_global_properties(), [&genesis_state](global_property_object& p) {
       p.parameters.current_fees = genesis_state.initial_parameters.current_fees;
    });
 
+
    // Create FBA counters
    create<fba_accumulator_object>([&]( fba_accumulator_object& acc )
    {

libraries/chain/db_management.cpp

@@ -44,7 +44,6 @@ database::database() :
 {
    initialize_indexes();
    initialize_evaluators();
-   initialize_hardforks();
 }
 
 database::~database()
@@ -124,7 +123,7 @@ void database::reindex( fc::path data_dir )
    }
    for( uint32_t i = head_block_num() + 1; i <= last_block_num; ++i )
    {
-      if( i % 1000000 == 0 )
+      if( i % 10000 == 0 )
       {
          ilog( "Writing database to disk at block ${i}", ("i",i) );
          flush();
@@ -233,12 +232,7 @@ void database::open(
          FC_ASSERT( *last_block >= head_block_id(),
                     "last block ID does not match current chain state",
                     ("last_block->id", last_block)("head_block_id",head_block_num()) );
-
-         _block_id_to_block.set_replay_mode(true);
-
          reindex( data_dir );
-
-         _block_id_to_block.set_replay_mode(false);
       }
       _opened = true;
    }

libraries/chain/db_notify.cpp

@@ -203,10 +203,27 @@ struct get_impacted_account_visitor
       _impacted.insert( op.issuer );
    }
 
-   //! We don't use this operations
-   void operator()( const transfer_to_blind_operation& op ){}
-   void operator()( const blind_transfer_operation& op ){}
-   void operator()( const transfer_from_blind_operation& op ){}
+   void operator()( const transfer_to_blind_operation& op )
+   {
+      _impacted.insert( op.from );
+      for( const auto& out : op.outputs )
+         add_authority_accounts( _impacted, out.owner );
+   }
+
+   void operator()( const blind_transfer_operation& op )
+   {
+      for( const auto& in : op.inputs )
+         add_authority_accounts( _impacted, in.owner );
+      for( const auto& out : op.outputs )
+         add_authority_accounts( _impacted, out.owner );
+   }
+
+   void operator()( const transfer_from_blind_operation& op )
+   {
+      _impacted.insert( op.to );
+      for( const auto& in : op.inputs )
+         add_authority_accounts( _impacted, in.owner );
+   }
 
    void operator()( const asset_settle_cancel_operation& op )
    {
@@ -414,6 +431,12 @@ struct get_impacted_account_visitor
    void operator()( const random_number_store_operation& op ) {
       _impacted.insert( op.account );
    }
+   void operator()( const bid_collateral_operation& op ) {
+      _impacted.insert( op.bidder );
+   }
+   void operator()( const execute_bid_operation& op ) {
+      _impacted.insert( op.bidder );
+   }
 };
 
 void graphene::chain::operation_get_impacted_accounts( const operation& op, flat_set<account_id_type>& result, bool ignore_custom_operation_required_auths ) {
@@ -608,6 +631,7 @@ void database::notify_changed_objects()
    if( _undo_db.enabled() ) 
    {
       const auto& head_undo = _undo_db.head();
+      auto chain_time = head_block_time();
 
       // New
       if( !new_objects.empty() )
@@ -619,7 +643,8 @@ void database::notify_changed_objects()
           new_ids.push_back(item);
           auto obj = find_object(item);
           if(obj != nullptr)
-            get_relevant_accounts(obj, new_accounts_impacted, true);
+            get_relevant_accounts(obj, new_accounts_impacted,
+                                  MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(chain_time));
         }
 
         GRAPHENE_TRY_NOTIFY( new_objects, new_ids, new_accounts_impacted)
@@ -633,7 +658,8 @@ void database::notify_changed_objects()
         for( const auto& item : head_undo.old_values )
         {
           changed_ids.push_back(item.first);
-          get_relevant_accounts(item.second.get(), changed_accounts_impacted, true);
+          get_relevant_accounts(item.second.get(), changed_accounts_impacted,
+                                MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(chain_time));
         }
 
         GRAPHENE_TRY_NOTIFY( changed_objects, changed_ids, changed_accounts_impacted)
@@ -650,7 +676,8 @@ void database::notify_changed_objects()
           removed_ids.emplace_back( item.first );
           auto obj = item.second.get();
           removed.emplace_back( obj );
-          get_relevant_accounts(obj, removed_accounts_impacted, true);
+          get_relevant_accounts(obj, removed_accounts_impacted,
+                                MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(chain_time));
         }
 
         GRAPHENE_TRY_NOTIFY( removed_objects, removed_ids, removed, removed_accounts_impacted)

libraries/chain/db_update.cpp

@@ -250,8 +250,40 @@ bool database::check_for_blackswan( const asset_object& mia, bool enable_black_s
     auto settle_price = bitasset.current_feed.settlement_price;
     if( settle_price.is_null() ) return false; // no feed
 
-    const call_order_index& call_index = get_index_type<call_order_index>();
-    const auto& call_price_index = call_index.indices().get<by_price>();
+    const call_order_object* call_ptr = nullptr; // place holder for the call order with least collateral ratio
+
+    asset_id_type debt_asset_id = mia.id;
+    auto call_min = price::min( bitasset.options.short_backing_asset, debt_asset_id );
+
+    auto maint_time = get_dynamic_global_properties().next_maintenance_time;
+    bool before_core_hardfork_1270 = ( maint_time <= HARDFORK_CORE_1270_TIME ); // call price caching issue
+
+    if( before_core_hardfork_1270 ) // before core-1270 hard fork, check with call_price
+    {
+       const auto& call_price_index = get_index_type<call_order_index>().indices().get<by_price>();
+       auto call_itr = call_price_index.lower_bound( call_min );
+       if( call_itr == call_price_index.end() ) // no call order
+          return false;
+       call_ptr = &(*call_itr);
+    }
+    else // after core-1270 hard fork, check with collateralization
+    {
+       const auto& call_collateral_index = get_index_type<call_order_index>().indices().get<by_collateral>();
+       auto call_itr = call_collateral_index.lower_bound( call_min );
+       if( call_itr == call_collateral_index.end() ) // no call order
+          return false;
+       call_ptr = &(*call_itr);
+    }
+    if( call_ptr->debt_type() != debt_asset_id ) // no call order
+       return false;
+
+    price highest = settle_price;
+    if( maint_time > HARDFORK_CORE_1270_TIME )
+       // due to #338, we won't check for black swan on incoming limit order, so need to check with MSSP here
+       highest = bitasset.current_feed.max_short_squeeze_price();
+    else if( maint_time > HARDFORK_CORE_338_TIME )
+       // due to #338, we won't check for black swan on incoming limit order, so need to check with MSSP here
+       highest = bitasset.current_feed.max_short_squeeze_price_before_hf_1270();
 
     const limit_order_index& limit_index = get_index_type<limit_order_index>();
     const auto& limit_price_index = limit_index.indices().get<by_price>();
@@ -261,38 +293,37 @@ bool database::check_for_blackswan( const asset_object& mia, bool enable_black_s
     // stop when limit orders are selling too little USD for too much CORE
     auto lowest_possible_bid  = price::min( mia.id, bitasset.options.short_backing_asset );
 
-    assert( highest_possible_bid.base.asset_id == lowest_possible_bid.base.asset_id );
+    FC_ASSERT( highest_possible_bid.base.asset_id == lowest_possible_bid.base.asset_id );
     // NOTE limit_price_index is sorted from greatest to least
     auto limit_itr = limit_price_index.lower_bound( highest_possible_bid );
     auto limit_end = limit_price_index.upper_bound( lowest_possible_bid );
 
-    auto call_min = price::min( bitasset.options.short_backing_asset, mia.id );
-    auto call_max = price::max( bitasset.options.short_backing_asset, mia.id );
-    auto call_itr = call_price_index.lower_bound( call_min );
-    auto call_end = call_price_index.upper_bound( call_max );
-
-    if( call_itr == call_end ) return false;  // no call orders
-
-    price highest = settle_price;
     if( limit_itr != limit_end ) {
-       assert( settle_price.base.asset_id == limit_itr->sell_price.base.asset_id );
-       highest = std::max( limit_itr->sell_price, settle_price );
+       FC_ASSERT( highest.base.asset_id == limit_itr->sell_price.base.asset_id );
+       highest = std::max( limit_itr->sell_price, highest );
     }
 
-    auto least_collateral = call_itr->collateralization();
+    auto least_collateral = call_ptr->collateralization();
     if( ~least_collateral >= highest  ) 
     {
-       elog( "Black Swan detected: \n"
+       wdump( (*call_ptr) );
+       elog( "Black Swan detected on asset ${symbol} (${id}) at block ${b}: \n"
              "   Least collateralized call: ${lc}  ${~lc}\n"
            //  "   Highest Bid:               ${hb}  ${~hb}\n"
-             "   Settle Price:              ${sp}  ${~sp}\n"
-             "   Max:                       ${h}   ${~h}\n",
+             "   Settle Price:              ${~sp}  ${sp}\n"
+             "   Max:                       ${~h}   ${h}\n",
+            ("id",mia.id)("symbol",mia.symbol)("b",head_block_num())
             ("lc",least_collateral.to_real())("~lc",(~least_collateral).to_real())
           //  ("hb",limit_itr->sell_price.to_real())("~hb",(~limit_itr->sell_price).to_real())
             ("sp",settle_price.to_real())("~sp",(~settle_price).to_real())
             ("h",highest.to_real())("~h",(~highest).to_real()) );
+       edump((enable_black_swan));
        FC_ASSERT( enable_black_swan, "Black swan was detected during a margin update which is not allowed to trigger a blackswan" );
-       globally_settle_asset(mia, ~least_collateral );
+       if( maint_time > HARDFORK_CORE_338_TIME && ~least_collateral <= settle_price )
+          // globol settle at feed price if possible
+          globally_settle_asset(mia, settle_price );
+       else
+          globally_settle_asset(mia, ~least_collateral );
        return true;
     } 
     return false;
@@ -300,33 +331,30 @@ bool database::check_for_blackswan( const asset_object& mia, bool enable_black_s
 
 void database::clear_expired_orders()
 { try {
-   detail::with_skip_flags( *this,
-      get_node_properties().skip_flags | skip_authority_check, [&](){
-         transaction_evaluation_state cancel_context(this);
-
-         //Cancel expired limit orders
-         auto& limit_index = get_index_type<limit_order_index>().indices().get<by_expiration>();
-         while( !limit_index.empty() && limit_index.begin()->expiration <= head_block_time() )
-         {
-            limit_order_cancel_operation canceler;
-            const limit_order_object& order = *limit_index.begin();
-            canceler.fee_paying_account = order.seller;
-            canceler.order = order.id;
-            canceler.fee = current_fee_schedule().calculate_fee( canceler );
-            if( canceler.fee.amount > order.deferred_fee )
-            {
-               // Cap auto-cancel fees at deferred_fee; see #549
-               wlog( "At block ${b}, fee for clearing expired order ${oid} was capped at deferred_fee ${fee}", ("b", head_block_num())("oid", order.id)("fee", order.deferred_fee) );
-               canceler.fee = asset( order.deferred_fee, asset_id_type() );
-            }
-            // we know the fee for this op is set correctly since it is set by the chain.
-            // this allows us to avoid a hung chain:
-            // - if #549 case above triggers
-            // - if the fee is incorrect, which may happen due to #435 (although since cancel is a fixed-fee op, it shouldn't)
-            cancel_context.skip_fee_schedule_check = true;
-            apply_operation(cancel_context, canceler);
-         }
-     });
+   //Cancel expired limit orders
+   auto head_time = head_block_time();
+   auto maint_time = get_dynamic_global_properties().next_maintenance_time;
+   bool before_core_hardfork_184 = ( maint_time <= HARDFORK_CORE_184_TIME ); // something-for-nothing
+   bool before_core_hardfork_342 = ( maint_time <= HARDFORK_CORE_342_TIME ); // better rounding
+   bool before_core_hardfork_606 = ( maint_time <= HARDFORK_CORE_606_TIME ); // feed always trigger call
+   auto& limit_index = get_index_type<limit_order_index>().indices().get<by_expiration>();
+   while( !limit_index.empty() && limit_index.begin()->expiration <= head_time )
+   {
+      const limit_order_object& order = *limit_index.begin();
+      auto base_asset = order.sell_price.base.asset_id;
+      auto quote_asset = order.sell_price.quote.asset_id;
+      cancel_limit_order( order );
+      if( before_core_hardfork_606 )
+      {
+         // check call orders
+         // Comments below are copied from limit_order_cancel_evaluator::do_apply(...)
+         // Possible optimization: order can be called by cancelling a limit order
+         //   if the canceled order was at the top of the book.
+         // Do I need to check calls in both assets?
+         check_call_orders( base_asset( *this ) );
+         check_call_orders( quote_asset( *this ) );
+      }
+   }
 
    //Process expired force settlement orders
    auto& settlement_index = get_index_type<force_settlement_index>().indices().get<by_expiration>();
@@ -334,9 +362,12 @@ void database::clear_expired_orders()
    {
       asset_id_type current_asset = settlement_index.begin()->settlement_asset_id();
       asset max_settlement_volume;
+      price settlement_fill_price;
+      price settlement_price;
+      bool current_asset_finished = false;
       bool extra_dump = false;
 
-      auto next_asset = [&current_asset, &settlement_index, &extra_dump] {
+      auto next_asset = [&current_asset, &current_asset_finished, &settlement_index, &extra_dump] {
          auto bound = settlement_index.upper_bound(current_asset);
          if( bound == settlement_index.end() )
          {
@@ -351,6 +382,7 @@ void database::clear_expired_orders()
             ilog( "next_asset returning true, bound is ${b}", ("b", *bound) );
          }
          current_asset = bound->settlement_asset_id();
+         current_asset_finished = false;
          return true;
       };
 
@@ -379,12 +411,12 @@ void database::clear_expired_orders()
          if( mia.has_settlement() )
          {
             ilog( "Canceling a force settlement because of black swan" );
-            cancel_order( order );
+            cancel_settle_order( order );
             continue;
          }
 
          // Has this order not reached its settlement date?
-         if( order.settlement_date > head_block_time() )
+         if( order.settlement_date > head_time )
          {
             if( next_asset() )
             {
@@ -401,12 +433,14 @@ void database::clear_expired_orders()
          {
             ilog("Canceling a force settlement in ${asset} because settlement price is null",
                  ("asset", mia_object.symbol));
-            cancel_order(order);
+            cancel_settle_order(order);
             continue;
          }
          if( max_settlement_volume.asset_id != current_asset )
             max_settlement_volume = mia_object.amount(mia.max_force_settlement_volume(mia_object.dynamic_data(*this).current_supply));
-         if( mia.force_settled_volume >= max_settlement_volume.amount )
+         // When current_asset_finished is true, this would be the 2nd time processing the same order.
+         // In this case, we move to the next asset.
+         if( mia.force_settled_volume >= max_settlement_volume.amount || current_asset_finished )
          {
             /*
             ilog("Skipping force settlement in ${asset}; settled ${settled_volume} / ${max_volume}",
@@ -424,13 +458,23 @@ void database::clear_expired_orders()
             break;
          }
 
-         auto& pays = order.balance;
-         auto receives = (order.balance * mia.current_feed.settlement_price);
-         receives.amount = (fc::uint128_t(receives.amount.value) *
-                            (GRAPHENE_100_PERCENT - mia.options.force_settlement_offset_percent) / GRAPHENE_100_PERCENT).to_uint64();
-         assert(receives <= order.balance * mia.current_feed.settlement_price);
+         if( settlement_fill_price.base.asset_id != current_asset )
+            settlement_fill_price = mia.current_feed.settlement_price
+                                    / ratio_type( GRAPHENE_100_PERCENT - mia.options.force_settlement_offset_percent,
+                                                  GRAPHENE_100_PERCENT );
 
-         price settlement_price = pays / receives;
+         if( before_core_hardfork_342 )
+         {
+            auto& pays = order.balance;
+            auto receives = (order.balance * mia.current_feed.settlement_price);
+            receives.amount = ( fc::uint128_t(receives.amount.value) *
+                                (GRAPHENE_100_PERCENT - mia.options.force_settlement_offset_percent) /
+                                GRAPHENE_100_PERCENT ).to_uint64();
+            assert(receives <= order.balance * mia.current_feed.settlement_price);
+            settlement_price = pays / receives;
+         }
+         else if( settlement_price.base.asset_id != current_asset ) // only calculate once per asset
+            settlement_price = settlement_fill_price;
 
          auto& call_index = get_index_type<call_order_index>().indices().get<by_collateral>();
          asset settled = mia_object.amount(mia.force_settled_volume);
@@ -446,15 +490,33 @@ void database::clear_expired_orders()
             if( order.balance.amount == 0 )
             {
                wlog( "0 settlement detected" );
-               cancel_order( order );
+               cancel_settle_order( order );
                break;
             }
             try {
-               settled += match(*itr, order, settlement_price, max_settlement);
+               asset new_settled = match(*itr, order, settlement_price, max_settlement, settlement_fill_price);
+               if( !before_core_hardfork_184 && new_settled.amount == 0 ) // unable to fill this settle order
+               {
+                  if( find_object( order_id ) ) // the settle order hasn't been cancelled
+                     current_asset_finished = true;
+                  break;
+               }
+               settled += new_settled;
+               // before hard fork core-342, if new_settled > 0, we'll have:
+               // * call order is completely filled (thus itr will change in next loop), or
+               // * settle order is completely filled (thus find_object(order_id) will be false so will break out), or
+               // * reached max_settlement_volume limit (thus new_settled == max_settlement so will break out).
+               //
+               // after hard fork core-342, if new_settled > 0, we'll have:
+               // * call order is completely filled (thus itr will change in next loop), or
+               // * settle order is completely filled (thus find_object(order_id) will be false so will break out), or
+               // * reached max_settlement_volume limit, but it's possible that new_settled < max_settlement,
+               //   in this case, new_settled will be zero in next iteration of the loop, so no need to check here.
             } 
             catch ( const black_swan_exception& e ) { 
-               wlog( "black swan detected: ${e}", ("e", e.to_detail_string() ) );
-               cancel_order( order );
+               wlog( "Cancelling a settle_order since it may trigger a black swan: ${o}, ${e}",
+                     ("o", order)("e", e.to_detail_string()) );
+               cancel_settle_order( order );
                break;
             }
          }
@@ -471,6 +533,7 @@ void database::clear_expired_orders()
 void database::update_expired_feeds()
 {
    const auto head_time = head_block_time();
+   const auto next_maint_time = get_dynamic_global_properties().next_maintenance_time;
    bool after_hardfork_615 = ( head_time >= HARDFORK_615_TIME );
 
    const auto& idx = get_index_type<asset_bitasset_data_index>().indices().get<by_feed_expiration>();
@@ -485,9 +548,9 @@ void database::update_expired_feeds()
       if( after_hardfork_615 || b.feed_is_expired_before_hardfork_615( head_time ) )
       {
          auto old_median_feed = b.current_feed;
-         modify( b, [head_time,&update_cer]( asset_bitasset_data_object& abdo )
+         modify( b, [head_time,next_maint_time,&update_cer]( asset_bitasset_data_object& abdo )
          {
-            abdo.update_median_feeds( head_time );
+            abdo.update_median_feeds( head_time, next_maint_time );
             if( abdo.need_to_update_cer() )
             {
                update_cer = true;

libraries/chain/db_witness_schedule.cpp

@@ -74,32 +74,21 @@ witness_id_type database::get_scheduled_witness( uint32_t slot_num )const
    return wid;
 }
 
-unsigned_int database::get_son_schedule_id( sidechain_type type )const
-{
-   static const map<sidechain_type, unsigned_int> schedule_map = {
-      { sidechain_type::bitcoin, 0 },
-      { sidechain_type::ethereum, 1 },
-      { sidechain_type::hive, 2 }
-   };
-
-   return schedule_map.at(type);
-}
-
-son_id_type database::get_scheduled_son( sidechain_type type, uint32_t slot_num )const
+son_id_type database::get_scheduled_son( uint32_t slot_num )const
 {
    son_id_type sid;
    const global_property_object& gpo = get_global_properties();
    if (gpo.parameters.witness_schedule_algorithm == GRAPHENE_WITNESS_SHUFFLED_ALGORITHM)
    {
        const dynamic_global_property_object& dpo = get_dynamic_global_properties();
-       const son_schedule_object& sso = son_schedule_id_type(get_son_schedule_id(type))(*this);
+       const son_schedule_object& sso = son_schedule_id_type()(*this);
        uint64_t current_aslot = dpo.current_aslot + slot_num;
        return sso.current_shuffled_sons[ current_aslot % sso.current_shuffled_sons.size() ];
    }
    if (gpo.parameters.witness_schedule_algorithm == GRAPHENE_WITNESS_SCHEDULED_ALGORITHM &&
        slot_num != 0 )
    {
-      const son_schedule_object& sso = son_schedule_id_type(get_son_schedule_id(type))(*this);
+       const son_schedule_object& sso = son_schedule_id_type()(*this);
        // ask the near scheduler who goes in the given slot
        bool slot_is_near = sso.scheduler.get_slot(slot_num-1, sid);
        if(! slot_is_near)
@@ -200,39 +189,36 @@ void database::update_witness_schedule()
    }
 }
 
-void database::update_son_schedule(sidechain_type type)
+void database::update_son_schedule()
 {
+   const son_schedule_object& sso = son_schedule_id_type()(*this);
    const global_property_object& gpo = get_global_properties();
 
-   const son_schedule_object& sidechain_sso = get(son_schedule_id_type(get_son_schedule_id(type)));
-   if( gpo.active_sons.at(type).size() != 0 &&
-         head_block_num() % gpo.active_sons.at(type).size() == 0)
+   if( head_block_num() % gpo.active_sons.size() == 0 )
    {
-      modify( sidechain_sso, [&]( son_schedule_object& _sso )
+      modify( sso, [&]( son_schedule_object& _sso )
       {
          _sso.current_shuffled_sons.clear();
-         _sso.current_shuffled_sons.reserve( gpo.active_sons.at(type).size() );
+         _sso.current_shuffled_sons.reserve( gpo.active_sons.size() );
 
-         for ( const auto &w : gpo.active_sons.at(type) ) {
-               _sso.current_shuffled_sons.push_back(w.son_id);
-         }
+         for( const son_info& w : gpo.active_sons )
+            _sso.current_shuffled_sons.push_back( w.son_id );
 
          auto now_hi = uint64_t(head_block_time().sec_since_epoch()) << 32;
-
-         for (uint32_t i = 0; i < _sso.current_shuffled_sons.size(); ++i)
+         for( uint32_t i = 0; i < _sso.current_shuffled_sons.size(); ++i )
          {
             /// High performance random generator
             /// http://xorshift.di.unimi.it/
-            uint64_t k = now_hi + uint64_t(i) * 2685821657736338717ULL;
+            uint64_t k = now_hi + uint64_t(i)*2685821657736338717ULL;
             k ^= (k >> 12);
             k ^= (k << 25);
             k ^= (k >> 27);
             k *= 2685821657736338717ULL;
 
             uint32_t jmax = _sso.current_shuffled_sons.size() - i;
-            uint32_t j = i + k % jmax;
-            std::swap(_sso.current_shuffled_sons[i],
-                      _sso.current_shuffled_sons[j]);
+            uint32_t j = i + k%jmax;
+            std::swap( _sso.current_shuffled_sons[i],
+                       _sso.current_shuffled_sons[j] );
          }
       });
    }
@@ -318,15 +304,13 @@ void database::update_witness_schedule(const signed_block& next_block)
       idump( ( double(total_time/1000000.0)/calls) );
 }
 
-void database::update_son_schedule(sidechain_type type, const signed_block& next_block)
+void database::update_son_schedule(const signed_block& next_block)
 {
    auto start = fc::time_point::now();
-#ifndef NDEBUG
-   const son_schedule_object& sso = get(son_schedule_id_type());
-#endif
    const global_property_object& gpo = get_global_properties();
-   const uint32_t schedule_needs_filled = gpo.active_sons.at(type).size();
-   const uint32_t schedule_slot = get_slot_at_time(next_block.timestamp);
+   const son_schedule_object& sso = get(son_schedule_id_type());
+   uint32_t schedule_needs_filled = gpo.active_sons.size();
+   uint32_t schedule_slot = get_slot_at_time(next_block.timestamp);
 
    // We shouldn't be able to generate _pending_block with timestamp
    // in the past, and incoming blocks from the network with timestamp
@@ -335,49 +319,48 @@ void database::update_son_schedule(sidechain_type type, const signed_block& next
 
    assert( schedule_slot > 0 );
 
+   son_id_type first_son;
+   bool slot_is_near = sso.scheduler.get_slot( schedule_slot-1, first_son );
+
+   son_id_type son;
+
    const dynamic_global_property_object& dpo = get_dynamic_global_properties();
 
    assert( dpo.random.data_size() == witness_scheduler_rng::seed_length );
    assert( witness_scheduler_rng::seed_length == sso.rng_seed.size() );
 
-   const son_schedule_object& sidechain_sso = get(son_schedule_id_type(get_son_schedule_id(type)));
-   son_id_type first_son;
-   bool slot_is_near = sidechain_sso.scheduler.get_slot( schedule_slot-1, first_son );
-   son_id_type son_id;
-
-   modify(sidechain_sso, [&](son_schedule_object& _sso)
+   modify(sso, [&](son_schedule_object& _sso)
    {
-    _sso.slots_since_genesis += schedule_slot;
-    witness_scheduler_rng rng(_sso.rng_seed.data, _sso.slots_since_genesis);
+      _sso.slots_since_genesis += schedule_slot;
+      witness_scheduler_rng rng(sso.rng_seed.data, _sso.slots_since_genesis);
 
-    _sso.scheduler._min_token_count = std::max(int(gpo.active_sons.at(type).size()) / 2, 1);
+      _sso.scheduler._min_token_count = std::max(int(gpo.active_sons.size()) / 2, 1);
 
-    if( slot_is_near )
-    {
-       uint32_t drain = schedule_slot;
-       while( drain > 0 )
-       {
-          if( _sso.scheduler.size() == 0 )
-             break;
-          _sso.scheduler.consume_schedule();
-          --drain;
-       }
-    }
-    else
-    {
-       _sso.scheduler.reset_schedule( first_son );
-    }
-    while( !_sso.scheduler.get_slot(schedule_needs_filled, son_id) )
-    {
-       if( _sso.scheduler.produce_schedule(rng) & emit_turn )
-          memcpy(_sso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size());
-    }
-    _sso.last_scheduling_block = next_block.block_num();
-    _sso.recent_slots_filled = (
-                                     (_sso.recent_slots_filled << 1)
-                                     + 1) << (schedule_slot - 1);
+      if( slot_is_near )
+      {
+         uint32_t drain = schedule_slot;
+         while( drain > 0 )
+         {
+            if( _sso.scheduler.size() == 0 )
+               break;
+            _sso.scheduler.consume_schedule();
+            --drain;
+         }
+      }
+      else
+      {
+         _sso.scheduler.reset_schedule( first_son );
+      }
+      while( !_sso.scheduler.get_slot(schedule_needs_filled, son) )
+      {
+         if( _sso.scheduler.produce_schedule(rng) & emit_turn )
+            memcpy(_sso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size());
+      }
+      _sso.last_scheduling_block = next_block.block_num();
+      _sso.recent_slots_filled = (
+           (_sso.recent_slots_filled << 1)
+           + 1) << (schedule_slot - 1);
    });
-
    auto end = fc::time_point::now();
    static uint64_t total_time = 0;
    static uint64_t calls = 0;

libraries/chain/event_object.cpp

@@ -47,7 +47,7 @@ namespace graphene { namespace chain {
    };
 } }
 
-FC_REFLECT_ENUM(graphene::chain::event_state,
+FC_REFLECT_ENUM(graphene::chain::event_state, 
                 (upcoming)
                 (frozen_upcoming)
                 (in_progress)
@@ -61,12 +61,12 @@ namespace graphene { namespace chain {
    namespace msm = boost::msm;
    namespace mpl = boost::mpl;
 
-   namespace
+   namespace 
    {
 
       // Events -- most events happen when the witnesses publish an event_update operation with a new
       // status, so if they publish an event with the status set to `frozen`, we'll generate a `frozen_event`
-      struct upcoming_event
+      struct upcoming_event 
       {
          database& db;
          upcoming_event(database& db) : db(db) {}
@@ -76,12 +76,12 @@ namespace graphene { namespace chain {
          database& db;
          in_progress_event(database& db) : db(db) {}
       };
-      struct frozen_event
+      struct frozen_event 
       {
          database& db;
          frozen_event(database& db) : db(db) {}
       };
-      struct finished_event
+      struct finished_event 
       {
          database& db;
          finished_event(database& db) : db(db) {}
@@ -104,7 +104,7 @@ namespace graphene { namespace chain {
          betting_market_group_resolved_event(database& db, betting_market_group_id_type resolved_group, bool was_canceled) : db(db), resolved_group(resolved_group), was_canceled(was_canceled) {}
       };
 
-      // event triggered when a betting market group is closed.  When we get this,
+      // event triggered when a betting market group is closed.  When we get this, 
       // if all child betting market groups are closed, transition to finished
       struct betting_market_group_closed_event
       {
@@ -127,7 +127,7 @@ namespace graphene { namespace chain {
             void on_entry(const upcoming_event& event, event_state_machine_& fsm) {
                dlog("event ${id} -> upcoming", ("id", fsm.event_obj->id));
                auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-               for (const betting_market_group_object& betting_market_group :
+               for (const betting_market_group_object& betting_market_group : 
                     boost::make_iterator_range(betting_market_group_index.equal_range(fsm.event_obj->id)))
                   try
                   {
@@ -147,7 +147,7 @@ namespace graphene { namespace chain {
             void on_entry(const in_progress_event& event, event_state_machine_& fsm) {
                dlog("event ${id} -> in_progress", ("id", fsm.event_obj->id));
                auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-               for (const betting_market_group_object& betting_market_group :
+               for (const betting_market_group_object& betting_market_group : 
                     boost::make_iterator_range(betting_market_group_index.equal_range(fsm.event_obj->id)))
                   try
                   {
@@ -203,7 +203,7 @@ namespace graphene { namespace chain {
 
          void freeze_betting_market_groups(const frozen_event& event) {
             auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id)))
             {
                try
@@ -222,7 +222,7 @@ namespace graphene { namespace chain {
 
          void close_all_betting_market_groups(const finished_event& event) {
             auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id)))
             {
                try
@@ -241,7 +241,7 @@ namespace graphene { namespace chain {
 
          void cancel_all_betting_market_groups(const canceled_event& event) {
             auto& betting_market_group_index = event.db.template get_index_type<betting_market_group_object_index>().indices().template get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id)))
                event.db.modify(betting_market_group, [&event](betting_market_group_object& betting_market_group_obj) {
                   betting_market_group_obj.on_canceled_event(event.db, true);
@@ -252,15 +252,15 @@ namespace graphene { namespace chain {
          bool all_betting_market_groups_are_closed(const betting_market_group_closed_event& event)
          {
             auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id)))
                if (betting_market_group.id != event.closed_group)
                {
                   betting_market_group_status status = betting_market_group.get_status();
-                  if (status != betting_market_group_status::closed &&
-                      status != betting_market_group_status::graded &&
-                      status != betting_market_group_status::re_grading &&
-                      status != betting_market_group_status::settled &&
+                  if (status != betting_market_group_status::closed  && 
+                      status != betting_market_group_status::graded  && 
+                      status != betting_market_group_status::re_grading  && 
+                      status != betting_market_group_status::settled  && 
                       status != betting_market_group_status::canceled)
                      return false;
                }
@@ -276,7 +276,7 @@ namespace graphene { namespace chain {
             if (event_obj->at_least_one_betting_market_group_settled)
                return false;
             auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id)))
                if (betting_market_group.id != event.resolved_group)
                   if (betting_market_group.get_status() != betting_market_group_status::canceled)
@@ -290,7 +290,7 @@ namespace graphene { namespace chain {
                event_obj->at_least_one_betting_market_group_settled = true;
 
             auto& betting_market_group_index = event.db.get_index_type<betting_market_group_object_index>().indices().get<by_event_id>();
-            for (const betting_market_group_object& betting_market_group :
+            for (const betting_market_group_object& betting_market_group : 
                  boost::make_iterator_range(betting_market_group_index.equal_range(event_obj->id))) {
                if (betting_market_group.id != event.resolved_group) {
                   betting_market_group_status status = betting_market_group.get_status();
@@ -344,6 +344,7 @@ namespace graphene { namespace chain {
          {
             FC_THROW_EXCEPTION(graphene::chain::no_transition, "No transition");
          }
+          
          template <class Fsm>
          void no_transition(canceled_event const& e, Fsm&, int state)
          {
@@ -371,7 +372,7 @@ namespace graphene { namespace chain {
    {
    }
 
-   event_object::event_object(const event_object& rhs) :
+   event_object::event_object(const event_object& rhs) : 
       graphene::db::abstract_object<event_object>(rhs),
       name(rhs.name),
       season(rhs.season),
@@ -407,7 +408,7 @@ namespace graphene { namespace chain {
    }
 
    namespace {
-
+   
       bool verify_event_status_constants()
       {
          unsigned error_count = 0;
@@ -442,19 +443,19 @@ namespace graphene { namespace chain {
             dlog("Event status constants are correct");
          else
             wlog("There were ${count} errors in the event status constants", ("count", error_count));
-
+   
          return error_count == 0;
       }
    } // end anonymous namespace
-
+   
    event_status event_object::get_status() const
    {
       static bool state_constants_are_correct = verify_event_status_constants();
       (void)&state_constants_are_correct;
       event_state state = (event_state)my->state_machine.current_state()[0];
-
+      
       ddump((state));
-
+   
       switch (state)
       {
          case event_state::upcoming:
@@ -522,8 +523,8 @@ namespace graphene { namespace chain {
       my->state_machine.process_event(betting_market_group_closed_event(db, closed_group));
    }
 
-   // These are the only statuses that can be explicitly set by witness operations.  The missing
-   // status, 'settled', is automatically set when all of the betting market groups have
+   // These are the only statuses that can be explicitly set by witness operations.  The missing 
+   // status, 'settled', is automatically set when all of the betting market groups have 
    // settled/canceled
    void event_object::dispatch_new_status(database& db, event_status new_status)
    {
@@ -532,16 +533,16 @@ namespace graphene { namespace chain {
          on_upcoming_event(db);
          break;
       case event_status::in_progress:  // by witnesses when the event starts
-         on_in_progress_event(db);
+         on_in_progress_event(db); 
          break;
       case event_status::frozen: // by witnesses when the event needs to be frozen
-         on_frozen_event(db);
+         on_frozen_event(db); 
          break;
       case event_status::finished: // by witnesses when the event is complete
-         on_finished_event(db);
+         on_finished_event(db); 
          break;
       case event_status::canceled: // by witnesses to cancel the event
-         on_canceled_event(db);
+         on_canceled_event(db); 
          break;
       default:
          FC_THROW("Status ${new_status} cannot be explicitly set", ("new_status", new_status));
@@ -550,7 +551,7 @@ namespace graphene { namespace chain {
 
 } } // graphene::chain
 
-namespace fc {
+namespace fc { 
    // Manually reflect event_object to variant to properly reflect "state"
    void to_variant(const graphene::chain::event_object& event_obj, fc::variant& v, uint32_t max_depth)
    {

libraries/chain/game_object.cpp

@@ -547,7 +547,7 @@ namespace graphene { namespace chain {
 
 } } // graphene::chain
 
-namespace fc {
+namespace fc { 
    // Manually reflect game_object to variant to properly reflect "state"
    void to_variant(const graphene::chain::game_object& game_obj, fc::variant& v, uint32_t max_depth)
    {

libraries/chain/hardfork.d/1000.hf

@@ -1,7 +1,3 @@
 #ifndef HARDFORK_1000_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_1000_TIME (fc::time_point_sec::from_iso_string("2018-10-20T01:46:40"))
-#else
-#define HARDFORK_1000_TIME (fc::time_point_sec::from_iso_string("2019-02-18T12:00:00"))
-#endif
+#define HARDFORK_1000_TIME (fc::time_point_sec( 1540000000 ))
 #endif

libraries/chain/hardfork.d/1001.hf

@@ -1,8 +1,4 @@
 // added delete sport and delete event group operations
 #ifndef HARDFORK_1001_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_1001_TIME (fc::time_point_sec::from_iso_string("2018-10-20T01:46:40"))
-#else
-#define HARDFORK_1001_TIME (fc::time_point_sec::from_iso_string("2019-02-18T12:00:00"))
-#endif
+#define HARDFORK_1001_TIME (fc::time_point_sec( 1540000000 ))
 #endif

libraries/chain/hardfork.d/357.hf

@@ -1,8 +1,4 @@
 // #357 Disallow publishing certain malformed price feeds
 #ifndef HARDFORK_357_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_357_TIME (fc::time_point_sec::from_iso_string("2015-10-09T18:45:00"))
-#else
-#define HARDFORK_357_TIME (fc::time_point_sec::from_iso_string("2015-10-09T18:45:00"))
-#endif
+#define HARDFORK_357_TIME (fc::time_point_sec( 1444416300 ))
 #endif

libraries/chain/hardfork.d/359.hf

@@ -1,8 +1,4 @@
 // #359 Allow digits in asset name
 #ifndef HARDFORK_359_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_359_TIME (fc::time_point_sec::from_iso_string("2015-10-09T18:45:00"))
-#else
-#define HARDFORK_359_TIME (fc::time_point_sec::from_iso_string("2015-10-09T18:45:00"))
-#endif
+#define HARDFORK_359_TIME (fc::time_point_sec( 1444416300 ))
 #endif

libraries/chain/hardfork.d/385.hf

@@ -1,8 +1,4 @@
 // #385 October 23 enforce PARENT.CHILD and allow short names
 #ifndef HARDFORK_385_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_385_TIME (fc::time_point_sec::from_iso_string("2015-10-23T00:00:00"))
-#else
-#define HARDFORK_385_TIME (fc::time_point_sec::from_iso_string("2015-10-23T00:00:00"))
-#endif
+#define HARDFORK_385_TIME (fc::time_point_sec( 1445558400 ))
 #endif

libraries/chain/hardfork.d/409.hf

@@ -1,8 +1,4 @@
 // #409 Allow creation of sub-assets
 #ifndef HARDFORK_409_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_409_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#else
-#define HARDFORK_409_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#endif
+#define HARDFORK_409_TIME (fc::time_point_sec( 1446652800 ))
 #endif

libraries/chain/hardfork.d/413.hf

@@ -1,8 +1,4 @@
 // #413 Add operation to claim asset fees
 #ifndef HARDFORK_413_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_413_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#else
-#define HARDFORK_413_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#endif
+#define HARDFORK_413_TIME (fc::time_point_sec( 1446652800 ))
 #endif

libraries/chain/hardfork.d/415.hf

@@ -1,8 +1,4 @@
 // #415 Default accept policy for asset with no whitelist authorities
 #ifndef HARDFORK_415_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_415_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#else
-#define HARDFORK_415_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#endif
+#define HARDFORK_415_TIME (fc::time_point_sec( 1446652800 ))
 #endif

libraries/chain/hardfork.d/416.hf

@@ -1,8 +1,4 @@
 // #416 enforce_white_list is inconsistently applied
 #ifndef HARDFORK_416_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_416_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#else
-#define HARDFORK_416_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#endif
+#define HARDFORK_416_TIME (fc::time_point_sec( 1446652800 ))
 #endif

libraries/chain/hardfork.d/419.hf

@@ -1,8 +1,4 @@
 // #419 Account can pay fees in blacklisted asset
 #ifndef HARDFORK_419_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_419_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#else
-#define HARDFORK_419_TIME (fc::time_point_sec::from_iso_string("2015-11-04T16:00:00"))
-#endif
+#define HARDFORK_419_TIME (fc::time_point_sec( 1446652800 ))
 #endif

libraries/chain/hardfork.d/436.hf

@@ -1,8 +1,4 @@
 // #436 Prevent margin call from being triggered unless feed < call price
 #ifndef HARDFORK_436_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_436_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#else
-#define HARDFORK_436_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#endif
+#define HARDFORK_436_TIME (fc::time_point_sec( 1450288800 ))
 #endif

libraries/chain/hardfork.d/445.hf

@@ -1,8 +1,4 @@
 // #445 Refund create order fees on cancel
 #ifndef HARDFORK_445_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_445_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#else
-#define HARDFORK_445_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#endif
+#define HARDFORK_445_TIME (fc::time_point_sec( 1450288800 ))
 #endif

libraries/chain/hardfork.d/453.hf

@@ -1,8 +1,4 @@
 // #453 Hardfork to retroactively correct referral percentages
 #ifndef HARDFORK_453_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_453_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#else
-#define HARDFORK_453_TIME (fc::time_point_sec::from_iso_string("2015-12-16T18:00:00"))
-#endif
+#define HARDFORK_453_TIME (fc::time_point_sec( 1450288800 ))
 #endif

libraries/chain/hardfork.d/480.hf

@@ -1,8 +1,4 @@
 // #480 Fix non-BTS MIA core_exchange_rate check
 #ifndef HARDFORK_480_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_480_TIME (fc::time_point_sec::from_iso_string("2015-12-17T19:00:00"))
-#else
-#define HARDFORK_480_TIME (fc::time_point_sec::from_iso_string("2015-12-17T19:00:00"))
-#endif
+#define HARDFORK_480_TIME (fc::time_point_sec( 1450378800 ))
 #endif

libraries/chain/hardfork.d/483.hf

@@ -1,8 +1,4 @@
 // #483 Operation history numbering change
 #ifndef HARDFORK_483_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_483_TIME (fc::time_point_sec::from_iso_string("2015-12-17T19:00:00"))
-#else
-#define HARDFORK_483_TIME (fc::time_point_sec::from_iso_string("2015-12-17T19:00:00"))
-#endif
+#define HARDFORK_483_TIME (fc::time_point_sec( 1450378800 ))
 #endif

libraries/chain/hardfork.d/5050-1.hf

@@ -1,7 +1,4 @@
+// 5050_1 HARDFORK Wednesday, 15 April 2020 20:00:00 GMT
 #ifndef HARDFORK_5050_1_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_5050_1_TIME (fc::time_point_sec::from_iso_string("2020-04-15T20:00:00"))
-#else
-#define HARDFORK_5050_1_TIME (fc::time_point_sec::from_iso_string("2020-04-22T20:00:00"))
-#endif
+#define HARDFORK_5050_1_TIME (fc::time_point_sec( 1586980800 ))
 #endif

libraries/chain/hardfork.d/516.hf

@@ -1,8 +1,4 @@
 // #516 Special authorities
 #ifndef HARDFORK_516_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_516_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_516_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_516_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/533.hf

@@ -1,8 +1,4 @@
 // #533 Improve vote counting implementation
 #ifndef HARDFORK_533_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_533_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_533_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_533_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/538.hf

@@ -1,8 +1,4 @@
 // #538 Buyback accounts
 #ifndef HARDFORK_538_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_538_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_538_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_538_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/555.hf

@@ -1,8 +1,4 @@
 // #555 Buyback accounts
 #ifndef HARDFORK_555_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_555_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_555_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_555_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/563.hf

@@ -1,8 +1,4 @@
 // #563 Stealth fee routing
 #ifndef HARDFORK_563_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_563_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_563_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_563_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/572.hf

@@ -1,8 +1,4 @@
 // #572 Allow asset to update permission flags when no supply exists
 #ifndef HARDFORK_572_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_572_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#else
-#define HARDFORK_572_TIME (fc::time_point_sec::from_iso_string("2016-02-23T18:00:00"))
-#endif
+#define HARDFORK_572_TIME (fc::time_point_sec( 1456250400 ))
 #endif

libraries/chain/hardfork.d/599.hf

@@ -1,8 +1,4 @@
 // #599 Unpacking of extension is incorrect
 #ifndef HARDFORK_599_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_599_TIME (fc::time_point_sec::from_iso_string("2016-04-04T17:00:00"))
-#else
-#define HARDFORK_599_TIME (fc::time_point_sec::from_iso_string("2016-04-04T17:00:00"))
-#endif
+#define HARDFORK_599_TIME (fc::time_point_sec( 1459789200 ))
 #endif

libraries/chain/hardfork.d/607.hf

@@ -1,8 +1,4 @@
 // #607 Disable negative voting on workers
 #ifndef HARDFORK_607_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_607_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#else
-#define HARDFORK_607_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#endif
+#define HARDFORK_607_TIME (fc::time_point_sec( 1458752400 ))
 #endif

libraries/chain/hardfork.d/613.hf

@@ -1,8 +1,4 @@
 // #613 Deprecate annual membership
 #ifndef HARDFORK_613_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_613_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#else
-#define HARDFORK_613_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#endif
+#define HARDFORK_613_TIME (fc::time_point_sec( 1458752400 ))
 #endif

libraries/chain/hardfork.d/615.hf

@@ -1,8 +1,4 @@
 // #615 Fix price feed expiration check, so websocket server will never spam too much data
 #ifndef HARDFORK_615_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_615_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#else
-#define HARDFORK_615_TIME (fc::time_point_sec::from_iso_string("2016-03-23T17:00:00"))
-#endif
+#define HARDFORK_615_TIME (fc::time_point_sec( 1458752400 ))
 #endif

libraries/chain/hardfork.d/999.hf

@@ -1,8 +1,4 @@
 // Placeholder HF for affiliate reward system
 #ifndef HARDFORK_999_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_999_TIME (fc::time_point_sec::from_iso_string("2018-10-20T01:46:40"))
-#else
-#define HARDFORK_999_TIME (fc::time_point_sec::from_iso_string("2019-02-18T12:00:00"))
-#endif
+#define HARDFORK_999_TIME (fc::time_point_sec( 1540000000 ))
 #endif

libraries/chain/hardfork.d/CORE-429.hf

@@ -1,8 +1,4 @@
 // bitshares-core #429 rounding issue when creating assets
 #ifndef HARDFORK_CORE_429_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_CORE_429_TIME (fc::time_point_sec::from_iso_string("2019-08-26T02:00:00"))
-#else
-#define HARDFORK_CORE_429_TIME (fc::time_point_sec::from_iso_string("2019-09-13T02:00:00"))
-#endif
+#define HARDFORK_CORE_429_TIME (fc::time_point_sec( 1566784800 ))
 #endif

libraries/chain/hardfork.d/CORE_1270.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1270 Call price is inconsistent when MCR changed
+#ifndef HARDFORK_CORE_1270_TIME
+#define HARDFORK_CORE_1270_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_1465.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1465 check max_supply before processing call_order_update
+#ifndef HARDFORK_CORE_1465_TIME
+#define HARDFORK_CORE_1465_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_1479.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1479 nodes crashing on self-approving proposal
+#ifndef HARDFORK_CORE_1479_TIME
+#define HARDFORK_CORE_1479_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_1573.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1573 check transaction size
+#ifndef HARDFORK_CORE_1573_TIME
+#define HARDFORK_CORE_1573_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_1669.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1669 Stop using call_price when globally settling
+#ifndef HARDFORK_CORE_1669_TIME
+#define HARDFORK_CORE_1669_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_1692.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #1692 validation check of bid_collateral
+#ifndef HARDFORK_CORE_1692_TIME
+#define HARDFORK_CORE_1692_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_184.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #184 Fix "Potential something-for-nothing fill bug"
+#ifndef HARDFORK_CORE_184_TIME
+#define HARDFORK_CORE_184_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_210.hf

@@ -0,0 +1,6 @@
+// #210 Check authorities on custom_operation
+#ifndef HARDFORK_CORE_210_TIME
+#define HARDFORK_CORE_210_TIME (fc::time_point_sec(1893456000)) // Jan 1 00:00:00 2030 (Not yet scheduled)
+// Bugfix: pre-HF 210, custom_operation's required_auths field was ignored.
+#define MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(chain_time) (chain_time <= HARDFORK_CORE_210_TIME)
+#endif

libraries/chain/hardfork.d/CORE_216.hf

@@ -0,0 +1,4 @@
+// bitshares-core #216 Process to reset a Smartcoin after a Black Swan
+#ifndef HARDFORK_CORE_216_TIME
+#define HARDFORK_CORE_216_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_338.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #338 Fix "margin call order fills at price of matching limit_order"
+#ifndef HARDFORK_CORE_338_TIME
+#define HARDFORK_CORE_338_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_342.hf

@@ -0,0 +1,5 @@
+// bitshares-core issue #342
+// Mitigate rounding issue when matching orders
+#ifndef HARDFORK_CORE_342_TIME
+#define HARDFORK_CORE_342_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_343.hf

@@ -0,0 +1,5 @@
+// bitshares-core issue #343
+// Fix "Inconsistent sorting of call orders between matching against a limit order and a force settle order"
+#ifndef HARDFORK_CORE_343_TIME
+#define HARDFORK_CORE_343_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_453.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #453 Fix "Multiple limit order and call order matching issue"
+#ifndef HARDFORK_CORE_453_TIME
+#define HARDFORK_CORE_453_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_460.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #460 Prediction Market price feed should not cause black swan
+#ifndef HARDFORK_CORE_460_TIME
+#define HARDFORK_CORE_460_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_518.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #518 Clean up bitasset_data during maintenance
+#ifndef HARDFORK_CORE_518_TIME
+#define HARDFORK_CORE_518_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_583.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #583 Always allow updating a call order to higher collateral ratio
+#ifndef HARDFORK_CORE_583_TIME
+#define HARDFORK_CORE_583_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_604.hf

@@ -0,0 +1,5 @@
+// bitshares-core issue #604
+// Implement BSIP 26: refund order creation fee in original paid asset when order is cancelled
+#ifndef HARDFORK_CORE_604_TIME
+#define HARDFORK_CORE_604_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_606.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #606 Fix "Undercollateralized short positions should be called regardless of asks"
+#ifndef HARDFORK_CORE_606_TIME
+#define HARDFORK_CORE_606_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_625.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #625 Fix "Potential erratic order matching issue involving margin call orders"
+#ifndef HARDFORK_CORE_625_TIME
+#define HARDFORK_CORE_625_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_834.hf

@@ -0,0 +1,4 @@
+// bitshares-core issue #834 "BSIP38: add target CR option to short positions"
+#ifndef HARDFORK_CORE_834_TIME
+#define HARDFORK_CORE_834_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_868_890.hf

@@ -0,0 +1,5 @@
+// bitshares-core issue #868 Clear price feed data after updated a bitAsset's backing asset ID
+// bitshares-core issue #890 Update median feeds after feed_lifetime_sec changed
+#ifndef HARDFORK_CORE_868_890_TIME
+#define HARDFORK_CORE_868_890_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif

libraries/chain/hardfork.d/CORE_922_931.hf

@@ -0,0 +1,5 @@
+// bitshares-core issue #922 Missing checks when updating an asset's bitasset_data
+// bitshares-core issue #931 Changing backing asset ID runs some checks against the old value instead of the new
+#ifndef HARDFORK_CORE_922_931_TIME
+#define HARDFORK_CORE_922_931_TIME (fc::time_point_sec( 1615334400 )) // Wednesday, 10 March 2021 00:00:00 UTC
+#endif