For review

#bug-empty-json - tag is used for quick search

.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

@@ -46,5 +46,6 @@ object_database/*
 *.pyc
 *.pyo
 .vscode
+.vs
 .DS_Store
 .idea

.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,25 @@ build-mainnet:
   tags:
     - builder
 
-test-mainnet:
-  stage: test
-  dependencies:
-    - build-mainnet
-  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:
+dockerize:
   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
+    - docker build . -t $DOCKER_REPO:$CI_COMMIT_REF_NAME
+    - docker login -u $DOCKER_USER -p $DOCKER_PASS
+    - docker push $DOCKER_REPO:$CI_COMMIT_REF_NAME
+    - docker logout
   tags:
     - builder
+  when: manual
+  timeout: 3h
 
-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:
+test:
   stage: test
   dependencies:
-    - build-testnet
+    - 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
-  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

@@ -4,6 +4,6 @@
     ignore = dirty
 [submodule "libraries/fc"]
     path = libraries/fc
-	url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
-	branch = develop
+    url = https://github.com/peerplays-network/peerplays-fc.git
+    branch = latest-fc
     ignore = dirty

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)
@@ -114,6 +83,7 @@ LIST(APPEND BOOST_COMPONENTS thread
                              system
                              filesystem
                              program_options
+                             signals
                              serialization
                              chrono
                              unit_test_framework

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,95 @@ 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
-
+cmake -DBOOST_ROOT="$BOOST_ROOT" -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 -DBUILD_PEERPLAYS_TESTNET=1
 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
 
-Install docker, and add current user to docker group.
+## Docker image
+
 ```
+# 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
-```
 
-### Official docker image for Peerplas Mainnet
 
-```
-docker pull datasecuritynode/peerplays:latest
-```
+# Build docker image (from the project root, must be a docker group member)
+docker build -t peerplays .
 
-### 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
+# Start docker image
+docker start peerplays
 
-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
+# Exposed ports
+# # rpc service:
+# EXPOSE 8090
+# # p2p service:
+# EXPOSE 1776
 ```
 
  Rest of the instructions on starting the chain remains same.
 
 Starting A Peerplays Node
 -----------------
+
+For Ubuntu 14.04 LTS and up users, see
+[this](https://github.com/cryptonomex/graphene/wiki/build-ubuntu) and
+then proceed with:
+
+    git clone https://github.com/peerplays-network/peerplays.git
+    cd peerplays
+    git submodule update --init --recursive
+    cmake -DBOOST_ROOT="$BOOST_ROOT" -DCMAKE_BUILD_TYPE=Release .
+    make
+    ./programs/witness_node/witness_node
+
 Launching the witness creates required directories. Next, **stop the witness** and continue.
 
     $ vi witness_node_data_dir/config.ini

clang-format.sh

@@ -3,4 +3,3 @@
 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"

libraries/app/api.cpp

@@ -45,6 +45,7 @@ template class fc::api<graphene::app::block_api>;
 template class fc::api<graphene::app::network_broadcast_api>;
 template class fc::api<graphene::app::network_node_api>;
 template class fc::api<graphene::app::history_api>;
+template class fc::api<graphene::app::crypto_api>;
 template class fc::api<graphene::app::asset_api>;
 template class fc::api<graphene::debug_witness::debug_api>;
 template class fc::api<graphene::app::login_api>;
@@ -89,6 +90,8 @@ void login_api::enable_api(const std::string &api_name) {
       _history_api = std::make_shared<history_api>(_app);
    } else if (api_name == "network_node_api") {
       _network_node_api = std::make_shared<network_node_api>(std::ref(_app));
+   } else if (api_name == "crypto_api") {
+      _crypto_api = std::make_shared<crypto_api>();
    } else if (api_name == "asset_api") {
       _asset_api = std::make_shared<asset_api>(_app);
    } else if (api_name == "debug_api") {
@@ -103,10 +106,6 @@ void login_api::enable_api(const std::string &api_name) {
       // can only enable this API if the plugin was loaded
       if (_app.get_plugin("affiliate_stats"))
          _affiliate_stats_api = std::make_shared<graphene::affiliate_stats::affiliate_stats_api>(std::ref(_app));
-   } else if (api_name == "sidechain_api") {
-      // can only enable this API if the plugin was loaded
-      if (_app.get_plugin("peerplays_sidechain"))
-         _sidechain_api = std::make_shared<graphene::peerplays_sidechain::sidechain_api>(std::ref(_app));
    }
    return;
 }
@@ -286,6 +285,11 @@ fc::api<history_api> login_api::history() const {
    return *_history_api;
 }
 
+fc::api<crypto_api> login_api::crypto() const {
+   FC_ASSERT(_crypto_api);
+   return *_crypto_api;
+}
+
 fc::api<asset_api> login_api::asset() const {
    FC_ASSERT(_asset_api);
    return *_asset_api;
@@ -306,11 +310,6 @@ fc::api<graphene::affiliate_stats::affiliate_stats_api> login_api::affiliate_sta
    return *_affiliate_stats_api;
 }
 
-fc::api<graphene::peerplays_sidechain::sidechain_api> login_api::sidechain() const {
-   FC_ASSERT(_sidechain_api);
-   return *_sidechain_api;
-}
-
 vector<order_history_object> history_api::get_fill_order_history(std::string asset_a, std::string asset_b, uint32_t limit) const {
    FC_ASSERT(_app.chain_database());
    const auto &db = *_app.chain_database();
@@ -514,6 +513,55 @@ vector<bucket_object> history_api::get_market_history(std::string asset_a, std::
    FC_CAPTURE_AND_RETHROW((asset_a)(asset_b)(bucket_seconds)(start)(end))
 }
 
+crypto_api::crypto_api(){};
+
+commitment_type crypto_api::blind(const blind_factor_type &blind, uint64_t value) {
+   return fc::ecc::blind(blind, value);
+}
+
+blind_factor_type crypto_api::blind_sum(const std::vector<blind_factor_type> &blinds_in, uint32_t non_neg) {
+   return fc::ecc::blind_sum(blinds_in, non_neg);
+}
+
+bool crypto_api::verify_sum(const std::vector<commitment_type> &commits_in, const std::vector<commitment_type> &neg_commits_in, int64_t excess) {
+   return fc::ecc::verify_sum(commits_in, neg_commits_in, excess);
+}
+
+verify_range_result crypto_api::verify_range(const commitment_type &commit, const std::vector<char> &proof) {
+   verify_range_result result;
+   result.success = fc::ecc::verify_range(result.min_val, result.max_val, commit, proof);
+   return result;
+}
+
+std::vector<char> crypto_api::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) {
+   return fc::ecc::range_proof_sign(min_value, commit, commit_blind, nonce, base10_exp, min_bits, actual_value);
+}
+
+verify_range_proof_rewind_result crypto_api::verify_range_proof_rewind(const blind_factor_type &nonce,
+                                                                       const commitment_type &commit,
+                                                                       const std::vector<char> &proof) {
+   verify_range_proof_rewind_result result;
+   result.success = fc::ecc::verify_range_proof_rewind(result.blind_out,
+                                                       result.value_out,
+                                                       result.message_out,
+                                                       nonce,
+                                                       result.min_val,
+                                                       result.max_val,
+                                                       const_cast<commitment_type &>(commit),
+                                                       proof);
+   return result;
+}
+
+range_proof_info crypto_api::range_get_info(const std::vector<char> &proof) {
+   return fc::ecc::range_get_info(proof);
+}
+
 // asset_api
 asset_api::asset_api(graphene::app::application &app) :
       _app(app),

libraries/app/application.cpp

@@ -48,7 +48,6 @@
 #include <boost/range/algorithm/reverse.hpp>
 #include <boost/signals2.hpp>
 
-#include <atomic>
 #include <iostream>
 
 #include <fc/log/file_appender.hpp>
@@ -108,7 +107,6 @@ public:
    fc::optional<fc::temp_file> _lock_file;
    bool _is_block_producer = false;
    bool _force_validate = false;
-   std::atomic_bool _running{true};
 
    void reset_p2p_node(const fc::path &data_dir) {
       try {
@@ -117,20 +115,27 @@ public:
          _p2p_network->load_configuration(data_dir / "p2p");
          _p2p_network->set_node_delegate(this);
 
-         vector<string> all_seeds;
-
          if (_options->count("seed-node")) {
             auto seeds = _options->at("seed-node").as<vector<string>>();
-            all_seeds.insert(all_seeds.end(), seeds.begin(), seeds.end());
+            for (const string &endpoint_string : seeds) {
+               try {
+                  std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
+                  for (const fc::ip::endpoint &endpoint : endpoints) {
+                     ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
+                     _p2p_network->add_node(endpoint);
+                     _p2p_network->connect_to_endpoint(endpoint);
+                  }
+               } catch (const fc::exception &e) {
+                  wlog("caught exception ${e} while adding seed node ${endpoint}",
+                       ("e", e.to_detail_string())("endpoint", endpoint_string));
+               }
+            }
          }
 
          if (_options->count("seed-nodes")) {
             auto seeds_str = _options->at("seed-nodes").as<string>();
             auto seeds = fc::json::from_string(seeds_str).as<vector<string>>(2);
-            all_seeds.insert(all_seeds.end(), seeds.begin(), seeds.end());
-         }
-
-         for (const string &endpoint_string : all_seeds) {
+            for (const string &endpoint_string : seeds) {
                try {
                   std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
                   for (const fc::ip::endpoint &endpoint : endpoints) {
@@ -142,6 +147,37 @@ public:
                        ("e", e.to_detail_string())("endpoint", endpoint_string));
                }
             }
+         } else {
+            // t.me/peerplays #seednodes
+            vector<string> seeds = {
+#ifdef BUILD_PEERPLAYS_TESTNET
+
+#else
+                  "51.222.110.110:9777",
+                  "95.216.90.243:9777",
+                  "96.46.48.98:19777",
+                  "96.46.48.98:29777",
+                  "96.46.48.98:39777",
+                  "96.46.48.98:49777",
+                  "96.46.48.98:59777",
+                  "seed.i9networks.net.br:9777",
+                  "witness.serverpit.com:9777"
+#endif
+            };
+
+            for (const string &endpoint_string : seeds) {
+               try {
+                  std::vector<fc::ip::endpoint> endpoints = resolve_string_to_ip_endpoints(endpoint_string);
+                  for (const fc::ip::endpoint &endpoint : endpoints) {
+                     ilog("Adding seed node ${endpoint}", ("endpoint", endpoint));
+                     _p2p_network->add_node(endpoint);
+                  }
+               } catch (const fc::exception &e) {
+                  wlog("caught exception ${e} while adding seed node ${endpoint}",
+                       ("e", e.to_detail_string())("endpoint", endpoint_string));
+               }
+            }
+         }
 
          if (_options->count("p2p-endpoint"))
             _p2p_network->listen_on_endpoint(fc::ip::endpoint::from_string(_options->at("p2p-endpoint").as<string>()), true);
@@ -362,9 +398,9 @@ public:
             wild_access.allowed_apis.push_back("database_api");
             wild_access.allowed_apis.push_back("network_broadcast_api");
             wild_access.allowed_apis.push_back("history_api");
+            wild_access.allowed_apis.push_back("crypto_api");
             wild_access.allowed_apis.push_back("bookie_api");
             wild_access.allowed_apis.push_back("affiliate_stats_api");
-            wild_access.allowed_apis.push_back("sidechain_api");
             _apiaccess.permission_map["*"] = wild_access;
          }
 
@@ -413,12 +449,6 @@ public:
        */
    virtual bool handle_block(const graphene::net::block_message &blk_msg, bool sync_mode,
                              std::vector<fc::uint160_t> &contained_transaction_message_ids) override {
-
-      // check point for the threads which may be cancled on application shutdown
-      if (!_running.load()) {
-         return true;
-      }
-
       try {
          auto latency = fc::time_point::now() - blk_msg.block.timestamp;
          FC_ASSERT((latency.count() / 1000) > -5000, "Rejecting block with timestamp in the future");
@@ -764,10 +794,6 @@ public:
       FC_CAPTURE_AND_RETHROW((block_id))
    }
 
-   virtual fc::time_point_sec get_last_known_hardfork_time() override {
-      return _chain_db->_hardfork_times[_chain_db->_hardfork_times.size() - 1];
-   }
-
    /**
        * Returns the time a block was produced (if block_id = 0, returns genesis time).
        * If we don't know about the block, returns time_point_sec::min()
@@ -833,26 +859,11 @@ application::~application() {
 
 void application::set_program_options(boost::program_options::options_description &cli,
                                       boost::program_options::options_description &cfg) const {
-
-   std::vector<string> seed_nodes = {
-#ifdef BUILD_PEERPLAYS_TESTNET
-#else
-         "51.222.110.110:9777",
-         "95.216.90.243:9777",
-         "ca.peerplays.info:9777",
-         "de.peerplays.xyz:9777",
-         "pl.peerplays.org:9777",
-         "seed.i9networks.net.br:9777",
-         "witness.serverpit.com:9777"
-#endif
-   };
-   std::string seed_nodes_str = fc::json::to_string(seed_nodes);
-
-   cfg.add_options()("p2p-endpoint", bpo::value<string>()->default_value("0.0.0.0:9777"), "Endpoint for P2P node to listen on");
+   cfg.add_options()("p2p-endpoint", bpo::value<string>(), "Endpoint for P2P node to listen on");
    cfg.add_options()("seed-node,s", bpo::value<vector<string>>()->composing(), "P2P nodes to connect to on startup (may specify multiple times)");
-   cfg.add_options()("seed-nodes", bpo::value<string>()->composing()->default_value(seed_nodes_str), "JSON array of P2P nodes to connect to on startup");
+   cfg.add_options()("seed-nodes", bpo::value<string>()->composing(), "JSON array of P2P nodes to connect to on startup");
    cfg.add_options()("checkpoint,c", bpo::value<vector<string>>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.");
-   cfg.add_options()("rpc-endpoint", bpo::value<string>()->default_value("127.0.0.1:8090"), "Endpoint for websocket RPC to listen on");
+   cfg.add_options()("rpc-endpoint", bpo::value<string>()->implicit_value("127.0.0.1:8090"), "Endpoint for websocket RPC to listen on");
    cfg.add_options()("rpc-tls-endpoint", bpo::value<string>()->implicit_value("127.0.0.1:8089"), "Endpoint for TLS websocket RPC to listen on");
    cfg.add_options()("server-pem,p", bpo::value<string>()->implicit_value("server.pem"), "The TLS certificate file for this server");
    cfg.add_options()("server-pem-password,P", bpo::value<string>()->implicit_value(""), "Password for this certificate");
@@ -917,7 +928,6 @@ void application::initialize(const fc::path &data_dir, const boost::program_opti
       wanted.insert("accounts_list");
       wanted.insert("affiliate_stats");
    }
-   if (!wanted.count("delayed_node") && !wanted.count("debug_witness") && !wanted.count("witness")) // explicitly requested delayed_node or debug_witness functionality suppresses witness functions
    wanted.insert("witness");
    wanted.insert("bookie");
 
@@ -950,7 +960,7 @@ void application::startup() {
 }
 
 std::shared_ptr<abstract_plugin> application::get_plugin(const string &name) const {
-   return is_plugin_enabled(name) ? my->_active_plugins[name] : nullptr;
+   return my->_active_plugins[name];
 }
 
 bool application::is_plugin_enabled(const string &name) const {
@@ -997,7 +1007,6 @@ void application::shutdown_plugins() {
    return;
 }
 void application::shutdown() {
-   my->_running.store(false);
    if (my->_p2p_network)
       my->_p2p_network->close();
    if (my->_chain_db)

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

@@ -28,15 +28,16 @@
 #include <graphene/chain/protocol/confidential.hpp>
 #include <graphene/chain/protocol/types.hpp>
 
-#include <graphene/net/node.hpp>
-
 #include <graphene/accounts_list/accounts_list_plugin.hpp>
+#include <graphene/market_history/market_history_plugin.hpp>
+
+#include <graphene/elasticsearch/elasticsearch_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 <graphene/net/node.hpp>
 
 #include <fc/api.hpp>
 #include <fc/crypto/elliptic.hpp>
@@ -289,6 +290,33 @@ private:
    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
     */
@@ -332,6 +360,7 @@ 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>;
 
@@ -366,6 +395,8 @@ public:
    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)
@@ -374,8 +405,6 @@ public:
    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;
 
    /// @brief Called to enable an API, not reflected.
    void enable_api(const string &api_name);
@@ -387,11 +416,11 @@ private:
    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;
-   optional<fc::api<graphene::peerplays_sidechain::sidechain_api>> _sidechain_api;
 };
 
 }} // namespace graphene::app
@@ -444,6 +473,15 @@ FC_API(graphene::app::network_node_api,
       (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)
@@ -456,10 +494,10 @@ FC_API(graphene::app::login_api,
       (database)
       (history)
       (network_node)
+      (crypto)
       (asset)
       (debug)
       (bookie)
-      (affiliate_stats)
-      (sidechain))
+      (affiliate_stats))
 
 // clang-format on

libraries/app/include/graphene/app/database_api.hpp

@@ -56,8 +56,6 @@
 #include <graphene/chain/custom_permission_object.hpp>
 #include <graphene/chain/nft_object.hpp>
 #include <graphene/chain/offer_object.hpp>
-#include <graphene/chain/voters_info.hpp>
-#include <graphene/chain/votes_info.hpp>
 
 #include <graphene/market_history/market_history_plugin.hpp>
 
@@ -82,15 +80,6 @@ using namespace std;
 
 class database_api_impl;
 
-struct signed_block_with_info : public signed_block {
-   signed_block_with_info();
-   signed_block_with_info(const signed_block &block);
-   signed_block_with_info(const signed_block_with_info &block) = default;
-   block_id_type block_id;
-   public_key_type signing_key;
-   vector<transaction_id_type> transaction_ids;
-};
-
 struct order {
    double price;
    double quote;
@@ -139,14 +128,6 @@ struct gpos_info {
    share_type account_vested_balance;
 };
 
-struct version_info {
-   string version;
-   string git_revision;
-   string built;
-   string openssl;
-   string boost;
-};
-
 /**
  * @brief The database_api class implements the RPC API for the chain database.
  *
@@ -211,13 +192,6 @@ public:
     */
    optional<signed_block> get_block(uint32_t block_num) const;
 
-   /**
-    * @brief Retrieve a full, signed block, with some extra info
-    * @param block_num Height of the block to be returned
-    * @return the referenced block, or null if no matching block was found
-    */
-   optional<signed_block_with_info> get_block2(uint32_t block_num) const;
-
    /**
     * @brief Retrieve a list of signed blocks
     * @param block_num_from start
@@ -242,11 +216,6 @@ public:
    // Globals //
    /////////////
 
-   /**
-    * @brief Retrieve the @ref version_info associated with the witness node
-    */
-   version_info get_version_info() const;
-
    /**
     * @brief Retrieve the @ref chain_property_object associated with the chain
     */
@@ -589,13 +558,6 @@ public:
     * @param account The ID of the account whose witness should be retrieved
     * @return The witness object, or null if the account does not have a witness
     */
-   fc::optional<witness_object> get_witness_by_account_id(account_id_type account) const;
-
-   /**
-    * @brief Get the witness owned by a given account
-    * @param account_id_or_name The ID or name of the account whose witness should be retrieved
-    * @return The witness object, or null if the account does not have a witness
-    */
    fc::optional<witness_object> get_witness_by_account(const std::string account_name_or_id) const;
 
    /**
@@ -624,13 +586,6 @@ public:
     */
    vector<optional<committee_member_object>> get_committee_members(const vector<committee_member_id_type> &committee_member_ids) const;
 
-   /**
-    * @brief Get the committee_member owned by a given account
-    * @param account The ID of the account whose committee_member should be retrieved
-    * @return The committee_member object, or null if the account does not have a committee_member
-    */
-   fc::optional<committee_member_object> get_committee_member_by_account_id(account_id_type account) const;
-
    /**
     * @brief Get the committee_member owned by a given account
     * @param account_id_or_name The ID or name of the account whose committee_member should be retrieved
@@ -646,11 +601,6 @@ public:
     */
    map<string, committee_member_id_type> lookup_committee_member_accounts(const string &lower_bound_name, uint32_t limit) const;
 
-   /**
-    * @brief Get the total number of committee_members registered with the blockchain
-    */
-   uint64_t get_committee_member_count() const;
-
    /////////////////
    // SON members //
    /////////////////
@@ -669,14 +619,7 @@ public:
     * @param account The ID of the account whose SON should be retrieved
     * @return The SON object, or null if the account does not have a SON
     */
-   fc::optional<son_object> get_son_by_account_id(account_id_type account) const;
-
-   /**
-    * @brief Get the SON owned by a given account
-    * @param account_id_or_name The ID of the account whose SON should be retrieved
-    * @return The SON object, or null if the account does not have a SON
-    */
-   fc::optional<son_object> get_son_by_account(const std::string account_id_or_name) const;
+   fc::optional<son_object> get_son_by_account(account_id_type account) const;
 
    /**
     * @brief Get names and IDs for registered SONs
@@ -691,32 +634,6 @@ public:
     */
    uint64_t get_son_count() const;
 
-   /**
-    * @brief Get list of active sons
-    * @return List of active SONs
-    */
-   flat_map<sidechain_type, vector<son_sidechain_info>> get_active_sons();
-
-   /**
-    * @brief Get list of active sons
-    * @param sidechain Sidechain type [bitcoin|ethereum|hive]
-    * @return List of active SONs
-    */
-   vector<son_sidechain_info> get_active_sons_by_sidechain(sidechain_type sidechain);
-
-   /**
-    * @brief Get SON network status
-    * @return SON network status description for a given sidechain type
-    */
-   map<sidechain_type, map<son_id_type, string>> get_son_network_status();
-
-   /**
-    * @brief Get SON network status
-    * @param sidechain Sidechain type [bitcoin|ethereum|hive]
-    * @return SON network status description for a given sidechain type
-    */
-   map<son_id_type, string> get_son_network_status_by_sidechain(sidechain_type sidechain);
-
    /////////////////////////
    // SON Wallets      //
    /////////////////////////
@@ -781,46 +698,15 @@ public:
     */
    uint64_t get_sidechain_addresses_count() const;
 
-   /////////////
-   // Workers //
-   /////////////
-
-   /**
-    * @brief Get a list of workers by ID
-    * @param worker_ids IDs of the workers to retrieve
-    * @return The workers corresponding to the provided IDs
-    *
-    * This function has semantics identical to @ref get_objects
-    */
-   vector<optional<worker_object>> get_workers(const vector<worker_id_type> &worker_ids) const;
+   /// WORKERS
 
    /**
     * @brief Return the worker objects associated with this account.
-    * @param account The ID of the account whose workers should be retrieved
-    * @return The worker object or null if the account does not have a worker
-    */
-   vector<worker_object> get_workers_by_account_id(account_id_type account) const;
-
-   /**
-    * @brief Return the worker objects associated with this account.
-    * @param account_id_or_name The ID or name of the account whose workers should be retrieved
+    * @param account_id_or_name The ID or name of the account whose worker should be retrieved
     * @return The worker object or null if the account does not have a worker
     */
    vector<worker_object> get_workers_by_account(const std::string account_id_or_name) const;
 
-   /**
-    * @brief Get names and IDs for registered workers
-    * @param lower_bound_name Lower bound of the first name to return
-    * @param limit Maximum number of results to return -- must not exceed 1000
-    * @return Map of worker names to corresponding IDs
-    */
-   map<string, worker_id_type> lookup_worker_accounts(const string &lower_bound_name, uint32_t limit) const;
-
-   /**
-    * @brief Get the total number of workers registered with the blockchain
-    */
-   uint64_t get_worker_count() const;
-
    ///////////
    // Votes //
    ///////////
@@ -835,39 +721,6 @@ public:
     */
    vector<variant> lookup_vote_ids(const vector<vote_id_type> &votes) const;
 
-   /**
-    * @brief Get a list of vote_id_type that ID votes for
-    * @param account_name_or_id ID or name of the account to get votes for
-    * @return The list of vote_id_type ID votes for
-    *
-    */
-   vector<vote_id_type> get_votes_ids(const string &account_name_or_id) const;
-
-   /**
-    * @brief Return the objects account_name_or_id votes for
-    * @param account_name_or_id ID or name of the account to get votes for
-    * @return The votes_info account_name_or_id votes for
-    *
-    */
-   votes_info get_votes(const string &account_name_or_id) const;
-
-   /**
-    *
-    * @brief Get a list of accounts that votes for vote_id
-    * @param vote_id We search accounts that vote for this ID
-    * @return The accounts that votes for provided ID
-    *
-    */
-   vector<account_object> get_voters_by_id(const vote_id_type &vote_id) const;
-
-   /**
-    * @brief Return the accounts that votes for account_name_or_id
-    * @param account_name_or_id ID or name of the account to get voters for
-    * @return The voters_info for account_name_or_id
-    *
-    */
-   voters_info get_voters(const string &account_name_or_id) const;
-
    ////////////////////////////
    // Authority / validation //
    ////////////////////////////
@@ -919,6 +772,15 @@ public:
     */
    vector<proposal_object> get_proposed_transactions(const std::string account_id_or_name) const;
 
+   //////////////////////
+   // Blinded balances //
+   //////////////////////
+
+   /**
+    *  @return the set of blinded balance objects by commitment ID
+    */
+   vector<blinded_balance_object> get_blinded_balances(const flat_set<commitment_type> &commitments) const;
+
    /////////////////
    // Tournaments //
    /////////////////
@@ -1043,25 +905,14 @@ public:
     * @brief Returns list of all available NTF's
     * @return List of all available NFT's
     */
-   vector<nft_object> nft_get_all_tokens(const nft_id_type lower_id, uint32_t limit) const;
+   vector<nft_object> nft_get_all_tokens() const;
 
    /**
     * @brief Returns NFT's owned by owner
     * @param owner NFT owner
-    * @param lower_id ID of the first NFT to return
-    * @param limit Maximum number of results to return
     * @return List of NFT owned by owner
     */
-   vector<nft_object> nft_get_tokens_by_owner(const account_id_type owner, const nft_id_type lower_id, uint32_t limit) const;
-
-   /**
-    * @brief Returns NFT metadata owned by owner
-    * @param owner NFT owner
-    * @param lower_id ID of the first NFT metadata to return
-    * @param limit Maximum number of results to return
-    * @return List of NFT owned by owner
-    */
-   vector<nft_metadata_object> nft_get_metadata_by_owner(const account_id_type owner, const nft_metadata_id_type lower_id, uint32_t limit) const;
+   vector<nft_object> nft_get_tokens_by_owner(const account_id_type owner) const;
 
    //////////////////
    // MARKET PLACE //
@@ -1091,15 +942,12 @@ extern template class fc::api<graphene::app::database_api>;
 
 // clang-format off
 
-FC_REFLECT_DERIVED(graphene::app::signed_block_with_info, (graphene::chain::signed_block), (block_id)(signing_key)(transaction_ids));
-
 FC_REFLECT(graphene::app::order, (price)(quote)(base));
 FC_REFLECT(graphene::app::order_book, (base)(quote)(bids)(asks));
 FC_REFLECT(graphene::app::market_ticker, (base)(quote)(latest)(lowest_ask)(highest_bid)(percent_change)(base_volume)(quote_volume));
 FC_REFLECT(graphene::app::market_volume, (base)(quote)(base_volume)(quote_volume));
 FC_REFLECT(graphene::app::market_trade, (date)(price)(amount)(value));
 FC_REFLECT(graphene::app::gpos_info, (vesting_factor)(award)(total_amount)(current_subperiod)(last_voted_time)(allowed_withdraw_amount)(account_vested_balance));
-FC_REFLECT(graphene::app::version_info, (version)(git_revision)(built)(openssl)(boost));
 
 FC_API(graphene::app::database_api,
    // Objects
@@ -1115,13 +963,11 @@ FC_API(graphene::app::database_api,
    (get_block_header)
    (get_block_header_batch)
    (get_block)
-   (get_block2)
    (get_blocks)
    (get_transaction)
    (get_recent_transaction_by_id)
 
    // Globals
-   (get_version_info)
    (get_chain_properties)
    (get_global_properties)
    (get_config)
@@ -1187,28 +1033,20 @@ FC_API(graphene::app::database_api,
 
    // Witnesses
    (get_witnesses)
-   (get_witness_by_account_id)
    (get_witness_by_account)
    (lookup_witness_accounts)
    (get_witness_count)
 
    // Committee members
    (get_committee_members)
-   (get_committee_member_by_account_id)
    (get_committee_member_by_account)
    (lookup_committee_member_accounts)
-   (get_committee_member_count)
 
    // SON members
    (get_sons)
-   (get_son_by_account_id)
    (get_son_by_account)
    (lookup_son_accounts)
    (get_son_count)
-   (get_active_sons)
-   (get_active_sons_by_sidechain)
-   (get_son_network_status)
-   (get_son_network_status_by_sidechain)
 
    // SON wallets
    (get_active_son_wallet)
@@ -1222,19 +1060,10 @@ FC_API(graphene::app::database_api,
    (get_sidechain_address_by_account_and_sidechain)
    (get_sidechain_addresses_count)
 
-   // Workers
-   (get_workers)
-   (get_workers_by_account_id)
+   // workers
    (get_workers_by_account)
-   (lookup_worker_accounts)
-   (get_worker_count)
-
    // Votes
    (lookup_vote_ids)
-   (get_votes_ids)
-   (get_votes)
-   (get_voters_by_id)
-   (get_voters)
 
    // Authority / validation
    (get_transaction_hex)
@@ -1249,6 +1078,9 @@ FC_API(graphene::app::database_api,
    // Proposed transactions
    (get_proposed_transactions)
 
+   // Blinded balances
+   (get_blinded_balances)
+
    // Tournaments
    (get_tournaments_in_state)
    (get_tournaments_by_state)
@@ -1279,7 +1111,6 @@ FC_API(graphene::app::database_api,
    (nft_token_of_owner_by_index)
    (nft_get_all_tokens)
    (nft_get_tokens_by_owner)
-   (nft_get_metadata_by_owner)
 
    // Marketplace
    (list_offers)

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/betting_market_object.cpp

@@ -493,3 +493,4 @@ namespace fc {
       const_cast<int*>(event_obj.my->state_machine.current_state())[0] = (int)status;
    }
 } //end namespace fc
+

libraries/chain/confidential_evaluator.cpp

@@ -34,9 +34,8 @@ 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);
+
+   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) );
@@ -46,15 +45,12 @@ void_result transfer_to_blind_evaluator::do_evaluate( const transfer_to_blind_op
       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 ) 
 { try {
-  if( db().head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
    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 
@@ -62,53 +58,49 @@ void_result transfer_to_blind_evaluator::do_apply( const transfer_to_blind_opera
       obj.confidential_supply += o.amount.amount;
       FC_ASSERT( obj.confidential_supply >= 0 );
    });
-     for (const auto &out : o.outputs) {
+   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)
+   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) {
+   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 ) 
 { 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) {
+   for( const auto& in : o.inputs )
+   {
       auto itr = cidx.find( in.commitment );
       FC_ASSERT( itr != cidx.end() );
       db().remove( *itr );
@@ -118,54 +110,51 @@ void_result transfer_from_blind_evaluator::do_apply( const transfer_from_blind_o
       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)
+   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>();
+   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& 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) {
+   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 ) 
 { 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) {
+   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) {
+   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;
@@ -177,19 +166,16 @@ void_result blind_transfer_evaluator::do_apply( const blind_transfer_operation&
       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)
+   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,14 +160,11 @@ void database::check_transaction_for_duplicated_operations(const signed_transact
       existed_operations_digests.insert( proposed_operations_digests.begin(), proposed_operations_digests.end() );
    });
 
-   {
-      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(trx);
    for (auto& digest: proposed_operations_digests)
@@ -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};
+   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);
-   }
 
    // 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));
-            }
             _applied_ops[i].reset();
          }
       }
@@ -527,26 +499,24 @@ 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();
-   }
 
    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 );
 
       // postpone transaction if it would make block too big
-         if (new_total_size >= maximum_block_size) {
+      if( new_total_size >= maximum_block_size )
+      {
          postponed_tx_count++;
          continue;
       }
 
-         try {
+      try
+      {
          auto temp_session = _undo_db.start_undo_session();
          processed_transaction ptx = _apply_transaction( tx );
          temp_session.merge();
@@ -556,23 +526,20 @@ signed_block database::_generate_block(
          // their size)
          total_block_size += fc::raw::pack_size( ptx );
          pending_block.transactions.push_back( ptx );
-         } catch (const fc::exception &e) {
+      }
+      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();
-   }
 
    // 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();
-   }
-
    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);
       }
    }
 
@@ -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 );
    }
 

libraries/chain/db_getter.cpp

@@ -222,33 +222,18 @@ 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)
-      {
-         const auto& sidechain = status.first;
-         if(status.second != son_status::in_maintenance)
-            need_to_be_deregistered = false;
-
-         if(need_to_be_deregistered)
+      if(son.status == son_status::in_maintenance)
       {
          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;
-               }
-            }
-         }
-      }
-
-      if(need_to_be_deregistered)
+         if(head_block_time() - stats.last_down_timestamp >= fc::seconds(get_global_properties().parameters.son_deregister_time()))
          {
             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 (son->status == son_status::in_maintenance &&
+                (head_block_time() - son->statistics(*this).last_down_timestamp >= fc::seconds(get_global_properties().parameters.son_deregister_time())));
 }
 
-   return status_son_dereg_valid;
-}
-
-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());
 }
@@ -386,14 +349,23 @@ vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum
 
 bool database::is_asset_creation_allowed(const string &symbol)
 {
+   time_point_sec now = head_block_time();
+   std::unordered_set<std::string> post_son_hf_symbols = {"ETH", "USDT", "BNB", "ADA", "DOGE", "XRP", "USDC", "DOT", "UNI", "BUSD", "BCH", "LTC", "SOL", "LINK", "MATIC", "THETA",
+                                                          "WBTC", "XLM", "ICP", "DAI", "VET", "ETC", "TRX", "FIL", "XMR", "EGR", "EOS", "SHIB", "AAVE", "CRO", "ALGO", "AMP", "BTCB",
+                                                          "BSV", "KLAY", "CAKE", "FTT", "LEO", "XTZ", "TFUEL", "MIOTA", "LUNA", "NEO", "ATOM", "MKR", "FEI", "WBNB", "UST", "AVAX",
+                                                          "STEEM", "HIVE", "HBD", "SBD", "BTS"};
    if (symbol == "BTC")
    {
-      if (head_block_time() < HARDFORK_SON_TIME)
+      if (now < HARDFORK_SON_TIME)
+         return false;
+   }
+
+   if (post_son_hf_symbols.find(symbol) != post_son_hf_symbols.end())
+   {
+      if (now >= HARDFORK_SON_TIME)
          return false;
    }
    return true;
 }
 
-}
-
-}
+} }

libraries/chain/db_init.cpp

@@ -329,53 +329,9 @@ void database::initialize_evaluators()
    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());
-}
-
 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 );
 
    //Protocol object indexes
@@ -476,9 +432,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 +1058,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 +1068,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_maint.cpp

@@ -78,34 +78,25 @@ vector<std::reference_wrapper<const typename Index::object_type>> database::sort
 }
 
 template<>
-vector<std::reference_wrapper<const son_object>> database::sort_votable_objects<son_index>(sidechain_type sidechain, size_t count) const
+vector<std::reference_wrapper<const son_object>> database::sort_votable_objects<son_index>(size_t count) const
 {
    const auto& all_sons = get_index_type<son_index>().indices().get< by_id >();
    std::vector<std::reference_wrapper<const son_object>> refs;
    for( auto& son : all_sons )
    {
-      if(son.has_valid_config(head_block_time(), sidechain) && son.statuses.at(sidechain) != son_status::deregistered)
+      if(son.has_valid_config(head_block_time()) && son.status != son_status::deregistered)
       {
          refs.push_back(std::cref(son));
       }
    }
    count = std::min(count, refs.size());
    std::partial_sort(refs.begin(), refs.begin() + count, refs.end(),
-      [this, sidechain](const son_object& a, const son_object& b)->bool {
-         FC_ASSERT(sidechain == sidechain_type::bitcoin ||
-                   sidechain == sidechain_type::ethereum ||
-                   sidechain == sidechain_type::hive,
-                   "Unexpected sidechain type");
-
-         FC_ASSERT(a.get_sidechain_vote_id(sidechain).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", sidechain)("son", a));
-         FC_ASSERT(b.get_sidechain_vote_id(sidechain).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", sidechain)("son", b));
-         const share_type oa_vote = _vote_tally_buffer.size() > *a.get_sidechain_vote_id(sidechain) ? _vote_tally_buffer[*a.get_sidechain_vote_id(sidechain)] : 0;
-         const share_type ob_vote = _vote_tally_buffer.size() > *b.get_sidechain_vote_id(sidechain) ? _vote_tally_buffer[*b.get_sidechain_vote_id(sidechain)] : 0;
-
+                   [this](const son_object& a, const son_object& b)->bool {
+      share_type oa_vote = _vote_tally_buffer[a.vote_id];
+      share_type ob_vote = _vote_tally_buffer[b.vote_id];
       if( oa_vote != ob_vote )
          return oa_vote > ob_vote;
-
-         return a.get_sidechain_vote_id(sidechain) < b.get_sidechain_vote_id(sidechain);
+      return a.vote_id < b.vote_id;
    });
 
    refs.resize(count, refs.front());
@@ -170,7 +161,6 @@ struct worker_pay_visitor
          worker.pay_worker(pay, db);
       }
 };
-
 void database::update_worker_votes()
 {
    auto& idx = get_index_type<worker_index>();
@@ -186,95 +176,63 @@ void database::update_worker_votes()
    }
 }
 
-void database::hotfix_2024()
+void database::pay_sons()
 {
-   if (head_block_time() >= HARDFORK_HOTFIX_2024_TIME)
-   {
-      if (get_chain_id().str() == "6b6b5f0ce7a36d323768e534f3edb41c6d6332a541a95725b98e28d140850134")
-      {
-         const auto& vb_idx = get_index_type<vesting_balance_index>().indices().get<by_id>();
-         auto vbo = vb_idx.find(vesting_balance_id_type(388));
-         if (vbo != vb_idx.end())
-         {
-            if (vbo->owner == account_id_type(14786))
-            {
-               modify(*vbo, [&]( vesting_balance_object& _vbo)
-               {
-                  _vbo.owner = account_id_type(0);
-               });
-            }
-         }
-      }
-   }
-}
-
-void database::pay_sons_before_hf_ethereum()
-{
-   const auto now = head_block_time();
+   time_point_sec now = head_block_time();
    const dynamic_global_property_object& dpo = get_dynamic_global_properties();
    // Current requirement is that we have to pay every 24 hours, so the following check
-   if( dpo.son_budget.value > 0 && ((now - dpo.last_son_payout_time) >= fc::seconds(get_global_properties().parameters.son_pay_time())))
-   {
-      const sidechain_type st = sidechain_type::bitcoin;
-      const auto sons = sort_votable_objects<son_index>(st, get_global_properties().parameters.maximum_son_count());
-
+   if( dpo.son_budget.value > 0 && ((now - dpo.last_son_payout_time) >= fc::seconds(get_global_properties().parameters.son_pay_time()))) {
+      auto sons = sort_votable_objects<son_index>(get_global_properties().parameters.maximum_son_count());
       // After SON2 HF
       uint64_t total_votes = 0;
       for( const son_object& son : sons )
       {
-         FC_ASSERT(son.get_sidechain_vote_id(st).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", st)("son", son));
-         total_votes += _vote_tally_buffer[*son.get_sidechain_vote_id(st)];
+         total_votes += _vote_tally_buffer[son.vote_id];
       }
-      const int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
+      int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
       auto get_weight = [&bits_to_drop]( uint64_t son_votes ) {
-         const uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
+         uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
          return weight;
       };
-
       // Before SON2 HF
       auto get_weight_before_son2_hf = []( uint64_t son_votes ) {
-         const int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(son_votes)) - 15, 0);
-         const uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
+         int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(son_votes)) - 15, 0);
+         uint16_t weight = std::max((son_votes >> bits_to_drop), uint64_t(1) );
          return weight;
       };
-
       uint64_t weighted_total_txs_signed = 0;
-      const share_type son_budget = dpo.son_budget;
-      get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &get_weight, &now, &get_weight_before_son2_hf, &st](const object& o) {
+      share_type son_budget = dpo.son_budget;
+      get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &get_weight, &now, &get_weight_before_son2_hf](const object& o) {
          const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
          const auto& idx = get_index_type<son_index>().indices().get<by_id>();
-         const auto son_obj = idx.find( s.owner );
-         uint16_t son_weight = 0;
-         FC_ASSERT(son_obj->get_sidechain_vote_id(st).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", st)("son", *son_obj));
-         if( now >= HARDFORK_SON2_TIME ) {
-            son_weight += get_weight(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
+         auto son_obj = idx.find( s.owner );
+         auto son_weight = get_weight(_vote_tally_buffer[son_obj->vote_id]);
+         if( now < HARDFORK_SON2_TIME ) {
+            son_weight = get_weight_before_son2_hf(_vote_tally_buffer[son_obj->vote_id]);
          }
-         else {
-            son_weight += get_weight_before_son2_hf(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
+         uint64_t txs_signed = 0;
+         for (const auto &ts : s.txs_signed) {
+            txs_signed = txs_signed + ts.second;
          }
-         const uint64_t txs_signed_bitcoin = s.txs_signed.contains(sidechain_type::bitcoin) ? s.txs_signed.at(sidechain_type::bitcoin) : 0;
-         const uint64_t txs_signed_hive = s.txs_signed.contains(sidechain_type::hive) ? s.txs_signed.at(sidechain_type::hive) : 0;
-         weighted_total_txs_signed += ((txs_signed_bitcoin + txs_signed_hive) * son_weight);
+         weighted_total_txs_signed += (txs_signed * son_weight);
       });
 
       // Now pay off each SON proportional to the number of transactions signed.
-      get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &dpo, &son_budget, &get_weight, &get_weight_before_son2_hf, &now, &st](const object& o) {
+      get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &dpo, &son_budget, &get_weight, &get_weight_before_son2_hf, &now](const object& o) {
          const son_statistics_object& s = static_cast<const son_statistics_object&>(o);
-         const uint64_t txs_signed_bitcoin = s.txs_signed.contains(sidechain_type::bitcoin) ? s.txs_signed.at(sidechain_type::bitcoin) : 0;
-         const uint64_t txs_signed_hive = s.txs_signed.contains(sidechain_type::hive) ? s.txs_signed.at(sidechain_type::hive) : 0;
+         uint64_t txs_signed = 0;
+         for (const auto &ts : s.txs_signed) {
+            txs_signed = txs_signed + ts.second;
+         }
 
-         if(txs_signed_bitcoin > 0 || txs_signed_hive > 0) {
+         if(txs_signed > 0){
             const auto& idx = get_index_type<son_index>().indices().get<by_id>();
             auto son_obj = idx.find( s.owner );
-            uint16_t son_weight = 0;
-            FC_ASSERT(son_obj->get_sidechain_vote_id(st).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", st)("son", *son_obj));
-            if( now >= HARDFORK_SON2_TIME ) {
-               son_weight += get_weight(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
+            auto son_weight = get_weight(_vote_tally_buffer[son_obj->vote_id]);
+            if( now < HARDFORK_SON2_TIME ) {
+               son_weight = get_weight_before_son2_hf(_vote_tally_buffer[son_obj->vote_id]);
             }
-            else {
-               son_weight += get_weight_before_son2_hf(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
-            }
-            const share_type pay = ((txs_signed_bitcoin + txs_signed_hive) * son_weight * son_budget.value)/weighted_total_txs_signed;
+            share_type pay = (txs_signed * son_weight * son_budget.value)/weighted_total_txs_signed;
             modify( *son_obj, [&]( son_object& _son_obj)
             {
                _son_obj.pay_son_fee(pay, *this);
@@ -287,14 +245,12 @@ void database::pay_sons_before_hf_ethereum()
             //Reset the tx counter in each son statistics object
             modify( s, [&]( son_statistics_object& _s)
             {
-               if(_s.txs_signed.contains(sidechain_type::bitcoin))
-                  _s.txs_signed.at(sidechain_type::bitcoin) = 0;
-               if(_s.txs_signed.contains(sidechain_type::hive))
-                  _s.txs_signed.at(sidechain_type::hive) = 0;
+               for (const auto &ts : s.txs_signed) {
+                  _s.txs_signed.at(ts.first) = 0;
+               }
             });
          }
       });
-
       //Note the last son pay out time
       modify( dpo, [&]( dynamic_global_property_object& _dpo )
       {
@@ -303,228 +259,122 @@ void database::pay_sons_before_hf_ethereum()
    }
 }
 
-void database::pay_sons_after_hf_ethereum()
+void database::update_son_metrics(const vector<son_info>& curr_active_sons)
 {
-   const time_point_sec now = head_block_time();
-   const dynamic_global_property_object& dpo = get_dynamic_global_properties();
-   // Current requirement is that we have to pay every 24 hours, so the following check
-   if( dpo.son_budget.value > 0 && ((now - dpo.last_son_payout_time) >= fc::seconds(get_global_properties().parameters.son_pay_time())))
-   {
-      flat_map<sidechain_type, int8_t> bits_to_drop;
-      for(const auto& active_sidechain_type : active_sidechain_types(now))
-      {
-         assert( _son_count_histogram_buffer.at(active_sidechain_type).size() > 0 );
-         const share_type  stake_target = (_total_voting_stake-_son_count_histogram_buffer.at(active_sidechain_type)[0]) / 2;
-         /// accounts that vote for 0 or 1 son do not get to express an opinion on
-         /// the number of sons to have (they abstain and are non-voting accounts)
-         share_type stake_tally = 0;
-         size_t son_count = 0;
-         if( stake_target > 0 )
-         {
-            while( (son_count < _son_count_histogram_buffer.at(active_sidechain_type).size() - 1)
-                   && (stake_tally <= stake_target) )
-            {
-               stake_tally += _son_count_histogram_buffer.at(active_sidechain_type)[++son_count];
-            }
-         }
-
-         const auto sons = sort_votable_objects<son_index>(active_sidechain_type, (std::max(son_count*2+1, (size_t)get_chain_properties().immutable_parameters.min_son_count)));
-
-         // After SON2 HF
-         uint64_t total_votes = 0;
-         for( const son_object& son : sons )
-         {
-            FC_ASSERT(son.get_sidechain_vote_id(active_sidechain_type).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", active_sidechain_type)("son", son));
-            total_votes += _vote_tally_buffer[*son.get_sidechain_vote_id(active_sidechain_type)];
-         }
-         bits_to_drop[active_sidechain_type] = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
-      }
-
-      auto get_weight = [&bits_to_drop]( sidechain_type sidechain, uint64_t son_votes ) {
-         const uint16_t weight = std::max((son_votes >> bits_to_drop.at(sidechain)), uint64_t(1) );
-         return weight;
-      };
-
-      // Calculate weighted_total_txs_signed
-      uint64_t weighted_total_txs_signed = 0;
-      get_index_type<son_stats_index>().inspect_all_objects([this, &weighted_total_txs_signed, &get_weight, &now](const object& o) {
-         for(const auto& active_sidechain_type : active_sidechain_types(now)) {
-            const son_statistics_object &s = static_cast<const son_statistics_object &>(o);
-            const auto &idx = get_index_type<son_index>().indices().get<by_id>();
-            const auto son_obj = idx.find(s.owner);
-            FC_ASSERT(son_obj->get_sidechain_vote_id(active_sidechain_type).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", active_sidechain_type)("son", *son_obj));
-            const uint16_t son_weight = get_weight(active_sidechain_type, _vote_tally_buffer[*son_obj->get_sidechain_vote_id(active_sidechain_type)]);
-            const uint64_t txs_signed = s.txs_signed.contains(active_sidechain_type) ? s.txs_signed.at(active_sidechain_type) : 0;
-            weighted_total_txs_signed += (txs_signed * son_weight);
-         }
-      });
-
-      // Now pay off each SON proportional to the number of transactions signed
-      const share_type son_budget = dpo.son_budget;
-      get_index_type<son_stats_index>().inspect_all_objects([this, &now, &get_weight, &weighted_total_txs_signed, &dpo, &son_budget](const object& o) {
-         for(const auto& active_sidechain_type : active_sidechain_types(now)) {
-            const son_statistics_object &s = static_cast<const son_statistics_object &>(o);
-
-            const uint64_t txs_signed = s.txs_signed.contains(active_sidechain_type) ? s.txs_signed.at(active_sidechain_type) : 0;
-            if (txs_signed > 0) {
-               const auto &idx = get_index_type<son_index>().indices().get<by_id>();
-               auto son_obj = idx.find(s.owner);
-               uint16_t son_weight = 0;
-               FC_ASSERT(son_obj->get_sidechain_vote_id(active_sidechain_type).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", active_sidechain_type)("son", *son_obj));
-               son_weight += get_weight(active_sidechain_type, _vote_tally_buffer[*son_obj->get_sidechain_vote_id(active_sidechain_type)]);
-               const share_type pay = (txs_signed * son_weight * son_budget.value) / weighted_total_txs_signed;
-               modify(*son_obj, [&](son_object &_son_obj) {
-                  _son_obj.pay_son_fee(pay, *this);
-               });
-               // Remove the amount paid out to SON from global SON Budget
-               modify(dpo, [&](dynamic_global_property_object &_dpo) {
-                  _dpo.son_budget -= pay;
-               });
-               // Reset the tx counter in each son statistics object
-               modify(s, [&](son_statistics_object &_s) {
-                  if (_s.txs_signed.contains(active_sidechain_type))
-                     _s.txs_signed.at(active_sidechain_type) = 0;
-               });
-            }
-         }
-      });
-
-      //Note the last son pay out time
-      modify( dpo, [&]( dynamic_global_property_object& _dpo )
-      {
-         _dpo.last_son_payout_time = now;
-      });
-   }
-}
-
-void database::update_son_metrics(const flat_map<sidechain_type, vector<son_sidechain_info> >& curr_active_sons)
-{
-   for(const auto& curr_active_sidechain_sons : curr_active_sons) {
-      const auto& sidechain = curr_active_sidechain_sons.first;
-      const auto& _curr_active_sidechain_sons = curr_active_sidechain_sons.second;
-
    vector<son_id_type> current_sons;
 
-      current_sons.reserve(_curr_active_sidechain_sons.size());
-      std::transform(_curr_active_sidechain_sons.cbegin(), _curr_active_sidechain_sons.cend(),
+   current_sons.reserve(curr_active_sons.size());
+   std::transform(curr_active_sons.begin(), curr_active_sons.end(),
                   std::inserter(current_sons, current_sons.end()),
-                     [](const son_sidechain_info &swi) {
+                  [](const son_info &swi) {
                      return swi.son_id;
                   });
 
    const auto& son_idx = get_index_type<son_index>().indices().get< by_id >();
-      for (auto &son : son_idx) {
+   for( auto& son : son_idx )
+   {
       auto& stats = son.statistics(*this);
       bool is_active_son = (std::find(current_sons.begin(), current_sons.end(), son.id) != current_sons.end());
-         modify(stats, [&](son_statistics_object &_stats) {
+      modify( stats, [&]( son_statistics_object& _stats )
+      {
          if(is_active_son) {
-               _stats.total_voted_time[sidechain] = _stats.total_voted_time[sidechain] + get_global_properties().parameters.maintenance_interval;
+            _stats.total_voted_time = _stats.total_voted_time + get_global_properties().parameters.maintenance_interval;
+         }
+         _stats.total_downtime += _stats.current_interval_downtime;
+         _stats.current_interval_downtime = 0;
+         for (const auto &str : _stats.sidechain_txs_reported) {
+            _stats.sidechain_txs_reported.at(str.first) = 0;
          }
-            if(!_stats.current_interval_downtime.contains(sidechain))
-               _stats.current_interval_downtime[sidechain] = 0;
-
-            _stats.total_downtime[sidechain] += _stats.current_interval_downtime.at(sidechain);
-            _stats.current_interval_downtime[sidechain] = 0;
-            _stats.sidechain_txs_reported[sidechain] = 0;
       });
    }
 }
-}
 
-void database::update_son_statuses( const flat_map<sidechain_type, vector<son_sidechain_info> >& curr_active_sons,
-                                    const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons )
+void database::update_son_statuses(const vector<son_info>& curr_active_sons, const vector<son_info>& new_active_sons)
 {
-   for(const auto& new_active_sidechain_sons : new_active_sons) {
-      const auto& sidechain = new_active_sidechain_sons.first;
-
    vector<son_id_type> current_sons, new_sons;
    vector<son_id_type> sons_to_remove, sons_to_add;
    const auto& idx = get_index_type<son_index>().indices().get<by_id>();
 
-      if(curr_active_sons.contains(sidechain)) {
-         current_sons.reserve(curr_active_sons.at(sidechain).size());
-         std::transform(curr_active_sons.at(sidechain).cbegin(), curr_active_sons.at(sidechain).cend(),
+   current_sons.reserve(curr_active_sons.size());
+   std::transform(curr_active_sons.begin(), curr_active_sons.end(),
                   std::inserter(current_sons, current_sons.end()),
-                        [](const son_sidechain_info &swi) {
+                  [](const son_info &swi) {
                      return swi.son_id;
                   });
-      }
 
-      new_sons.reserve(new_active_sons.at(sidechain).size());
-      std::transform(new_active_sons.at(sidechain).cbegin(), new_active_sons.at(sidechain).cend(),
+   new_sons.reserve(new_active_sons.size());
+   std::transform(new_active_sons.begin(), new_active_sons.end(),
                   std::inserter(new_sons, new_sons.end()),
-                     [](const son_sidechain_info &swi) {
+                  [](const son_info &swi) {
                      return swi.son_id;
                   });
 
    // find all cur_active_sons members that is not in new_active_sons
    for_each(current_sons.begin(), current_sons.end(),
-               [&sons_to_remove, &new_sons](const son_id_type &si) {
+            [&sons_to_remove, &new_sons](const son_id_type& si)
+            {
                if(std::find(new_sons.begin(), new_sons.end(), si) ==
-                      new_sons.end()) {
+                     new_sons.end())
+               {
                   sons_to_remove.push_back(si);
                }
-               });
+            }
+   );
 
-      for (const auto &sid : sons_to_remove) {
+   for( const auto& sid : sons_to_remove )
+   {
       auto son = idx.find( sid );
       if(son == idx.end()) // SON is deleted already
          continue;
       // keep maintenance status for nodes becoming inactive
-         if (son->statuses.at(sidechain) == son_status::active) {
+      if(son->status == son_status::active)
+      {
          modify( *son, [&]( son_object& obj ){
-               obj.statuses.at(sidechain) = son_status::inactive;
+                  obj.status = son_status::inactive;
                   });
       }
    }
 
    // find all new_active_sons members that is not in cur_active_sons
    for_each(new_sons.begin(), new_sons.end(),
-               [&sons_to_add, &current_sons](const son_id_type &si) {
+            [&sons_to_add, &current_sons](const son_id_type& si)
+            {
                if(std::find(current_sons.begin(), current_sons.end(), si) ==
-                      current_sons.end()) {
+                     current_sons.end())
+               {
                   sons_to_add.push_back(si);
                }
-               });
+            }
+   );
 
-      for (const auto &sid : sons_to_add) {
+   for( const auto& sid : sons_to_add )
+   {
       auto son = idx.find( sid );
-         FC_ASSERT(son != idx.end(), "Invalid SON in active list, id = ${sonid}.", ("sonid", sid));
+      FC_ASSERT(son != idx.end(), "Invalid SON in active list, id={sonid}.", ("sonid", sid));
       // keep maintenance status for new nodes
-         if (son->statuses.at(sidechain) == son_status::inactive) {
+      if(son->status == son_status::inactive)
+      {
          modify( *son, [&]( son_object& obj ){
-               obj.statuses.at(sidechain) = son_status::active;
+                  obj.status = son_status::active;
                   });
       }
    }
 
-      ilog("New SONS for sidechain = ${sidechain}", ("sidechain", sidechain));
+   ilog("New SONS");
    for(size_t i = 0; i < new_sons.size(); i++) {
          auto son = idx.find( new_sons[i] );
          if(son == idx.end()) // SON is deleted already
             continue;
-         ilog("${s}, status = ${ss}, total_votes = ${sv}", ("s", new_sons[i])("ss", son->statuses.at(sidechain))("sv", son->total_votes));
-      }
+      ilog( "${s}, status = ${ss}, total_votes = ${sv}", ("s", new_sons[i])("ss", son->status)("sv", son->total_votes) );
    }
 
-   //! Remove inactive sons (when all sidechain inactive)
-   vector<son_id_type> sons_to_remove;
-   const auto &idx = get_index_type<son_index>().indices().get<by_id>();
-   for(const auto& son : idx) {
-      bool inactive_son = true;
-      for(const auto& status : son.statuses) {
-         if (status.second != son_status::inactive)
-            inactive_son = false;
-      }
-      if (inactive_son)
-         sons_to_remove.emplace_back(son.id);
-   }
-   if (sons_to_remove.size() > 0) {
+   if( sons_to_remove.size() > 0 )
+   {
       remove_inactive_son_proposals(sons_to_remove);
    }
 }
 
-void database::update_son_wallet(const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons)
+void database::update_son_wallet(const vector<son_info>& new_active_sons)
 {
    bool should_recreate_pw = true;
 
@@ -537,16 +387,8 @@ void database::update_son_wallet(const flat_map<sidechain_type, vector<son_sidec
 
       bool wallet_son_sets_equal = (cur_wallet_sons.size() == new_active_sons.size());
       if (wallet_son_sets_equal) {
-         for( const auto& cur_wallet_sidechain_sons : cur_wallet_sons ) {
-            const auto& sidechain = cur_wallet_sidechain_sons.first;
-            const auto& _cur_wallet_sidechain_sons = cur_wallet_sidechain_sons.second;
-
-            wallet_son_sets_equal = wallet_son_sets_equal && (_cur_wallet_sidechain_sons.size() == new_active_sons.at(sidechain).size());
-            if (wallet_son_sets_equal) {
-               for (size_t i = 0; i < _cur_wallet_sidechain_sons.size(); i++) {
-                  wallet_son_sets_equal = wallet_son_sets_equal && (_cur_wallet_sidechain_sons.at(i) == new_active_sons.at(sidechain).at(i));
-               }
-            }
+         for( size_t i = 0; i < cur_wallet_sons.size(); i++ ) {
+            wallet_son_sets_equal = wallet_son_sets_equal && cur_wallet_sons.at(i) == new_active_sons.at(i);
          }
       }
 
@@ -559,24 +401,14 @@ void database::update_son_wallet(const flat_map<sidechain_type, vector<son_sidec
       }
    }
 
-   bool should_recreate_pw_sidechain = false;
-   for(const auto& new_active_sidechain_sons : new_active_sons) {
-      if(new_active_sidechain_sons.second.size() >= get_chain_properties().immutable_parameters.min_son_count)
-         should_recreate_pw_sidechain = true;
-   }
-   should_recreate_pw = should_recreate_pw && should_recreate_pw_sidechain;
+   should_recreate_pw = should_recreate_pw && (new_active_sons.size() >= get_chain_properties().immutable_parameters.min_son_count);
 
    if (should_recreate_pw) {
       // Create new son_wallet_object, to initiate wallet recreation
       create<son_wallet_object>( [&]( son_wallet_object& obj ) {
          obj.valid_from = head_block_time();
          obj.expires = time_point_sec::maximum();
-         for(const auto& new_active_sidechain_sons : new_active_sons){
-            const auto& sidechain = new_active_sidechain_sons.first;
-            const auto& _new_active_sidechain_sons = new_active_sidechain_sons.second;
-
-            obj.sons[sidechain].insert(obj.sons[sidechain].end(), _new_active_sidechain_sons.cbegin(), _new_active_sidechain_sons.cend());
-         }
+         obj.sons.insert(obj.sons.end(), new_active_sons.begin(), new_active_sons.end());
       });
    }
 }
@@ -828,75 +660,44 @@ void database::update_active_committee_members()
 
 void database::update_active_sons()
 { try {
-   if (head_block_time() < HARDFORK_SON_TIME) {
-      return;
-   }
-
    assert( _son_count_histogram_buffer.size() > 0 );
-#ifndef NDEBUG
-   for( const auto& son_count_histogram_buffer : _son_count_histogram_buffer ){
-      assert( son_count_histogram_buffer.second.size() > 0 );
-   }
-#endif
-
-   const auto supported_active_sidechain_types = active_sidechain_types(head_block_time());
-   flat_map<sidechain_type, size_t> son_count;
-   for(const auto& active_sidechain_type : supported_active_sidechain_types)
-   {
-      const share_type  stake_target = (_total_voting_stake-_son_count_histogram_buffer.at(active_sidechain_type)[0]) / 2;
+   share_type stake_target = (_total_voting_stake-_son_count_histogram_buffer[0]) / 2;
 
    /// accounts that vote for 0 or 1 son do not get to express an opinion on
    /// the number of sons to have (they abstain and are non-voting accounts)
+
    share_type stake_tally = 0;
-      son_count[active_sidechain_type] = 0;
+
+   size_t son_count = 0;
    if( stake_target > 0 )
    {
-         while( (son_count.at(active_sidechain_type) < _son_count_histogram_buffer.at(active_sidechain_type).size() - 1)
+      while( (son_count < _son_count_histogram_buffer.size() - 1)
              && (stake_tally <= stake_target) )
       {
-               stake_tally += _son_count_histogram_buffer.at(active_sidechain_type)[ ++son_count[active_sidechain_type] ];
-         }
+         stake_tally += _son_count_histogram_buffer[++son_count];
       }
    }
 
    const global_property_object& gpo = get_global_properties();
-   const chain_property_object& cpo = get_chain_properties();
-   const auto& all_sons = get_index_type<son_index>().indices();
-   flat_map<sidechain_type, vector<std::reference_wrapper<const son_object> > > sons;
-   for(const auto& active_sidechain_type : supported_active_sidechain_types)
-   {
-      if(head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME) {
-         sons[active_sidechain_type] = sort_votable_objects<son_index>(active_sidechain_type,
-                                                                       (std::max(son_count.at(active_sidechain_type) * 2 + 1, (size_t)cpo.immutable_parameters.min_son_count)));
-      }
-      else {
-         sons[active_sidechain_type] = sort_votable_objects<son_index>(sidechain_type::bitcoin, get_global_properties().parameters.maximum_son_count());
-      }
-   }
+   const chain_parameters& cp = gpo.parameters;
+   auto sons = sort_votable_objects<son_index>(cp.maximum_son_count());
 
+   const auto& all_sons = get_index_type<son_index>().indices();
+
+   auto& local_vote_buffer_ref = _vote_tally_buffer;
    for( const son_object& son : all_sons )
    {
-      for(const auto& status: son.statuses)
-      {
-         const auto& sidechain = status.first;
-         if(status.second == son_status::in_maintenance)
+      if(son.status == son_status::request_maintenance)
       {
          auto& stats = son.statistics(*this);
          modify( stats, [&]( son_statistics_object& _s){
-               _s.last_down_timestamp[sidechain] = head_block_time();
+               _s.last_down_timestamp = head_block_time();
             });
       }
-      }
-
-      modify( son, [this]( son_object& obj ){
-         for(const auto& sidechain_vote_id : obj.sidechain_vote_ids ){
-            obj.total_votes[sidechain_vote_id.first] = _vote_tally_buffer.size() > sidechain_vote_id.second ? _vote_tally_buffer[sidechain_vote_id.second] : 0;
-         }
-         for(auto& status: obj.statuses)
-         {
-            if (status.second == son_status::request_maintenance)
-               status.second = son_status::in_maintenance;
-         }
+      modify( son, [local_vote_buffer_ref]( son_object& obj ){
+              obj.total_votes = local_vote_buffer_ref[obj.vote_id];
+              if(obj.status == son_status::request_maintenance)
+                 obj.status = son_status::in_maintenance;
               });
    }
 
@@ -905,24 +706,21 @@ void database::update_active_sons()
    {
       modify( get(gpo.parameters.son_account()), [&]( account_object& a )
       {
-         set<account_id_type> account_ids;
-         for(const auto& sidechain_sons : sons)
-         {
-            for( const son_object& son : sidechain_sons.second )
-            {
-               account_ids.emplace(son.son_account);
-            }
-         }
-
          if( head_block_time() < HARDFORK_533_TIME )
          {
+            map<account_id_type, uint64_t> weights;
             a.active.weight_threshold = 0;
             a.active.account_auths.clear();
 
-            for( const auto& account_id : account_ids )
+            for( const son_object& son : sons )
+            {
+               weights.emplace(son.son_account, uint64_t(1));
+            }
+
+            for( const auto& weight : weights )
             {
                // Ensure that everyone has at least one vote. Zero weights aren't allowed.
-               a.active.account_auths[account_id] += 1;
+               a.active.account_auths[weight.first] += 1;
                a.active.weight_threshold += 1;
             }
 
@@ -933,10 +731,8 @@ void database::update_active_sons()
          else
          {
             vote_counter vc;
-            for( const auto& account_id : account_ids )
-            {
-               vc.add(account_id, UINT64_C(1));
-            }
+            for( const son_object& son : sons )
+               vc.add( son.son_account, UINT64_C(1) );
             vc.finish_2_3( a.active );
          }
       } );
@@ -944,41 +740,30 @@ void database::update_active_sons()
 
 
    // Compare current and to-be lists of active sons
-   const auto cur_active_sons = gpo.active_sons;
-   flat_map<sidechain_type, vector<son_sidechain_info> > new_active_sons;
+   auto cur_active_sons = gpo.active_sons;
+   vector<son_info> new_active_sons;
    const auto &acc = get(gpo.parameters.son_account());
-   for( const auto& sidechain_sons : sons ){
-      const auto& sidechain = sidechain_sons.first;
-      const auto& sons_array = sidechain_sons.second;
-
-      new_active_sons[sidechain].reserve(sons_array.size());
-      for( const son_object& son : sons_array ) {
-         son_sidechain_info swi;
+   for( const son_object& son : sons ) {
+      son_info swi;
       swi.son_id = son.id;
       swi.weight = acc.active.account_auths.at(son.son_account);
       swi.signing_key = son.signing_key;
-         if (son.sidechain_public_keys.find(sidechain) != son.sidechain_public_keys.end())
-            swi.public_key = son.sidechain_public_keys.at(sidechain);
-         new_active_sons[sidechain].push_back(swi);
-      }
+      swi.sidechain_public_keys = son.sidechain_public_keys;
+      new_active_sons.push_back(swi);
    }
 
    bool son_sets_equal = (cur_active_sons.size() == new_active_sons.size());
    if (son_sets_equal) {
-      for( const auto& cur_active_sidechain_sons : cur_active_sons ){
-         const auto& sidechain = cur_active_sidechain_sons.first;
-         const auto& _cur_active_sidechain_sons = cur_active_sidechain_sons.second;
+      for( size_t i = 0; i < cur_active_sons.size(); i++ ) {
+         son_sets_equal = son_sets_equal && cur_active_sons.at(i) == new_active_sons.at(i);
+      }
+   }
 
-         son_sets_equal = son_sets_equal && (_cur_active_sidechain_sons.size() == new_active_sons.at(sidechain).size());
    if (son_sets_equal) {
-            for (size_t i = 0; i < _cur_active_sidechain_sons.size(); i++) {
-               son_sets_equal = son_sets_equal && (_cur_active_sidechain_sons.at(i) == new_active_sons.at(sidechain).at(i));
-            }
-         }
-      }
-   }
+      ilog( "Active SONs set NOT CHANGED" );
+   } else {
+      ilog( "Active SONs set CHANGED" );
 
-   if (!son_sets_equal) {
       update_son_wallet(new_active_sons);
       update_son_statuses(cur_active_sons, new_active_sons);
    }
@@ -989,38 +774,28 @@ void database::update_active_sons()
    modify(gpo, [&]( global_property_object& gp ){
       gp.active_sons.clear();
       gp.active_sons.reserve(new_active_sons.size());
-      for( const auto& new_active_sidechain_sons : new_active_sons ) {
-         const auto& sidechain = new_active_sidechain_sons.first;
-         const auto& _new_active_sidechain_sons = new_active_sidechain_sons.second;
-
-         gp.active_sons[sidechain].reserve(_new_active_sidechain_sons.size());
-         gp.active_sons[sidechain].insert(gp.active_sons[sidechain].end(), _new_active_sidechain_sons.cbegin(), _new_active_sidechain_sons.cend());
-      }
+      gp.active_sons.insert(gp.active_sons.end(), new_active_sons.begin(), new_active_sons.end());
    });
 
-   for(const auto& active_sidechain_type : supported_active_sidechain_types)
-   {
-      const son_schedule_object& sidechain_sso = son_schedule_id_type(get_son_schedule_id(active_sidechain_type))(*this);
-      modify(sidechain_sso, [&](son_schedule_object& _sso)
+   const son_schedule_object& sso = son_schedule_id_type()(*this);
+   modify(sso, [&](son_schedule_object& _sso)
    {
       flat_set<son_id_type> active_sons;
-         active_sons.reserve(gpo.active_sons.at(active_sidechain_type).size());
-         std::transform(gpo.active_sons.at(active_sidechain_type).cbegin(), gpo.active_sons.at(active_sidechain_type).cend(),
+      active_sons.reserve(gpo.active_sons.size());
+      std::transform(gpo.active_sons.begin(), gpo.active_sons.end(),
                      std::inserter(active_sons, active_sons.end()),
-                        [](const son_sidechain_info& swi) {
+                     [](const son_info& swi) {
          return swi.son_id;
       });
       _sso.scheduler.update(active_sons);
       // similar to witness, produce schedule for sons
-         if( ((cur_active_sons.contains(active_sidechain_type) && cur_active_sons.at(active_sidechain_type).size() == 0) ||
-               !cur_active_sons.contains(active_sidechain_type)) && new_active_sons.at(active_sidechain_type).size() > 0 )
+      if(cur_active_sons.size() == 0 && new_active_sons.size() > 0)
       {
          witness_scheduler_rng rng(_sso.rng_seed.begin(), GRAPHENE_NEAR_SCHEDULE_CTR_IV);
-            for( size_t i=0; i<new_active_sons.at(active_sidechain_type).size(); ++i )
+         for( size_t i=0; i<new_active_sons.size(); ++i )
             _sso.scheduler.produce_schedule(rng);
       }
    });
-   }
 } FC_CAPTURE_AND_RETHROW() }
 
 void database::initialize_budget_record( fc::time_point_sec now, budget_record& rec )const
@@ -1560,19 +1335,17 @@ void rolling_period_start(database& db)
 {
    if(db.head_block_time() >= HARDFORK_GPOS_TIME)
    {
-      const auto gpo = db.get_global_properties();
+      auto gpo = db.get_global_properties();
       auto period_start = db.get_global_properties().parameters.gpos_period_start();
-      const auto vesting_period = db.get_global_properties().parameters.gpos_period();
+      auto vesting_period = db.get_global_properties().parameters.gpos_period();
 
-      const auto now = db.head_block_time();
-      while(now.sec_since_epoch() >= (period_start + vesting_period))
+      auto now = db.head_block_time();
+      if(now.sec_since_epoch() >= (period_start + vesting_period))
       {
          // roll
          db.modify(db.get_global_properties(), [period_start, vesting_period](global_property_object& p) {
             p.parameters.extensions.value.gpos_period_start =  period_start + vesting_period;
          });
-
-         period_start = db.get_global_properties().parameters.gpos_period_start();
       }
    }
 }
@@ -2167,7 +1940,7 @@ void database::perform_son_tasks()
                               asset_issuer_permission_flags::override_authority;
             a.options.core_exchange_rate.base.amount = 100000;
             a.options.core_exchange_rate.base.asset_id = asset_id_type(0);
-            a.options.core_exchange_rate.quote.amount = 2500;
+            a.options.core_exchange_rate.quote.amount = 2500; // CoinMarketCap approx value
             a.options.core_exchange_rate.quote.asset_id = a.id;
             a.options.whitelist_authorities.clear(); // accounts allowed to use asset, if not empty
             a.options.blacklist_authorities.clear(); // accounts who can blacklist other accounts to use asset, if white_list flag is set
@@ -2181,40 +1954,6 @@ void database::perform_son_tasks()
                gpo.pending_parameters->extensions.value.btc_asset = btc_asset.get_id();
       });
    }
-   // create ETH asset here because son_account is the issuer of the ETH
-   if (gpo.parameters.eth_asset() == asset_id_type() && head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME)
-   {
-      const asset_dynamic_data_object& dyn_asset =
-         create<asset_dynamic_data_object>([](asset_dynamic_data_object& a) {
-            a.current_supply = 0;
-         });
-
-      const asset_object& eth_asset =
-         create<asset_object>( [&gpo, &dyn_asset]( asset_object& a ) {
-            a.symbol = "ETH";
-            a.precision = 8;
-            a.issuer = gpo.parameters.son_account();
-            a.options.max_supply = GRAPHENE_MAX_SHARE_SUPPLY;
-            a.options.market_fee_percent = 500; // 5%
-            a.options.issuer_permissions = UIA_ASSET_ISSUER_PERMISSION_MASK;
-            a.options.flags = asset_issuer_permission_flags::charge_market_fee |
-                              asset_issuer_permission_flags::override_authority;
-            a.options.core_exchange_rate.base.amount = 100000;
-            a.options.core_exchange_rate.base.asset_id = asset_id_type(0);
-            a.options.core_exchange_rate.quote.amount = 2500;
-            a.options.core_exchange_rate.quote.asset_id = a.id;
-            a.options.whitelist_authorities.clear(); // accounts allowed to use asset, if not empty
-            a.options.blacklist_authorities.clear(); // accounts who can blacklist other accounts to use asset, if white_list flag is set
-            a.options.whitelist_markets.clear(); // might be traded with
-            a.options.blacklist_markets.clear(); // might not be traded with
-            a.dynamic_asset_data_id = dyn_asset.id;
-         });
-      modify( gpo, [&eth_asset]( global_property_object& gpo ) {
-            gpo.parameters.extensions.value.eth_asset = eth_asset.get_id();
-            if( gpo.pending_parameters )
-               gpo.pending_parameters->extensions.value.eth_asset = eth_asset.get_id();
-      });
-   }
    // create HBD asset here because son_account is the issuer of the HBD
    if (gpo.parameters.hbd_asset() == asset_id_type()  && head_block_time() >= HARDFORK_SON_FOR_HIVE_TIME)
    {
@@ -2235,7 +1974,7 @@ void database::perform_son_tasks()
                               asset_issuer_permission_flags::override_authority;
             a.options.core_exchange_rate.base.amount = 100000;
             a.options.core_exchange_rate.base.asset_id = asset_id_type(0);
-            a.options.core_exchange_rate.quote.amount = 2500;
+            a.options.core_exchange_rate.quote.amount = 2500; // CoinMarketCap approx value
             a.options.core_exchange_rate.quote.asset_id = a.id;
             a.options.whitelist_authorities.clear(); // accounts allowed to use asset, if not empty
             a.options.blacklist_authorities.clear(); // accounts who can blacklist other accounts to use asset, if white_list flag is set
@@ -2269,7 +2008,7 @@ void database::perform_son_tasks()
                               asset_issuer_permission_flags::override_authority;
             a.options.core_exchange_rate.base.amount = 100000;
             a.options.core_exchange_rate.base.asset_id = asset_id_type(0);
-            a.options.core_exchange_rate.quote.amount = 2500;
+            a.options.core_exchange_rate.quote.amount = 2500; // CoinMarketCap approx value
             a.options.core_exchange_rate.quote.asset_id = a.id;
             a.options.whitelist_authorities.clear(); // accounts allowed to use asset, if not empty
             a.options.blacklist_authorities.clear(); // accounts who can blacklist other accounts to use asset, if white_list flag is set
@@ -2283,73 +2022,30 @@ void database::perform_son_tasks()
                gpo.pending_parameters->extensions.value.hive_asset = hive_asset.get_id();
       });
    }
-
    // Pay the SONs
    if (head_block_time() >= HARDFORK_SON_TIME)
    {
       // Before making a budget we should pay out SONs
       // This function should check if its time to pay sons
       // and modify the global son funds accordingly, whatever is left is passed on to next budget
-      if(head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME)
-         pay_sons_before_hf_ethereum();
-      else
-         pay_sons_after_hf_ethereum();
-   }
-
-   // Split vote_ids
-   if (head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME) {
-      // Get SON 1.33.0 and check if it has HIVE vote_id
-      const son_id_type sid = son_id_type(0);
-      const auto p_son = find(sid);
-      if(p_son != nullptr) {
-         if (p_son->sidechain_vote_ids.find(sidechain_type::hive) == p_son->sidechain_vote_ids.end()) {
-            // Add vote_ids for HIVE and ETHEREUM to all existing SONs
-            const auto &all_sons = get_index_type<son_index>().indices().get<by_id>();
-            for (const son_object &son : all_sons) {
-               const auto existing_vote_id_bitcoin = son.get_bitcoin_vote_id();
-               vote_id_type new_vote_id_hive;
-               vote_id_type new_vote_id_eth;
-
-               modify(gpo, [&new_vote_id_hive, &new_vote_id_eth](global_property_object &p) {
-                  new_vote_id_hive = get_next_vote_id(p, vote_id_type::son_hive);
-                  new_vote_id_eth = get_next_vote_id(p, vote_id_type::son_ethereum);
-               });
-
-               modify(son, [new_vote_id_hive, new_vote_id_eth](son_object &obj) {
-                  obj.sidechain_vote_ids[sidechain_type::hive] = new_vote_id_hive;
-                  obj.sidechain_vote_ids[sidechain_type::ethereum] = new_vote_id_eth;
-               });
-
-               // Duplicate all votes from bitcoin to hive
-               const auto &all_accounts = get_index_type<account_index>().indices().get<by_id>();
-               for (const auto &account : all_accounts) {
-                  if (existing_vote_id_bitcoin.valid() && account.options.votes.count(*existing_vote_id_bitcoin) != 0) {
-                     modify(account, [new_vote_id_hive](account_object &a) {
-                        a.options.votes.insert(new_vote_id_hive);
-                     });
-                  }
-               }
-            }
-         }
-      }
+      pay_sons();
    }
 }
 
 void update_son_params(database& db)
 {
-   if( (db.head_block_time() >= HARDFORK_SON2_TIME) && (db.head_block_time() < HARDFORK_SON_FOR_ETHEREUM_TIME) )
+   if( db.head_block_time() >= HARDFORK_SON2_TIME )
    {
       const auto& gpo = db.get_global_properties();
-      db.modify( gpo, []( global_property_object& gpo ) {
-         gpo.parameters.extensions.value.maximum_son_count = 7;
+      const asset_object& btc_asset = gpo.parameters.btc_asset()(db);
+      if( btc_asset.is_transfer_restricted() ) {
+         db.modify( btc_asset, []( asset_object& ao ) {
+            ao.options.flags = asset_issuer_permission_flags::charge_market_fee |
+                              asset_issuer_permission_flags::override_authority;
          });
       }
-
-   if( (db.head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME) )
-   {
-      const auto& gpo = db.get_global_properties();
       db.modify( gpo, []( global_property_object& gpo ) {
-         gpo.parameters.extensions.value.maximum_son_count = GRAPHENE_DEFAULT_MAX_SONS;
+            gpo.parameters.extensions.value.maximum_son_count = 7;
       });
    }
 }
@@ -2378,9 +2074,7 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
          d._vote_tally_buffer.resize(props.next_available_vote_id);
          d._witness_count_histogram_buffer.resize(props.parameters.maximum_witness_count / 2 + 1);
          d._committee_count_histogram_buffer.resize(props.parameters.maximum_committee_count / 2 + 1);
-         for( auto& son_count_histogram_buffer : d._son_count_histogram_buffer ){
-            son_count_histogram_buffer.second.resize(props.parameters.maximum_son_count() / 2 + 1);
-         }
+         d._son_count_histogram_buffer.resize(props.parameters.maximum_son_count() / 2 + 1);
          d._total_voting_stake = 0;
 
          auto balance_type = vesting_balance_type::normal;
@@ -2480,24 +2174,17 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
                // same rationale as for witnesses
                d._committee_count_histogram_buffer[offset] += voting_stake;
             }
-
-            if ( opinion_account.options.extensions.value.num_son.valid() )
+            if( opinion_account.options.num_son <= props.parameters.maximum_son_count() )
             {
-               for(const auto& num_sidechain_son : *opinion_account.options.extensions.value.num_son) {
-                  const auto sidechain = num_sidechain_son.first;
-                  const auto& num_son = num_sidechain_son.second;
-                  if (num_son <= props.parameters.maximum_son_count()) {
-                     uint16_t offset = std::min(size_t(num_son / 2),
-                                                d._son_count_histogram_buffer.at(sidechain).size() - 1);
+               uint16_t offset = std::min(size_t(opinion_account.options.num_son/2),
+                                          d._son_count_histogram_buffer.size() - 1);
                // votes for a number greater than maximum_son_count
                // are turned into votes for maximum_son_count.
                //
                // in particular, this takes care of the case where a
                // member was voting for a high number, then the
                // parameter was lowered.
-                     d._son_count_histogram_buffer.at(sidechain)[offset] += voting_stake;
-                  }
-               }
+               d._son_count_histogram_buffer[offset] += voting_stake;
             }
 
             d._total_voting_stake += voting_stake;
@@ -2512,20 +2199,10 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
    private:
       vector<uint64_t>& target;
    };
-   struct clear_canary_map {
-      clear_canary_map(flat_map<sidechain_type, vector<uint64_t> >& target): target(target){}
-      ~clear_canary_map() {
-         for(auto& sidechain_target : target){
-            sidechain_target.second.clear();
-         }
-      }
-   private:
-      flat_map<sidechain_type, vector<uint64_t> >& target;
-   };
    clear_canary a(_witness_count_histogram_buffer),
                 b(_committee_count_histogram_buffer),
+                d(_son_count_histogram_buffer),
                 c(_vote_tally_buffer);
-   clear_canary_map d{_son_count_histogram_buffer};
 
    perform_son_tasks();
    update_top_n_authorities(*this);
@@ -2533,7 +2210,6 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
    update_active_committee_members();
    update_active_sons();
    update_worker_votes();
-   hotfix_2024();
 
    const dynamic_global_property_object& dgpo = get_dynamic_global_properties();
 
@@ -2598,18 +2274,6 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
             p.pending_parameters->extensions.value.hbd_asset = p.parameters.extensions.value.hbd_asset;
          if( !p.pending_parameters->extensions.value.hive_asset.valid() )
             p.pending_parameters->extensions.value.hive_asset = p.parameters.extensions.value.hive_asset;
-         if( !p.pending_parameters->extensions.value.eth_asset.valid() )
-            p.pending_parameters->extensions.value.eth_asset = p.parameters.extensions.value.eth_asset;
-
-         // the following parameters are not allowed to be changed. So take what is in global property
-         p.pending_parameters->extensions.value.gpos_period_start = p.parameters.extensions.value.gpos_period_start;
-         p.pending_parameters->extensions.value.son_account = p.parameters.extensions.value.son_account;
-         p.pending_parameters->extensions.value.btc_asset = p.parameters.extensions.value.btc_asset;
-         p.pending_parameters->extensions.value.maximum_son_count = p.parameters.extensions.value.maximum_son_count;
-         p.pending_parameters->extensions.value.hbd_asset = p.parameters.extensions.value.hbd_asset;
-         p.pending_parameters->extensions.value.hive_asset = p.parameters.extensions.value.hive_asset;
-         p.pending_parameters->extensions.value.eth_asset = p.parameters.extensions.value.eth_asset;
-
          p.parameters = std::move(*p.pending_parameters);
          p.pending_parameters.reset();
       }

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();

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 )
    {
@@ -608,6 +625,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 +637,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 +652,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 +670,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_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,25 +189,22 @@ 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) ) {
+         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 )
          {
             /// High performance random generator
@@ -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,22 +319,22 @@ 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);
+      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 )
       {
@@ -367,7 +351,7 @@ void database::update_son_schedule(sidechain_type type, const signed_block& next
       {
          _sso.scheduler.reset_schedule( first_son );
       }
-    while( !_sso.scheduler.get_slot(schedule_needs_filled, son_id) )
+      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());
@@ -377,7 +361,6 @@ void database::update_son_schedule(sidechain_type type, const signed_block& next
            (_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

@@ -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)
          {

libraries/chain/hardfork.d/CORE_210.hf

@@ -0,0 +1,10 @@
+// #210 Check authorities on custom_operation
+#ifndef HARDFORK_CORE_210_TIME
+#ifdef BUILD_PEERPLAYS_TESTNET
+#define HARDFORK_CORE_210_TIME (fc::time_point_sec::from_iso_string("2030-01-01T00:00:00")) // (Not yet scheduled)
+#else
+#define HARDFORK_CORE_210_TIME (fc::time_point_sec::from_iso_string("2030-01-01T00:00:00")) // (Not yet scheduled)
+#endif
+// 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/HOTFIX_2024.hf

@@ -1,7 +0,0 @@
-#ifndef HARDFORK_HOTFIX_2024_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_HOTFIX_2024_TIME (fc::time_point_sec::from_iso_string("2023-12-20T00:00:00"))
-#else
-#define HARDFORK_HOTFIX_2024_TIME (fc::time_point_sec::from_iso_string("2023-12-20T00:00:00"))
-#endif
-#endif

libraries/chain/hardfork.d/SIDECHAIN.hf

@@ -1,7 +0,0 @@
-#ifndef HARDFORK_SIDECHAIN_DELETE_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
-#else
-#define HARDFORK_SIDECHAIN_DELETE_TIME (fc::time_point_sec::from_iso_string("2022-11-16T02:00:00"))
-#endif
-#endif

libraries/chain/hardfork.d/SON_FOR_ETHEREUM.hf

@@ -1,7 +0,0 @@
-#ifndef HARDFORK_SON_FOR_ETHEREUM_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-07-17T12:00:00"))
-#else
-#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-10-24T12:00:00"))
-#endif
-#endif

libraries/chain/hardfork.d/SON_FOR_HIVE.hf

@@ -2,6 +2,6 @@
 #ifdef BUILD_PEERPLAYS_TESTNET
 #define HARDFORK_SON_FOR_HIVE_TIME (fc::time_point_sec::from_iso_string("2021-03-31T00:00:00"))
 #else
-#define HARDFORK_SON_FOR_HIVE_TIME (fc::time_point_sec::from_iso_string("2021-12-21T00:00:00"))
+#define HARDFORK_SON_FOR_HIVE_TIME (fc::time_point_sec::from_iso_string("2021-12-11T00:00:00"))
 #endif
 #endif

libraries/chain/include/graphene/chain/betting_market_object.hpp

@@ -24,12 +24,13 @@
 #pragma once
 
 #include <graphene/chain/protocol/types.hpp>
-#include <graphene/chain/protocol/betting_market.hpp>
 #include <graphene/db/object.hpp>
 #include <graphene/db/generic_index.hpp>
-#include <boost/multi_index/composite_key.hpp>
+#include <graphene/chain/protocol/betting_market.hpp>
 #include <sstream>
 
+#include <boost/multi_index/composite_key.hpp>
+
 namespace graphene { namespace chain {
    class betting_market_object;
    class betting_market_group_object;
@@ -625,6 +626,7 @@ typedef multi_index_container<
 
 typedef generic_index<betting_market_position_object, betting_market_position_multi_index_type> betting_market_position_index;
 
+
 template<typename Stream>
 inline Stream& operator<<( Stream& s, const betting_market_object& betting_market_obj )
 { 
@@ -712,110 +714,12 @@ inline Stream& operator>>( Stream& s, betting_market_group_object& betting_marke
    
    return s;
 }
+
 } } // graphene::chain
 
 FC_REFLECT_DERIVED( graphene::chain::betting_market_rules_object, (graphene::db::object), (name)(description) )
-
+FC_REFLECT_DERIVED( graphene::chain::betting_market_group_object, (graphene::db::object), (description)(event_id)(rules_id)(asset_id)(total_matched_bets_amount)(never_in_play)(delay_before_settling)(settling_time) )
+FC_REFLECT_DERIVED( graphene::chain::betting_market_object, (graphene::db::object), (group_id)(description)(payout_condition)(resolution) )
 FC_REFLECT_DERIVED( graphene::chain::bet_object, (graphene::db::object), (bettor_id)(betting_market_id)(amount_to_bet)(backer_multiplier)(back_or_lay)(end_of_delay) )
 
 FC_REFLECT_DERIVED( graphene::chain::betting_market_position_object, (graphene::db::object), (bettor_id)(betting_market_id)(pay_if_payout_condition)(pay_if_not_payout_condition)(pay_if_canceled)(pay_if_not_canceled)(fees_collected) )
-
-namespace fc {
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::betting_market_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::betting_market_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::betting_market_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::betting_market_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::betting_market_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } }  // namespace fc::raw::detail
-
-   template <>
-   struct get_typename<graphene::chain::betting_market_object> {
-      static const char *name() {
-         return "graphene::chain::betting_market_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::betting_market_object> {
-      typedef graphene::chain::betting_market_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc
-
-namespace fc {
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::betting_market_group_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::betting_market_group_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::betting_market_group_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::betting_market_group_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::betting_market_group_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } } // namespace fc::raw:detail
-
-   template <>
-   struct get_typename<graphene::chain::betting_market_group_object> {
-      static const char *name() {
-         return "graphene::chain::betting_market_group_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::betting_market_group_object> {
-      typedef graphene::chain::betting_market_group_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc

libraries/chain/include/graphene/chain/config.hpp

@@ -158,7 +158,7 @@
 #define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT             4
 #define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT             3
 
-#define GRAPHENE_CURRENT_DB_VERSION                          "PPY2.5"
+#define GRAPHENE_CURRENT_DB_VERSION                          "PPY2.4"
 
 #define GRAPHENE_IRREVERSIBLE_THRESHOLD                      (70 * GRAPHENE_1_PERCENT)
 

libraries/chain/include/graphene/chain/database.hpp

@@ -66,8 +66,6 @@ namespace graphene { namespace chain {
          database();
          ~database();
 
-         std::vector<fc::time_point_sec> _hardfork_times;
-
          enum validation_steps
          {
             skip_nothing                = 0,
@@ -245,16 +243,7 @@ namespace graphene { namespace chain {
          witness_id_type get_scheduled_witness(uint32_t slot_num)const;
 
          /**
-          * @brief Get son schedule id for the given sidechain_type.
-          *
-          * type sidechain_type we getting schedule.
-          *
-          * returns Id of the schedule object.
-          */
-         unsigned_int get_son_schedule_id(sidechain_type type)const;
-
-         /**
-          * @brief Get the bitcoin or hive son scheduled for block production in a slot.
+          * @brief Get the son scheduled for block production in a slot.
           *
           * slot_num always corresponds to a time in the future.
           *
@@ -267,7 +256,7 @@ namespace graphene { namespace chain {
           *
           * Passing slot_num == 0 returns GRAPHENE_NULL_WITNESS
           */
-         son_id_type get_scheduled_son(sidechain_type type, uint32_t slot_num)const;
+         son_id_type get_scheduled_son(uint32_t slot_num)const;
 
          /**
           * Get the time at which the given slot occurs.
@@ -292,8 +281,8 @@ namespace graphene { namespace chain {
          vector<witness_id_type> get_near_witness_schedule()const;
          void update_witness_schedule();
          void update_witness_schedule(const signed_block& next_block);
-         void update_son_schedule(sidechain_type type);
-         void update_son_schedule(sidechain_type type, const signed_block& next_block);
+         void update_son_schedule();
+         void update_son_schedule(const signed_block& next_block);
       
          void check_lottery_end_by_participants( asset_id_type asset_id );
          void check_ending_lotteries();
@@ -322,7 +311,7 @@ namespace graphene { namespace chain {
          fc::optional<operation>                create_son_deregister_proposal( son_id_type son_id, account_id_type paying_son );
          signed_transaction                     create_signed_transaction( const fc::ecc::private_key& signing_private_key, const operation& op );
          bool                                   is_son_dereg_valid( son_id_type son_id );
-         bool                                   is_son_active( sidechain_type type, son_id_type son_id );
+         bool                                   is_son_active( son_id_type son_id );
          bool                                   is_asset_creation_allowed(const string& symbol);
 
          time_point_sec   head_block_time()const;
@@ -343,8 +332,6 @@ namespace graphene { namespace chain {
          void initialize_evaluators();
          /// Reset the object graph in-memory
          void initialize_indexes();
-         void initialize_hardforks();
-
          void init_genesis(const genesis_state_type& genesis_state = genesis_state_type());
 
          template<typename EvaluatorType>
@@ -520,16 +507,12 @@ namespace graphene { namespace chain {
          void notify_changed_objects();
 
       private:
-         std::mutex                             _pending_tx_session_mutex;
          optional<undo_database::session>       _pending_tx_session;
          vector< unique_ptr<op_evaluator> >     _operation_evaluators;
 
          template<class Index>
          vector<std::reference_wrapper<const typename Index::object_type>> sort_votable_objects(size_t count)const;
 
-         template<class Index>
-         vector<std::reference_wrapper<const typename Index::object_type>> sort_votable_objects(sidechain_type sidechain, size_t count)const;
-
          //////////////////// db_block.cpp ////////////////////
 
        public:
@@ -579,22 +562,19 @@ namespace graphene { namespace chain {
          void initialize_budget_record( fc::time_point_sec now, budget_record& rec )const;
          void process_budget();
          void pay_workers( share_type& budget );
-         void pay_sons_before_hf_ethereum();
-         void pay_sons_after_hf_ethereum();
+         void pay_sons();
          void perform_son_tasks();
          void perform_chain_maintenance(const signed_block& next_block, const global_property_object& global_props);
          void update_active_witnesses();
          void update_active_committee_members();
-         void update_son_metrics( const flat_map<sidechain_type, vector<son_sidechain_info> >& curr_active_sons );
+         void update_son_metrics( const vector<son_info>& curr_active_sons );
          void update_active_sons();
          void remove_son_proposal( const proposal_object& proposal );
          void remove_inactive_son_down_proposals( const vector<son_id_type>& son_ids_to_remove );
          void remove_inactive_son_proposals( const vector<son_id_type>& son_ids_to_remove );
-         void update_son_statuses( const flat_map<sidechain_type, vector<son_sidechain_info> >& curr_active_sons,
-                                   const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons );
-         void update_son_wallet( const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons );
+         void update_son_statuses( const vector<son_info>& cur_active_sons, const vector<son_info>& new_active_sons );
+         void update_son_wallet( const vector<son_info>& new_active_sons );
          void update_worker_votes();
-         void hotfix_2024();
 
          public:
             double calculate_vesting_factor(const account_object& stake_account);
@@ -605,7 +585,6 @@ namespace graphene { namespace chain {
          ///@}
          ///@}
 
-         std::mutex                             _pending_tx_mutex;
          vector< processed_transaction >        _pending_tx;
          fork_database                          _fork_db;
 
@@ -636,13 +615,7 @@ namespace graphene { namespace chain {
          vector<uint64_t>                  _vote_tally_buffer;
          vector<uint64_t>                  _witness_count_histogram_buffer;
          vector<uint64_t>                  _committee_count_histogram_buffer;
-         flat_map<sidechain_type, vector<uint64_t> >  _son_count_histogram_buffer = []{
-            flat_map<sidechain_type, vector<uint64_t> >  son_count_histogram_buffer;
-            for(const auto& active_sidechain_type : all_sidechain_types){
-               son_count_histogram_buffer[active_sidechain_type] = vector<uint64_t>{};
-            }
-            return son_count_histogram_buffer;
-         }();
+         vector<uint64_t>                  _son_count_histogram_buffer;
          uint64_t                          _total_voting_stake;
 
          flat_map<uint32_t,block_id_type>  _checkpoints;

libraries/chain/include/graphene/chain/event_object.hpp

@@ -158,53 +158,6 @@ typedef generic_index<event_object, event_object_multi_index_type> event_object_
       return s;
    }
 } } // graphene::chain
+FC_REFLECT(graphene::chain::event_object, (name)(season)(start_time)(event_group_id)(at_least_one_betting_market_group_settled)(scores))
 
-namespace fc {
 
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::event_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::event_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::event_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::event_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::event_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } } // namespace fc::raw::detail
-
-   template <>
-   struct get_typename<graphene::chain::event_object> {
-      static const char *name() {
-         return "graphene::chain::event_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::event_object> {
-      typedef graphene::chain::event_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc

libraries/chain/include/graphene/chain/exceptions.hpp

@@ -23,7 +23,6 @@
  */
 #pragma once
 
-#include <boost/exception/diagnostic_information.hpp> 
 #include <fc/exception/exception.hpp>
 #include <graphene/chain/protocol/protocol.hpp>
 
@@ -76,14 +75,6 @@
       elog( "Caught plugin exception: ${e}", ("e", e.to_detail_string() ) );  \
       throw;                                                                  \
    }                                                                          \
-   catch( const boost::exception& e )                                                           \
-   {                                                                                            \
-      elog( "Caught plugin boost::exception: ${e}", ("e", boost::diagnostic_information(e) ) ); \
-   }                                                                                            \
-   catch( const std::exception& e )                                                             \
-   {                                                                                            \
-      elog( "Caught plugin std::exception: ${e}", ("e", e.what() ) );                           \
-   }                                                                                            \
    catch( ... )                                                               \
    {                                                                          \
       wlog( "Caught unexpected exception in plugin" );                        \

libraries/chain/include/graphene/chain/game_object.hpp

@@ -23,8 +23,10 @@
  */
 
 #pragma once
+#include <graphene/chain/match_object.hpp>
 #include <graphene/chain/rock_paper_scissors.hpp>
-#include <graphene/db/object.hpp>
+#include <boost/multi_index/composite_key.hpp>
+#include <graphene/db/flat_index.hpp>
 #include <graphene/db/generic_index.hpp>
 #include <fc/crypto/hex.hpp>
 #include <sstream>
@@ -154,6 +156,7 @@ namespace graphene { namespace chain {
       
       return s;
    }
+
 } }
 
 FC_REFLECT_ENUM(graphene::chain::game_state,
@@ -162,52 +165,7 @@ FC_REFLECT_ENUM(graphene::chain::game_state,
                 (expecting_reveal_moves)
                 (game_complete))
 
-namespace fc {
+//FC_REFLECT_TYPENAME(graphene::chain::game_object) // manually serialized
+FC_REFLECT(graphene::chain::game_object, (players))
 
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::game_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
 
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::game_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::game_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::game_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::game_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } } // namespace fc::raw::detail
-
-   template <>
-   struct get_typename<graphene::chain::game_object> {
-      static const char *name() {
-         return "graphene::chain::game_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::game_object> {
-      typedef graphene::chain::game_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc

libraries/chain/include/graphene/chain/global_property_object.hpp

@@ -27,7 +27,7 @@
 #include <graphene/chain/protocol/chain_parameters.hpp>
 #include <graphene/chain/protocol/types.hpp>
 #include <graphene/chain/database.hpp>
-#include <graphene/chain/son_sidechain_info.hpp>
+#include <graphene/chain/son_info.hpp>
 #include <graphene/db/object.hpp>
 
 namespace graphene { namespace chain {
@@ -52,15 +52,7 @@ namespace graphene { namespace chain {
          uint32_t                           next_available_vote_id = 0;
          vector<committee_member_id_type>   active_committee_members; // updated once per maintenance interval
          flat_set<witness_id_type>          active_witnesses; // updated once per maintenance interval
-         flat_map<sidechain_type, vector<son_sidechain_info> >    active_sons = []()         // updated once per maintenance interval
-         {
-            flat_map<sidechain_type, vector<son_sidechain_info> > active_sons;
-            for(const auto& active_sidechain_type : all_sidechain_types)
-            {
-               active_sons[active_sidechain_type] = vector<son_sidechain_info>();
-            }
-            return active_sons;
-         }();
+         vector<son_info>                   active_sons; // updated once per maintenance interval
          // n.b. witness scheduling is done by witness_schedule object
    };
 
@@ -139,7 +131,6 @@ namespace graphene { namespace chain {
 }}
 
 FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene::db::object),
-                    (random)
                     (head_block_number)
                     (head_block_id)
                     (time)

libraries/chain/include/graphene/chain/match_object.hpp

@@ -1,5 +1,8 @@
 #pragma once
-#include <graphene/db/object.hpp>
+#include <graphene/chain/protocol/tournament.hpp>
+#include <graphene/chain/rock_paper_scissors.hpp>
+#include <boost/multi_index/composite_key.hpp>
+#include <graphene/db/flat_index.hpp>
 #include <graphene/db/generic_index.hpp>
 #include <fc/crypto/hex.hpp>
 #include <sstream>
@@ -13,7 +16,6 @@ namespace fc {
    void from_variant(const fc::variant& v, graphene::chain::match_object& match_obj, uint32_t max_depth = 1);
 } //end namespace fc
 
-
 namespace graphene { namespace chain {
    class database;
    using namespace graphene::db;
@@ -87,7 +89,6 @@ namespace graphene { namespace chain {
 
       void pack_impl(std::ostream& stream) const;
       void unpack_impl(std::istream& stream);
-
       void on_initiate_match(database& db);
       void on_game_complete(database& db, const game_object& game);
       game_id_type start_next_game(database& db, match_id_type match_id);
@@ -153,6 +154,7 @@ namespace graphene { namespace chain {
       
       return s;
    }
+
 } }
 
 FC_REFLECT_ENUM(graphene::chain::match_state,
@@ -160,52 +162,6 @@ FC_REFLECT_ENUM(graphene::chain::match_state,
                 (match_in_progress)
                 (match_complete))
 
-namespace fc {
+//FC_REFLECT_TYPENAME(graphene::chain::match_object) // manually serialized
+FC_REFLECT(graphene::chain::match_object, (players))
 
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::match_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::match_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::match_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::match_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::match_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } } // namespace fc::raw::detail
-
-   template <>
-   struct get_typename<graphene::chain::match_object> {
-      static const char *name() {
-         return "graphene::chain::match_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::match_object> {
-      typedef graphene::chain::match_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc

libraries/chain/include/graphene/chain/nft_object.hpp

@@ -130,9 +130,6 @@ namespace graphene { namespace chain {
                std::greater< uint32_t >,
                std::greater< object_id_type >
             >
-         >,
-         ordered_non_unique< tag<by_owner>,
-            member<nft_metadata_object, account_id_type, &nft_metadata_object::owner>
          >
       >
    >;

libraries/chain/include/graphene/chain/protocol/account.hpp

@@ -28,7 +28,6 @@
 #include <graphene/chain/protocol/special_authority.hpp>
 #include <graphene/chain/protocol/types.hpp>
 #include <graphene/chain/protocol/vote.hpp>
-#include <graphene/chain/sidechain_defs.hpp>
 
 namespace graphene { namespace chain {
 
@@ -38,26 +37,6 @@ namespace graphene { namespace chain {
    /// These are the fields which can be updated by the active authority.
    struct account_options
    {
-      struct ext
-      {
-         /// The number of active son members this account votes the blockchain should appoint
-         /// Must not exceed the actual number of son members voted for in @ref votes
-         optional< flat_map<sidechain_type, uint16_t> > num_son;
-
-         /// Returns and empty num_son map with all sidechains
-         static flat_map<sidechain_type, uint16_t> empty_num_son()
-         {
-            flat_map<sidechain_type, uint16_t> num_son;
-            for(const auto& active_sidechain_type : all_sidechain_types)
-            {
-               num_son[active_sidechain_type] = 0;
-            }
-
-            return num_son;
-         }
-      };
-
-
       /// The memo key is the key this account will typically use to encrypt/sign transaction memos and other non-
       /// validated account activities. This field is here to prevent confusion if the active authority has zero or
       /// multiple keys in it.
@@ -73,10 +52,13 @@ namespace graphene { namespace chain {
       /// The number of active committee members this account votes the blockchain should appoint
       /// Must not exceed the actual number of committee members voted for in @ref votes
       uint16_t num_committee = 0;
+      /// The number of active son members this account votes the blockchain should appoint
+      /// Must not exceed the actual number of son members voted for in @ref votes
+      uint16_t num_son = 0;
       /// This is the list of vote IDs this account votes for. The weight of these votes is determined by this
       /// account's balance of core asset.
       flat_set<vote_id_type> votes;
-      extension< ext > extensions;
+      extensions_type        extensions;
       
       /// Whether this account is voting
       inline bool is_voting() const
@@ -307,7 +289,6 @@ namespace graphene { namespace chain {
 
 } } // graphene::chain
 
-FC_REFLECT(graphene::chain::account_options::ext, (num_son))
 FC_REFLECT(graphene::chain::account_options, (memo_key)(voting_account)(num_witness)(num_committee)(votes)(extensions))
 // FC_REFLECT_TYPENAME( graphene::chain::account_whitelist_operation::account_listing)
 FC_REFLECT_ENUM( graphene::chain::account_whitelist_operation::account_listing,

libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp

@@ -70,7 +70,6 @@ namespace graphene { namespace chain {
       optional < uint16_t >           maximum_son_count                 = GRAPHENE_DEFAULT_MAX_SONS; ///< maximum number of active SONS
       optional < asset_id_type >      hbd_asset                         = asset_id_type();
       optional < asset_id_type >      hive_asset                        = asset_id_type();
-      optional < asset_id_type >      eth_asset                         = asset_id_type();
    };
 
    struct chain_parameters
@@ -221,9 +220,6 @@ namespace graphene { namespace chain {
       inline asset_id_type hive_asset() const {
          return extensions.value.hive_asset.valid() ? *extensions.value.hive_asset : asset_id_type();
       }
-      inline asset_id_type eth_asset() const {
-         return extensions.value.eth_asset.valid() ? *extensions.value.eth_asset : asset_id_type();
-      }
       private:
       static void safe_copy(chain_parameters& to, const chain_parameters& from);
    };
@@ -261,7 +257,6 @@ FC_REFLECT( graphene::chain::parameter_extension,
    (maximum_son_count)
    (hbd_asset)
    (hive_asset)
-   (eth_asset)
 )
 
 FC_REFLECT( graphene::chain::chain_parameters,

libraries/chain/include/graphene/chain/protocol/confidential.hpp

@@ -111,12 +111,12 @@ struct stealth_confirmation
    /**
     *  Packs *this then encodes as base58 encoded string.
     */
-   //operator string()const;
+   operator string()const;
    /**
     * Unpacks from a base58 string
     */
-   //stealth_confirmation( const std::string& base58 );
-   //stealth_confirmation(){}
+   stealth_confirmation( const std::string& base58 );
+   stealth_confirmation(){}
 
    public_key_type           one_time_key;
    optional<public_key_type> to;
@@ -152,6 +152,7 @@ struct transfer_to_blind_operation : public base_operation
       uint32_t price_per_output = 5*GRAPHENE_BLOCKCHAIN_PRECISION;
    };
 
+
    asset                 fee;
    asset                 amount;
    account_id_type       from;
@@ -159,8 +160,8 @@ struct transfer_to_blind_operation : public base_operation
    vector<blind_output>  outputs;
 
    account_id_type fee_payer()const { return from; }
-   //void            validate()const;
-   //share_type      calculate_fee(const fee_parameters_type& )const;
+   void            validate()const;
+   share_type      calculate_fee(const fee_parameters_type& )const;
 };
 
 /**
@@ -180,12 +181,13 @@ struct transfer_from_blind_operation : public base_operation
    vector<blind_input>   inputs;
 
    account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; }
-   //void            validate()const;
-   //void            get_required_authorities( vector<authority>& a )const
-   //{
-   //   for( const auto& in : inputs )
-   //      a.push_back( in.owner );
-   //}
+   void            validate()const;
+
+   void            get_required_authorities( vector<authority>& a )const
+   {
+      for( const auto& in : inputs )
+         a.push_back( in.owner ); 
+   }
 };
 
 /**
@@ -243,14 +245,15 @@ struct blind_transfer_operation : public base_operation
    vector<blind_output>  outputs;
     
    /** graphene TEMP account */
-   account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; }
-   //void            validate()const;
-   //share_type      calculate_fee( const fee_parameters_type& k )const;
-   //void            get_required_authorities( vector<authority>& a )const
-   //{
-   //   for( const auto& in : inputs )
-   //      a.push_back( in.owner );
-   //}
+   account_id_type fee_payer()const;
+   void            validate()const;
+   share_type      calculate_fee( const fee_parameters_type& k )const;
+
+   void            get_required_authorities( vector<authority>& a )const
+   {
+      for( const auto& in : inputs )
+         a.push_back( in.owner ); 
+   }
 };
 
 ///@} endgroup stealth

libraries/chain/include/graphene/chain/protocol/nft_lottery.hpp

@@ -18,7 +18,7 @@ namespace graphene
             // Buyer purchasing lottery tickets
             account_id_type buyer;
             // count of tickets to buy
-            share_type tickets_to_buy;
+            uint64_t tickets_to_buy;
             // amount that can spent
             asset amount;
 

libraries/chain/include/graphene/chain/protocol/operations.hpp

@@ -106,9 +106,9 @@ namespace graphene { namespace chain {
             assert_operation,
             balance_claim_operation,
             override_transfer_operation,
-            transfer_to_blind_operation,     //! We don't use this operation
-            blind_transfer_operation,        //! We don't use this operation
-            transfer_from_blind_operation,   //! We don't use this operation
+            transfer_to_blind_operation,
+            blind_transfer_operation,
+            transfer_from_blind_operation,
             asset_settle_cancel_operation,  // VIRTUAL
             asset_claim_fees_operation,
             fba_distribute_operation,        // VIRTUAL

libraries/chain/include/graphene/chain/protocol/son.hpp

@@ -33,6 +33,7 @@ namespace graphene { namespace chain {
          optional<public_key_type> new_signing_key;
          optional<flat_map<sidechain_type, string>> new_sidechain_public_keys;
          optional<vesting_balance_id_type> new_pay_vb;
+         optional<son_status> new_status;
 
          account_id_type fee_payer()const { return owner_account; }
          share_type      calculate_fee(const fee_parameters_type& k)const { return 0; }
@@ -104,7 +105,7 @@ FC_REFLECT(graphene::chain::son_create_operation, (fee)(owner_account)(url)(depo
 
 FC_REFLECT(graphene::chain::son_update_operation::fee_parameters_type, (fee) )
 FC_REFLECT(graphene::chain::son_update_operation, (fee)(son_id)(owner_account)(new_url)(new_deposit)
-           (new_signing_key)(new_sidechain_public_keys)(new_pay_vb) )
+           (new_signing_key)(new_sidechain_public_keys)(new_pay_vb)(new_status) )
 
 FC_REFLECT(graphene::chain::son_deregister_operation::fee_parameters_type, (fee) )
 FC_REFLECT(graphene::chain::son_deregister_operation, (fee)(son_id)(payer) )

libraries/chain/include/graphene/chain/protocol/son_wallet.hpp

@@ -1,23 +1,17 @@
 #pragma once
 #include <graphene/chain/protocol/base.hpp>
 #include <graphene/chain/son_info.hpp>
-#include <graphene/chain/son_sidechain_info.hpp>
 
 namespace graphene { namespace chain {
 
     struct son_wallet_recreate_operation : public base_operation
     {
         struct fee_parameters_type { uint64_t fee = 0; };
-     struct ext
-     {
-        optional<flat_map<sidechain_type, vector<son_sidechain_info> > > sidechain_sons;
-     };
 
         asset fee;
         account_id_type payer;
 
         vector<son_info> sons;
-     extension< ext > extensions;
 
         account_id_type fee_payer()const { return payer; }
         share_type      calculate_fee(const fee_parameters_type& k)const { return 0; }
@@ -41,7 +35,6 @@ namespace graphene { namespace chain {
 } } // namespace graphene::chain
 
 FC_REFLECT(graphene::chain::son_wallet_recreate_operation::fee_parameters_type, (fee) )
-FC_REFLECT(graphene::chain::son_wallet_recreate_operation::ext, (sidechain_sons))
-FC_REFLECT(graphene::chain::son_wallet_recreate_operation, (fee)(payer)(sons)(extensions) )
+FC_REFLECT(graphene::chain::son_wallet_recreate_operation, (fee)(payer)(sons) )
 FC_REFLECT(graphene::chain::son_wallet_update_operation::fee_parameters_type, (fee) )
 FC_REFLECT(graphene::chain::son_wallet_update_operation, (fee)(payer)(son_wallet_id)(sidechain)(address) )

libraries/chain/include/graphene/chain/protocol/types.hpp

@@ -395,13 +395,6 @@ namespace graphene { namespace chain {
        bool is_valid_muse( const std::string& base58str );
    };
 
-   class pubkey_comparator {
-   public:
-      inline bool operator()(const public_key_type& a, const public_key_type& b) const {
-         return a.key_data < b.key_data;
-      }
-   };
-
    struct extended_public_key_type
    {
       struct binary_key
@@ -584,8 +577,6 @@ FC_REFLECT_TYPENAME( graphene::chain::fba_accumulator_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::betting_market_position_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::global_betting_statistics_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::tournament_details_id_type )
-FC_REFLECT_TYPENAME( graphene::chain::game_id_type )
-FC_REFLECT_TYPENAME( graphene::chain::match_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::custom_permission_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::custom_account_authority_id_type )
 FC_REFLECT_TYPENAME( graphene::chain::offer_history_id_type )

libraries/chain/include/graphene/chain/protocol/vote.hpp

@@ -59,9 +59,7 @@ struct vote_id_type
       committee,
       witness,
       worker,
-      son_bitcoin,
-      son_hive,
-      son_ethereum,
+      son,
       VOTE_TYPE_COUNT
    };
 
@@ -146,7 +144,7 @@ void from_variant( const fc::variant& var, graphene::chain::vote_id_type& vo, ui
 
 FC_REFLECT_TYPENAME( fc::flat_set<graphene::chain::vote_id_type> )
 
-FC_REFLECT_ENUM( graphene::chain::vote_id_type::vote_type, (witness)(committee)(worker)(son_bitcoin)(son_hive)(son_ethereum)(VOTE_TYPE_COUNT) )
+FC_REFLECT_ENUM( graphene::chain::vote_id_type::vote_type, (witness)(committee)(worker)(son)(VOTE_TYPE_COUNT) )
 FC_REFLECT( graphene::chain::vote_id_type, (content) )
 
 GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::vote_id_type )

libraries/chain/include/graphene/chain/sidechain_address_object.hpp

@@ -31,20 +31,11 @@ namespace graphene { namespace chain {
          time_point_sec expires;
 
          sidechain_address_object() :
-            sidechain(sidechain_type::bitcoin), //! FIXME - bitcoin ???
+            sidechain(sidechain_type::bitcoin),
             deposit_public_key(""),
             deposit_address(""),
             withdraw_public_key(""),
             withdraw_address("") {}
-
-         inline string get_deposit_address() const {
-            if(sidechain_type::ethereum != sidechain)
-               return deposit_address;
-
-            auto deposit_address_lower = deposit_address;
-            std::transform(deposit_address_lower.begin(), deposit_address_lower.end(), deposit_address_lower.begin(), ::tolower);
-            return deposit_address_lower;
-         }
    };
 
    struct by_account;
@@ -85,7 +76,7 @@ namespace graphene { namespace chain {
          ordered_non_unique< tag<by_sidechain_and_deposit_address_and_expires>,
             composite_key<sidechain_address_object,
                member<sidechain_address_object, sidechain_type, &sidechain_address_object::sidechain>,
-               const_mem_fun<sidechain_address_object, string, &sidechain_address_object::get_deposit_address>,
+               member<sidechain_address_object, string, &sidechain_address_object::deposit_address>,
                member<sidechain_address_object, time_point_sec, &sidechain_address_object::expires>
             >
          >

libraries/chain/include/graphene/chain/sidechain_defs.hpp

@@ -1,11 +1,6 @@
 #pragma once
 
-#include <set>
-
-#include <graphene/chain/hardfork.hpp>
-
 #include <fc/reflect/reflect.hpp>
-#include <fc/time.hpp>
 
 namespace graphene { namespace chain {
 
@@ -18,23 +13,7 @@ enum class sidechain_type {
    hive
 };
 
-static const std::set<sidechain_type> all_sidechain_types = {sidechain_type::bitcoin, sidechain_type::ethereum, sidechain_type::hive};
-
-inline std::set<sidechain_type> active_sidechain_types(const fc::time_point_sec block_time) {
-   std::set<sidechain_type> active_sidechain_types{};
-
-   if (block_time >= HARDFORK_SON_TIME)
-      active_sidechain_types.insert(sidechain_type::bitcoin);
-   if (block_time >= HARDFORK_SON_FOR_HIVE_TIME)
-      active_sidechain_types.insert(sidechain_type::hive);
-   if (block_time >= HARDFORK_SON_FOR_ETHEREUM_TIME)
-      active_sidechain_types.insert(sidechain_type::ethereum);
-
-   return active_sidechain_types;
-}
-
-} // namespace chain
-} // namespace graphene
+} }
 
 FC_REFLECT_ENUM(graphene::chain::sidechain_type,
         (unknown)

libraries/chain/include/graphene/chain/sidechain_transaction_object.hpp

@@ -2,7 +2,7 @@
 #include <boost/multi_index/composite_key.hpp>
 #include <graphene/chain/protocol/types.hpp>
 #include <graphene/chain/sidechain_defs.hpp>
-#include <graphene/chain/son_sidechain_info.hpp>
+#include <graphene/chain/son_info.hpp>
 
 namespace graphene { namespace chain {
    using namespace graphene::db;
@@ -30,7 +30,7 @@ namespace graphene { namespace chain {
          sidechain_type sidechain = sidechain_type::unknown;
          object_id_type object_id;
          std::string transaction;
-         std::vector<son_sidechain_info> signers;
+         std::vector<son_info> signers;
          std::vector<std::pair<son_id_type, std::string>> signatures;
          std::string sidechain_transaction;
 

libraries/chain/include/graphene/chain/son_info.hpp

@@ -3,6 +3,7 @@
 #include <graphene/chain/sidechain_defs.hpp>
 
 namespace graphene { namespace chain {
+   using namespace graphene::db;
 
    /**
     * @class son_info
@@ -39,4 +40,8 @@ namespace graphene { namespace chain {
 
 } }
 
-FC_REFLECT( graphene::chain::son_info, (son_id) (weight) (signing_key) (sidechain_public_keys) )
+FC_REFLECT( graphene::chain::son_info,
+      (son_id)
+      (weight)
+      (signing_key)
+      (sidechain_public_keys) )

libraries/chain/include/graphene/chain/son_object.hpp

@@ -35,15 +35,15 @@ namespace graphene { namespace chain {
          // Transactions signed since the last son payouts
          flat_map<sidechain_type, uint64_t> txs_signed;
          // Total Voted Active time i.e. duration selected as part of voted active SONs
-         flat_map<sidechain_type, uint64_t> total_voted_time;
+         uint64_t total_voted_time = 0;
          // Total Downtime barring the current down time in seconds, used for stats to present to user
-         flat_map<sidechain_type, uint64_t> total_downtime;
+         uint64_t total_downtime = 0;
          // Current Interval Downtime since last maintenance
-         flat_map<sidechain_type, uint64_t> current_interval_downtime;
+         uint64_t current_interval_downtime = 0;
          // Down timestamp, if son status is in_maintenance use this
-         flat_map<sidechain_type, fc::time_point_sec> last_down_timestamp;
+         fc::time_point_sec last_down_timestamp;
          // Last Active heartbeat timestamp
-         flat_map<sidechain_type, fc::time_point_sec> last_active_timestamp;
+         fc::time_point_sec last_active_timestamp;
          // Deregistered Timestamp
          fc::time_point_sec deregistered_timestamp;
          // Total sidechain transactions reported by SON network while SON was active
@@ -64,48 +64,23 @@ namespace graphene { namespace chain {
          static const uint8_t type_id  = son_object_type;
 
          account_id_type son_account;
-         flat_map<sidechain_type, vote_id_type> sidechain_vote_ids;
-         flat_map<sidechain_type, uint64_t> total_votes = []()
-         {
-            flat_map<sidechain_type, uint64_t> total_votes;
-            for(const auto& active_sidechain_type : all_sidechain_types)
-            {
-               total_votes[active_sidechain_type] = 0;
-            }
-            return total_votes;
-         }();
+         vote_id_type vote_id;
+         uint64_t total_votes = 0;
          string url;
          vesting_balance_id_type deposit;
          public_key_type signing_key;
          vesting_balance_id_type pay_vb;
          son_statistics_id_type statistics;
-         flat_map<sidechain_type, son_status> statuses = []()
-         {
-            flat_map<sidechain_type, son_status> statuses;
-            for(const auto& active_sidechain_type : all_sidechain_types)
-            {
-               statuses[active_sidechain_type] = son_status::inactive;
-            }
-            return statuses;
-         }();
+         son_status status = son_status::inactive;
          flat_map<sidechain_type, string> sidechain_public_keys;
 
          void pay_son_fee(share_type pay, database& db);
-         bool has_valid_config(time_point_sec head_block_time, sidechain_type sidechain) const;
-
-         inline optional<vote_id_type> get_sidechain_vote_id(sidechain_type sidechain) const { return sidechain_vote_ids.contains(sidechain) ? sidechain_vote_ids.at(sidechain) : optional<vote_id_type>{}; }
-         inline optional<vote_id_type> get_bitcoin_vote_id() const { return get_sidechain_vote_id(sidechain_type::bitcoin); }
-         inline optional<vote_id_type> get_hive_vote_id() const { return get_sidechain_vote_id(sidechain_type::hive); }
-         inline optional<vote_id_type> get_ethereum_vote_id() const { return get_sidechain_vote_id(sidechain_type::ethereum); }
-
-      private:
-         bool has_valid_config(sidechain_type sidechain) const;
+         bool has_valid_config()const;
+         bool has_valid_config(time_point_sec head_block_time)const;
    };
 
    struct by_account;
-   struct by_vote_id_bitcoin;
-   struct by_vote_id_hive;
-   struct by_vote_id_ethereum;
+   struct by_vote_id;
    using son_multi_index_type = multi_index_container<
       son_object,
       indexed_by<
@@ -115,14 +90,8 @@ namespace graphene { namespace chain {
          ordered_unique< tag<by_account>,
             member<son_object, account_id_type, &son_object::son_account>
          >,
-         ordered_non_unique< tag<by_vote_id_bitcoin>,
-            const_mem_fun<son_object, optional<vote_id_type>, &son_object::get_bitcoin_vote_id>
-         >,
-         ordered_non_unique< tag<by_vote_id_hive>,
-            const_mem_fun<son_object, optional<vote_id_type>, &son_object::get_hive_vote_id>
-         >,
-         ordered_non_unique< tag<by_vote_id_ethereum>,
-            const_mem_fun<son_object, optional<vote_id_type>, &son_object::get_ethereum_vote_id>
+         ordered_unique< tag<by_vote_id>,
+            member<son_object, vote_id_type, &son_object::vote_id>
          >
       >
    >;
@@ -148,14 +117,14 @@ FC_REFLECT_ENUM(graphene::chain::son_status, (inactive)(active)(request_maintena
 
 FC_REFLECT_DERIVED( graphene::chain::son_object, (graphene::db::object),
                     (son_account)
-                    (sidechain_vote_ids)
+                    (vote_id)
                     (total_votes)
                     (url)
                     (deposit)
                     (signing_key)
                     (pay_vb)
                     (statistics)
-                    (statuses)
+                    (status)
                     (sidechain_public_keys)
                   )
 

libraries/chain/include/graphene/chain/son_sidechain_info.hpp

@@ -1,31 +0,0 @@
-#pragma once
-#include <graphene/chain/protocol/types.hpp>
-#include <graphene/chain/sidechain_defs.hpp>
-
-namespace graphene { namespace chain {
-
-   /**
-    * @class son_sidechain_info
-    * @brief tracks information about a SON info required to re/create primary wallet
-    * @ingroup object
-    */
-   struct son_sidechain_info {
-      son_id_type son_id;
-      weight_type weight = 0;
-      public_key_type signing_key;
-      string public_key;
-
-      bool operator==(const son_sidechain_info& rhs) const {
-         bool son_sets_equal =
-               (son_id == rhs.son_id) &&
-               (weight == rhs.weight) &&
-               (signing_key == rhs.signing_key) &&
-               (public_key == rhs.public_key);
-
-         return son_sets_equal;
-      }
-   };
-
-} }
-
-FC_REFLECT( graphene::chain::son_sidechain_info, (son_id) (weight) (signing_key) (public_key) )

libraries/chain/include/graphene/chain/son_wallet_deposit_object.hpp

@@ -18,7 +18,7 @@ namespace graphene { namespace chain {
          static const uint8_t type_id  = son_wallet_deposit_object_type;
 
          time_point_sec timestamp;
-         uint32_t block_num = 0;
+         uint32_t block_num;
          sidechain_type sidechain = sidechain_type::unknown;
          std::string sidechain_uid;
          std::string sidechain_transaction_id;

libraries/chain/include/graphene/chain/son_wallet_object.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <graphene/chain/protocol/types.hpp>
-#include <graphene/chain/son_sidechain_info.hpp>
+#include <graphene/chain/son_info.hpp>
 #include <graphene/chain/sidechain_defs.hpp>
 
 namespace graphene { namespace chain {
@@ -21,7 +21,7 @@ namespace graphene { namespace chain {
          time_point_sec expires;
 
          flat_map<sidechain_type, string> addresses;
-         flat_map<sidechain_type, vector<son_sidechain_info> > sons;
+         vector<son_info> sons;
    };
 
    struct by_valid_from;

libraries/chain/include/graphene/chain/son_wallet_withdraw_object.hpp

@@ -18,7 +18,7 @@ namespace graphene { namespace chain {
          static const uint8_t type_id  = son_wallet_withdraw_object_type;
 
          time_point_sec timestamp;
-         uint32_t block_num = 0;
+         uint32_t block_num;
          sidechain_type sidechain = sidechain_type::unknown;
          std::string peerplays_uid;
          std::string peerplays_transaction_id;

libraries/chain/include/graphene/chain/tournament_object.hpp

@@ -1,7 +1,8 @@
 #pragma once
 #include <graphene/chain/protocol/tournament.hpp>
+#include <graphene/chain/rock_paper_scissors.hpp>
 #include <boost/multi_index/composite_key.hpp>
-#include <graphene/db/object.hpp>
+#include <graphene/db/flat_index.hpp>
 #include <graphene/db/generic_index.hpp>
 #include <fc/crypto/hex.hpp>
 #include <sstream>
@@ -153,6 +154,7 @@ namespace graphene { namespace chain {
    > tournament_details_object_multi_index_type;
    typedef generic_index<tournament_details_object, tournament_details_object_multi_index_type> tournament_details_index;
 
+
    template<typename Stream>
    inline Stream& operator<<( Stream& s, const tournament_object& tournament_obj )
    { 
@@ -179,7 +181,6 @@ namespace graphene { namespace chain {
 
       return s;
    }
-
    template<typename Stream>
    inline Stream& operator>>( Stream& s, tournament_object& tournament_obj )
    { 
@@ -229,6 +230,8 @@ namespace graphene { namespace chain {
 
          flat_set<account_id_type> before_account_ids;
    };
+
+
 } }
 
 FC_REFLECT_DERIVED(graphene::chain::tournament_details_object, (graphene::db::object),
@@ -237,7 +240,8 @@ FC_REFLECT_DERIVED(graphene::chain::tournament_details_object, (graphene::db::ob
                    (payers)
                    (players_payers)
                    (matches))
-
+//FC_REFLECT_TYPENAME(graphene::chain::tournament_object) // manually serialized
+FC_REFLECT(graphene::chain::tournament_object, (creator))
 FC_REFLECT_ENUM(graphene::chain::tournament_state,
                 (accepting_registrations)
                 (awaiting_start)
@@ -245,52 +249,3 @@ FC_REFLECT_ENUM(graphene::chain::tournament_state,
                 (registration_period_expired)
                 (concluded))
 
-namespace fc {
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::from_variant(const variant &vo, graphene::chain::tournament_object &v, uint32_t max_depth) {
-      from_variant(vo, v, max_depth);
-   }
-
-   template<>
-   template<>
-   inline void if_enum<fc::false_type>::to_variant(const graphene::chain::tournament_object &v, variant &vo, uint32_t max_depth) {
-      to_variant(v, vo, max_depth);
-   }
-
-   namespace raw { namespace detail {
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<size_t> &s, const graphene::chain::tournament_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::pack(fc::datastream<char*> &s, const graphene::chain::tournament_object &v, uint32_t) {
-         s << v;
-      }
-
-      template<>
-      template<>
-      inline void if_enum<fc::false_type>::unpack(fc::datastream<const char*> &s, graphene::chain::tournament_object &v, uint32_t) {
-         s >> v;
-      }
-
-   } } // namespace fc::raw::detail
-
-   template <>
-   struct get_typename<graphene::chain::tournament_object> {
-      static const char *name() {
-         return "graphene::chain::tournament_object";
-      }
-   };
-   template <>
-   struct reflector<graphene::chain::tournament_object> {
-      typedef graphene::chain::tournament_object type;
-      typedef fc::true_type is_defined;
-      typedef fc::false_type is_enum;
-   };
-} // namespace fc

libraries/chain/include/graphene/chain/voters_info.hpp

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <graphene/chain/protocol/vote.hpp>
-
-namespace graphene { namespace chain {
-
-   /**
-       * @class voters_info_object
-       * @ingroup object
-    */
-   struct voters_info_object {
-      vote_id_type vote_id;
-      vector<account_id_type> voters;
-   };
-
-   /**
-       * @class voters_info
-       * @brief tracks information about a voters info
-       * @ingroup object
-    */
-   struct voters_info {
-      optional<voters_info_object>                             voters_for_committee_member;
-      optional<voters_info_object>                             voters_for_witness;
-      optional<vector<voters_info_object> >                    voters_for_workers;
-      optional<vector<voters_info_object> >                    voters_against_workers;
-      optional<flat_map<sidechain_type, voters_info_object> >  voters_for_son;
-   };
-
-} } // graphene::chain
-
-FC_REFLECT( graphene::chain::voters_info_object,
-   (vote_id)
-   (voters) )
-
-FC_REFLECT( graphene::chain::voters_info,
-   (voters_for_committee_member)
-   (voters_for_witness)
-   (voters_for_workers)
-   (voters_against_workers)
-   (voters_for_son))

libraries/chain/include/graphene/chain/votes_info.hpp

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <graphene/chain/protocol/vote.hpp>
-
-namespace graphene { namespace chain {
-
-   /**
-       * @class votes_info_object
-       * @ingroup object
-    */
-   struct votes_info_object {
-      vote_id_type vote_id;
-      object_id_type id;
-   };
-
-   /**
-       * @class votes_info
-       * @brief tracks information about a votes info
-       * @ingroup object
-    */
-   struct votes_info {
-      optional< vector< votes_info_object > >                              votes_for_committee_members;
-      optional< vector< votes_info_object > >                              votes_for_witnesses;
-      optional< vector< votes_info_object > >                              votes_for_workers;
-      optional< vector< votes_info_object > >                              votes_against_workers;
-      optional< flat_map<sidechain_type, vector< votes_info_object > > >   votes_for_sons;
-   };
-
-} } // graphene::chain
-
-FC_REFLECT( graphene::chain::votes_info_object,
-   (vote_id)
-   (id) )
-
-FC_REFLECT( graphene::chain::votes_info,
-   (votes_for_committee_members)
-   (votes_for_witnesses)
-   (votes_for_workers)
-   (votes_against_workers)
-   (votes_for_sons))

libraries/chain/include/graphene/chain/witness_scheduler.hpp

@@ -162,12 +162,8 @@ class generic_witness_scheduler
          _schedule.pop_front();
 
          auto it = _lame_duck.find( result );
-         if( it != _lame_duck.end() ) {
-            set< WitnessID > removal_set;
-            removal_set.insert(*it);
-            remove_all( removal_set );
+         if( it != _lame_duck.end() )
             _lame_duck.erase( it );
-         }
          if( debug ) check_invariant();
          return result;
       }
@@ -393,7 +389,7 @@ class generic_witness_scheduler
       // scheduled
       std::deque < WitnessID > _schedule;
 
-      // in _schedule, but must be removed
+      // in _schedule, but not to be replaced
       set< WitnessID > _lame_duck;
 };
 

libraries/chain/nft_lottery_evaluator.cpp

@@ -30,7 +30,7 @@ namespace graphene
 
                 auto lottery_options = lottery_md_obj.lottery_data->lottery_options;
                 FC_ASSERT(lottery_options.ticket_price.asset_id == op.amount.asset_id);
-                FC_ASSERT(op.tickets_to_buy * lottery_options.ticket_price.amount.value == op.amount.amount.value);
+                FC_ASSERT((double)op.amount.amount.value / lottery_options.ticket_price.amount.value == (double)op.tickets_to_buy);
                 return void_result();
             }
             FC_CAPTURE_AND_RETHROW((op))

libraries/chain/proposal_evaluator.cpp

@@ -302,7 +302,8 @@ void_result proposal_create_evaluator::do_evaluate( const proposal_create_operat
       vector<authority> other;
       for( auto& op : o.proposed_ops )
       {
-         operation_get_required_authorities( op.op, auths, auths, other, true );
+         operation_get_required_authorities( op.op, auths, auths, other,
+                                             MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(block_time) );
       }
 
       FC_ASSERT( other.size() == 0 ); // TODO: what about other??? 
@@ -351,7 +352,8 @@ object_id_type proposal_create_evaluator::do_apply( const proposal_create_operat
       
       // TODO: consider caching values from evaluate?
       for( auto& op : _proposed_trx.operations )
-         operation_get_required_authorities( op, required_active, proposal.required_owner_approvals, other, true);
+         operation_get_required_authorities( op, required_active, proposal.required_owner_approvals, other,
+                                             MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(chain_time) );
 
       //All accounts which must provide both owner and active authority should be omitted from the active authority set;
       //owner authority approval implies active authority approval.

libraries/chain/proposal_object.cpp

@@ -39,7 +39,7 @@ bool proposal_object::is_authorized_to_execute( database& db ) const
                         [&]( account_id_type id ){ return &id(db).owner;  },
                         [&]( account_id_type id, const operation& op ){
                            return db.get_account_custom_authorities(id, op); },
-                        true,
+                        MUST_IGNORE_CUSTOM_OP_REQD_AUTHS( db.head_block_time() ),
                         db.get_global_properties().parameters.max_authority_depth,
                         true, /* allow committee */
                         available_active_approvals,

libraries/chain/protocol/account.cpp

@@ -174,37 +174,22 @@ void account_options::validate() const
 {
    auto needed_witnesses = num_witness;
    auto needed_committee = num_committee;
+   auto needed_sons = num_son;
 
    for( vote_id_type id : votes )
       if( id.type() == vote_id_type::witness && needed_witnesses )
          --needed_witnesses;
       else if ( id.type() == vote_id_type::committee && needed_committee )
          --needed_committee;
+      else if ( id.type() == vote_id_type::son && needed_sons )
+         --needed_sons;
 
    FC_ASSERT( needed_witnesses == 0,
               "May not specify fewer witnesses than the number voted for.");
    FC_ASSERT( needed_committee == 0,
               "May not specify fewer committee members than the number voted for.");
-
-   if ( extensions.value.num_son.valid() )
-   {
-      flat_map<sidechain_type, uint16_t> needed_sons = *extensions.value.num_son;
-
-      for( vote_id_type id : votes )
-         if ( id.type() == vote_id_type::son_bitcoin && needed_sons[sidechain_type::bitcoin] )
-               --needed_sons[sidechain_type::bitcoin];
-         else if ( id.type() == vote_id_type::son_hive && needed_sons[sidechain_type::hive] )
-               --needed_sons[sidechain_type::hive];
-         else if ( id.type() == vote_id_type::son_ethereum && needed_sons[sidechain_type::ethereum] )
-               --needed_sons[sidechain_type::ethereum];
-
-      FC_ASSERT( needed_sons[sidechain_type::bitcoin] == 0,
-                "May not specify fewer Bitcoin SONs than the number voted for.");
-      FC_ASSERT( needed_sons[sidechain_type::hive] == 0,
-                "May not specify fewer Hive SONs than the number voted for.");
-      FC_ASSERT( needed_sons[sidechain_type::ethereum] == 0,
-                "May not specify fewer Ethereum SONs than the number voted for.");
-   }
+   FC_ASSERT( needed_sons == 0,
+              "May not specify fewer SONs than the number voted for.");
 }
 
 void affiliate_reward_distribution::validate() const

libraries/chain/protocol/confidential.cpp

@@ -22,10 +22,12 @@
  * THE SOFTWARE.
  */
 #include <graphene/chain/protocol/confidential.hpp>
+#include <graphene/chain/confidential_evaluator.hpp>
+#include <graphene/chain/database.hpp>
 
+#include <fc/crypto/base58.hpp>
 #include <fc/io/raw.hpp>
 
-/*
 namespace graphene { namespace chain {
 
 void transfer_to_blind_operation::validate()const
@@ -45,6 +47,19 @@ void transfer_to_blind_operation::validate()const
       FC_ASSERT( !outputs[i].owner.is_impossible() );
    }
    FC_ASSERT( out.size(), "there must be at least one output" );
+
+   auto public_c = fc::ecc::blind(blinding_factor,net_public);
+
+   FC_ASSERT( fc::ecc::verify_sum( {public_c}, out, 0 ), "", ("net_public",net_public) );
+
+   if( outputs.size() > 1 )
+   {
+      for( auto out : outputs )
+      {
+         auto info = fc::ecc::range_get_info( out.range_proof );
+         FC_ASSERT( info.max_value <= GRAPHENE_MAX_SHARE_SUPPLY );
+      }
+   }
 }
 
 share_type transfer_to_blind_operation::calculate_fee( const fee_parameters_type& k )const
@@ -64,15 +79,31 @@ void transfer_from_blind_operation::validate()const
    vector<commitment_type> in(inputs.size());
    vector<commitment_type> out;
    int64_t                 net_public = fee.amount.value + amount.amount.value;
+   out.push_back( fc::ecc::blind( blinding_factor, net_public ) );
+   for( uint32_t i = 0; i < in.size(); ++i )
+   {
+      in[i] = inputs[i].commitment;
+      /// by requiring all inputs to be sorted we also prevent duplicate commitments on the input
+      if( i > 0 ) FC_ASSERT( in[i-1] < in[i], "all inputs must be sorted by commitment id" );
+   }
+   FC_ASSERT( in.size(), "there must be at least one input" );
+   FC_ASSERT( fc::ecc::verify_sum( in, out, 0 ) );
 }
 
 
+/**
+ *  If fee_payer = temp_account_id, then the fee is paid by the surplus balance of inputs-outputs and
+ *  100% of the fee goes to the network.
+ */
 account_id_type blind_transfer_operation::fee_payer()const
 {
    return GRAPHENE_TEMP_ACCOUNT;
 }
 
 
+/**
+ *  This method can be computationally intensive because it verifies that input commitments - output commitments add up to 0
+ */
 void blind_transfer_operation::validate()const
 { try {
    vector<commitment_type> in(inputs.size());
@@ -91,6 +122,17 @@ void blind_transfer_operation::validate()const
       FC_ASSERT( !outputs[i].owner.is_impossible() );
    }
    FC_ASSERT( in.size(), "there must be at least one input" );
+   FC_ASSERT( fc::ecc::verify_sum( in, out, net_public ), "", ("net_public", net_public) );
+
+   if( outputs.size() > 1 )
+   {
+      for( auto out : outputs )
+      {
+         auto info = fc::ecc::range_get_info( out.range_proof );
+         FC_ASSERT( info.max_value <= GRAPHENE_MAX_SHARE_SUPPLY );
+      }
+   }
+   FC_ASSERT( fc::ecc::verify_sum( in, out, net_public ), "", ("net_public", net_public) );
 } FC_CAPTURE_AND_RETHROW( (*this) ) }
 
 share_type blind_transfer_operation::calculate_fee( const fee_parameters_type& k )const
@@ -98,12 +140,16 @@ share_type blind_transfer_operation::calculate_fee( const fee_parameters_type& k
     return k.fee + outputs.size() * k.price_per_output;
 }
 
-
+/**
+ *  Packs *this then encodes as base58 encoded string.
+ */
 stealth_confirmation::operator string()const
 {
    return fc::to_base58( fc::raw::pack( *this ) );
 }
-
+/**
+ * Unpacks from a base58 string
+ */
 stealth_confirmation::stealth_confirmation( const std::string& base58 )
 {
    *this = fc::raw::unpack<stealth_confirmation>( fc::from_base58( base58 ) );
@@ -111,8 +157,6 @@ stealth_confirmation::stealth_confirmation( const std::string& base58 )
 
 } } // graphene::chain
 
-*/
-
 GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::transfer_to_blind_operation::fee_parameters_type )
 GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::transfer_from_blind_operation::fee_parameters_type )
 GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::blind_transfer_operation::fee_parameters_type )

libraries/chain/protocol/fee_schedule.cpp

@@ -192,16 +192,6 @@ namespace graphene { namespace chain {
          FC_ASSERT( *extensions.value.betting_rake_fee_percentage <= TOURNAMENT_MAXIMAL_RAKE_FEE_PERCENTAGE,
                     "Rake fee percentage must not be greater than ${max}", ("max", TOURNAMENT_MAXIMAL_RAKE_FEE_PERCENTAGE));
       }
-
-      if( extensions.value.son_heartbeat_frequency.valid() &&  extensions.value.son_deregister_time.valid() )
-         FC_ASSERT( *extensions.value.son_heartbeat_frequency < *extensions.value.son_deregister_time );
-
-      if( extensions.value.son_heartbeat_frequency.valid() &&  extensions.value.son_down_time.valid() )
-         FC_ASSERT( *extensions.value.son_heartbeat_frequency < *extensions.value.son_down_time );
-
-      if( extensions.value.son_heartbeat_frequency.valid() &&  extensions.value.son_pay_time.valid() )
-         FC_ASSERT( *extensions.value.son_heartbeat_frequency < *extensions.value.son_pay_time );
-
    }
 
 } } // graphene::chain

libraries/chain/sidechain_address_evaluator.cpp

@@ -22,15 +22,12 @@ object_id_type add_sidechain_address_evaluator::do_apply(const sidechain_address
     const auto &sidechain_addresses_idx = db().get_index_type<sidechain_address_index>().indices().get<by_account_and_sidechain_and_expires>();
     const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(op.sidechain_address_account, op.sidechain, time_point_sec::maximum()));
 
-    if (addr_itr != sidechain_addresses_idx.end()) {
-       if (db().head_block_time() >= HARDFORK_SIDECHAIN_DELETE_TIME) {
-          db().remove(*addr_itr);
-       } else {
+    if (addr_itr != sidechain_addresses_idx.end())
+    {
         db().modify(*addr_itr, [&](sidechain_address_object &sao) {
             sao.expires = db().head_block_time();
         });
     }
-    }
 
     const auto& new_sidechain_address_object = db().create<sidechain_address_object>( [&]( sidechain_address_object& obj ){
         obj.sidechain_address_account = op.sidechain_address_account;
@@ -50,7 +47,7 @@ void_result update_sidechain_address_evaluator::do_evaluate(const sidechain_addr
 { try {
     const auto& sidx = db().get_index_type<son_index>().indices().get<by_account>();
     const auto& son_obj = sidx.find(op.payer);
-    FC_ASSERT( son_obj != sidx.end() && db().is_son_active(op.sidechain, son_obj->id), "Non active SON trying to update deposit address object" );
+    FC_ASSERT( son_obj != sidx.end() && db().is_son_active(son_obj->id), "Non active SON trying to update deposit address object" );
     const auto& sdpke_idx = db().get_index_type<sidechain_address_index>().indices().get<by_sidechain_and_deposit_public_key_and_expires>();
     FC_ASSERT( op.deposit_address.valid() && op.deposit_public_key.valid() && op.deposit_address_data.valid(), "Update operation by SON is not valid");
     FC_ASSERT( (*op.deposit_address).length() > 0 && (*op.deposit_public_key).length() > 0 && (*op.deposit_address_data).length() > 0, "SON should create a valid deposit address with valid deposit public key");
@@ -109,14 +106,10 @@ void_result delete_sidechain_address_evaluator::do_apply(const sidechain_address
     const auto& idx = db().get_index_type<sidechain_address_index>().indices().get<by_id>();
     auto sidechain_address = idx.find(op.sidechain_address_id);
     if(sidechain_address != idx.end()) {
-       if (db().head_block_time() >= HARDFORK_SIDECHAIN_DELETE_TIME) {
-          db().remove(*sidechain_address);
-       } else {
         db().modify(*sidechain_address, [&](sidechain_address_object &sao) {
             sao.expires = db().head_block_time();
         });
     }
-    }
     return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 

libraries/chain/sidechain_transaction_evaluator.cpp

@@ -28,26 +28,15 @@ void_result sidechain_transaction_create_evaluator::do_evaluate(const sidechain_
 object_id_type sidechain_transaction_create_evaluator::do_apply(const sidechain_transaction_create_operation &op)
 { try {
    const auto &new_sidechain_transaction_object = db().create<sidechain_transaction_object>([&](sidechain_transaction_object &sto) {
-
       sto.timestamp = db().head_block_time();
       sto.sidechain = op.sidechain;
       sto.object_id = op.object_id;
       sto.transaction = op.transaction;
-      std::vector<son_sidechain_info> signers;
-      for(const auto& signer : op.signers){
-         son_sidechain_info ssi;
-         ssi.son_id = signer.son_id;
-         ssi.weight = signer.weight;
-         ssi.signing_key = signer.signing_key;
-         ssi.public_key = signer.sidechain_public_keys.at(op.sidechain);
-         signers.emplace_back(std::move(ssi));
-      }
-      sto.signers = std::move(signers);
-
-      std::transform(sto.signers.begin(), sto.signers.end(), std::inserter(sto.signatures, sto.signatures.end()), [](const son_sidechain_info &si) {
+      sto.signers = op.signers;
+      std::transform(op.signers.begin(), op.signers.end(), std::inserter(sto.signatures, sto.signatures.end()), [](const son_info &si) {
          return std::make_pair(si.son_id, std::string());
       });
-      for (const auto &si : sto.signers) {
+      for (const auto &si : op.signers) {
          sto.total_weight = sto.total_weight + si.weight;
       }
       sto.sidechain_transaction = "";

libraries/chain/son_evaluator.cpp

@@ -39,28 +39,13 @@ void_result create_son_evaluator::do_evaluate(const son_create_operation& op)
 object_id_type create_son_evaluator::do_apply(const son_create_operation& op)
 { try {
     vote_id_type vote_id;
-    flat_map<sidechain_type, vote_id_type> vote_ids;
-
-    const auto now = db().head_block_time();
-    if( now < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
     db().modify(db().get_global_properties(), [&vote_id](global_property_object& p) {
-         vote_id = get_next_vote_id(p, vote_id_type::son_bitcoin);
+        vote_id = get_next_vote_id(p, vote_id_type::son);
     });
-    }
-    else {
-      db().modify(db().get_global_properties(), [&vote_ids](global_property_object &p) {
-         vote_ids[sidechain_type::bitcoin] = get_next_vote_id(p, vote_id_type::son_bitcoin);
-         vote_ids[sidechain_type::hive] = get_next_vote_id(p, vote_id_type::son_hive);
-         vote_ids[sidechain_type::ethereum] = get_next_vote_id(p, vote_id_type::son_ethereum);
-      });
-    }
 
     const auto& new_son_object = db().create<son_object>( [&]( son_object& obj ){
         obj.son_account = op.owner_account;
-        if( now < HARDFORK_SON_FOR_ETHEREUM_TIME )
-           obj.sidechain_vote_ids[sidechain_type::bitcoin] = vote_id;
-        else
-           obj.sidechain_vote_ids = vote_ids;
+        obj.vote_id = vote_id;
         obj.url = op.url;
         obj.deposit = op.deposit;
         obj.signing_key = op.signing_key;
@@ -94,6 +79,9 @@ void_result update_son_evaluator::do_evaluate(const son_update_operation& op)
        FC_ASSERT(vbo.policy.which() == vesting_policy::tag<linear_vesting_policy>::value,
              "Payment balance must have linear vesting policy");
     }
+    if(op.new_status.valid()) {
+       FC_ASSERT(db().get(op.son_id).status == son_status::deregistered, "SON must be in deregistered state");
+    }
     return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
@@ -109,8 +97,7 @@ object_id_type update_son_evaluator::do_apply(const son_update_operation& op)
            if(op.new_signing_key.valid()) so.signing_key = *op.new_signing_key;
            if(op.new_sidechain_public_keys.valid()) so.sidechain_public_keys = *op.new_sidechain_public_keys;
            if(op.new_pay_vb.valid()) so.pay_vb = *op.new_pay_vb;
-           for(auto& status : so.statuses)
-            if(status.second == son_status::deregistered) status.second = son_status::inactive;
+           if(op.new_status.valid()) so.status = son_status::inactive;
        });
    }
    return op.son_id;
@@ -143,8 +130,7 @@ void_result deregister_son_evaluator::do_apply(const son_deregister_operation& o
        });
 
        db().modify(*son, [&op](son_object &so) {
-          for(auto& status : so.statuses)
-            status.second = son_status::deregistered;
+          so.status = son_status::deregistered;
        });
 
        auto stats_obj = ss_idx.find(son->statistics);
@@ -161,28 +147,18 @@ void_result son_heartbeat_evaluator::do_evaluate(const son_heartbeat_operation&
 { try {
     FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK"); // can be removed after HF date pass
     const auto& idx = db().get_index_type<son_index>().indices().get<by_id>();
-    const auto itr = idx.find(op.son_id);
+    auto itr = idx.find(op.son_id);
     FC_ASSERT( itr != idx.end() );
     FC_ASSERT(itr->son_account == op.owner_account);
     auto stats = itr->statistics( db() );
     // Inactive SONs need not send heartbeats
-    bool status_need_to_send_heartbeats = false;
-    for(const auto& status : itr->statuses)
-    {
-       if( (status.second == son_status::active) || (status.second == son_status::in_maintenance) || (status.second == son_status::request_maintenance) )
-          status_need_to_send_heartbeats = true;
-    }
-    FC_ASSERT(status_need_to_send_heartbeats, "Inactive SONs need not send heartbeats");
+    FC_ASSERT((itr->status == son_status::active) || (itr->status == son_status::in_maintenance) || (itr->status == son_status::request_maintenance), "Inactive SONs need not send heartbeats");
     // Account for network delays
     fc::time_point_sec min_ts = db().head_block_time() - fc::seconds(5 * db().block_interval());
     // Account for server ntp sync difference
     fc::time_point_sec max_ts = db().head_block_time() + fc::seconds(5 * db().block_interval());
-    for(const auto& active_sidechain_type : active_sidechain_types(db().head_block_time())) {
-      if(stats.last_active_timestamp.contains(active_sidechain_type))
-         FC_ASSERT(op.ts > stats.last_active_timestamp.at(active_sidechain_type), "Heartbeat sent for sidechain = ${sidechain} without waiting minimum time", ("sidechain", active_sidechain_type));
-      if(stats.last_down_timestamp.contains(active_sidechain_type))
-         FC_ASSERT(op.ts > stats.last_down_timestamp.at(active_sidechain_type), "Heartbeat sent for sidechain = ${sidechain} is invalid can't be <= last down timestamp", ("sidechain", active_sidechain_type));
-    }
+    FC_ASSERT(op.ts > stats.last_active_timestamp, "Heartbeat sent without waiting minimum time");
+    FC_ASSERT(op.ts > stats.last_down_timestamp, "Heartbeat sent is invalid can't be <= last down timestamp");
     FC_ASSERT(op.ts >= min_ts, "Heartbeat ts is behind the min threshold");
     FC_ASSERT(op.ts <= max_ts, "Heartbeat ts is above the max threshold");
     return void_result();
@@ -191,50 +167,46 @@ void_result son_heartbeat_evaluator::do_evaluate(const son_heartbeat_operation&
 object_id_type son_heartbeat_evaluator::do_apply(const son_heartbeat_operation& op)
 { try {
     const auto& idx = db().get_index_type<son_index>().indices().get<by_id>();
-    const auto itr = idx.find(op.son_id);
+    auto itr = idx.find(op.son_id);
     if(itr != idx.end())
     {
         const global_property_object& gpo = db().get_global_properties();
-
-        for(const auto& active_sidechain_sons : gpo.active_sons) {
-           const auto& sidechain = active_sidechain_sons.first;
-           const auto& active_sons = active_sidechain_sons.second;
-
         vector<son_id_type> active_son_ids;
-           active_son_ids.reserve(active_sons.size());
-           std::transform(active_sons.cbegin(), active_sons.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;
         });
 
-           const auto it_son = std::find(active_son_ids.begin(), active_son_ids.end(), op.son_id);
+        auto it_son = std::find(active_son_ids.begin(), active_son_ids.end(), op.son_id);
         bool is_son_active = true;
 
         if(it_son == active_son_ids.end()) {
             is_son_active = false;
         }
 
-           if (itr->statuses.at(sidechain) == son_status::in_maintenance) {
-              db().modify(itr->statistics(db()), [&](son_statistics_object &sso) {
-                 sso.current_interval_downtime[sidechain] += op.ts.sec_since_epoch() - (sso.last_down_timestamp.contains(sidechain) ? sso.last_down_timestamp.at(sidechain).sec_since_epoch() : op.ts.sec_since_epoch());
-                 sso.last_active_timestamp[sidechain] = op.ts;
+        if(itr->status == son_status::in_maintenance) {
+            db().modify( itr->statistics( db() ), [&]( son_statistics_object& sso )
+            {
+                sso.current_interval_downtime += op.ts.sec_since_epoch() - sso.last_down_timestamp.sec_since_epoch();
+                sso.last_active_timestamp = op.ts;
             } );
 
-              db().modify(*itr, [&is_son_active, &sidechain](son_object &so) {
+            db().modify(*itr, [&is_son_active](son_object &so) {
                 if(is_son_active) {
-                    so.statuses[sidechain] = son_status::active;
+                    so.status = son_status::active;
                 } else {
-                    so.statuses[sidechain] = son_status::inactive;
+                    so.status = son_status::inactive;
                 }
             });
-           } else if ((itr->statuses.at(sidechain) == son_status::active) || (itr->statuses.at(sidechain) == son_status::request_maintenance)) {
-              db().modify(itr->statistics(db()), [&](son_statistics_object &sso) {
-                 sso.last_active_timestamp[sidechain] = op.ts;
+        } else if ((itr->status == son_status::active) || (itr->status == son_status::request_maintenance)) {
+            db().modify( itr->statistics( db() ), [&]( son_statistics_object& sso )
+            {
+                sso.last_active_timestamp = op.ts;
             } );
         }
     }
-    }
     return op.son_id;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
@@ -244,42 +216,30 @@ void_result son_report_down_evaluator::do_evaluate(const son_report_down_operati
     FC_ASSERT(op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer.");
     const auto& idx = db().get_index_type<son_index>().indices().get<by_id>();
     FC_ASSERT( idx.find(op.son_id) != idx.end() );
-    const auto itr = idx.find(op.son_id);
-    const auto stats = itr->statistics( db() );
-    bool status_need_to_report_down = false;
-    for(const auto& status : itr->statuses)
-    {
-       if( (status.second == son_status::active) || (status.second == son_status::request_maintenance) )
-          status_need_to_report_down = true;
-    }
-    FC_ASSERT(status_need_to_report_down, "Inactive/Deregistered/in_maintenance SONs cannot be reported on as down");
-    for(const auto& active_sidechain_type : active_sidechain_types(db().head_block_time())) {
-      if(stats.last_active_timestamp.contains(active_sidechain_type))
-         FC_ASSERT(op.down_ts >= stats.last_active_timestamp.at(active_sidechain_type), "sidechain = ${sidechain} down_ts should be greater than last_active_timestamp", ("sidechain", active_sidechain_type));
-    }
+    auto itr = idx.find(op.son_id);
+    auto stats = itr->statistics( db() );
+    FC_ASSERT(itr->status == son_status::active || itr->status == son_status::request_maintenance, "Inactive/Deregistered/in_maintenance SONs cannot be reported on as down");
+    FC_ASSERT(op.down_ts >= stats.last_active_timestamp, "down_ts should be greater than last_active_timestamp");
     return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
 object_id_type son_report_down_evaluator::do_apply(const son_report_down_operation& op)
 { try {
     const auto& idx = db().get_index_type<son_index>().indices().get<by_id>();
-    const auto itr = idx.find(op.son_id);
+    auto itr = idx.find(op.son_id);
     if(itr != idx.end())
     {
-       for( const auto& status : itr->statuses ) {
-          const auto& sidechain = status.first;
-
-          if ((status.second == son_status::active) || (status.second == son_status::request_maintenance)) {
-             db().modify(*itr, [&sidechain](son_object &so) {
-                so.statuses[sidechain] = son_status::in_maintenance;
+        if ((itr->status == son_status::active) || (itr->status == son_status::request_maintenance)) {
+            db().modify( itr->statistics( db() ), [&]( son_statistics_object& sso )
+            {
+                sso.last_down_timestamp = op.down_ts;
             });
 
-             db().modify(itr->statistics(db()), [&](son_statistics_object &sso) {
-                sso.last_down_timestamp[sidechain] = op.down_ts;
+            db().modify(*itr, [&op](son_object &so) {
+                so.status = son_status::in_maintenance;
             });
         }
     }
-    }
     return op.son_id;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 
@@ -292,19 +252,9 @@ void_result son_maintenance_evaluator::do_evaluate(const son_maintenance_operati
     FC_ASSERT( itr != idx.end() );
     // Inactive SONs can't go to maintenance, toggle between active and request_maintenance states
     if(op.request_type == son_maintenance_request_type::request_maintenance) {
-       bool status_active = false;
-       for(const auto& status : itr->statuses) {
-          if( (status.second == son_status::active) )
-             status_active = true;
-       }
-       FC_ASSERT(status_active, "Inactive SONs can't request for maintenance");
+        FC_ASSERT(itr->status == son_status::active, "Inactive SONs can't request for maintenance");
     } else if(op.request_type == son_maintenance_request_type::cancel_request_maintenance) {
-          bool status_request_maintenance = false;
-          for(const auto& status : itr->statuses) {
-             if( (status.second == son_status::request_maintenance) )
-                status_request_maintenance = true;
-          }
-          FC_ASSERT(status_request_maintenance, "Only maintenance requested SONs can cancel the request");
+        FC_ASSERT(itr->status == son_status::request_maintenance, "Only maintenance requested SONs can cancel the request");
     } else {
         FC_ASSERT(false, "Invalid maintenance operation");
     }
@@ -317,34 +267,16 @@ object_id_type son_maintenance_evaluator::do_apply(const son_maintenance_operati
     auto itr = idx.find(op.son_id);
     if(itr != idx.end())
     {
-       bool status_active = false;
-       for(const auto& status : itr->statuses) {
-          if( (status.second == son_status::active) )
-             status_active = true;
-       }
-       if(status_active && op.request_type == son_maintenance_request_type::request_maintenance) {
+        if(itr->status == son_status::active && op.request_type == son_maintenance_request_type::request_maintenance) {
             db().modify(*itr, [](son_object &so) {
-             for(auto& status : so.statuses) {
-                status.second = son_status::request_maintenance;
-             }
+                so.status = son_status::request_maintenance;
             });
-       }
-       else
-       {
-          bool status_request_maintenance = false;
-          for(const auto& status : itr->statuses) {
-             if( (status.second == son_status::request_maintenance) )
-                status_request_maintenance = true;
-          }
-          if(status_request_maintenance && op.request_type == son_maintenance_request_type::cancel_request_maintenance) {
+        } else if(itr->status == son_status::request_maintenance && op.request_type == son_maintenance_request_type::cancel_request_maintenance) {
             db().modify(*itr, [](son_object &so) {
-               for(auto& status : so.statuses) {
-                  status.second = son_status::active;
-               }
+                so.status = son_status::active;
             });
         }
     }
-    }
     return op.son_id;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
 

libraries/chain/son_object.cpp

@@ -6,22 +6,20 @@ namespace graphene { namespace chain {
       db.adjust_balance(son_account, pay);
    }
 
-   bool son_object::has_valid_config(sidechain_type sidechain) const {
-      return (sidechain_public_keys.find( sidechain ) != sidechain_public_keys.end()) &&
-         (sidechain_public_keys.at(sidechain).length() > 0);
+   bool son_object::has_valid_config()const {
+      return ((std::string(signing_key).length() > 0) &&
+             (sidechain_public_keys.size() > 0) &&
+             (sidechain_public_keys.find( sidechain_type::bitcoin ) != sidechain_public_keys.end()) &&
+             (sidechain_public_keys.at(sidechain_type::bitcoin).length() > 0));
    }
 
-   bool son_object::has_valid_config(time_point_sec head_block_time, sidechain_type sidechain) const {
-      bool retval = (std::string(signing_key).length() > 0) && (sidechain_public_keys.size() > 0);
+   bool son_object::has_valid_config(time_point_sec head_block_time)const {
+      bool retval = has_valid_config();
 
-      if (head_block_time < HARDFORK_SON_FOR_HIVE_TIME) {
-         retval = retval && has_valid_config(sidechain_type::bitcoin);
-      }
-      if (head_block_time >= HARDFORK_SON_FOR_HIVE_TIME && head_block_time < HARDFORK_SON_FOR_ETHEREUM_TIME) {
-         retval = retval && has_valid_config(sidechain_type::bitcoin) && has_valid_config(sidechain_type::hive);
-      }
-      else if (head_block_time >= HARDFORK_SON_FOR_ETHEREUM_TIME) {
-         retval = retval && has_valid_config(sidechain);
+      if (head_block_time >= HARDFORK_SON_FOR_HIVE_TIME) {
+          retval = retval &&
+                   (sidechain_public_keys.find( sidechain_type::hive ) != sidechain_public_keys.end()) &&
+                   (sidechain_public_keys.at(sidechain_type::hive).length() > 0);
       }
 
       return retval;

libraries/chain/son_wallet_deposit_evaluator.cpp

@@ -23,9 +23,9 @@ void_result create_son_wallet_deposit_evaluator::do_evaluate(const son_wallet_de
    const auto &swdo_idx = db().get_index_type<son_wallet_deposit_index>().indices().get<by_sidechain_uid>();
    const auto swdo = swdo_idx.find(op.sidechain_uid);
    if (swdo == swdo_idx.end()) {
-      const auto &gpo = db().get_global_properties();
+      auto &gpo = db().get_global_properties();
       bool expected = false;
-      for (auto &si : gpo.active_sons.at(op.sidechain)) {
+      for (auto &si : gpo.active_sons) {
          if (op.son_id == si.son_id) {
             expected = true;
             break;
@@ -78,8 +78,8 @@ object_id_type create_son_wallet_deposit_evaluator::do_apply(const son_wallet_de
          swdo.peerplays_to = op.peerplays_to;
          swdo.peerplays_asset = op.peerplays_asset;
 
-         const auto &gpo = db().get_global_properties();
-         for (auto &si : gpo.active_sons.at(op.sidechain)) {
+         auto &gpo = db().get_global_properties();
+         for (auto &si : gpo.active_sons) {
             swdo.expected_reports.insert(std::make_pair(si.son_id, si.weight));
 
             auto stats_itr = db().get_index_type<son_stats_index>().indices().get<by_owner>().find(si.son_id);
@@ -142,11 +142,11 @@ void_result process_son_wallet_deposit_evaluator::do_evaluate(const son_wallet_d
 { try{
    FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
    FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." );
+   FC_ASSERT(db().get_global_properties().active_sons.size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present");
 
    const auto& idx = db().get_index_type<son_wallet_deposit_index>().indices().get<by_id>();
    const auto& itr = idx.find(op.son_wallet_deposit_id);
    FC_ASSERT(itr != idx.end(), "Son wallet deposit not found");
-   FC_ASSERT(db().get_global_properties().active_sons.at(itr->sidechain).size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present");
    FC_ASSERT(!itr->processed, "Son wallet deposit is already processed");
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }

libraries/chain/son_wallet_evaluator.cpp

@@ -7,8 +7,7 @@ namespace graphene { namespace chain {
 
 void_result recreate_son_wallet_evaluator::do_evaluate(const son_wallet_recreate_operation& op)
 { try{
-   const auto now = db().head_block_time();
-   FC_ASSERT(now >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
+   FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
    FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." );
 
    const auto& idx = db().get_index_type<son_wallet_index>().indices().get<by_id>();
@@ -17,36 +16,12 @@ void_result recreate_son_wallet_evaluator::do_evaluate(const son_wallet_recreate
    {
       // Compare current wallet SONs and to-be lists of active sons
       auto cur_wallet_sons = (*itr).sons;
-      flat_map<sidechain_type, vector<son_sidechain_info> > new_wallet_sons;
-      if( now < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-         for(const auto& son : op.sons){
-            for(const auto& active_sidechain_type : active_sidechain_types(db().head_block_time())){
-               son_sidechain_info ssi;
-               ssi.son_id = son.son_id;
-               ssi.weight = son.weight;
-               ssi.signing_key = son.signing_key;
-               ssi.public_key = son.sidechain_public_keys.at(active_sidechain_type);
-               new_wallet_sons[active_sidechain_type].emplace_back(std::move(ssi));
-            }
-         }
-      }
-      else{
-         FC_ASSERT(op.extensions.value.sidechain_sons.valid(), "Sons is not valid");
-         new_wallet_sons = *op.extensions.value.sidechain_sons;
-      }
+      auto new_wallet_sons = op.sons;
 
       bool son_sets_equal = (cur_wallet_sons.size() == new_wallet_sons.size());
-      if (son_sets_equal) {
-         for( const auto& cur_wallet_sidechain_sons : cur_wallet_sons ) {
-            const auto& sidechain = cur_wallet_sidechain_sons.first;
-            const auto& _cur_wallet_sidechain_sons = cur_wallet_sidechain_sons.second;
-
-            son_sets_equal = son_sets_equal && (_cur_wallet_sidechain_sons.size() == new_wallet_sons.at(sidechain).size());
       if (son_sets_equal) {
          for( size_t i = 0; i < cur_wallet_sons.size(); i++ ) {
-                  son_sets_equal = son_sets_equal && _cur_wallet_sidechain_sons.at(i) == new_wallet_sons.at(sidechain).at(i);
-               }
-            }
+            son_sets_equal = son_sets_equal && cur_wallet_sons.at(i) == new_wallet_sons.at(i);
          }
       }
 
@@ -68,26 +43,9 @@ object_id_type recreate_son_wallet_evaluator::do_apply(const son_wallet_recreate
    }
 
    const auto& new_son_wallet_object = db().create<son_wallet_object>( [&]( son_wallet_object& obj ){
-      const auto now = db().head_block_time();
-      obj.valid_from = now;
+      obj.valid_from = db().head_block_time();
       obj.expires = time_point_sec::maximum();
-      if( now < HARDFORK_SON_FOR_ETHEREUM_TIME ) {
-         flat_map<sidechain_type, vector<son_sidechain_info> > sons;
-         for(const auto& son : op.sons){
-            for(const auto& active_sidechain_type : active_sidechain_types(db().head_block_time())){
-               son_sidechain_info ssi;
-               ssi.son_id = son.son_id;
-               ssi.weight = son.weight;
-               ssi.signing_key = son.signing_key;
-               ssi.public_key = son.sidechain_public_keys.at(active_sidechain_type);
-               sons[active_sidechain_type].emplace_back(std::move(ssi));
-            }
-         }
-         obj.sons = std::move(sons);
-      }
-      else{
-         obj.sons = *op.extensions.value.sidechain_sons;
-      }
+      obj.sons = op.sons;
    });
    return new_son_wallet_object.id;
 } FC_CAPTURE_AND_RETHROW( (op) ) }
@@ -97,19 +55,8 @@ void_result update_son_wallet_evaluator::do_evaluate(const son_wallet_update_ope
    FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
    FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." );
 
-   const son_wallet_id_type son_wallet_id = [&]{
-      if(db().head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME)
-      {
-         const auto ast = active_sidechain_types(db().head_block_time());
-         const auto id = (op.son_wallet_id.instance.value - std::distance(ast.begin(), ast.find(op.sidechain))) / ast.size();
-         return son_wallet_id_type{ id };
-      }
-
-      return op.son_wallet_id;
-   }();
-
    const auto& idx = db().get_index_type<son_wallet_index>().indices().get<by_id>();
-   FC_ASSERT( idx.find(son_wallet_id) != idx.end() );
+   FC_ASSERT( idx.find(op.son_wallet_id) != idx.end() );
    //auto itr = idx.find(op.son_wallet_id);
    //FC_ASSERT( itr->addresses.find(op.sidechain) == itr->addresses.end() ||
    //        itr->addresses.at(op.sidechain).empty(), "Sidechain wallet address already set");
@@ -118,19 +65,8 @@ void_result update_son_wallet_evaluator::do_evaluate(const son_wallet_update_ope
 
 object_id_type update_son_wallet_evaluator::do_apply(const son_wallet_update_operation& op)
 { try {
-   const son_wallet_id_type son_wallet_id = [&]{
-      if(db().head_block_time() >= HARDFORK_SON_FOR_ETHEREUM_TIME)
-      {
-         const auto ast = active_sidechain_types(db().head_block_time());
-         const auto id = (op.son_wallet_id.instance.value - std::distance(ast.begin(), ast.find(op.sidechain))) / ast.size();
-         return son_wallet_id_type{ id };
-      }
-
-      return op.son_wallet_id;
-   }();
-
    const auto& idx = db().get_index_type<son_wallet_index>().indices().get<by_id>();
-   auto itr = idx.find(son_wallet_id);
+   auto itr = idx.find(op.son_wallet_id);
    if (itr != idx.end())
    {
       if (itr->addresses.find(op.sidechain) == itr->addresses.end()) {

libraries/chain/son_wallet_withdraw_evaluator.cpp

@@ -10,13 +10,12 @@ namespace graphene { namespace chain {
 
 void_result create_son_wallet_withdraw_evaluator::do_evaluate(const son_wallet_withdraw_create_operation& op)
 { try {
-   const auto now = db().head_block_time();
-   FC_ASSERT(now >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
+   FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
+
    const auto &son_idx = db().get_index_type<son_index>().indices().get<by_id>();
    const auto so = son_idx.find(op.son_id);
    FC_ASSERT(so != son_idx.end(), "SON not found");
    FC_ASSERT(so->son_account == op.payer, "Payer is not SON account owner");
-   FC_ASSERT(!(op.sidechain == sidechain_type::peerplays && now >= HARDFORK_SON_FOR_ETHEREUM_TIME), "Peerplays sidechain type is not allowed");
 
    const auto &ss_idx = db().get_index_type<son_stats_index>().indices().get<by_owner>();
    FC_ASSERT(ss_idx.find(op.son_id) != ss_idx.end(), "Statistic object for a given SON ID does not exists");
@@ -24,23 +23,15 @@ void_result create_son_wallet_withdraw_evaluator::do_evaluate(const son_wallet_w
    const auto &swwo_idx = db().get_index_type<son_wallet_withdraw_index>().indices().get<by_peerplays_uid>();
    const auto swwo = swwo_idx.find(op.peerplays_uid);
    if (swwo == swwo_idx.end()) {
-      const sidechain_type sidechain = [&op]{
-         if(op.sidechain == sidechain_type::peerplays){
-            return op.withdraw_sidechain;
-         }
-         else
-            return op.sidechain;
-      }();
-
-      const auto &gpo = db().get_global_properties();
+      auto &gpo = db().get_global_properties();
       bool expected = false;
-      for (auto &si : gpo.active_sons.at(sidechain)) {
+      for (auto &si : gpo.active_sons) {
          if (op.son_id == si.son_id) {
             expected = true;
             break;
          }
       }
-      FC_ASSERT(expected, "Only active SON can create withdraw");
+      FC_ASSERT(expected, "Only active SON can create deposit");
    } else {
       bool exactly_the_same = true;
       exactly_the_same = exactly_the_same && (swwo->sidechain == op.sidechain);
@@ -85,16 +76,8 @@ object_id_type create_son_wallet_withdraw_evaluator::do_apply(const son_wallet_w
          swwo.withdraw_currency = op.withdraw_currency;
          swwo.withdraw_amount = op.withdraw_amount;
 
-         const sidechain_type sidechain = [&op]{
-            if(op.sidechain == sidechain_type::peerplays){
-               return op.withdraw_sidechain;
-            }
-            else
-               return op.sidechain;
-         }();
-
-         const auto &gpo = db().get_global_properties();
-         for (auto &si : gpo.active_sons.at(sidechain)) {
+         auto &gpo = db().get_global_properties();
+         for (auto &si : gpo.active_sons) {
             swwo.expected_reports.insert(std::make_pair(si.son_id, si.weight));
 
             auto stats_itr = db().get_index_type<son_stats_index>().indices().get<by_owner>().find(si.son_id);
@@ -155,17 +138,13 @@ object_id_type create_son_wallet_withdraw_evaluator::do_apply(const son_wallet_w
 
 void_result process_son_wallet_withdraw_evaluator::do_evaluate(const son_wallet_withdraw_process_operation& op)
 { try{
-   const auto now = db().head_block_time();
-   FC_ASSERT(now >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
+   FC_ASSERT(db().head_block_time() >= HARDFORK_SON_TIME, "Not allowed until SON HARDFORK");
    FC_ASSERT( op.payer == db().get_global_properties().parameters.son_account(), "SON paying account must be set as payer." );
+   FC_ASSERT(db().get_global_properties().active_sons.size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present");
 
    const auto& idx = db().get_index_type<son_wallet_withdraw_index>().indices().get<by_id>();
    const auto& itr = idx.find(op.son_wallet_withdraw_id);
    FC_ASSERT(itr != idx.end(), "Son wallet withdraw not found");
-   FC_ASSERT(!(itr->sidechain == sidechain_type::peerplays && now >= HARDFORK_SON_FOR_ETHEREUM_TIME), "Peerplays sidechain type is not allowed");
-   if(itr->sidechain != sidechain_type::peerplays) {
-      FC_ASSERT(db().get_global_properties().active_sons.at(itr->sidechain).size() >= db().get_chain_properties().immutable_parameters.min_son_count, "Min required voted SONs not present");
-   }
    FC_ASSERT(!itr->processed, "Son wallet withdraw is already processed");
    return void_result();
 } FC_CAPTURE_AND_RETHROW( (op) ) }

libraries/db/include/graphene/db/object_database.hpp

@@ -29,7 +29,6 @@
 #include <fc/log/logger.hpp>
 
 #include <map>
-#include <mutex>
 
 namespace graphene { namespace db {
 
@@ -145,7 +144,6 @@ namespace graphene { namespace db {
          fc::path get_data_dir()const { return _data_dir; }
 
          /** public for testing purposes only... should be private in practice. */
-         mutable std::mutex                     _undo_db_mutex;
          undo_database                          _undo_db;
      protected:
          template<typename IndexType>

libraries/db/include/graphene/db/undo_database.hpp

@@ -36,7 +36,7 @@ namespace graphene { namespace db {
    {
       unordered_map<object_id_type, unique_ptr<object> > old_values;
       unordered_map<object_id_type, object_id_type>      old_index_next_ids;
-      std::set<object_id_type, std::greater<object_id_type> >  new_ids;
+      std::unordered_set<object_id_type>                 new_ids;
       unordered_map<object_id_type, unique_ptr<object> > removed;
    };
 

libraries/fc

@@ -1 +1 @@
-Subproject commit 156b0c4e41c9215eadb2af8009b05e0f38c16dda
+Subproject commit 488883921936139e8734b99822d3a589afe80da1

libraries/net/core_messages.cpp

@@ -47,3 +47,4 @@ namespace graphene { namespace net {
   const core_message_type_enum get_current_connections_reply_message::type   = core_message_type_enum::get_current_connections_reply_message_type;
 
 } } // graphene::net
+

libraries/net/include/graphene/net/config.hpp

@@ -23,8 +23,6 @@
  */
 #pragma once
 
-#include <stddef.h>
-
 #define GRAPHENE_NET_PROTOCOL_VERSION                        106
 
 /**
@@ -112,6 +110,3 @@
 #define GRAPHENE_NET_MAX_NESTED_OBJECTS                      (250)
 
 #define MAXIMUM_PEERDB_SIZE 1000
-
-constexpr size_t MAX_BLOCKS_TO_HANDLE_AT_ONCE = 200;
-constexpr size_t MAX_SYNC_BLOCKS_TO_PREFETCH = 10 * MAX_BLOCKS_TO_HANDLE_AT_ONCE;

libraries/net/include/graphene/net/node.hpp

@@ -61,7 +61,7 @@ namespace graphene { namespace net {
    class node_delegate
    {
       public:
-         virtual ~node_delegate() = default;
+         virtual ~node_delegate(){}
 
          /**
           *  If delegate has the item, the network has no need to fetch it.
@@ -71,9 +71,7 @@ namespace graphene { namespace net {
          /**
           *  @brief Called when a new block comes in from the network
           *
-          *  @param blk_msg the message which contains the block
           *  @param sync_mode true if the message was fetched through the sync process, false during normal operation
-          *  @param contained_transaction_msg_ids container for the transactions to write back into
           *  @returns true if this message caused the blockchain to switch forks, false if it did not
           *
           *  @throws exception if error validating the item, otherwise the item is
@@ -154,8 +152,6 @@ namespace graphene { namespace net {
 
          virtual uint32_t get_block_number(const item_hash_t& block_id) = 0;
 
-         virtual fc::time_point_sec get_last_known_hardfork_time() = 0;
-
          /**
           * Returns the time a block was produced (if block_id = 0, returns genesis time).
           * If we don't know about the block, returns time_point_sec::min()
@@ -197,7 +193,7 @@ namespace graphene { namespace net {
    {
       public:
         node(const std::string& user_agent);
-        virtual ~node();
+        ~node();
 
         void close();
 
@@ -215,34 +211,11 @@ namespace graphene { namespace net {
          */
         void      add_node( const fc::ip::endpoint& ep );
 
-        /*****
-         * @brief add a list of nodes to seed the p2p network
-         * @param seeds a vector of url strings
-         */
-        void add_seed_nodes( std::vector<std::string> seeds );
-
-        /****
-         * @brief add a node to seed the p2p network
-         * @param in the url as a string
-         */
-        void add_seed_node( const std::string& in);
-
         /**
          *  Attempt to connect to the specified endpoint immediately.
          */
         virtual void connect_to_endpoint( const fc::ip::endpoint& ep );
 
-        /**
-         * @brief Helper to convert a string to a collection of endpoints
-         *
-         * This converts a string (i.e. "bitshares.eu:665535" to a collection of endpoints.
-         * NOTE: Throws an exception if not in correct format or was unable to resolve URL.
-         *
-         * @param in the incoming string
-         * @returns a vector of endpoints
-         */
-        static std::vector<fc::ip::endpoint> resolve_string_to_ip_endpoints( const std::string& in );
-
         /**
          *  Specifies the network interface and port upon which incoming
          *  connections should be accepted.

libraries/net/include/graphene/net/peer_connection.hpp

@@ -62,7 +62,6 @@ namespace graphene { namespace net
     class peer_connection_delegate
     {
     public:
-      virtual ~peer_connection_delegate() = default;
       virtual void on_message(peer_connection* originating_peer,
                               const message& received_message) = 0;
       virtual void on_connection_closed(peer_connection* originating_peer) = 0;
@@ -126,7 +125,7 @@ namespace graphene { namespace net
          * it is sitting on the queue
          */
         virtual size_t get_size_in_queue() = 0;
-        virtual ~queued_message() = default;
+        virtual ~queued_message() {}
       };
 
       /* when you queue up a 'real_queued_message', a full copy of the message is
@@ -259,8 +258,6 @@ namespace graphene { namespace net
 
       uint32_t last_known_fork_block_number = 0;
 
-      fc::time_point_sec last_known_hardfork_time;
-
       fc::future<void> accept_or_connect_task_done;
 
       firewall_check_state_data *firewall_check_state = nullptr;

libraries/net/include/graphene/net/peer_database.hpp

@@ -97,7 +97,7 @@ namespace graphene { namespace net {
   {
   public:
     peer_database();
-    virtual ~peer_database();
+    ~peer_database();
 
     void open(const fc::path& databaseFilename);
     void close();

libraries/net/peer_database.cpp

@@ -50,8 +50,7 @@ namespace graphene { namespace net {
                                            indexed_by<ordered_non_unique<tag<last_seen_time_index>, 
                                                                          member<potential_peer_record, 
                                                                                 fc::time_point_sec, 
-                                                                                &potential_peer_record::last_seen_time>,
-                                                                         std::greater<fc::time_point_sec> >,
+                                                                                &potential_peer_record::last_seen_time> >,
                                                       hashed_unique<tag<endpoint_index>, 
                                                                     member<potential_peer_record, 
                                                                            fc::ip::endpoint, 

libraries/plugins/account_history/account_history_plugin.cpp

@@ -78,14 +78,11 @@ account_history_plugin_impl::~account_history_plugin_impl()
 }
 
 void account_history_plugin_impl::update_account_histories( const signed_block& b )
-{
-   try                                                                                          \
 {
    graphene::chain::database& db = database();
    vector<optional< operation_history_object > >& hist = db.get_applied_operations();
    bool is_first = true;
    auto skip_oho_id = [&is_first,&db,this]() {
-         const std::lock_guard<std::mutex> undo_db_lock{db._undo_db_mutex};
       if( is_first && db._undo_db.enabled() ) // this ensures that the current id is rolled back on undo
       {
          db.remove( db.create<operation_history_object>( []( operation_history_object& obj) {} ) );
@@ -127,12 +124,14 @@ void account_history_plugin_impl::update_account_histories( const signed_block&
       flat_set<account_id_type> impacted;
       vector<authority> other;
       // fee payer is added here
-         operation_get_required_authorities( op.op, impacted, impacted, other, true );
+      operation_get_required_authorities( op.op, impacted, impacted, other,
+                                          MUST_IGNORE_CUSTOM_OP_REQD_AUTHS( db.head_block_time() ) );
 
       if( op.op.which() == operation::tag< account_create_operation >::value )
          impacted.insert( op.result.get<object_id_type>() );
       else
-            graphene::chain::operation_get_impacted_accounts( op.op, impacted, true );
+         graphene::chain::operation_get_impacted_accounts( op.op, impacted,
+                                                           MUST_IGNORE_CUSTOM_OP_REQD_AUTHS(db.head_block_time()) );
       if( op.op.which() == operation::tag< lottery_end_operation >::value )
       {
          auto lop = op.op.get< lottery_end_operation >();
@@ -199,19 +198,6 @@ void account_history_plugin_impl::update_account_histories( const signed_block&
          skip_oho_id();
    }
 }
-   catch( const boost::exception& e )
-   {
-      elog( "Caught account_history_plugin::update_account_histories(...) boost::exception: ${e}", ("e", boost::diagnostic_information(e) ) );
-   }
-   catch( const std::exception& e )
-   {
-      elog( "Caught account_history_plugin::update_account_histories(...) std::exception: ${e}", ("e", e.what() ) );
-   }
-   catch( ... )
-   {
-      wlog( "Caught unexpected exception in account_history_plugin::update_account_histories(...)" );
-   }
-}
 
 void account_history_plugin_impl::add_account_history( const account_id_type account_id, const operation_history_id_type op_id )
 {

libraries/plugins/affiliate_stats/include/graphene/affiliate_stats/affiliate_stats_api.hpp

@@ -29,6 +29,7 @@
 
 #include <graphene/chain/protocol/types.hpp>
 #include <graphene/chain/protocol/asset.hpp>
+#include <graphene/chain/event_object.hpp>
 #include <graphene/chain/operation_history_object.hpp>
 
 #include <graphene/affiliate_stats/affiliate_stats_objects.hpp>

libraries/plugins/bookie/bookie_api.cpp

@@ -157,45 +157,37 @@ fc::variants bookie_api_impl::get_objects(const vector<object_id_type>& ids) con
       {
       case event_id_type::type_id:
          {
-            const auto &idx = db->get_index_type<event_object_index>();
-            const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-            const auto &refs = aidx.get_secondary_index<detail::persistent_event_index>();
-            auto iter = refs.ephemeral_event_object.find(id.as<event_id_type>());
-            if (iter != refs.ephemeral_event_object.end())
-               return iter->second.to_variant();
+            auto& persistent_events_by_event_id = db->get_index_type<detail::persistent_event_index>().indices().get<by_event_id>();
+            auto iter = persistent_events_by_event_id.find(id.as<event_id_type>());
+            if (iter != persistent_events_by_event_id.end())
+               return iter->ephemeral_event_object.to_variant();
             else
                return {};
          }
       case bet_id_type::type_id:
          {
-            const auto &idx = db->get_index_type<bet_object_index>();
-            const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-            const auto &refs = aidx.get_secondary_index<detail::persistent_bet_index>();
-            auto iter = refs.internal.find(id.as<bet_id_type>());
-            if (iter != refs.internal.end())
-               return iter->second.ephemeral_bet_object.to_variant();
+            auto& persistent_bets_by_bet_id = db->get_index_type<detail::persistent_bet_index>().indices().get<by_bet_id>();
+            auto iter = persistent_bets_by_bet_id.find(id.as<bet_id_type>());
+            if (iter != persistent_bets_by_bet_id.end())
+               return iter->ephemeral_bet_object.to_variant();
             else
                return {};
          }
       case betting_market_object::type_id:
          { 
-            const auto &idx = db->get_index_type<betting_market_object_index>();
-            const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-            const auto &refs = aidx.get_secondary_index<detail::persistent_betting_market_index>();
-            auto iter = refs.ephemeral_betting_market_object.find(id.as<betting_market_id_type>());
-            if (iter != refs.ephemeral_betting_market_object.end())
-               return iter->second.to_variant();
+            auto& persistent_betting_markets_by_betting_market_id = db->get_index_type<detail::persistent_betting_market_index>().indices().get<by_betting_market_id>();
+            auto iter = persistent_betting_markets_by_betting_market_id.find(id.as<betting_market_id_type>());
+            if (iter != persistent_betting_markets_by_betting_market_id.end())
+               return iter->ephemeral_betting_market_object.to_variant();
             else
                return {};
          }
       case betting_market_group_object::type_id:
          { 
-            const auto &idx = db->get_index_type<betting_market_group_object_index>();
-            const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-            const auto &refs = aidx.get_secondary_index<detail::persistent_betting_market_group_index>();
-            auto iter = refs.internal.find(id.as<betting_market_group_id_type>());
-            if (iter != refs.internal.end())
-               return iter->second.ephemeral_betting_market_group_object.to_variant();
+            auto& persistent_betting_market_groups_by_betting_market_group_id = db->get_index_type<detail::persistent_betting_market_group_index>().indices().get<by_betting_market_group_id>();
+            auto iter = persistent_betting_market_groups_by_betting_market_group_id.find(id.as<betting_market_group_id_type>());
+            if (iter != persistent_betting_market_groups_by_betting_market_group_id.end())
+               return iter->ephemeral_betting_market_group_object.to_variant();
             else
                return {};
          }
@@ -211,28 +203,25 @@ std::vector<matched_bet_object> bookie_api_impl::get_matched_bets_for_bettor(acc
 {
    std::vector<matched_bet_object> result;
    std::shared_ptr<graphene::chain::database> db = app.chain_database();
-   const auto &idx = db->get_index_type<bet_object_index>();
-   const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-   const auto &refs = aidx.get_secondary_index<detail::persistent_bet_index>();
-
-   for( const auto& bet_pair : refs.internal )
-   {
-      const auto& bet = bet_pair.second;
-      if( bet.get_bettor_id() == bettor_id && bet.is_matched() )
+   auto& persistent_bets_by_bettor_id = db->get_index_type<detail::persistent_bet_index>().indices().get<by_bettor_id>();
+   auto iter = persistent_bets_by_bettor_id.lower_bound(std::make_tuple(bettor_id, true));
+   while (iter != persistent_bets_by_bettor_id.end() && 
+          iter->get_bettor_id() == bettor_id &&
+          iter->is_matched())
    {
       matched_bet_object match;
-         match.id = bet.ephemeral_bet_object.id;
-         match.bettor_id = bet.ephemeral_bet_object.bettor_id;
-         match.betting_market_id = bet.ephemeral_bet_object.betting_market_id;
-         match.amount_to_bet = bet.ephemeral_bet_object.amount_to_bet;
-         match.back_or_lay = bet.ephemeral_bet_object.back_or_lay;
-         match.end_of_delay = bet.ephemeral_bet_object.end_of_delay;
-         match.amount_matched = bet.amount_matched;
-         match.associated_operations = bet.associated_operations;
+      match.id = iter->ephemeral_bet_object.id;
+      match.bettor_id = iter->ephemeral_bet_object.bettor_id;
+      match.betting_market_id = iter->ephemeral_bet_object.betting_market_id;
+      match.amount_to_bet = iter->ephemeral_bet_object.amount_to_bet;
+      match.back_or_lay = iter->ephemeral_bet_object.back_or_lay;
+      match.end_of_delay = iter->ephemeral_bet_object.end_of_delay;
+      match.amount_matched = iter->amount_matched;
+      match.associated_operations = iter->associated_operations;
       result.emplace_back(std::move(match));
-      }
-   }
 
+      ++iter;
+   }
    return result;
 }
 
@@ -242,32 +231,29 @@ std::vector<matched_bet_object> bookie_api_impl::get_all_matched_bets_for_bettor
 
    std::vector<matched_bet_object> result;
    std::shared_ptr<graphene::chain::database> db = app.chain_database();
-   const auto &idx = db->get_index_type<bet_object_index>();
-   const auto &aidx = dynamic_cast<const base_primary_index &>(idx);
-   const auto &refs = aidx.get_secondary_index<detail::persistent_bet_index>();
-
-   for( const auto& bet_pair : refs.internal )
-   {
-      const auto& bet_id = bet_pair.first;
-      const auto& bet = bet_pair.second;
-      if( bet.get_bettor_id() == bettor_id &&
-          bet.is_matched() &&
-          bet_id > start &&
+   auto& persistent_bets_by_bettor_id = db->get_index_type<detail::persistent_bet_index>().indices().get<by_bettor_id>();
+   persistent_bet_multi_index_type::index<by_bettor_id>::type::iterator iter;
+   if (start == bet_id_type())
+      iter = persistent_bets_by_bettor_id.lower_bound(std::make_tuple(bettor_id, true));
+   else
+      iter = persistent_bets_by_bettor_id.lower_bound(std::make_tuple(bettor_id, true, start));
+   while (iter != persistent_bets_by_bettor_id.end() && 
+          iter->get_bettor_id() == bettor_id &&
+          iter->is_matched() &&
           result.size() < limit)
    {
       matched_bet_object match;
-         match.id = bet.ephemeral_bet_object.id;
-         match.bettor_id = bet.ephemeral_bet_object.bettor_id;
-         match.betting_market_id = bet.ephemeral_bet_object.betting_market_id;
-         match.amount_to_bet = bet.ephemeral_bet_object.amount_to_bet;
-         match.back_or_lay = bet.ephemeral_bet_object.back_or_lay;
-         match.end_of_delay = bet.ephemeral_bet_object.end_of_delay;
-         match.amount_matched = bet.amount_matched;
-         match.associated_operations = bet.associated_operations;
+      match.id = iter->ephemeral_bet_object.id;
+      match.bettor_id = iter->ephemeral_bet_object.bettor_id;
+      match.betting_market_id = iter->ephemeral_bet_object.betting_market_id;
+      match.amount_to_bet = iter->ephemeral_bet_object.amount_to_bet;
+      match.back_or_lay = iter->ephemeral_bet_object.back_or_lay;
+      match.end_of_delay = iter->ephemeral_bet_object.end_of_delay;
+      match.amount_matched = iter->amount_matched;
       result.emplace_back(std::move(match));
-      }
-   }
 
+      ++iter;
+   }
    return result;
 }
 

libraries/plugins/bookie/bookie_plugin.cpp

@@ -59,80 +59,143 @@ namespace detail
  * We do this by creating a secondary index on bet_object.  We don't actually use it
  * to index any property of the bet, we just use it to register for callbacks.
  */
+class persistent_bet_object_helper : public secondary_index
+{
+   public:
+      virtual ~persistent_bet_object_helper() {}
 
-void persistent_bet_index::object_inserted(const object& obj)
+      virtual void object_inserted(const object& obj) override;
+      //virtual void object_removed( const object& obj ) override;
+      //virtual void about_to_modify( const object& before ) override;
+      virtual void object_modified(const object& after) override;
+      void set_plugin_instance(bookie_plugin* instance) { _bookie_plugin = instance; }
+   private:
+      bookie_plugin* _bookie_plugin;
+};
+
+void persistent_bet_object_helper::object_inserted(const object& obj) 
 {
    const bet_object& bet_obj = *boost::polymorphic_downcast<const bet_object*>(&obj);
-   if(0 == internal.count(bet_obj.id))
-      internal.insert( {bet_obj.id, bet_obj} );
-   else
-      internal[bet_obj.id] = bet_obj;
+   _bookie_plugin->database().create<persistent_bet_object>([&](persistent_bet_object& saved_bet_obj) {
+      saved_bet_obj.ephemeral_bet_object = bet_obj;
+   });
 }
-void persistent_bet_index::object_modified(const object& after)
+void persistent_bet_object_helper::object_modified(const object& after) 
 {
+   database& db = _bookie_plugin->database();
+   auto& persistent_bets_by_bet_id = db.get_index_type<persistent_bet_index>().indices().get<by_bet_id>();
    const bet_object& bet_obj = *boost::polymorphic_downcast<const bet_object*>(&after);
-   auto iter = internal.find(bet_obj.id);
-   assert (iter != internal.end());
-   if (iter != internal.end())
-      iter->second = bet_obj;
+   auto iter = persistent_bets_by_bet_id.find(bet_obj.id);
+   assert (iter != persistent_bets_by_bet_id.end());
+   if (iter != persistent_bets_by_bet_id.end())
+      db.modify(*iter, [&](persistent_bet_object& saved_bet_obj) {
+         saved_bet_obj.ephemeral_bet_object = bet_obj;
+      });
 }
 
 //////////// end bet_object ///////////////////
+class persistent_betting_market_object_helper : public secondary_index
+{
+   public:
+      virtual ~persistent_betting_market_object_helper() {}
 
-void persistent_betting_market_index::object_inserted(const object& obj)
+      virtual void object_inserted(const object& obj) override;
+      //virtual void object_removed( const object& obj ) override;
+      //virtual void about_to_modify( const object& before ) override;
+      virtual void object_modified(const object& after) override;
+      void set_plugin_instance(bookie_plugin* instance) { _bookie_plugin = instance; }
+   private:
+      bookie_plugin* _bookie_plugin;
+};
+
+void persistent_betting_market_object_helper::object_inserted(const object& obj) 
 {
    const betting_market_object& betting_market_obj = *boost::polymorphic_downcast<const betting_market_object*>(&obj);
-   if(0 == ephemeral_betting_market_object.count(betting_market_obj.id))
-      ephemeral_betting_market_object.insert( {betting_market_obj.id, betting_market_obj} );
-   else
-      ephemeral_betting_market_object[betting_market_obj.id] = betting_market_obj;
-
+   _bookie_plugin->database().create<persistent_betting_market_object>([&](persistent_betting_market_object& saved_betting_market_obj) {
+      saved_betting_market_obj.ephemeral_betting_market_object = betting_market_obj;
+   });
 }
-void persistent_betting_market_index::object_modified(const object& after)
+void persistent_betting_market_object_helper::object_modified(const object& after) 
 {
+   database& db = _bookie_plugin->database();
+   auto& persistent_betting_markets_by_betting_market_id = db.get_index_type<persistent_betting_market_index>().indices().get<by_betting_market_id>();
    const betting_market_object& betting_market_obj = *boost::polymorphic_downcast<const betting_market_object*>(&after);
-   auto iter = ephemeral_betting_market_object.find(betting_market_obj.id);
-   assert (iter != ephemeral_betting_market_object.end());
-   if (iter != ephemeral_betting_market_object.end())
-      iter->second = betting_market_obj;
+   auto iter = persistent_betting_markets_by_betting_market_id.find(betting_market_obj.id);
+   assert (iter != persistent_betting_markets_by_betting_market_id.end());
+   if (iter != persistent_betting_markets_by_betting_market_id.end())
+      db.modify(*iter, [&](persistent_betting_market_object& saved_betting_market_obj) {
+         saved_betting_market_obj.ephemeral_betting_market_object = betting_market_obj;
+      });
 }
 
 //////////// end betting_market_object ///////////////////
+class persistent_betting_market_group_object_helper : public secondary_index
+{
+   public:
+      virtual ~persistent_betting_market_group_object_helper() {}
 
-void persistent_betting_market_group_index::object_inserted(const object& obj)
+      virtual void object_inserted(const object& obj) override;
+      //virtual void object_removed( const object& obj ) override;
+      //virtual void about_to_modify( const object& before ) override;
+      virtual void object_modified(const object& after) override;
+      void set_plugin_instance(bookie_plugin* instance) { _bookie_plugin = instance; }
+   private:
+      bookie_plugin* _bookie_plugin;
+};
+
+void persistent_betting_market_group_object_helper::object_inserted(const object& obj) 
 {
    const betting_market_group_object& betting_market_group_obj = *boost::polymorphic_downcast<const betting_market_group_object*>(&obj);
-   if(0 == internal.count(betting_market_group_obj.id))
-      internal.insert( {betting_market_group_obj.id, betting_market_group_obj} );
-   else
-      internal[betting_market_group_obj.id] = betting_market_group_obj;
+   _bookie_plugin->database().create<persistent_betting_market_group_object>([&](persistent_betting_market_group_object& saved_betting_market_group_obj) {
+      saved_betting_market_group_obj.ephemeral_betting_market_group_object = betting_market_group_obj;
+   });
 }
-void persistent_betting_market_group_index::object_modified(const object& after)
+void persistent_betting_market_group_object_helper::object_modified(const object& after) 
 {
+   database& db = _bookie_plugin->database();
+   auto& persistent_betting_market_groups_by_betting_market_group_id = db.get_index_type<persistent_betting_market_group_index>().indices().get<by_betting_market_group_id>();
    const betting_market_group_object& betting_market_group_obj = *boost::polymorphic_downcast<const betting_market_group_object*>(&after);
-   auto iter = internal.find(betting_market_group_obj.id);
-   assert (iter != internal.end());
-   if (iter != internal.end())
-      iter->second = betting_market_group_obj;
+   auto iter = persistent_betting_market_groups_by_betting_market_group_id.find(betting_market_group_obj.id);
+   assert (iter != persistent_betting_market_groups_by_betting_market_group_id.end());
+   if (iter != persistent_betting_market_groups_by_betting_market_group_id.end())
+      db.modify(*iter, [&](persistent_betting_market_group_object& saved_betting_market_group_obj) {
+         saved_betting_market_group_obj.ephemeral_betting_market_group_object = betting_market_group_obj;
+      });
 }
 
 //////////// end betting_market_group_object ///////////////////
+class persistent_event_object_helper : public secondary_index
+{
+   public:
+      virtual ~persistent_event_object_helper() {}
 
-void persistent_event_index::object_inserted(const object& obj)
+      virtual void object_inserted(const object& obj) override;
+      //virtual void object_removed( const object& obj ) override;
+      //virtual void about_to_modify( const object& before ) override;
+      virtual void object_modified(const object& after) override;
+      void set_plugin_instance(bookie_plugin* instance) { _bookie_plugin = instance; }
+   private:
+      bookie_plugin* _bookie_plugin;
+};
+
+void persistent_event_object_helper::object_inserted(const object& obj) 
 {
    const event_object& event_obj = *boost::polymorphic_downcast<const event_object*>(&obj);
-   if(0 == ephemeral_event_object.count(event_obj.id))
-      ephemeral_event_object.insert( {event_obj.id, event_obj} );
-   else
-      ephemeral_event_object[event_obj.id] = event_obj;
+   _bookie_plugin->database().create<persistent_event_object>([&](persistent_event_object& saved_event_obj) {
+      saved_event_obj.ephemeral_event_object = event_obj;
+   });
 }
-void persistent_event_index::object_modified(const object& after)
+void persistent_event_object_helper::object_modified(const object& after) 
 {
+   database& db = _bookie_plugin->database();
+   auto& persistent_events_by_event_id = db.get_index_type<persistent_event_index>().indices().get<by_event_id>();
    const event_object& event_obj = *boost::polymorphic_downcast<const event_object*>(&after);
-   auto iter = ephemeral_event_object.find(event_obj.id);
-   assert (iter != ephemeral_event_object.end());
-   if (iter != ephemeral_event_object.end())
-      iter->second = event_obj;
+   auto iter = persistent_events_by_event_id.find(event_obj.id);
+   assert (iter != persistent_events_by_event_id.end());
+   if (iter != persistent_events_by_event_id.end())
+      db.modify(*iter, [&](persistent_event_object& saved_event_obj) {
+         saved_event_obj.ephemeral_event_object = event_obj;
+      });
 }
 
 //////////// end event_object ///////////////////
@@ -144,6 +207,7 @@ class bookie_plugin_impl
       { }
       virtual ~bookie_plugin_impl();
 
+
       /**
        *  Called After a block has been applied and committed.  The callback
        *  should not yield and should execute quickly.
@@ -235,35 +299,27 @@ void bookie_plugin_impl::on_block_applied( const signed_block& )
          const asset& amount_bet = bet_matched_op.amount_bet;
          // object may no longer exist
          //const bet_object& bet = bet_matched_op.bet_id(db);
-         const auto &idx_bet_object = db.get_index_type<bet_object_index>();
-         const auto &aidx_bet_object = dynamic_cast<const base_primary_index &>(idx_bet_object);
-         const auto &refs_bet_object = aidx_bet_object.get_secondary_index<detail::persistent_bet_index>();
-         auto& nonconst_refs_bet_object = const_cast<persistent_bet_index&>(refs_bet_object);
-
-         auto bet_iter = nonconst_refs_bet_object.internal.find(bet_matched_op.bet_id);
-         assert(bet_iter != nonconst_refs_bet_object.internal.end());
-         if (bet_iter != nonconst_refs_bet_object.internal.end())
+         auto& persistent_bets_by_bet_id = db.get_index_type<persistent_bet_index>().indices().get<by_bet_id>();
+         auto bet_iter = persistent_bets_by_bet_id.find(bet_matched_op.bet_id);
+         assert(bet_iter != persistent_bets_by_bet_id.end());
+         if (bet_iter != persistent_bets_by_bet_id.end())
          {
-            bet_iter->second.amount_matched += amount_bet.amount;
+            db.modify(*bet_iter, [&]( persistent_bet_object& obj ) {
+               obj.amount_matched += amount_bet.amount;
                if (is_operation_history_object_stored(op.id))
-               bet_iter->second.associated_operations.emplace_back(op.id);
+                  obj.associated_operations.emplace_back(op.id);
+            });
+            const bet_object& bet_obj = bet_iter->ephemeral_bet_object;
 
-            const bet_object& bet_obj = bet_iter->second.ephemeral_bet_object;
+            auto& persistent_betting_market_idx = db.get_index_type<persistent_betting_market_index>().indices().get<by_betting_market_id>();
+            auto persistent_betting_market_object_iter = persistent_betting_market_idx.find(bet_obj.betting_market_id);
+            FC_ASSERT(persistent_betting_market_object_iter != persistent_betting_market_idx.end());
+            const betting_market_object& betting_market = persistent_betting_market_object_iter->ephemeral_betting_market_object;
 
-            const auto &idx_betting_market = db.get_index_type<betting_market_object_index>();
-            const auto &aidx_betting_market = dynamic_cast<const base_primary_index &>(idx_betting_market);
-            const auto &refs_betting_market = aidx_betting_market.get_secondary_index<detail::persistent_betting_market_index>();
-            auto persistent_betting_market_object_iter = refs_betting_market.ephemeral_betting_market_object.find(bet_obj.betting_market_id);
-            FC_ASSERT(persistent_betting_market_object_iter != refs_betting_market.ephemeral_betting_market_object.end());
-            const betting_market_object& betting_market = persistent_betting_market_object_iter->second;
-
-            const auto &idx_betting_market_group = db.get_index_type<betting_market_group_object_index>();
-            const auto &aidx_betting_market_group = dynamic_cast<const base_primary_index &>(idx_betting_market_group);
-            const auto &refs_betting_market_group = aidx_betting_market_group.get_secondary_index<detail::persistent_betting_market_group_index>();
-            auto& nonconst_refs_betting_market_group = const_cast<persistent_betting_market_group_index&>(refs_betting_market_group);
-            auto persistent_betting_market_group_object_iter = nonconst_refs_betting_market_group.internal.find(betting_market.group_id);
-            FC_ASSERT(persistent_betting_market_group_object_iter != nonconst_refs_betting_market_group.internal.end());
-            const betting_market_group_object& betting_market_group = persistent_betting_market_group_object_iter->second.ephemeral_betting_market_group_object;
+            auto& persistent_betting_market_group_idx = db.get_index_type<persistent_betting_market_group_index>().indices().get<by_betting_market_group_id>();
+            auto persistent_betting_market_group_object_iter = persistent_betting_market_group_idx.find(betting_market.group_id);
+            FC_ASSERT(persistent_betting_market_group_object_iter != persistent_betting_market_group_idx.end());
+            const betting_market_group_object& betting_market_group = persistent_betting_market_group_object_iter->ephemeral_betting_market_group_object;
 
             // if the object is still in the main database, keep the running total there
             // otherwise, add it directly to the persistent version
@@ -274,7 +330,9 @@ void bookie_plugin_impl::on_block_applied( const signed_block& )
                   obj.total_matched_bets_amount += amount_bet.amount;
                });
             else
-               persistent_betting_market_group_object_iter->second.total_matched_bets_amount += amount_bet.amount;
+               db.modify( *persistent_betting_market_group_object_iter, [&]( persistent_betting_market_group_object& obj ){
+                  obj.ephemeral_betting_market_group_object.total_matched_bets_amount += amount_bet.amount;
+               });
          }
       }
       else if( op.op.which() == operation::tag<event_create_operation>::value )
@@ -306,35 +364,33 @@ void bookie_plugin_impl::on_block_applied( const signed_block& )
       else if ( op.op.which() == operation::tag<bet_canceled_operation>::value )
       {
          const bet_canceled_operation& bet_canceled_op = op.op.get<bet_canceled_operation>();
-         const auto &idx_bet_object = db.get_index_type<bet_object_index>();
-         const auto &aidx_bet_object = dynamic_cast<const base_primary_index &>(idx_bet_object);
-         const auto &refs_bet_object = aidx_bet_object.get_secondary_index<detail::persistent_bet_index>();
-         auto& nonconst_refs_bet_object = const_cast<persistent_bet_index&>(refs_bet_object);
-
-         auto bet_iter = nonconst_refs_bet_object.internal.find(bet_canceled_op.bet_id);
-         assert(bet_iter != nonconst_refs_bet_object.internal.end());
-         if (bet_iter != nonconst_refs_bet_object.internal.end())
+         auto& persistent_bets_by_bet_id = db.get_index_type<persistent_bet_index>().indices().get<by_bet_id>();
+         auto bet_iter = persistent_bets_by_bet_id.find(bet_canceled_op.bet_id);
+         assert(bet_iter != persistent_bets_by_bet_id.end());
+         if (bet_iter != persistent_bets_by_bet_id.end())
          {
             // ilog("Adding bet_canceled_operation ${canceled_id} to bet ${bet_id}'s associated operations", 
             //     ("canceled_id", op.id)("bet_id", bet_canceled_op.bet_id));
-            bet_iter->second.associated_operations.emplace_back(op.id);
+            if (is_operation_history_object_stored(op.id))
+               db.modify(*bet_iter, [&]( persistent_bet_object& obj ) {
+                  obj.associated_operations.emplace_back(op.id);
+               });
          }
       }
       else if ( op.op.which() == operation::tag<bet_adjusted_operation>::value )
       {
          const bet_adjusted_operation& bet_adjusted_op = op.op.get<bet_adjusted_operation>();
-         const auto &idx_bet_object = db.get_index_type<bet_object_index>();
-         const auto &aidx_bet_object = dynamic_cast<const base_primary_index &>(idx_bet_object);
-         const auto &refs_bet_object = aidx_bet_object.get_secondary_index<detail::persistent_bet_index>();
-         auto& nonconst_refs_bet_object = const_cast<persistent_bet_index&>(refs_bet_object);
-
-         auto bet_iter = nonconst_refs_bet_object.internal.find(bet_adjusted_op.bet_id);
-         assert(bet_iter != nonconst_refs_bet_object.internal.end());
-         if (bet_iter != nonconst_refs_bet_object.internal.end())
+         auto& persistent_bets_by_bet_id = db.get_index_type<persistent_bet_index>().indices().get<by_bet_id>();
+         auto bet_iter = persistent_bets_by_bet_id.find(bet_adjusted_op.bet_id);
+         assert(bet_iter != persistent_bets_by_bet_id.end());
+         if (bet_iter != persistent_bets_by_bet_id.end())
          {
             // ilog("Adding bet_adjusted_operation ${adjusted_id} to bet ${bet_id}'s associated operations", 
             //     ("adjusted_id", op.id)("bet_id", bet_adjusted_op.bet_id));
-            bet_iter->second.associated_operations.emplace_back(op.id);
+            if (is_operation_history_object_stored(op.id))
+               db.modify(*bet_iter, [&]( persistent_bet_object& obj ) {
+                  obj.associated_operations.emplace_back(op.id);
+               });
          }
       }
 
@@ -416,21 +472,31 @@ void bookie_plugin::plugin_initialize(const boost::program_options::variables_ma
     database().new_objects.connect([this](const vector<object_id_type>& ids, const flat_set<account_id_type>& impacted_accounts) { my->on_objects_new(ids); });
     database().removed_objects.connect([this](const vector<object_id_type>& ids, const vector<const object*>& objs, const flat_set<account_id_type>& impacted_accounts) { my->on_objects_removed(ids); });
 
+
+    //auto event_index =
+    database().add_index<primary_index<detail::persistent_event_index> >();
+    database().add_index<primary_index<detail::persistent_betting_market_group_index> >();
+    database().add_index<primary_index<detail::persistent_betting_market_index> >();
+    database().add_index<primary_index<detail::persistent_bet_index> >();
     const primary_index<bet_object_index>& bet_object_idx = database().get_index_type<primary_index<bet_object_index> >();
     primary_index<bet_object_index>& nonconst_bet_object_idx = const_cast<primary_index<bet_object_index>&>(bet_object_idx);
-    nonconst_bet_object_idx.add_secondary_index<detail::persistent_bet_index>();
+    detail::persistent_bet_object_helper* persistent_bet_object_helper_index = nonconst_bet_object_idx.add_secondary_index<detail::persistent_bet_object_helper>();
+    persistent_bet_object_helper_index->set_plugin_instance(this);
 
     const primary_index<betting_market_object_index>& betting_market_object_idx = database().get_index_type<primary_index<betting_market_object_index> >();
     primary_index<betting_market_object_index>& nonconst_betting_market_object_idx = const_cast<primary_index<betting_market_object_index>&>(betting_market_object_idx);
-    nonconst_betting_market_object_idx.add_secondary_index<detail::persistent_betting_market_index>();
+    detail::persistent_betting_market_object_helper* persistent_betting_market_object_helper_index = nonconst_betting_market_object_idx.add_secondary_index<detail::persistent_betting_market_object_helper>();
+    persistent_betting_market_object_helper_index->set_plugin_instance(this);
 
     const primary_index<betting_market_group_object_index>& betting_market_group_object_idx = database().get_index_type<primary_index<betting_market_group_object_index> >();
     primary_index<betting_market_group_object_index>& nonconst_betting_market_group_object_idx = const_cast<primary_index<betting_market_group_object_index>&>(betting_market_group_object_idx);
-    nonconst_betting_market_group_object_idx.add_secondary_index<detail::persistent_betting_market_group_index>();
+    detail::persistent_betting_market_group_object_helper* persistent_betting_market_group_object_helper_index = nonconst_betting_market_group_object_idx.add_secondary_index<detail::persistent_betting_market_group_object_helper>();
+    persistent_betting_market_group_object_helper_index->set_plugin_instance(this);
 
     const primary_index<event_object_index>& event_object_idx = database().get_index_type<primary_index<event_object_index> >();
     primary_index<event_object_index>& nonconst_event_object_idx = const_cast<primary_index<event_object_index>&>(event_object_idx);
-    nonconst_event_object_idx.add_secondary_index<detail::persistent_event_index>();
+    detail::persistent_event_object_helper* persistent_event_object_helper_index = nonconst_event_object_idx.add_secondary_index<detail::persistent_event_object_helper>();
+    persistent_event_object_helper_index->set_plugin_instance(this);
 
     ilog("bookie plugin: plugin_startup() end");
  }

libraries/plugins/bookie/include/graphene/bookie/bookie_objects.hpp

@@ -29,21 +29,39 @@
 namespace graphene { namespace bookie {
 using namespace chain;
 
+enum bookie_object_type
+{
+   persistent_event_object_type,
+   persistent_betting_market_group_object_type,
+   persistent_betting_market_object_type,
+   persistent_bet_object_type,
+   BOOKIE_OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
+};
+
 namespace detail
 {
 
-/**
-    *  @brief This secondary index will allow a reverse lookup of all events that happened
- */
-class persistent_event_index : public secondary_index
+class persistent_event_object : public graphene::db::abstract_object<persistent_event_object>
 {
    public:
-   virtual void object_inserted( const object& obj ) override;
-   virtual void object_modified( const object& after  ) override;
+      static const uint8_t space_id = bookie_objects;
+      static const uint8_t type_id = persistent_event_object_type;
 
-   map< event_id_type, event_object > ephemeral_event_object;
+      event_object ephemeral_event_object;
+
+      event_id_type get_event_id() const { return ephemeral_event_object.id; }
 };
 
+typedef object_id<bookie_objects, persistent_event_object_type, persistent_event_object> persistent_event_id_type;
+
+struct by_event_id;
+typedef multi_index_container<
+   persistent_event_object,
+   indexed_by<
+      ordered_unique<tag<by_id>, member<object, object_id_type, &object::id> >,
+      ordered_unique<tag<by_event_id>, const_mem_fun<persistent_event_object, event_id_type, &persistent_event_object::get_event_id> > > > persistent_event_multi_index_type;
+typedef generic_index<persistent_event_object, persistent_event_multi_index_type> persistent_event_index;
+
 #if 0 // we no longer have competitors, just leaving this here as an example of how to do a secondary index
 class events_by_competitor_index : public secondary_index
 {
@@ -83,122 +101,95 @@ void events_by_competitor_index::object_modified( const object& after )
 }
 #endif
 
-/**
-    *  @brief This secondary index will allow a reverse lookup of all betting_market_group that happened
- */
-class persistent_betting_market_group_index : public secondary_index
+//////////// betting_market_group_object //////////////////
+class persistent_betting_market_group_object : public graphene::db::abstract_object<persistent_betting_market_group_object>
 {
    public:
-   struct internal_type
-   {
-      internal_type() = default;
-
-      internal_type(const betting_market_group_object& other)
-            : ephemeral_betting_market_group_object{other}
-      {}
-
-      internal_type& operator=(const betting_market_group_object& other)
-      {
-         ephemeral_betting_market_group_object = other;
-         return *this;
-      }
-
-      friend bool operator==(const internal_type& lhs, const internal_type& rhs);
-      friend bool operator<(const internal_type& lhs, const internal_type& rhs);
-      friend bool operator>(const internal_type& lhs, const internal_type& rhs);
+      static const uint8_t space_id = bookie_objects;
+      static const uint8_t type_id = persistent_betting_market_group_object_type;
 
       betting_market_group_object ephemeral_betting_market_group_object;
+
       share_type total_matched_bets_amount;
+
+      betting_market_group_id_type get_betting_market_group_id() const { return ephemeral_betting_market_group_object.id; }
 };
 
-public:
-   virtual void object_inserted( const object& obj ) override;
-   virtual void object_modified( const object& after  ) override;
+struct by_betting_market_group_id;
+typedef multi_index_container<
+   persistent_betting_market_group_object,
+   indexed_by<
+      ordered_unique<tag<by_id>, member<object, object_id_type, &object::id> >,
+      ordered_unique<tag<by_betting_market_group_id>, const_mem_fun<persistent_betting_market_group_object, betting_market_group_id_type, &persistent_betting_market_group_object::get_betting_market_group_id> > > > persistent_betting_market_group_multi_index_type;
 
-   map< betting_market_group_id_type, internal_type > internal;
+typedef generic_index<persistent_betting_market_group_object, persistent_betting_market_group_multi_index_type> persistent_betting_market_group_index;
+
+//////////// betting_market_object //////////////////
+class persistent_betting_market_object : public graphene::db::abstract_object<persistent_betting_market_object>
+{
+   public:
+      static const uint8_t space_id = bookie_objects;
+      static const uint8_t type_id = persistent_betting_market_object_type;
+
+      betting_market_object ephemeral_betting_market_object;
+
+      share_type total_matched_bets_amount;
+
+      betting_market_id_type get_betting_market_id() const { return ephemeral_betting_market_object.id; }
 };
 
-inline bool operator==(const persistent_betting_market_group_index::internal_type& lhs, const persistent_betting_market_group_index::internal_type& rhs)
-{
-   return lhs.ephemeral_betting_market_group_object == rhs.ephemeral_betting_market_group_object;
-}
+struct by_betting_market_id;
+typedef multi_index_container<
+   persistent_betting_market_object,
+   indexed_by<
+      ordered_unique<tag<by_id>, member<object, object_id_type, &object::id> >,
+      ordered_unique<tag<by_betting_market_id>, const_mem_fun<persistent_betting_market_object, betting_market_id_type, &persistent_betting_market_object::get_betting_market_id> > > > persistent_betting_market_multi_index_type;
 
-inline bool operator<(const persistent_betting_market_group_index::internal_type& lhs, const persistent_betting_market_group_index::internal_type& rhs)
-{
-   return lhs.ephemeral_betting_market_group_object < rhs.ephemeral_betting_market_group_object;
-}
+typedef generic_index<persistent_betting_market_object, persistent_betting_market_multi_index_type> persistent_betting_market_index;
 
-inline bool operator>(const persistent_betting_market_group_index::internal_type& lhs, const persistent_betting_market_group_index::internal_type& rhs)
-{
-   return !operator<(lhs, rhs);
-}
-
-/**
-    *  @brief This secondary index will allow a reverse lookup of all betting_market_object that happened
- */
-class persistent_betting_market_index : public secondary_index
+//////////// bet_object //////////////////
+class persistent_bet_object : public graphene::db::abstract_object<persistent_bet_object>
 {
    public:
-   virtual void object_inserted( const object& obj ) override;
-   virtual void object_modified( const object& after  ) override;
-
-   map< betting_market_id_type, betting_market_object > ephemeral_betting_market_object;
-};
-
-/**
-    *  @brief This secondary index will allow a reverse lookup of all bet_object that happened
- */
-class persistent_bet_index : public secondary_index
-{
-public:
-   struct internal_type
-   {
-      internal_type() = default;
-
-      internal_type(const bet_object& other)
-            : ephemeral_bet_object{other}
-      {}
-
-      internal_type& operator=(const bet_object& other)
-      {
-         ephemeral_bet_object = other;
-         return *this;
-      }
-
-      account_id_type get_bettor_id() const { return ephemeral_bet_object.bettor_id; }
-      bool is_matched() const { return amount_matched != share_type(); }
-
-      friend bool operator==(const internal_type& lhs, const internal_type& rhs);
-      friend bool operator<(const internal_type& lhs, const internal_type& rhs);
-      friend bool operator>(const internal_type& lhs, const internal_type& rhs);
+      static const uint8_t space_id = bookie_objects;
+      static const uint8_t type_id = persistent_bet_object_type;
 
       bet_object ephemeral_bet_object;
+
       // total amount of the bet that matched
       share_type amount_matched;
+
       std::vector<operation_history_id_type> associated_operations;
+
+      bet_id_type get_bet_id() const { return ephemeral_bet_object.id; }
+      account_id_type get_bettor_id() const { return ephemeral_bet_object.bettor_id; }
+      bool is_matched() const { return amount_matched != share_type(); }
 };
 
-public:
-   virtual void object_inserted( const object& obj ) override;
-   virtual void object_modified( const object& after  ) override;
+struct by_bet_id;
+struct by_bettor_id;
+typedef multi_index_container<
+   persistent_bet_object,
+   indexed_by<
+      ordered_unique<tag<by_id>, member<object, object_id_type, &object::id> >,
+      ordered_unique<tag<by_bet_id>, const_mem_fun<persistent_bet_object, bet_id_type, &persistent_bet_object::get_bet_id> >,
+      ordered_unique<tag<by_bettor_id>, 
+            composite_key<
+               persistent_bet_object,
+               const_mem_fun<persistent_bet_object, account_id_type, &persistent_bet_object::get_bettor_id>,
+               const_mem_fun<persistent_bet_object, bool, &persistent_bet_object::is_matched>,
+               const_mem_fun<persistent_bet_object, bet_id_type, &persistent_bet_object::get_bet_id> >,
+            composite_key_compare<
+               std::less<account_id_type>,
+               std::less<bool>,
+               std::greater<bet_id_type> > > > > persistent_bet_multi_index_type;
 
-   map< bet_id_type, internal_type > internal;
-};
-
-inline bool operator==(const persistent_bet_index::internal_type& lhs, const persistent_bet_index::internal_type& rhs)
-{
-   return lhs.ephemeral_bet_object == rhs.ephemeral_bet_object;
-}
-
-inline bool operator<(const persistent_bet_index::internal_type& lhs, const persistent_bet_index::internal_type& rhs)
-{
-   return lhs.ephemeral_bet_object < rhs.ephemeral_bet_object;
-}
-
-inline bool operator>(const persistent_bet_index::internal_type& lhs, const persistent_bet_index::internal_type& rhs)
-{
-   return !operator<(lhs, rhs);
-}
+typedef generic_index<persistent_bet_object, persistent_bet_multi_index_type> persistent_bet_index;
 
 } } } //graphene::bookie::detail
 
+FC_REFLECT_DERIVED( graphene::bookie::detail::persistent_event_object, (graphene::db::object), (ephemeral_event_object) )
+FC_REFLECT_DERIVED( graphene::bookie::detail::persistent_betting_market_group_object, (graphene::db::object), (ephemeral_betting_market_group_object)(total_matched_bets_amount) )
+FC_REFLECT_DERIVED( graphene::bookie::detail::persistent_betting_market_object, (graphene::db::object), (ephemeral_betting_market_object) )
+FC_REFLECT_DERIVED( graphene::bookie::detail::persistent_bet_object, (graphene::db::object), (ephemeral_bet_object)(amount_matched)(associated_operations) )
+

libraries/plugins/debug_witness/CMakeLists.txt

@@ -16,4 +16,3 @@ install( TARGETS
    LIBRARY DESTINATION lib
    ARCHIVE DESTINATION lib
 )
-INSTALL( FILES ${HEADERS} DESTINATION "include/graphene/debug_witness" )

libraries/plugins/debug_witness/debug_api.cpp

@@ -34,9 +34,7 @@ class debug_api_impl
 };
 
 debug_api_impl::debug_api_impl( graphene::app::application& _app ) : app( _app )
-{
-   // Nothing else to do
-}
+{}
 
 
 void debug_api_impl::debug_push_blocks( const std::string& src_filename, uint32_t count )

libraries/plugins/debug_witness/debug_witness.cpp

@@ -38,10 +38,7 @@ using std::vector;
 
 namespace bpo = boost::program_options;
 
-debug_witness_plugin::~debug_witness_plugin()
-{
-   cleanup();
-}
+debug_witness_plugin::~debug_witness_plugin() {}
 
 void debug_witness_plugin::plugin_set_program_options(
    boost::program_options::options_description& command_line_options,
@@ -65,7 +62,7 @@ void debug_witness_plugin::plugin_initialize(const boost::program_options::varia
    ilog("debug_witness plugin:  plugin_initialize() begin");
    _options = &options;
 
-   if( options.count("debug-private-key") > 0 )
+   if( options.count("debug-private-key") )
    {
       const std::vector<std::string> key_id_to_wif_pair_strings = options["debug-private-key"].as<std::vector<std::string>>();
       for (const std::string& key_id_to_wif_pair_string : key_id_to_wif_pair_strings)
@@ -103,6 +100,7 @@ void debug_witness_plugin::plugin_startup()
    _changed_objects_conn = db.changed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids, const fc::flat_set<graphene::chain::account_id_type>& impacted_accounts){ on_changed_objects(ids, impacted_accounts); });
    _removed_objects_conn = db.removed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*>& objs, const fc::flat_set<graphene::chain::account_id_type>& impacted_accounts){ on_removed_objects(ids, objs, impacted_accounts); });
 
+   return;
 }
 
 void debug_witness_plugin::on_changed_objects( const std::vector<graphene::db::object_id_type>& ids, const fc::flat_set<graphene::chain::account_id_type>& impacted_accounts )
@@ -157,15 +155,11 @@ void debug_witness_plugin::flush_json_object_stream()
 }
 
 void debug_witness_plugin::plugin_shutdown()
-{
-   cleanup();
-}
-
-void debug_witness_plugin::cleanup()
 {
    if( _json_object_stream )
    {
       _json_object_stream->close();
       _json_object_stream.reset();
    }
+   return;
 }

libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp

@@ -34,25 +34,23 @@ namespace graphene { namespace debug_witness_plugin {
 
 class debug_witness_plugin : public graphene::app::plugin {
 public:
-   using graphene::app::plugin::plugin;
-   ~debug_witness_plugin() override;
+   ~debug_witness_plugin();
 
    std::string plugin_name()const override;
 
-   void plugin_set_program_options(
+   virtual void plugin_set_program_options(
       boost::program_options::options_description &command_line_options,
       boost::program_options::options_description &config_file_options
       ) override;
 
-   void plugin_initialize( const boost::program_options::variables_map& options ) override;
-   void plugin_startup() override;
-   void plugin_shutdown() override;
+   virtual void plugin_initialize( const boost::program_options::variables_map& options ) override;
+   virtual void plugin_startup() override;
+   virtual void plugin_shutdown() override;
 
    void set_json_object_stream( const std::string& filename );
    void flush_json_object_stream();
 
 private:
-   void cleanup();
 
    void on_changed_objects( const std::vector<graphene::db::object_id_type>& ids, const fc::flat_set<graphene::chain::account_id_type>& impacted_accounts );
    void on_removed_objects( const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*> objs, const fc::flat_set<graphene::chain::account_id_type>& impacted_accounts );
@@ -60,7 +58,7 @@ private:
 
    boost::program_options::variables_map _options;
 
-   std::map<chain::public_key_type, fc::ecc::private_key, chain::pubkey_comparator> _private_keys;
+   std::map<chain::public_key_type, fc::ecc::private_key> _private_keys;
 
    std::shared_ptr< std::ofstream > _json_object_stream;
    boost::signals2::scoped_connection _applied_block_conn;

libraries/plugins/delayed_node/CMakeLists.txt

@@ -4,7 +4,7 @@ add_library( graphene_delayed_node
              delayed_node_plugin.cpp
            )
 
-target_link_libraries( graphene_delayed_node PRIVATE graphene_plugin graphene_accounts_list graphene_affiliate_stats graphene_bookie graphene_debug_witness graphene_elasticsearch graphene_market_history peerplays_sidechain )
+target_link_libraries( graphene_delayed_node PRIVATE graphene_plugin graphene_accounts_list graphene_affiliate_stats graphene_bookie graphene_debug_witness graphene_elasticsearch graphene_market_history )
 target_include_directories( graphene_delayed_node
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 

libraries/plugins/delayed_node/delayed_node_plugin.cpp

@@ -63,24 +63,8 @@ void delayed_node_plugin::plugin_set_program_options(bpo::options_description& c
 
 void delayed_node_plugin::connect()
 {
-   fc::http::websocket_connection_ptr con;
-   try
-   {
-      con = my->client.connect(my->remote_endpoint);
-   }
-   catch( const fc::exception& e )
-   {
-      wlog("Error while connecting: ${e}", ("e", e.to_detail_string()));
-      connection_failed();
-      return;
-   }
-   my->client_connection = std::make_shared<fc::rpc::websocket_api_connection>(
-           con, GRAPHENE_NET_MAX_NESTED_OBJECTS );
+   my->client_connection = std::make_shared<fc::rpc::websocket_api_connection>(my->client.connect(my->remote_endpoint), GRAPHENE_MAX_NESTED_OBJECTS);
    my->database_api = my->client_connection->get_remote_api<graphene::app::database_api>(0);
-   my->database_api->set_block_applied_callback([this]( const fc::variant& block_id )
-   {
-      fc::from_variant( block_id, my->last_received_remote_head, GRAPHENE_MAX_NESTED_OBJECTS );
-   } );
    my->client_connection_closed = my->client_connection->closed.connect([this] {
       connection_failed();
    });
@@ -89,9 +73,7 @@ void delayed_node_plugin::connect()
 void delayed_node_plugin::plugin_initialize(const boost::program_options::variables_map& options)
 {
    FC_ASSERT(options.count("trusted-node") > 0);
-   ilog("delayed_node_plugin:  plugin_initialize() begin");
    my->remote_endpoint = "ws://" + options.at("trusted-node").as<std::string>();
-   ilog("delayed_node_plugin:  plugin_initialize() end");
 }
 
 void delayed_node_plugin::sync_with_trusted_node()
@@ -118,11 +100,8 @@ void delayed_node_plugin::sync_with_trusted_node()
       while( remote_dpo.last_irreversible_block_num > db.head_block_num() )
       {
          fc::optional<graphene::chain::signed_block> block = my->database_api->get_block( db.head_block_num()+1 );
-         // TODO: during sync, decouple requesting blocks from preprocessing + applying them
          FC_ASSERT(block, "Trusted node claims it has blocks it doesn't actually have.");
          ilog("Pushing block #${n}", ("n", block->block_num()));
-         // timur: failed to merge from bitshares, API n/a in peerplays
-         // db.precompute_parallel( *block, graphene::chain::database::skip_nothing ).wait();
          db.push_block(*block);
          synced_blocks++;
       }
@@ -157,12 +136,24 @@ void delayed_node_plugin::plugin_startup()
       mainloop();
    });
 
+   try
+   {
       connect();
+      my->database_api->set_block_applied_callback([this]( const fc::variant& block_id )
+      {
+         fc::from_variant( block_id, my->last_received_remote_head, GRAPHENE_MAX_NESTED_OBJECTS );
+      } );
+      return;
+   }
+   catch (const fc::exception& e)
+   {
+      elog("Error during connection: ${e}", ("e", e.to_detail_string()));
+   }
+   fc::async([this]{connection_failed();});
 }
 
 void delayed_node_plugin::connection_failed()
 {
-   my->last_received_remote_head = my->last_processed_remote_head;
    elog("Connection to trusted node failed; retrying in 5 seconds...");
    fc::schedule([this]{connect();}, fc::time_point::now() + fc::seconds(5));
 }