Try move num_son init from do_apply

.gitlab-ci.yml

@@ -9,8 +9,6 @@ stages:
   - build
   - test
   - dockerize
-  - python-test
-  - deploy
 
 build-mainnet:
   stage: build
@@ -50,7 +48,6 @@ dockerize-mainnet:
     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 .
@@ -59,6 +56,8 @@ dockerize-mainnet:
     - docker rmi $IMAGE
   tags:
     - builder
+  when:
+    manual
   timeout:
     3h
 
@@ -79,27 +78,12 @@ build-testnet:
       - build/libraries/
       - build/programs/
       - build/tests/
-  when: manual
   tags:
     - builder
-
-deploy-testnet:
-  stage: deploy
-  dependencies:
-    - build-testnet
-  script:
-    - sudo systemctl stop witness
-    - rm $WORK_DIR/peerplays/witness_node || true
-    - cp build/programs/witness_node/witness_node $WORK_DIR/peerplays/
-    - sudo systemctl restart witness
-  rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-      when: always
-  environment:
-    name: devnet
-    url: $DEVNET_URL
-  tags: 
-    - devnet
+  when:
+    manual
+  timeout:
+    3h
 
 test-testnet:
   stage: test
@@ -135,37 +119,3 @@ dockerize-testnet:
     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

Dockerfile

@@ -134,8 +134,11 @@ RUN \
       libsodium-dev
 
 RUN \
-    git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \
-    cd libbitcoin-explorer && \
+    git clone https://github.com/libbitcoin/libbitcoin-build.git && \
+    cd libbitcoin-build && \
+    git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d && \
+    ./generate3.sh && \
+    cd ../libbitcoin-explorer && \
     ./install.sh && \
     ldconfig && \
     rm -rf /home/peerplays/src/*
@@ -187,6 +190,7 @@ ADD . peerplays
 RUN \
     cd peerplays && \
     git submodule update --init --recursive && \
+    git symbolic-ref --short HEAD && \
     git log --oneline -n 5 && \
     mkdir build && \
     cd build && \

Dockerfile.18.04

@@ -134,8 +134,11 @@ RUN \
       libsodium-dev
 
 RUN \
-    git clone --branch version3.8.0 --depth 1 https://gitlab.com/PBSA/peerplays-1.0/libbitcoin-explorer.git && \
-    cd libbitcoin-explorer && \
+    git clone https://github.com/libbitcoin/libbitcoin-build.git && \
+    cd libbitcoin-build && \
+    git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d && \
+    ./generate3.sh && \
+    cd ../libbitcoin-explorer && \
     ./install.sh && \
     ldconfig && \
     rm -rf /home/peerplays/src/*

README.md

@@ -77,8 +77,11 @@ 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
+git clone https://github.com/libbitcoin/libbitcoin-build.git
+cd libbitcoin-build
+git reset --hard 92c215fc1ffa272bab4d485d369d0306db52d69d
+./generate3.sh
+cd ../libbitcoin-explorer
 sudo ./install.sh
 sudo ldconfig
 ```

libraries/app/api.cpp

@@ -210,8 +210,8 @@ network_node_api::network_node_api(application &a) :
       }
 
       /*
-       * Remove expired transactions from pending_transactions
-       */
+             * Remove expired transactions from pending_transactions
+             */
       for (const auto &transaction : _pending_transactions) {
          if (transaction.second.expiration < block.timestamp) {
             auto transaction_it = _pending_transactions.find(transaction.second.id());

libraries/app/application.cpp

@@ -391,8 +391,8 @@ public:
    }
 
    /**
-    * If delegate has the item, the network has no need to fetch it.
-    */
+       * If delegate has the item, the network has no need to fetch it.
+       */
    virtual bool has_item(const net::item_id &id) override {
       try {
          if (id.item_type == graphene::net::block_message_type)
@@ -404,13 +404,13 @@ public:
    }
 
    /**
-    * @brief allows the application to validate an item prior to broadcasting to peers.
-    *
-    * @param sync_mode true if the message was fetched through the sync process, false during normal operation
-    * @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 safe to broadcast on.
-    */
+       * @brief allows the application to validate an item prior to broadcasting to peers.
+       *
+       * @param sync_mode true if the message was fetched through the sync process, false during normal operation
+       * @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 safe to broadcast on.
+       */
    virtual bool handle_block(const graphene::net::block_message &blk_msg, bool sync_mode,
                              std::vector<fc::uint160_t> &contained_transaction_message_ids) override {
 
@@ -498,14 +498,14 @@ public:
    }
 
    /**
-    * Assuming all data elements are ordered in some way, this method should
-    * return up to limit ids that occur *after* the last ID in synopsis that
-    * we recognize.
-    *
-    * On return, remaining_item_count will be set to the number of items
-    * in our blockchain after the last item returned in the result,
-    * or 0 if the result contains the last item in the blockchain
-    */
+       * Assuming all data elements are ordered in some way, this method should
+       * return up to limit ids that occur *after* the last ID in synopsis that
+       * we recognize.
+       *
+       * On return, remaining_item_count will be set to the number of items
+       * in our blockchain after the last item returned in the result,
+       * or 0 if the result contains the last item in the blockchain
+       */
    virtual std::vector<item_hash_t> get_block_ids(const std::vector<item_hash_t> &blockchain_synopsis,
                                                   uint32_t &remaining_item_count,
                                                   uint32_t limit) override {
@@ -552,8 +552,8 @@ public:
    }
 
    /**
-    * Given the hash of the requested data, fetch the body.
-    */
+       * Given the hash of the requested data, fetch the body.
+       */
    virtual message get_item(const item_id &id) override {
       try {
          // ilog("Request for item ${id}", ("id", id));
@@ -576,63 +576,63 @@ public:
    }
 
    /**
-    * Returns a synopsis of the blockchain used for syncing.  This consists of a list of
-    * block hashes at intervals exponentially increasing towards the genesis block.
-    * When syncing to a peer, the peer uses this data to determine if we're on the same
-    * fork as they are, and if not, what blocks they need to send us to get us on their
-    * fork.
-    *
-    * In the over-simplified case, this is a straighforward synopsis of our current
-    * preferred blockchain; when we first connect up to a peer, this is what we will be sending.
-    * It looks like this:
-    *   If the blockchain is empty, it will return the empty list.
-    *   If the blockchain has one block, it will return a list containing just that block.
-    *   If it contains more than one block:
-    *     the first element in the list will be the hash of the highest numbered block that
-    *         we cannot undo
-    *     the second element will be the hash of an item at the half way point in the undoable
-    *         segment of the blockchain
-    *     the third will be ~3/4 of the way through the undoable segment of the block chain
-    *     the fourth will be at ~7/8...
-    *       &c.
-    *     the last item in the list will be the hash of the most recent block on our preferred chain
-    * so if the blockchain had 26 blocks labeled a - z, the synopsis would be:
-    *    a n u x z
-    * the idea being that by sending a small (<30) number of block ids, we can summarize a huge
-    * blockchain.  The block ids are more dense near the end of the chain where because we are
-    * more likely to be almost in sync when we first connect, and forks are likely to be short.
-    * If the peer we're syncing with in our example is on a fork that started at block 'v',
-    * then they will reply to our synopsis with a list of all blocks starting from block 'u',
-    * the last block they know that we had in common.
-    *
-    * In the real code, there are several complications.
-    *
-    * First, as an optimization, we don't usually send a synopsis of the entire blockchain, we
-    * send a synopsis of only the segment of the blockchain that we have undo data for.  If their
-    * fork doesn't build off of something in our undo history, we would be unable to switch, so there's
-    * no reason to fetch the blocks.
-    *
-    * Second, when a peer replies to our initial synopsis and gives us a list of the blocks they think
-    * we are missing, they only send a chunk of a few thousand blocks at once.  After we get those
-    * block ids, we need to request more blocks by sending another synopsis (we can't just say "send me
-    * the next 2000 ids" because they may have switched forks themselves and they don't track what
-    * they've sent us).  For faster performance, we want to get a fairly long list of block ids first,
-    * then start downloading the blocks.
-    * The peer doesn't handle these follow-up block id requests any different from the initial request;
-    * it treats the synopsis we send as our blockchain and bases its response entirely off that.  So to
-    * get the response we want (the next chunk of block ids following the last one they sent us, or,
-    * failing that, the shortest fork off of the last list of block ids they sent), we need to construct
-    * a synopsis as if our blockchain was made up of:
-    *    1. the blocks in our block chain up to the fork point (if there is a fork) or the head block (if no fork)
-    *    2. the blocks we've already pushed from their fork (if there's a fork)
-    *    3. the block ids they've previously sent us
-    * Segment 3 is handled in the p2p code, it just tells us the number of blocks it has (in
-    * number_of_blocks_after_reference_point) so we can leave space in the synopsis for them.
-    * We're responsible for constructing the synopsis of Segments 1 and 2 from our active blockchain and
-    * fork database.  The reference_point parameter is the last block from that peer that has been
-    * successfully pushed to the blockchain, so that tells us whether the peer is on a fork or on
-    * the main chain.
-    */
+       * Returns a synopsis of the blockchain used for syncing.  This consists of a list of
+       * block hashes at intervals exponentially increasing towards the genesis block.
+       * When syncing to a peer, the peer uses this data to determine if we're on the same
+       * fork as they are, and if not, what blocks they need to send us to get us on their
+       * fork.
+       *
+       * In the over-simplified case, this is a straighforward synopsis of our current
+       * preferred blockchain; when we first connect up to a peer, this is what we will be sending.
+       * It looks like this:
+       *   If the blockchain is empty, it will return the empty list.
+       *   If the blockchain has one block, it will return a list containing just that block.
+       *   If it contains more than one block:
+       *     the first element in the list will be the hash of the highest numbered block that
+       *         we cannot undo
+       *     the second element will be the hash of an item at the half way point in the undoable
+       *         segment of the blockchain
+       *     the third will be ~3/4 of the way through the undoable segment of the block chain
+       *     the fourth will be at ~7/8...
+       *       &c.
+       *     the last item in the list will be the hash of the most recent block on our preferred chain
+       * so if the blockchain had 26 blocks labeled a - z, the synopsis would be:
+       *    a n u x z
+       * the idea being that by sending a small (<30) number of block ids, we can summarize a huge
+       * blockchain.  The block ids are more dense near the end of the chain where because we are
+       * more likely to be almost in sync when we first connect, and forks are likely to be short.
+       * If the peer we're syncing with in our example is on a fork that started at block 'v',
+       * then they will reply to our synopsis with a list of all blocks starting from block 'u',
+       * the last block they know that we had in common.
+       *
+       * In the real code, there are several complications.
+       *
+       * First, as an optimization, we don't usually send a synopsis of the entire blockchain, we
+       * send a synopsis of only the segment of the blockchain that we have undo data for.  If their
+       * fork doesn't build off of something in our undo history, we would be unable to switch, so there's
+       * no reason to fetch the blocks.
+       *
+       * Second, when a peer replies to our initial synopsis and gives us a list of the blocks they think
+       * we are missing, they only send a chunk of a few thousand blocks at once.  After we get those
+       * block ids, we need to request more blocks by sending another synopsis (we can't just say "send me
+       * the next 2000 ids" because they may have switched forks themselves and they don't track what
+       * they've sent us).  For faster performance, we want to get a fairly long list of block ids first,
+       * then start downloading the blocks.
+       * The peer doesn't handle these follow-up block id requests any different from the initial request;
+       * it treats the synopsis we send as our blockchain and bases its response entirely off that.  So to
+       * get the response we want (the next chunk of block ids following the last one they sent us, or,
+       * failing that, the shortest fork off of the last list of block ids they sent), we need to construct
+       * a synopsis as if our blockchain was made up of:
+       *    1. the blocks in our block chain up to the fork point (if there is a fork) or the head block (if no fork)
+       *    2. the blocks we've already pushed from their fork (if there's a fork)
+       *    3. the block ids they've previously sent us
+       * Segment 3 is handled in the p2p code, it just tells us the number of blocks it has (in
+       * number_of_blocks_after_reference_point) so we can leave space in the synopsis for them.
+       * We're responsible for constructing the synopsis of Segments 1 and 2 from our active blockchain and
+       * fork database.  The reference_point parameter is the last block from that peer that has been
+       * successfully pushed to the blockchain, so that tells us whether the peer is on a fork or on
+       * the main chain.
+       */
    virtual std::vector<item_hash_t> get_blockchain_synopsis(const item_hash_t &reference_point,
                                                             uint32_t number_of_blocks_after_reference_point) override {
       try {
@@ -733,26 +733,26 @@ public:
             low_block_num += (true_high_block_num - low_block_num + 2) / 2;
          } while (low_block_num <= high_block_num);
 
-         // idump((synopsis));
+         //idump((synopsis));
          return synopsis;
       }
       FC_CAPTURE_AND_RETHROW()
    }
 
    /**
-    * Call this after the call to handle_message succeeds.
-    *
-    * @param item_type the type of the item we're synchronizing, will be the same as item passed to the sync_from() call
-    * @param item_count the number of items known to the node that haven't been sent to handle_item() yet.
-    *                   After `item_count` more calls to handle_item(), the node will be in sync
-    */
+       * Call this after the call to handle_message succeeds.
+       *
+       * @param item_type the type of the item we're synchronizing, will be the same as item passed to the sync_from() call
+       * @param item_count the number of items known to the node that haven't been sent to handle_item() yet.
+       *                   After `item_count` more calls to handle_item(), the node will be in sync
+       */
    virtual void sync_status(uint32_t item_type, uint32_t item_count) override {
       // any status reports to GUI go here
    }
 
    /**
-    * Call any time the number of connected peers changes.
-    */
+       * Call any time the number of connected peers changes.
+       */
    virtual void connection_count_changed(uint32_t c) override {
       // any status reports to GUI go here
    }
@@ -769,9 +769,9 @@ public:
    }
 
    /**
-    * 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()
-    */
+       * 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()
+       */
    virtual fc::time_point_sec get_block_time(const item_hash_t &block_id) override {
       try {
          auto opt_block = _chain_db->fetch_block_by_id(block_id);

libraries/app/database_api.cpp

@@ -313,7 +313,7 @@ public:
    uint32_t api_limit_get_trade_history = 100;
    uint32_t api_limit_get_trade_history_by_sequence = 100;
 
-   // private:
+   //private:
    const account_object *get_account_from_string(const std::string &name_or_id,
                                                  bool throw_if_not_found = true) const;
    const asset_object *get_asset_from_string(const std::string &symbol_or_id,
@@ -470,7 +470,7 @@ void database_api::set_subscribe_callback(std::function<void(const variant &)> c
 }
 
 void database_api_impl::set_subscribe_callback(std::function<void(const variant &)> cb, bool notify_remove_create) {
-   // edump((clear_filter));
+   //edump((clear_filter));
    _subscribe_callback = cb;
    _notify_remove_create = notify_remove_create;
    _subscribed_accounts.clear();
@@ -2197,7 +2197,7 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::committee: {
          auto itr = committee_idx.find(id);
          if (itr != committee_idx.end())
-            result.emplace_back(variant(*itr, 2)); // Depth of committee_member_object is 1, add 1 to be safe
+            result.emplace_back(variant(*itr, 1));
          else
             result.emplace_back(variant());
          break;
@@ -2205,7 +2205,7 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::witness: {
          auto itr = witness_idx.find(id);
          if (itr != witness_idx.end())
-            result.emplace_back(variant(*itr, 2)); // Depth of witness_object is 1, add 1 here to be safe
+            result.emplace_back(variant(*itr, 1));
          else
             result.emplace_back(variant());
          break;
@@ -2213,15 +2213,11 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::worker: {
          auto itr = for_worker_idx.find(id);
          if (itr != for_worker_idx.end()) {
-            result.emplace_back(variant(*itr, 4)); // Depth of worker_object is 3, add 1 here to be safe.
-                                                   // If we want to extract the balance object inside,
-                                                   //   need to increase this value
+            result.emplace_back(variant(*itr, 1));
          } else {
             auto itr = against_worker_idx.find(id);
             if (itr != against_worker_idx.end()) {
-               result.emplace_back(variant(*itr, 4)); // Depth of worker_object is 3, add 1 here to be safe.
-                                                      // If we want to extract the balance object inside,
-                                                      //   need to increase this value
+               result.emplace_back(variant(*itr, 1));
             } else {
                result.emplace_back(variant());
             }
@@ -2907,7 +2903,7 @@ graphene::app::gpos_info database_api::get_gpos_info(const account_id_type accou
 }
 
 graphene::app::gpos_info database_api_impl::get_gpos_info(const account_id_type account) const {
-   FC_ASSERT(_db.head_block_time() > HARDFORK_GPOS_TIME); // Can be deleted after GPOS hardfork time
+   FC_ASSERT(_db.head_block_time() > HARDFORK_GPOS_TIME); //Can be deleted after GPOS hardfork time
    gpos_info result;
 
    result.vesting_factor = _db.calculate_vesting_factor(account(_db));
@@ -3554,9 +3550,9 @@ void database_api_impl::handle_object_changed(bool force_notify, bool full_objec
       /// pushing the future back / popping the prior future if it is complete.
       /// if a connection hangs then this could get backed up and result in
       /// a failure to exit cleanly.
-      // fc::async([capture_this,this,updates,market_broadcast_queue](){
-      // if( _subscribe_callback )
-      //          _subscribe_callback( updates );
+      //fc::async([capture_this,this,updates,market_broadcast_queue](){
+      //if( _subscribe_callback )
+      //         _subscribe_callback( updates );
 
       for (auto id : ids) {
          if (id.is<call_order_object>()) {

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

@@ -85,10 +85,10 @@ struct asset_holders {
 };
 
 /**
- * @brief The history_api class implements the RPC API for account history
- *
- * This API contains methods to access account histories
- */
+    * @brief The history_api class implements the RPC API for account history
+    *
+    * This API contains methods to access account histories
+    */
 class history_api {
 public:
    history_api(application &app) :
@@ -97,27 +97,27 @@ public:
    }
 
    /**
-    * @brief Get operations relevant to the specificed account
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param stop ID of the earliest operation to retrieve
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start ID of the most recent operation to retrieve
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
+          * @brief Get operations relevant to the specificed account
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param stop ID of the earliest operation to retrieve
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start ID of the most recent operation to retrieve
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
    vector<operation_history_object> get_account_history(const std::string account_id_or_name,
                                                         operation_history_id_type stop = operation_history_id_type(),
                                                         unsigned limit = 100,
                                                         operation_history_id_type start = operation_history_id_type()) const;
 
    /**
-    * @brief Get only asked operations relevant to the specified account
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param operation_id The ID of the operation we want to get operations in the account( 0 = transfer , 1 = limit order create, ...)
-    * @param stop ID of the earliest operation to retrieve
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start ID of the most recent operation to retrieve
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
+          * @brief Get only asked operations relevant to the specified account
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param operation_id The ID of the operation we want to get operations in the account( 0 = transfer , 1 = limit order create, ...)
+          * @param stop ID of the earliest operation to retrieve
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start ID of the most recent operation to retrieve
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
    vector<operation_history_object> get_account_history_operations(const std::string account_id_or_name,
                                                                    int operation_id,
                                                                    operation_history_id_type start = operation_history_id_type(),
@@ -125,17 +125,17 @@ public:
                                                                    unsigned limit = 100) const;
 
    /**
-    * @breif Get operations relevant to the specified account referenced
-    * by an event numbering specific to the account. The current number of operations
-    * for the account can be found in the account statistics (or use 0 for start).
-    * @param account_id_or_name The account ID or name whose history should be queried
-    * @param stop Sequence number of earliest operation. 0 is default and will
-    * query 'limit' number of operations.
-    * @param limit Maximum number of operations to retrieve (must not exceed 100)
-    * @param start Sequence number of the most recent operation to retrieve.
-    * 0 is default, which will start querying from the most recent operation.
-    * @return A list of operations performed by account, ordered from most recent to oldest.
-    */
+          * @breif Get operations relevant to the specified account referenced
+          * by an event numbering specific to the account. The current number of operations
+          * for the account can be found in the account statistics (or use 0 for start).
+          * @param account_id_or_name The account ID or name whose history should be queried
+          * @param stop Sequence number of earliest operation. 0 is default and will
+          * query 'limit' number of operations.
+          * @param limit Maximum number of operations to retrieve (must not exceed 100)
+          * @param start Sequence number of the most recent operation to retrieve.
+          * 0 is default, which will start querying from the most recent operation.
+          * @return A list of operations performed by account, ordered from most recent to oldest.
+          */
    vector<operation_history_object> get_relative_account_history(const std::string account_id_or_name,
                                                                  uint32_t stop = 0,
                                                                  unsigned limit = 100,
@@ -156,8 +156,8 @@ private:
 };
 
 /**
- * @brief Block api
- */
+    * @brief Block api
+    */
 class block_api {
 public:
    block_api(graphene::chain::database &db);
@@ -170,8 +170,8 @@ private:
 };
 
 /**
- * @brief The network_broadcast_api class allows broadcasting of transactions.
- */
+    * @brief The network_broadcast_api class allows broadcasting of transactions.
+    */
 class network_broadcast_api : public std::enable_shared_from_this<network_broadcast_api> {
 public:
    network_broadcast_api(application &a);
@@ -186,36 +186,36 @@ public:
    typedef std::function<void(variant /*transaction_confirmation*/)> confirmation_callback;
 
    /**
-    * @brief Broadcast a transaction to the network
-    * @param trx The transaction to broadcast
-    *
-    * The transaction will be checked for validity in the local database prior to broadcasting. If it fails to
-    * apply locally, an error will be thrown and the transaction will not be broadcast.
-    */
+          * @brief Broadcast a transaction to the network
+          * @param trx The transaction to broadcast
+          *
+          * The transaction will be checked for validity in the local database prior to broadcasting. If it fails to
+          * apply locally, an error will be thrown and the transaction will not be broadcast.
+          */
    void broadcast_transaction(const signed_transaction &trx);
 
    /** this version of broadcast transaction registers a callback method that will be called when the transaction is
-    * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
-    * block.
-    */
+          * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
+          * block.
+          */
    void broadcast_transaction_with_callback(confirmation_callback cb, const signed_transaction &trx);
 
    /** this version of broadcast transaction registers a callback method that will be called when the transaction is
-    * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
-    * block.
-    */
+          * included into a block.  The callback method includes the transaction id, block number, and transaction number in the
+          * block.
+          */
    fc::variant broadcast_transaction_synchronous(const signed_transaction &trx);
 
    void broadcast_block(const signed_block &block);
 
    /**
-    * @brief Not reflected, thus not accessible to API clients.
-    *
-    * This function is registered to receive the applied_block
-    * signal from the chain database when a block is received.
-    * It then dispatches callbacks to clients who have requested
-    * to be notified when a particular txid is included in a block.
-    */
+          * @brief Not reflected, thus not accessible to API clients.
+          *
+          * This function is registered to receive the applied_block
+          * signal from the chain database when a block is received.
+          * It then dispatches callbacks to clients who have requested
+          * to be notified when a particular txid is included in a block.
+          */
    void on_applied_block(const signed_block &b);
 
 private:
@@ -225,60 +225,60 @@ private:
 };
 
 /**
- * @brief The network_node_api class allows maintenance of p2p connections.
- */
+    * @brief The network_node_api class allows maintenance of p2p connections.
+    */
 class network_node_api {
 public:
    network_node_api(application &a);
 
    /**
-    * @brief Return general network information, such as p2p port
-    */
+          * @brief Return general network information, such as p2p port
+          */
    fc::variant_object get_info() const;
 
    /**
-    * @brief add_node Connect to a new peer
-    * @param ep The IP/Port of the peer to connect to
-    */
+          * @brief add_node Connect to a new peer
+          * @param ep The IP/Port of the peer to connect to
+          */
    void add_node(const fc::ip::endpoint &ep);
 
    /**
-    * @brief Get status of all current connections to peers
-    */
+          * @brief Get status of all current connections to peers
+          */
    std::vector<net::peer_status> get_connected_peers() const;
 
    /**
-    * @brief Get advanced node parameters, such as desired and max
-    *        number of connections
-    */
+          * @brief Get advanced node parameters, such as desired and max
+          *        number of connections
+          */
    fc::variant_object get_advanced_node_parameters() const;
 
    /**
-    * @brief Set advanced node parameters, such as desired and max
-    *        number of connections
-    * @param params a JSON object containing the name/value pairs for the parameters to set
-    */
+          * @brief Set advanced node parameters, such as desired and max
+          *        number of connections
+          * @param params a JSON object containing the name/value pairs for the parameters to set
+          */
    void set_advanced_node_parameters(const fc::variant_object &params);
 
    /**
-    * @brief Return list of potential peers
-    */
+          * @brief Return list of potential peers
+          */
    std::vector<net::potential_peer_record> get_potential_peers() const;
 
    /**
-    * @brief Return list of pending transactions.
-    */
+          * @brief Return list of pending transactions.
+          */
    map<transaction_id_type, signed_transaction> list_pending_transactions() const;
 
    /**
-    * @brief Subscribes caller for notifications about pending transactions.
-    * @param callback a functional object which will be called when new transaction is created.
-    */
+          * @brief Subscribes caller for notifications about pending transactions.
+          * @param callback a functional object which will be called when new transaction is created.
+          */
    void subscribe_to_pending_transactions(std::function<void(const variant &)> callback);
 
    /**
-    * @brief Unsubscribes caller from notifications about pending transactions.
-    */
+          * @brief Unsubscribes caller from notifications about pending transactions.
+          */
    void unsubscribe_from_pending_transactions();
 
 private:
@@ -290,33 +290,33 @@ private:
 };
 
 /**
- * @brief
- */
+    * @brief
+    */
 class asset_api {
 public:
    asset_api(graphene::app::application &app);
    ~asset_api();
 
    /**
-    * @brief Get asset holders for a specific asset
-    * @param asset The specific asset id or symbol
-    * @param start The start index
-    * @param limit Maximum limit must not exceed 100
-    * @return A list of asset holders for the specified asset
-    */
+          * @brief Get asset holders for a specific asset
+          * @param asset The specific asset id or symbol
+          * @param start The start index
+          * @param limit Maximum limit must not exceed 100
+          * @return A list of asset holders for the specified asset
+          */
    vector<account_asset_balance> get_asset_holders(std::string asset, uint32_t start, uint32_t limit) const;
 
    /**
-    * @brief Get asset holders count for a specific asset
-    * @param asset The specific asset id or symbol
-    * @return Holders count for the specified asset
-    */
+          * @brief Get asset holders count for a specific asset
+          * @param asset The specific asset id or symbol
+          * @return Holders count for the specified asset
+          */
    int get_asset_holders_count(std::string asset) const;
 
    /**
-    * @brief Get all asset holders
-    * @return A list of all asset holders
-    */
+          * @brief Get all asset holders
+          * @return A list of all asset holders
+          */
    vector<asset_holders> get_all_asset_holders() const;
 
    uint32_t api_limit_get_asset_holders = 100;
@@ -337,24 +337,24 @@ extern template class fc::api<graphene::debug_witness::debug_api>;
 
 namespace graphene { namespace app {
 /**
- * @brief The login_api class implements the bottom layer of the RPC API
- *
- * All other APIs must be requested from this API.
- */
+    * @brief The login_api class implements the bottom layer of the RPC API
+    *
+    * All other APIs must be requested from this API.
+    */
 class login_api {
 public:
    login_api(application &a);
    ~login_api();
 
    /**
-    * @brief Authenticate to the RPC server
-    * @param user Username to login with
-    * @param password Password to login with
-    * @return True if logged in successfully; false otherwise
-    *
-    * @note This must be called prior to requesting other APIs. Other APIs may not be accessible until the client
-    * has sucessfully authenticated.
-    */
+          * @brief Authenticate to the RPC server
+          * @param user Username to login with
+          * @param password Password to login with
+          * @return True if logged in successfully; false otherwise
+          *
+          * @note This must be called prior to requesting other APIs. Other APIs may not be accessible until the client
+          * has sucessfully authenticated.
+          */
    bool login(const string &user, const string &password);
    /// @brief Retrieve the network block API
    fc::api<block_api> block() const;

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

@@ -198,10 +198,10 @@ public:
    optional<block_header> get_block_header(uint32_t block_num) const;
 
    /**
-    * @brief Retrieve multiple block header by block numbers
-    * @param block_num vector containing heights of the block whose header should be returned
-    * @return array of headers of the referenced blocks, or null if no matching block was found
-    */
+      * @brief Retrieve multiple block header by block numbers
+      * @param block_num vector containing heights of the block whose header should be returned
+      * @return array of headers of the referenced blocks, or null if no matching block was found
+      */
    map<uint32_t, optional<block_header>> get_block_header_batch(const vector<uint32_t> block_nums) const;
 
    /**
@@ -279,12 +279,12 @@ public:
    vector<vector<account_id_type>> get_key_references(vector<public_key_type> key) const;
 
    /**
-    * Determine whether a textual representation of a public key
-    * (in Base-58 format) is *currently* linked
-    * to any *registered* (i.e. non-stealth) account on the blockchain
-    * @param public_key Public key
-    * @return Whether a public key is known
-    */
+      * Determine whether a textual representation of a public key
+      * (in Base-58 format) is *currently* linked
+      * to any *registered* (i.e. non-stealth) account on the blockchain
+      * @param public_key Public key
+      * @return Whether a public key is known
+      */
    bool is_public_key_registered(string public_key) const;
 
    //////////////

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,
@@ -116,40 +69,14 @@ void verify_account_votes( const database& db, const account_options& options, f
    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 : *options.extensions.value.num_son)
+      {
+         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) );
+      }
    }
-
-   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;
@@ -264,12 +191,6 @@ object_id_type account_create_evaluator::do_apply( const account_create_operatio
       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 +290,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,30 +329,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() )
       {

libraries/chain/confidential_evaluator.cpp

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

libraries/chain/db_block.cpp

@@ -739,11 +739,13 @@ 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);
-         }
+      bool need_to_update_son_schedule = false;
+      for(const auto& active_sons : global_props.active_sons){
+         if(!active_sons.second.empty())
+            need_to_update_son_schedule = true;
+      }
+      if(need_to_update_son_schedule) {
+         update_son_schedule(next_block);
       }
    }
 
@@ -781,11 +783,15 @@ void database::_apply_block( const signed_block& next_block )
    if (global_props.parameters.witness_schedule_algorithm == GRAPHENE_WITNESS_SHUFFLED_ALGORITHM) {
       update_witness_schedule();
 
+      bool need_update_son_schedule = false;
       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);
+            need_update_son_schedule = true;
          }
       }
+      if(need_update_son_schedule) {
+         update_son_schedule();
+      }
    }
 
    if( !_node_property_object.debug_updates.empty() )

libraries/chain/db_getter.cpp

@@ -305,14 +305,16 @@ bool database::is_son_dereg_valid( son_id_type son_id )
    }
 
    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)
+   for(const auto& status : son->statuses)
+   {
+      const auto& sidechain = status.first;
+      if(status.second != 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())) {
+         if(son->statistics(*this).last_active_timestamp.contains(sidechain)) {
+            if (head_block_time() - son->statistics(*this).last_active_timestamp.at(sidechain) < fc::seconds(get_global_properties().parameters.son_deregister_time())) {
                status_son_dereg_valid = false;
             }
          }
@@ -386,14 +388,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_maint.cpp

@@ -170,7 +170,6 @@ struct worker_pay_visitor
          worker.pay_worker(pay, db);
       }
 };
-
 void database::update_worker_votes()
 {
    auto& idx = get_index_type<worker_index>();
@@ -186,131 +185,13 @@ void database::update_worker_votes()
    }
 }
 
-void database::hotfix_2024()
-{
-   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();
-   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());
-
-      // 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)];
-      }
-      const 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) );
-         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) );
-         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) {
-         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)]);
-         }
-         else {
-            son_weight += get_weight_before_son2_hf(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
-         }
-         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);
-      });
-
-      // 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) {
-         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;
-
-         if(txs_signed_bitcoin > 0 || txs_signed_hive > 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)]);
-            }
-            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;
-            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(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;
-            });
-         }
-      });
-
-      //Note the last son pay out time
-      modify( dpo, [&]( dynamic_global_property_object& _dpo )
-      {
-         _dpo.last_son_payout_time = now;
-      });
-   }
-}
-
-void database::pay_sons_after_hf_ethereum()
+void database::pay_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 );
@@ -328,72 +209,93 @@ void database::pay_sons_after_hf_ethereum()
             }
          }
 
-         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)));
+         const sidechain_type st = [&now, &active_sidechain_type]{
+            if( now < HARDFORK_SON_FOR_ETHEREUM_TIME )
+               return sidechain_type::bitcoin;
+            else
+               return active_sidechain_type;
+         }();
+
+         const auto sons = sort_votable_objects<son_index>(st,
+            (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)];
+            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)];
          }
-         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 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) );
+            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) );
+            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, &active_sidechain_type, &st](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)]);
+            }
+            else {
+               son_weight += get_weight_before_son2_hf(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
+            }
             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);
+         });
 
+         // 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, &active_sidechain_type, &st](const object& o) {
+            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);
+
+            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);
+               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)]);
+               }
+               else {
+                  son_weight += get_weight_before_son2_hf(_vote_tally_buffer[*son_obj->get_sidechain_vote_id(st)]);
+               }
+               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))
+               //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;
-      });
+         });
+         //Note the last son pay out time
+         modify( dpo, [&]( dynamic_global_property_object& _dpo )
+         {
+          _dpo.last_son_payout_time = now;
+         });
+      }
    }
 }
 
@@ -2250,7 +2152,7 @@ void database::perform_son_tasks()
       });
    }
    // create HIVE asset here because son_account is the issuer of the HIVE
-   if (gpo.parameters.hive_asset() == asset_id_type() && head_block_time() >= HARDFORK_SON_FOR_HIVE_TIME)
+   if (gpo.parameters.hive_asset() == asset_id_type()  && head_block_time() >= HARDFORK_SON_FOR_HIVE_TIME)
    {
       const asset_dynamic_data_object& dyn_asset =
          create<asset_dynamic_data_object>([](asset_dynamic_data_object& a) {
@@ -2290,10 +2192,7 @@ void database::perform_son_tasks()
       // 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();
+      pay_sons();
    }
 
    // Split vote_ids
@@ -2306,7 +2205,7 @@ void database::perform_son_tasks()
             // 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 existing_vote_id_bitcoin;
                vote_id_type new_vote_id_hive;
                vote_id_type new_vote_id_eth;
 
@@ -2323,7 +2222,7 @@ void database::perform_son_tasks()
                // 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) {
+                  if (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);
                      });
@@ -2483,7 +2382,24 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
 
             if ( opinion_account.options.extensions.value.num_son.valid() )
             {
-               for(const auto& num_sidechain_son : *opinion_account.options.extensions.value.num_son) {
+               auto active_sidechains = active_sidechain_types(d.head_block_time());
+               auto num_son_map = *opinion_account.options.extensions.value.num_son;
+
+               if ( num_son_map.size() != active_sidechains.size())
+               {
+                  for (const auto& num_sidechain_son : num_son_map)
+                  {
+                     FC_ASSERT(active_sidechains.find(num_sidechain_son.first) != active_sidechains.end());
+                     active_sidechains.erase(num_sidechain_son.first);
+                  }
+
+                  for (auto missing_num_son : active_sidechains)
+                  {
+                     num_son_map[missing_num_son] = 0;
+                  }
+               }
+
+               for(const auto& num_sidechain_son : num_son_map) {
                   const auto sidechain = num_sidechain_son.first;
                   const auto& num_son = num_sidechain_son.second;
                   if (num_son <= props.parameters.maximum_son_count()) {
@@ -2533,7 +2449,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();
 

libraries/chain/db_witness_schedule.cpp

@@ -200,41 +200,44 @@ void database::update_witness_schedule()
    }
 }
 
-void database::update_son_schedule(sidechain_type type)
+void database::update_son_schedule()
 {
    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)
+   for(const auto& active_sidechain_type : active_sidechain_types(head_block_time()))
    {
-      modify( sidechain_sso, [&]( son_schedule_object& _sso )
+      const son_schedule_object& sidechain_sso = get(son_schedule_id_type(get_son_schedule_id(active_sidechain_type)));
+      if( gpo.active_sons.at(active_sidechain_type).size() != 0 &&
+            head_block_num() % gpo.active_sons.at(active_sidechain_type).size() == 0)
       {
-         _sso.current_shuffled_sons.clear();
-         _sso.current_shuffled_sons.reserve( gpo.active_sons.at(type).size() );
-
-         for ( const auto &w : gpo.active_sons.at(type) ) {
-               _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)
+         modify( sidechain_sso, [&]( son_schedule_object& _sso )
          {
-            /// High performance random generator
-            /// http://xorshift.di.unimi.it/
-            uint64_t k = now_hi + uint64_t(i) * 2685821657736338717ULL;
-            k ^= (k >> 12);
-            k ^= (k << 25);
-            k ^= (k >> 27);
-            k *= 2685821657736338717ULL;
+            _sso.current_shuffled_sons.clear();
+            _sso.current_shuffled_sons.reserve( gpo.active_sons.at(active_sidechain_type).size() );
 
-            uint32_t jmax = _sso.current_shuffled_sons.size() - i;
-            uint32_t j = i + k % jmax;
-            std::swap(_sso.current_shuffled_sons[i],
-                      _sso.current_shuffled_sons[j]);
-         }
-      });
+            for ( const auto &w : gpo.active_sons.at(active_sidechain_type) ) {
+                  _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
+               /// http://xorshift.di.unimi.it/
+               uint64_t k = now_hi + uint64_t(i) * 2685821657736338717ULL;
+               k ^= (k >> 12);
+               k ^= (k << 25);
+               k ^= (k >> 27);
+               k *= 2685821657736338717ULL;
+
+               uint32_t jmax = _sso.current_shuffled_sons.size() - i;
+               uint32_t j = i + k % jmax;
+               std::swap(_sso.current_shuffled_sons[i],
+                         _sso.current_shuffled_sons[j]);
+            }
+         });
+      }
    }
 }
 
@@ -318,15 +321,23 @@ 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 flat_map<sidechain_type, uint32_t> schedule_needs_filled = [&gpo]()
+   {
+      flat_map<sidechain_type, uint32_t> schedule_needs_filled;
+      for(const auto& sidechain_active_sons : gpo.active_sons)
+      {
+         schedule_needs_filled[sidechain_active_sons.first] = sidechain_active_sons.second.size();
+      }
+      return schedule_needs_filled;
+   }();
+   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
@@ -340,43 +351,46 @@ void database::update_son_schedule(sidechain_type type, const signed_block& next
    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)
+   for(const auto& active_sidechain_type : active_sidechain_types(head_block_time()))
    {
-    _sso.slots_since_genesis += schedule_slot;
-    witness_scheduler_rng rng(_sso.rng_seed.data, _sso.slots_since_genesis);
+      const son_schedule_object& sidechain_sso = get(son_schedule_id_type(get_son_schedule_id(active_sidechain_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;
 
-    _sso.scheduler._min_token_count = std::max(int(gpo.active_sons.at(type).size()) / 2, 1);
+      modify(sidechain_sso, [&](son_schedule_object& _sso)
+      {
+       _sso.slots_since_genesis += schedule_slot;
+       witness_scheduler_rng rng(_sso.rng_seed.data, _sso.slots_since_genesis);
 
-    if( slot_is_near )
-    {
-       uint32_t drain = schedule_slot;
-       while( drain > 0 )
+       _sso.scheduler._min_token_count = std::max(int(gpo.active_sons.at(active_sidechain_type).size()) / 2, 1);
+
+       if( slot_is_near )
        {
-          if( _sso.scheduler.size() == 0 )
-             break;
-          _sso.scheduler.consume_schedule();
-          --drain;
+          uint32_t drain = schedule_slot;
+          while( drain > 0 )
+          {
+             if( _sso.scheduler.size() == 0 )
+                break;
+             _sso.scheduler.consume_schedule();
+             --drain;
+          }
        }
-    }
-    else
-    {
-       _sso.scheduler.reset_schedule( first_son );
-    }
-    while( !_sso.scheduler.get_slot(schedule_needs_filled, son_id) )
-    {
-       if( _sso.scheduler.produce_schedule(rng) & emit_turn )
-          memcpy(_sso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size());
-    }
-    _sso.last_scheduling_block = next_block.block_num();
-    _sso.recent_slots_filled = (
-                                     (_sso.recent_slots_filled << 1)
-                                     + 1) << (schedule_slot - 1);
-   });
+       else
+       {
+          _sso.scheduler.reset_schedule( first_son );
+       }
+       while( !_sso.scheduler.get_slot(schedule_needs_filled.at(active_sidechain_type), son_id) )
+       {
+          if( _sso.scheduler.produce_schedule(rng) & emit_turn )
+             memcpy(_sso.rng_seed.begin(), dpo.random.data(), dpo.random.data_size());
+       }
+       _sso.last_scheduling_block = next_block.block_num();
+       _sso.recent_slots_filled = (
+                                        (_sso.recent_slots_filled << 1)
+                                        + 1) << (schedule_slot - 1);
+      });
+   }
 
    auto end = fc::time_point::now();
    static uint64_t total_time = 0;

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/SON_FOR_ETHEREUM.hf

@@ -1,7 +1,7 @@
 #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"))
+#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-01-24T00:00:00"))
 #else
-#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-10-24T12:00:00"))
+#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-03-24T00:00:00"))
 #endif
 #endif

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

@@ -292,8 +292,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();
@@ -579,8 +579,7 @@ 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();
@@ -594,7 +593,6 @@ namespace graphene { namespace chain {
                                    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_worker_votes();
-         void hotfix_2024();
 
          public:
             double calculate_vesting_factor(const account_object& stake_account);

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

@@ -182,9 +182,6 @@ namespace graphene { namespace chain {
    GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( override_transfer );
    GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( not_permitted, override_transfer, 1, "not permitted" )
 
-   GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( blind_transfer );
-   GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( unknown_commitment, blind_transfer, 1, "Attempting to claim an unknown prior commitment" );
-
    /*
    FC_DECLARE_DERIVED_EXCEPTION( addition_overflow,                 graphene::chain::chain_exception, 30002, "addition overflow" )
    FC_DECLARE_DERIVED_EXCEPTION( subtraction_overflow,              graphene::chain::chain_exception, 30003, "subtraction overflow" )

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

@@ -43,18 +43,6 @@ namespace graphene { namespace chain {
          /// 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;
-         }
       };
 
 

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

@@ -158,7 +158,9 @@ struct transfer_to_blind_operation : public base_operation
    blind_factor_type     blinding_factor;
    vector<blind_output>  outputs;
 
-   account_id_type fee_payer()const { return from; }
+   account_id_type fee_payer()const { return account_id_type{}; }
+
+   //account_id_type fee_payer()const { return from; }
    //void            validate()const;
    //share_type      calculate_fee(const fee_parameters_type& )const;
 };
@@ -179,7 +181,9 @@ struct transfer_from_blind_operation : public base_operation
    blind_factor_type     blinding_factor;
    vector<blind_input>   inputs;
 
-   account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; }
+   account_id_type fee_payer()const { return account_id_type{}; }
+
+   //account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; }
    //void            validate()const;
    //void            get_required_authorities( vector<authority>& a )const
    //{
@@ -242,8 +246,10 @@ struct blind_transfer_operation : public base_operation
    vector<blind_input>   inputs;
    vector<blind_output>  outputs;
 
+   account_id_type fee_payer()const { return account_id_type{}; }
+
    /** graphene TEMP account */
-   account_id_type fee_payer()const { return GRAPHENE_TEMP_ACCOUNT; }
+   //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

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

@@ -36,15 +36,6 @@ namespace graphene { namespace chain {
             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/son_wallet_evaluator.cpp

@@ -97,18 +97,10 @@ 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>();
+   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();
+   const son_wallet_id_type son_wallet_id{ id };
    FC_ASSERT( idx.find(son_wallet_id) != idx.end() );
    //auto itr = idx.find(op.son_wallet_id);
    //FC_ASSERT( itr->addresses.find(op.sidechain) == itr->addresses.end() ||
@@ -118,18 +110,10 @@ 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>();
+   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();
+   const son_wallet_id_type son_wallet_id{ id };
    auto itr = idx.find(son_wallet_id);
    if (itr != idx.end())
    {

libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_transaction.cpp

@@ -152,7 +152,7 @@ void bitcoin_transaction_builder::add_in(payment_type type, tx_in txin, const by
       txin.scriptSig = script_code;
       break;
    default: {
-      if (txin.prevout.hash == fc::sha256("0000000000000000000000000000000000000000000000000000000000000000")) { // coinbase
+      if (txin.prevout.hash == fc::sha256("0000000000000000000000000000000000000000000000000000000000000000")) { //coinbase
          FC_ASSERT(script_code != bytes());
          txin.scriptSig = script_code;
       }

libraries/plugins/peerplays_sidechain/common/rpc_client.cpp

@@ -18,40 +18,10 @@
 
 namespace graphene { namespace peerplays_sidechain {
 
-struct rpc_reply {
-   uint16_t status;
-   std::string body;
-};
-
-class rpc_connection {
-public:
-   rpc_connection(const rpc_credentials &_credentials, bool _debug_rpc_calls);
-
-   std::string send_post_request(std::string method, std::string params, bool show_log);
-   std::string get_url() const;
-
-protected:
-   rpc_credentials credentials;
-   bool debug_rpc_calls;
-
-   std::string protocol;
-   std::string host;
-   std::string port;
-   std::string target;
-   std::string authorization;
-
-   uint32_t request_id;
-
-private:
-   rpc_reply send_post_request(std::string body, bool show_log);
-
-   boost::beast::net::io_context ioc;
-   boost::beast::net::ip::tcp::resolver resolver;
-   boost::asio::ip::basic_resolver_results<boost::asio::ip::tcp> results;
-};
-
-rpc_connection::rpc_connection(const rpc_credentials &_credentials, bool _debug_rpc_calls) :
-      credentials(_credentials),
+rpc_client::rpc_client(std::string _url, std::string _user, std::string _password, bool _debug_rpc_calls) :
+      url(_url),
+      user(_user),
+      password(_password),
       debug_rpc_calls(_debug_rpc_calls),
       request_id(0),
       resolver(ioc) {
@@ -61,7 +31,7 @@ rpc_connection::rpc_connection(const rpc_credentials &_credentials, bool _debug_
 
    boost::xpressive::smatch sm;
 
-   if (boost::xpressive::regex_search(credentials.url, sm, sr)) {
+   if (boost::xpressive::regex_search(url, sm, sr)) {
       protocol = sm["Protocol"];
       if (protocol.empty()) {
          protocol = "http";
@@ -82,19 +52,15 @@ rpc_connection::rpc_connection(const rpc_credentials &_credentials, bool _debug_
          target = "/";
       }
 
-      authorization = "Basic " + base64_encode(credentials.user + ":" + credentials.password);
+      authorization = "Basic " + base64_encode(user + ":" + password);
 
       results = resolver.resolve(host, port);
 
    } else {
-      elog("Invalid URL: ${url}", ("url", credentials.url));
+      elog("Invalid URL: ${url}", ("url", url));
    }
 }
 
-std::string rpc_connection::get_url() const {
-   return credentials.url;
-}
-
 std::string rpc_client::retrieve_array_value_from_reply(std::string reply_str, std::string array_path, uint32_t idx) {
    if (reply_str.empty()) {
       wlog("RPC call ${function}, empty reply string", ("function", __FUNCTION__));
@@ -159,7 +125,7 @@ std::string rpc_client::retrieve_value_from_reply(std::string reply_str, std::st
    return "";
 }
 
-std::string rpc_connection::send_post_request(std::string method, std::string params, bool show_log) {
+std::string rpc_client::send_post_request(std::string method, std::string params, bool show_log) {
    std::stringstream body;
 
    request_id = request_id + 1;
@@ -198,7 +164,7 @@ std::string rpc_connection::send_post_request(std::string method, std::string pa
    return "";
 }
 
-rpc_reply rpc_connection::send_post_request(std::string body, bool show_log) {
+rpc_reply rpc_client::send_post_request(std::string body, bool show_log) {
 
    // These object is used as a context for ssl connection
    boost::asio::ssl::context ctx(boost::asio::ssl::context::tlsv12_client);
@@ -273,7 +239,7 @@ rpc_reply rpc_connection::send_post_request(std::string body, bool show_log) {
    reply.body = rbody;
 
    if (show_log) {
-      ilog("### Request URL:    ${url}", ("url", credentials.url));
+      ilog("### Request URL:    ${url}", ("url", url));
       ilog("### Request:        ${body}", ("body", body));
       ilog("### Response:       ${rbody}", ("rbody", rbody));
    }
@@ -281,113 +247,4 @@ rpc_reply rpc_connection::send_post_request(std::string body, bool show_log) {
    return reply;
 }
 
-rpc_client::rpc_client(sidechain_type _sidechain, const std::vector<rpc_credentials> &_credentials, bool _debug_rpc_calls, bool _simulate_connection_reselection) :
-      sidechain(_sidechain),
-      debug_rpc_calls(_debug_rpc_calls),
-      simulate_connection_reselection(_simulate_connection_reselection) {
-   FC_ASSERT(_credentials.size());
-   for (size_t i = 0; i < _credentials.size(); i++)
-      connections.push_back(new rpc_connection(_credentials[i], _debug_rpc_calls));
-   n_active_conn = 0;
-   if (connections.size() > 1)
-      schedule_connection_selection();
-}
-
-void rpc_client::schedule_connection_selection() {
-   fc::time_point now = fc::time_point::now();
-   static const int64_t time_to_next_conn_selection = 10 * 1000 * 1000; // 10 sec
-   fc::time_point next_wakeup = now + fc::microseconds(time_to_next_conn_selection);
-   connection_selection_task = fc::schedule([this] {
-      select_connection();
-   },
-                                            next_wakeup, "SON RPC connection selection");
-}
-
-void rpc_client::select_connection() {
-   FC_ASSERT(connections.size() > 1);
-
-   const std::lock_guard<std::mutex> lock(conn_mutex);
-
-   static const int t_limit = 5 * 1000 * 1000, // 5 sec
-         quality_diff_threshold = 10 * 1000;   // 10 ms
-
-   int best_n = -1;
-   int best_quality = -1;
-
-   std::vector<uint64_t> head_block_numbers;
-   head_block_numbers.resize(connections.size());
-
-   std::vector<int> qualities;
-   qualities.resize(connections.size());
-
-   for (size_t n = 0; n < connections.size(); n++) {
-      rpc_connection &conn = *connections[n];
-      int quality = 0;
-      head_block_numbers[n] = std::numeric_limits<uint64_t>::max();
-
-      // ping n'th node
-      if (debug_rpc_calls)
-         ilog("### Ping ${sidechain} node #${n}, ${url}", ("sidechain", fc::reflector<sidechain_type>::to_string(sidechain))("n", n)("url", conn.get_url()));
-      fc::time_point t_sent = fc::time_point::now();
-      uint64_t head_block_number = ping(conn);
-      fc::time_point t_received = fc::time_point::now();
-      int t = (t_received - t_sent).count();
-
-      // evaluate n'th node reply quality and switch to it if it's better
-      if (head_block_number != std::numeric_limits<uint64_t>::max()) {
-         if (simulate_connection_reselection)
-            t += rand() % 10;
-         FC_ASSERT(t != -1);
-         head_block_numbers[n] = head_block_number;
-         if (t < t_limit)
-            quality = t_limit - t; // the less time, the higher quality
-
-         // look for the best quality
-         if (quality > best_quality) {
-            best_n = n;
-            best_quality = quality;
-         }
-      }
-      qualities[n] = quality;
-   }
-
-   FC_ASSERT(best_n != -1 && best_quality != -1);
-   if (best_n != n_active_conn) { // if the best client is not the current one, ...
-      uint64_t active_head_block_number = head_block_numbers[n_active_conn];
-      if ((active_head_block_number == std::numeric_limits<uint64_t>::max()      // ...and the current one has no known head block...
-           || head_block_numbers[best_n] >= active_head_block_number)            // ...or the best client's head is more recent than the current, ...
-          && best_quality > qualities[n_active_conn] + quality_diff_threshold) { // ...and the new client's quality exceeds current more than by threshold
-         n_active_conn = best_n;                                                 // ...then select new one
-         if (debug_rpc_calls)
-            ilog("### Reselected ${sidechain} node to #${n}, ${url}", ("sidechain", fc::reflector<sidechain_type>::to_string(sidechain))("n", n_active_conn)("url", connections[n_active_conn]->get_url()));
-      }
-   }
-
-   schedule_connection_selection();
-}
-
-rpc_connection &rpc_client::get_active_connection() const {
-   return *connections[n_active_conn];
-}
-
-std::string rpc_client::send_post_request(std::string method, std::string params, bool show_log) {
-   const std::lock_guard<std::mutex> lock(conn_mutex);
-   return send_post_request(get_active_connection(), method, params, show_log);
-}
-
-std::string rpc_client::send_post_request(rpc_connection &conn, std::string method, std::string params, bool show_log) {
-   return conn.send_post_request(method, params, show_log);
-}
-
-rpc_client::~rpc_client() {
-   try {
-      if (connection_selection_task.valid())
-         connection_selection_task.cancel_and_wait(__FUNCTION__);
-   } catch (fc::canceled_exception &) {
-      // Expected exception. Move along.
-   } catch (fc::exception &e) {
-      edump((e.to_detail_string()));
-   }
-}
-
 }} // namespace graphene::peerplays_sidechain

libraries/plugins/peerplays_sidechain/ethereum/encoders.cpp

@@ -137,9 +137,8 @@ std::string rlp_encoder::encode_length(int len, int offset) {
 
 std::string rlp_encoder::hex2bytes(const std::string &s) {
    std::string dest;
-   const auto s_final = s.size() % 2 == 0 ? s : "0" + s;
-   dest.resize(s_final.size() / 2);
-   hex2bin(s_final.c_str(), &dest[0]);
+   dest.resize(s.size() / 2);
+   hex2bin(s.c_str(), &dest[0]);
    return dest;
 }
 

libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/common/rpc_client.hpp

@@ -3,52 +3,44 @@
 #include <cstdint>
 #include <string>
 
-#include <fc/thread/future.hpp>
-#include <fc/thread/thread.hpp>
-
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/beast/core.hpp>
 
-#include <graphene/peerplays_sidechain/defs.hpp>
-
 namespace graphene { namespace peerplays_sidechain {
 
-class rpc_connection;
-
-struct rpc_credentials {
-   std::string url;
-   std::string user;
-   std::string password;
+struct rpc_reply {
+   uint16_t status;
+   std::string body;
 };
 
 class rpc_client {
 public:
-   const sidechain_type sidechain;
-
-   rpc_client(sidechain_type _sidechain, const std::vector<rpc_credentials> &_credentials, bool _debug_rpc_calls, bool _simulate_connection_reselection);
-   ~rpc_client();
+   rpc_client(std::string _url, std::string _user, std::string _password, bool _debug_rpc_calls);
 
 protected:
-   bool debug_rpc_calls;
-   bool simulate_connection_reselection;
+   std::string retrieve_array_value_from_reply(std::string reply_str, std::string array_path, uint32_t idx);
+   std::string retrieve_value_from_reply(std::string reply_str, std::string value_path);
    std::string send_post_request(std::string method, std::string params, bool show_log);
 
-   static std::string send_post_request(rpc_connection &conn, std::string method, std::string params, bool show_log);
+   std::string url;
+   std::string user;
+   std::string password;
+   bool debug_rpc_calls;
 
-   static std::string retrieve_array_value_from_reply(std::string reply_str, std::string array_path, uint32_t idx);
-   static std::string retrieve_value_from_reply(std::string reply_str, std::string value_path);
+   std::string protocol;
+   std::string host;
+   std::string port;
+   std::string target;
+   std::string authorization;
+
+   uint32_t request_id;
 
 private:
-   std::vector<rpc_connection *> connections;
-   int n_active_conn;
-   fc::future<void> connection_selection_task;
-   std::mutex conn_mutex;
+   rpc_reply send_post_request(std::string body, bool show_log);
 
-   rpc_connection &get_active_connection() const;
-
-   void select_connection();
-   void schedule_connection_selection();
-   virtual uint64_t ping(rpc_connection &conn) const = 0;
+   boost::beast::net::io_context ioc;
+   boost::beast::net::ip::tcp::resolver resolver;
+   boost::asio::ip::basic_resolver_results<boost::asio::ip::tcp> results;
 };
 
 }} // namespace graphene::peerplays_sidechain

libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/hive/types.hpp

@@ -22,15 +22,15 @@ typedef fc::ecc::private_key private_key_type;
 typedef fc::sha256 chain_id_type;
 typedef std::string account_name_type;
 typedef fc::ripemd160 block_id_type;
-// typedef fc::ripemd160 checksum_type;
+//typedef fc::ripemd160 checksum_type;
 typedef fc::ripemd160 transaction_id_type;
 typedef fc::sha256 digest_type;
 typedef fc::ecc::compact_signature signature_type;
 typedef fc::safe<int64_t> share_type;
-// typedef safe<uint64_t> ushare_type;
-// typedef uint16_t weight_type;
-// typedef uint32_t contribution_id_type;
-// typedef fixed_string<32> custom_id_type;
+//typedef safe<uint64_t> ushare_type;
+//typedef uint16_t weight_type;
+//typedef uint32_t contribution_id_type;
+//typedef fixed_string<32> custom_id_type;
 
 struct public_key_type {
 

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

@@ -16,10 +16,8 @@
 namespace graphene { namespace peerplays_sidechain {
 
 class sidechain_net_handler {
-protected:
-   sidechain_net_handler(sidechain_type _sidechain, peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options);
-
 public:
+   sidechain_net_handler(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options);
    virtual ~sidechain_net_handler();
 
    sidechain_type get_sidechain() const;
@@ -56,9 +54,9 @@ public:
    virtual optional<asset> estimate_withdrawal_transaction_fee() const = 0;
 
 protected:
-   const sidechain_type sidechain;
    peerplays_sidechain_plugin &plugin;
    graphene::chain::database &database;
+   sidechain_type sidechain;
 
    bool debug_rpc_calls;
    bool use_bitcoind_client;

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

@@ -98,7 +98,7 @@ protected:
 class bitcoin_rpc_client : public bitcoin_client_base, public rpc_client {
 public:
 public:
-   bitcoin_rpc_client(const std::vector<rpc_credentials> &_credentials, bool _debug_rpc_calls, bool _simulate_connection_reselection);
+   bitcoin_rpc_client(std::string _url, std::string _user, std::string _password, bool _debug_rpc_calls);
 
    uint64_t estimatesmartfee(uint16_t conf_target = 1);
    std::vector<info_for_vin> getblock(const block_data &block, int32_t verbosity = 2);
@@ -113,8 +113,6 @@ public:
    std::string walletlock();
    bool walletpassphrase(const std::string &passphrase, uint32_t timeout = 60);
 
-   virtual uint64_t ping(rpc_connection &conn) const override;
-
 private:
    std::string ip;
    std::string user;
@@ -215,11 +213,14 @@ public:
    virtual optional<asset> estimate_withdrawal_transaction_fee() const override;
 
 private:
-   std::vector<rpc_credentials> _rpc_credentials;
+   std::string bitcoin_node_ip;
    std::string libbitcoin_server_ip;
    uint32_t libbitcoin_block_zmq_port;
    uint32_t libbitcoin_trx_zmq_port;
    uint32_t bitcoin_node_zmq_port;
+   uint32_t rpc_port;
+   std::string rpc_user;
+   std::string rpc_password;
    std::string wallet_name;
    std::string wallet_password;
 

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

@@ -14,7 +14,7 @@ namespace graphene { namespace peerplays_sidechain {
 
 class ethereum_rpc_client : public rpc_client {
 public:
-   ethereum_rpc_client(const std::vector<rpc_credentials> &credentials, bool debug_rpc_calls, bool simulate_connection_reselection);
+   ethereum_rpc_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls);
 
    std::string eth_blockNumber();
    std::string eth_get_block_by_number(std::string block_number, bool full_block);
@@ -36,8 +36,6 @@ public:
    std::string eth_send_raw_transaction(const std::string &params);
    std::string eth_get_transaction_receipt(const std::string &params);
    std::string eth_get_transaction_by_hash(const std::string &params);
-
-   virtual uint64_t ping(rpc_connection &conn) const override;
 };
 
 class sidechain_net_handler_ethereum : public sidechain_net_handler {
@@ -56,9 +54,13 @@ public:
    virtual optional<asset> estimate_withdrawal_transaction_fee() const override;
 
 private:
-   std::vector<rpc_credentials> _rpc_credentials;
-   std::string wallet_contract_address;
    using bimap_type = boost::bimap<std::string, std::string>;
+
+private:
+   std::string rpc_url;
+   std::string rpc_user;
+   std::string rpc_password;
+   std::string wallet_contract_address;
    bimap_type erc20_addresses;
 
    ethereum_rpc_client *rpc_client;

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

@@ -13,7 +13,7 @@ namespace graphene { namespace peerplays_sidechain {
 
 class hive_rpc_client : public rpc_client {
 public:
-   hive_rpc_client(const std::vector<rpc_credentials> &credentials, bool debug_rpc_calls, bool simulate_connection_reselection);
+   hive_rpc_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls);
 
    std::string account_history_api_get_transaction(std::string transaction_id);
    std::string block_api_get_block(uint32_t block_number);
@@ -30,8 +30,6 @@ public:
    std::string get_head_block_time();
    std::string get_is_test_net();
    std::string get_last_irreversible_block_num();
-
-   virtual uint64_t ping(rpc_connection &conn) const override;
 };
 
 class sidechain_net_handler_hive : public sidechain_net_handler {
@@ -50,8 +48,9 @@ public:
    virtual optional<asset> estimate_withdrawal_transaction_fee() const override;
 
 private:
-   std::vector<rpc_credentials> _rpc_credentials;
-
+   std::string rpc_url;
+   std::string rpc_user;
+   std::string rpc_password;
    std::string wallet_account_name;
 
    hive_rpc_client *rpc_client;

libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp

@@ -100,7 +100,6 @@ private:
    uint16_t retries_threshold = 150;
 
    bool first_block_skipped;
-   bool son_processing_enabled;
    void on_applied_block(const signed_block &b);
 };
 
@@ -136,8 +135,7 @@ peerplays_sidechain_plugin_impl::peerplays_sidechain_plugin_impl(peerplays_sidec
          }
          return net_handlers;
       }()),
-      first_block_skipped(false),
-      son_processing_enabled(false) {
+      first_block_skipped(false) {
 }
 
 peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl() {
@@ -145,7 +143,7 @@ peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl() {
       if (_heartbeat_task.valid())
          _heartbeat_task.cancel_and_wait(__FUNCTION__);
    } catch (fc::canceled_exception &) {
-      // Expected exception. Move along.
+      //Expected exception. Move along.
    } catch (fc::exception &e) {
       edump((e.to_detail_string()));
    }
@@ -156,7 +154,7 @@ peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl() {
             _son_processing_task.at(active_sidechain_type).wait();
       }
    } catch (fc::canceled_exception &) {
-      // Expected exception. Move along.
+      //Expected exception. Move along.
    } catch (fc::exception &e) {
       edump((e.to_detail_string()));
    }
@@ -177,14 +175,13 @@ void peerplays_sidechain_plugin_impl::plugin_set_program_options(
    cli.add_options()("sidechain-retry-threshold", bpo::value<uint16_t>()->default_value(150), "Sidechain retry throttling threshold");
 
    cli.add_options()("debug-rpc-calls", bpo::value<bool>()->default_value(false), "Outputs RPC calls to console");
-   cli.add_options()("simulate-rpc-connection-reselection", bpo::value<bool>()->default_value(false), "Simulate RPC connection reselection by altering their response times by a random value");
 
    cli.add_options()("bitcoin-sidechain-enabled", bpo::value<bool>()->default_value(false), "Bitcoin sidechain handler enabled");
-   cli.add_options()("bitcoin-node-ip", bpo::value<vector<string>>()->composing()->multitoken()->DEFAULT_VALUE_VECTOR("127.0.0.1"), "IP address of Bitcoin node");
    cli.add_options()("use-bitcoind-client", bpo::value<bool>()->default_value(false), "Use bitcoind client instead of libbitcoin client");
    cli.add_options()("libbitcoin-server-ip", bpo::value<string>()->default_value("127.0.0.1"), "Libbitcoin server IP address");
    cli.add_options()("libbitcoin-server-block-zmq-port", bpo::value<uint32_t>()->default_value(9093), "Block ZMQ port of libbitcoin server");
    cli.add_options()("libbitcoin-server-trx-zmq-port", bpo::value<uint32_t>()->default_value(9094), "Trx ZMQ port of libbitcoin server");
+   cli.add_options()("bitcoin-node-ip", bpo::value<string>()->default_value("127.0.0.1"), "IP address of Bitcoin node");
    cli.add_options()("bitcoin-node-zmq-port", bpo::value<uint32_t>()->default_value(11111), "ZMQ port of Bitcoin node");
    cli.add_options()("bitcoin-node-rpc-port", bpo::value<uint32_t>()->default_value(8332), "RPC port of Bitcoin node");
    cli.add_options()("bitcoin-node-rpc-user", bpo::value<string>()->default_value("1"), "Bitcoin RPC user");
@@ -195,7 +192,7 @@ void peerplays_sidechain_plugin_impl::plugin_set_program_options(
                      "Tuple of [Bitcoin public key, Bitcoin private key] (may specify multiple times)");
 
    cli.add_options()("ethereum-sidechain-enabled", bpo::value<bool>()->default_value(false), "Ethereum sidechain handler enabled");
-   cli.add_options()("ethereum-node-rpc-url", bpo::value<vector<string>>()->composing()->multitoken()->DEFAULT_VALUE_VECTOR("127.0.0.1:8545"), "Ethereum node RPC URL [http[s]://]host[:port]");
+   cli.add_options()("ethereum-node-rpc-url", bpo::value<string>()->default_value("127.0.0.1:8545"), "Ethereum node RPC URL [http[s]://]host[:port]");
    cli.add_options()("ethereum-node-rpc-user", bpo::value<string>(), "Ethereum RPC user");
    cli.add_options()("ethereum-node-rpc-password", bpo::value<string>(), "Ethereum RPC password");
    cli.add_options()("ethereum-wallet-contract-address", bpo::value<string>(), "Ethereum wallet contract address");
@@ -205,7 +202,7 @@ void peerplays_sidechain_plugin_impl::plugin_set_program_options(
                      "Tuple of [Ethereum public key, Ethereum private key] (may specify multiple times)");
 
    cli.add_options()("hive-sidechain-enabled", bpo::value<bool>()->default_value(false), "Hive sidechain handler enabled");
-   cli.add_options()("hive-node-rpc-url", bpo::value<vector<string>>()->composing()->multitoken()->DEFAULT_VALUE_VECTOR("127.0.0.1:28090"), "Hive node RPC URL [http[s]://]host[:port]");
+   cli.add_options()("hive-node-rpc-url", bpo::value<string>()->default_value("127.0.0.1:28090"), "Hive node RPC URL [http[s]://]host[:port]");
    cli.add_options()("hive-node-rpc-user", bpo::value<string>(), "Hive node RPC user");
    cli.add_options()("hive-node-rpc-password", bpo::value<string>(), "Hive node RPC password");
    cli.add_options()("hive-wallet-account-name", bpo::value<string>(), "Hive wallet account name");
@@ -294,9 +291,6 @@ void peerplays_sidechain_plugin_impl::plugin_initialize(const boost::program_opt
    if (sidechain_enabled_peerplays && !config_ready_peerplays) {
       wlog("Haven't set up Peerplays sidechain parameters");
    }
-
-   if (options.at("simulate-rpc-connection-reselection").as<bool>())
-      ilog("### RPC connection reselection will be simulated");
 }
 
 void peerplays_sidechain_plugin_impl::plugin_startup() {
@@ -540,11 +534,11 @@ void peerplays_sidechain_plugin_impl::son_processing(sidechain_type sidechain) {
       return;
    }
 
-   // fc::time_point now_fine = fc::time_point::now();
-   // fc::time_point_sec now = now_fine + fc::microseconds(500000);
-   // if (plugin.database().get_slot_time(1) < now) {
-   //    return; // Not synced
-   // }
+   //fc::time_point now_fine = fc::time_point::now();
+   //fc::time_point_sec now = now_fine + fc::microseconds(500000);
+   //if (plugin.database().get_slot_time(1) < now) {
+   //   return; // Not synced
+   //}
 
    const fc::time_point now_fine = fc::time_point::now();
    const fc::time_point_sec now = now_fine - fc::milliseconds(3000);
@@ -873,16 +867,7 @@ void peerplays_sidechain_plugin_impl::settle_sidechain_transactions(sidechain_ty
 
 void peerplays_sidechain_plugin_impl::on_applied_block(const signed_block &b) {
    if (first_block_skipped) {
-      if (son_processing_enabled) {
-         schedule_son_processing();
-      } else {
-         const fc::time_point now_fine = fc::time_point::now();
-         const fc::time_point_sec now = now_fine + fc::microseconds(500000);
-         if (plugin.database().get_slot_time(1) >= now) {
-            son_processing_enabled = true;
-            schedule_son_processing();
-         }
-      }
+      schedule_son_processing();
    } else {
       first_block_skipped = true;
    }

libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp

@@ -9,8 +9,7 @@
 
 namespace graphene { namespace peerplays_sidechain {
 
-sidechain_net_handler::sidechain_net_handler(sidechain_type _sidechain, peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
-      sidechain(_sidechain),
+sidechain_net_handler::sidechain_net_handler(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
       plugin(_plugin),
       database(_plugin.database()) {
 
@@ -184,11 +183,11 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_
 
    bool enable_peerplays_asset_deposits = false;
 #ifdef ENABLE_PEERPLAYS_ASSET_DEPOSITS
-   // enable_peerplays_asset_deposits = (sed.sidechain == sidechain_type::peerplays) &&
-   //                                   (sed.sidechain_currency.compare("BTC") != 0) &&
-   //                                   (sed.sidechain_currency.compare("ETH") != 0) &&
-   //                                   (sed.sidechain_currency.compare("HBD") != 0) &&
-   //                                   (sed.sidechain_currency.compare("HIVE") != 0);
+   //enable_peerplays_asset_deposits = (sed.sidechain == sidechain_type::peerplays) &&
+   //                                  (sed.sidechain_currency.compare("BTC") != 0) &&
+   //                                  (sed.sidechain_currency.compare("ETH") != 0) &&
+   //                                  (sed.sidechain_currency.compare("HBD") != 0) &&
+   //                                  (sed.sidechain_currency.compare("HIVE") != 0);
 #endif
 
    const bool deposit_condition = (sed.peerplays_to == gpo.parameters.son_account()) &&
@@ -451,7 +450,7 @@ void sidechain_net_handler::process_deposits() {
       if (swdo.id == object_id_type(0, 0, 0) || !plugin.can_son_participate(sidechain, chain::operation::tag<chain::son_wallet_deposit_process_operation>::value, swdo.id)) {
          return;
       }
-      // Ignore the deposits which are not valid anymore, considered refunds.
+      //Ignore the deposits which are not valid anymore, considered refunds.
       const auto &sidechain_addresses_idx = database.get_index_type<sidechain_address_index>().indices().get<by_sidechain_and_deposit_address_and_expires>();
       const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(sidechain, swdo.sidechain_from, time_point_sec::maximum()));
       if (addr_itr == sidechain_addresses_idx.end()) {
@@ -680,7 +679,7 @@ void sidechain_net_handler::on_applied_block(const signed_block &b) {
             const bool is_tracked_asset =
                   ((sidechain == sidechain_type::bitcoin) && (transfer_op.amount.asset_id == gpo.parameters.btc_asset())) ||
                   ((sidechain == sidechain_type::ethereum) && (transfer_op.amount.asset_id == gpo.parameters.eth_asset())) ||
-                  ((sidechain == sidechain_type::ethereum) && (transfer_op.amount.asset_id != gpo.parameters.btc_asset()) && (transfer_op.amount.asset_id != gpo.parameters.hbd_asset()) && (transfer_op.amount.asset_id != gpo.parameters.hive_asset()) && (transfer_op.amount.asset_id != asset_id_type())) ||
+                  (sidechain == sidechain_type::ethereum) ||
                   ((sidechain == sidechain_type::hive) && (transfer_op.amount.asset_id == gpo.parameters.hbd_asset())) ||
                   ((sidechain == sidechain_type::hive) && (transfer_op.amount.asset_id == gpo.parameters.hive_asset()));
 

libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp

@@ -25,8 +25,8 @@ namespace graphene { namespace peerplays_sidechain {
 
 // =============================================================================
 
-bitcoin_rpc_client::bitcoin_rpc_client(const std::vector<rpc_credentials> &_credentials, bool _debug_rpc_calls, bool _simulate_connection_reselection) :
-      rpc_client(sidechain_type::bitcoin, _credentials, _debug_rpc_calls, _simulate_connection_reselection) {
+bitcoin_rpc_client::bitcoin_rpc_client(std::string _url, std::string _user, std::string _password, bool _debug_rpc_calls) :
+      rpc_client(_url, _user, _password, _debug_rpc_calls) {
 }
 
 uint64_t bitcoin_rpc_client::estimatesmartfee(uint16_t conf_target) {
@@ -498,13 +498,6 @@ std::string bitcoin_libbitcoin_client::sendrawtransaction(const std::string &tx_
    return res;
 }
 
-uint64_t bitcoin_rpc_client::ping(rpc_connection &conn) const {
-   std::string str = send_post_request(conn, "getblockcount", "[]", debug_rpc_calls);
-   if (str.length() > 0)
-      return std::stoll(str);
-   return std::numeric_limits<uint64_t>::max();
-}
-
 // =============================================================================
 
 zmq_listener::zmq_listener(std::string _ip, uint32_t _zmq_block_port, uint32_t _zmq_trx_port) :
@@ -662,18 +655,12 @@ void zmq_listener_libbitcoin::handle_block() {
 // =============================================================================
 
 sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
-      sidechain_net_handler(sidechain_type::bitcoin, _plugin, options) {
+      sidechain_net_handler(_plugin, options) {
+   sidechain = sidechain_type::bitcoin;
 
    if (options.count("debug-rpc-calls")) {
       debug_rpc_calls = options.at("debug-rpc-calls").as<bool>();
    }
-   bool simulate_connection_reselection = options.at("simulate-rpc-connection-reselection").as<bool>();
-
-   std::vector<std::string> ips = options.at("bitcoin-node-ip").as<std::vector<std::string>>();
-   bitcoin_node_zmq_port = options.at("bitcoin-node-zmq-port").as<uint32_t>();
-   uint32_t rpc_port = options.at("bitcoin-node-rpc-port").as<uint32_t>();
-   std::string rpc_user = options.at("bitcoin-node-rpc-user").as<std::string>();
-   std::string rpc_password = options.at("bitcoin-node-rpc-password").as<std::string>();
 
    if (options.count("use-bitcoind-client")) {
       use_bitcoind_client = options.at("use-bitcoind-client").as<bool>();
@@ -683,6 +670,11 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
    libbitcoin_block_zmq_port = options.at("libbitcoin-server-block-zmq-port").as<uint32_t>();
    libbitcoin_trx_zmq_port = options.at("libbitcoin-server-trx-zmq-port").as<uint32_t>();
 
+   bitcoin_node_ip = options.at("bitcoin-node-ip").as<std::string>();
+   bitcoin_node_zmq_port = options.at("bitcoin-node-zmq-port").as<uint32_t>();
+   rpc_port = options.at("bitcoin-node-rpc-port").as<uint32_t>();
+   rpc_user = options.at("bitcoin-node-rpc-user").as<std::string>();
+   rpc_password = options.at("bitcoin-node-rpc-password").as<std::string>();
    wallet_name = "";
    if (options.count("bitcoin-wallet-name")) {
       wallet_name = options.at("bitcoin-wallet-name").as<std::string>();
@@ -705,27 +697,17 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
    }
 
    if (use_bitcoind_client) {
-
-      for (size_t i = 0; i < ips.size(); i++) {
-         std::string ip = ips[i];
-         std::string url = ip + ":" + std::to_string(rpc_port);
-         if (!wallet_name.empty()) {
-            url = url + "/wallet/" + wallet_name;
-         }
-         rpc_credentials creds;
-         creds.url = url;
-         creds.user = rpc_user;
-         creds.password = rpc_password;
-         _rpc_credentials.push_back(creds);
+      std::string url = bitcoin_node_ip + ":" + std::to_string(rpc_port);
+      if (!wallet_name.empty()) {
+         url = url + "/wallet/" + wallet_name;
       }
-      FC_ASSERT(!_rpc_credentials.empty());
-
-      bitcoin_client = std::unique_ptr<bitcoin_rpc_client>(new bitcoin_rpc_client(_rpc_credentials, debug_rpc_calls, simulate_connection_reselection));
+      bitcoin_client = std::unique_ptr<bitcoin_rpc_client>(new bitcoin_rpc_client(url, rpc_user, rpc_password, debug_rpc_calls));
       if (!wallet_name.empty()) {
          bitcoin_client->loadwallet(wallet_name);
       }
 
-      listener = std::unique_ptr<zmq_listener>(new zmq_listener(ips[0], bitcoin_node_zmq_port));
+      listener = std::unique_ptr<zmq_listener>(new zmq_listener(bitcoin_node_ip, bitcoin_node_zmq_port));
+
    } else {
       bitcoin_client = std::unique_ptr<bitcoin_libbitcoin_client>(new bitcoin_libbitcoin_client(libbitcoin_server_ip));
 
@@ -745,6 +727,7 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
 
    bitcoin_client->getnetworkinfo();
 
+   listener->start();
    listener->block_event_received.connect([this](const block_data &block_event_data) {
       std::thread(&sidechain_net_handler_bitcoin::block_handle_event, this, block_event_data).detach();
    });
@@ -753,8 +736,6 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
       std::thread(&sidechain_net_handler_bitcoin::trx_handle_event, this, trx_event_data).detach();
    });
 
-   listener->start();
-
    database.changed_objects.connect([this](const vector<object_id_type> &ids, const flat_set<account_id_type> &accounts) {
       on_changed_objects(ids, accounts);
    });
@@ -774,7 +755,7 @@ sidechain_net_handler_bitcoin::~sidechain_net_handler_bitcoin() {
 
 bool sidechain_net_handler_bitcoin::process_proposal(const proposal_object &po) {
 
-   ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id(sidechain)));
+   // ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id(sidechain)));
 
    bool should_approve = false;
 
@@ -851,7 +832,7 @@ bool sidechain_net_handler_bitcoin::process_proposal(const proposal_object &po)
             std::string op_tx_str = op_obj_idx_1.get<sidechain_transaction_create_operation>().transaction;
 
             const auto &st_idx = database.get_index_type<sidechain_transaction_index>().indices().get<by_object_id>();
-            const auto st = st_idx.find(object_id);
+            const auto st = st_idx.find(obj_id);
             if (st == st_idx.end()) {
 
                std::string tx_str = "";
@@ -1071,10 +1052,6 @@ void sidechain_net_handler_bitcoin::process_primary_wallet() {
             return;
          }
 
-         if (!plugin.can_son_participate(sidechain, chain::operation::tag<chain::son_wallet_update_operation>::value, op_id)) {
-            return;
-         }
-
          const chain::global_property_object &gpo = database.get_global_properties();
 
          const auto &active_sons = gpo.active_sons.at(sidechain);

libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp

@@ -25,8 +25,8 @@
 
 namespace graphene { namespace peerplays_sidechain {
 
-ethereum_rpc_client::ethereum_rpc_client(const std::vector<rpc_credentials> &credentials, bool debug_rpc_calls, bool simulate_connection_reselection) :
-      rpc_client(sidechain_type::ethereum, credentials, debug_rpc_calls, simulate_connection_reselection) {
+ethereum_rpc_client::ethereum_rpc_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls) :
+      rpc_client(url, user_name, password, debug_rpc_calls) {
 }
 
 std::string ethereum_rpc_client::eth_blockNumber() {
@@ -126,29 +126,20 @@ std::string ethereum_rpc_client::eth_get_transaction_by_hash(const std::string &
    return send_post_request("eth_getTransactionByHash", "[\"" + params + "\"]", debug_rpc_calls);
 }
 
-uint64_t ethereum_rpc_client::ping(rpc_connection &conn) const {
-   std::string reply = send_post_request(conn, "eth_blockNumber", "", debug_rpc_calls);
-   if (!reply.empty())
-      return ethereum::from_hex<uint64_t>(retrieve_value_from_reply(reply, ""));
-   return std::numeric_limits<uint64_t>::max();
-}
-
 sidechain_net_handler_ethereum::sidechain_net_handler_ethereum(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
-      sidechain_net_handler(sidechain_type::ethereum, _plugin, options) {
+      sidechain_net_handler(_plugin, options) {
+   sidechain = sidechain_type::ethereum;
 
    if (options.count("debug-rpc-calls")) {
       debug_rpc_calls = options.at("debug-rpc-calls").as<bool>();
    }
-   bool simulate_connection_reselection = options.at("simulate-rpc-connection-reselection").as<bool>();
 
-   std::vector<std::string> rpc_urls = options.at("ethereum-node-rpc-url").as<std::vector<std::string>>();
-   std::string rpc_user;
+   rpc_url = options.at("ethereum-node-rpc-url").as<std::string>();
    if (options.count("ethereum-node-rpc-user")) {
       rpc_user = options.at("ethereum-node-rpc-user").as<std::string>();
    } else {
       rpc_user = "";
    }
-   std::string rpc_password;
    if (options.count("ethereum-node-rpc-password")) {
       rpc_password = options.at("ethereum-node-rpc-password").as<std::string>();
    } else {
@@ -184,27 +175,18 @@ sidechain_net_handler_ethereum::sidechain_net_handler_ethereum(peerplays_sidecha
       }
    }
 
-   for (size_t i = 0; i < rpc_urls.size(); i++) {
-      rpc_credentials creds;
-      creds.url = rpc_urls[i];
-      creds.user = rpc_user;
-      creds.password = rpc_password;
-      _rpc_credentials.push_back(creds);
-   }
-   FC_ASSERT(!_rpc_credentials.empty());
-
-   rpc_client = new ethereum_rpc_client(_rpc_credentials, debug_rpc_calls, simulate_connection_reselection);
+   rpc_client = new ethereum_rpc_client(rpc_url, rpc_user, rpc_password, debug_rpc_calls);
 
    const std::string chain_id_str = rpc_client->get_chain_id();
    if (chain_id_str.empty()) {
-      elog("No Ethereum node running at ${url}", ("url", _rpc_credentials[0].url));
+      elog("No Ethereum node running at ${url}", ("url", rpc_url));
       FC_ASSERT(false);
    }
    chain_id = std::stoll(chain_id_str);
 
    const std::string network_id_str = rpc_client->get_network_id();
    if (network_id_str.empty()) {
-      elog("No Ethereum node running at ${url}", ("url", _rpc_credentials[0].url));
+      elog("No Ethereum node running at ${url}", ("url", rpc_url));
       FC_ASSERT(false);
    }
    network_id = std::stoll(network_id_str);
@@ -223,7 +205,6 @@ sidechain_net_handler_ethereum::~sidechain_net_handler_ethereum() {
 }
 
 bool sidechain_net_handler_ethereum::process_proposal(const proposal_object &po) {
-
    ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id(sidechain)));
 
    bool should_approve = false;
@@ -282,7 +263,7 @@ bool sidechain_net_handler_ethereum::process_proposal(const proposal_object &po)
             const std::string op_tx_str = op_obj_idx_1.get<sidechain_transaction_create_operation>().transaction;
 
             const auto &st_idx = database.get_index_type<sidechain_transaction_index>().indices().get<by_object_id>();
-            const auto st = st_idx.find(object_id);
+            const auto st = st_idx.find(obj_id);
             if (st == st_idx.end()) {
 
                std::string tx_str = "";
@@ -684,18 +665,13 @@ std::string sidechain_net_handler_ethereum::send_sidechain_transaction(const sid
 
    const ethereum::signature_encoder encoder{function_signature};
 #ifdef SEND_RAW_TRANSACTION
-   const auto data = encoder.encode(transactions);
-   const std::string params = "[{\"from\":\"" + ethereum::add_0x(public_key) + "\", \"to\":\"" + wallet_contract_address + "\", \"data\":\"" + data + "\"}]";
-
    ethereum::raw_transaction raw_tr;
    raw_tr.nonce = rpc_client->get_nonce(ethereum::add_0x(public_key));
    raw_tr.gas_price = rpc_client->get_gas_price();
-   raw_tr.gas_limit = rpc_client->get_estimate_gas(params);
-   if (raw_tr.gas_limit.empty())
-      raw_tr.gas_limit = rpc_client->get_gas_limit();
+   raw_tr.gas_limit = rpc_client->get_gas_limit();
    raw_tr.to = wallet_contract_address;
    raw_tr.value = "";
-   raw_tr.data = data;
+   raw_tr.data = encoder.encode(transactions);
    raw_tr.chain_id = ethereum::add_0x(ethereum::to_hex(chain_id));
 
    const auto sign_tr = raw_tr.sign(get_private_key(public_key));
@@ -757,8 +733,8 @@ bool sidechain_net_handler_ethereum::settle_sidechain_transaction(const sidechai
       if ("0x1" == json_receipt.get<std::string>("result.status")) {
          count += 1;
          //! Fixme - compare data somehow?
-         // if( sto.transaction == entry_receipt.second.get<std::string>("data") ) {
-         // }
+         //if( sto.transaction == entry_receipt.second.get<std::string>("data") ) {
+         //}
       }
    }
 
@@ -809,7 +785,7 @@ optional<asset> sidechain_net_handler_ethereum::estimate_withdrawal_transaction_
    }
 
    const auto &public_key = son->sidechain_public_keys.at(sidechain);
-   const auto data = ethereum::withdrawal_encoder::encode(public_key, boost::multiprecision::uint256_t{1} * boost::multiprecision::uint256_t{10000000000}, "0");
+   const auto data = ethereum::withdrawal_encoder::encode(public_key, boost::multiprecision::uint256_t{1} * boost::multiprecision::uint256_t{10000000000}, son_wallet_withdraw_id_type{0}.operator object_id_type().operator std::string());
    const std::string params = "[{\"from\":\"" + ethereum::add_0x(public_key) + "\", \"to\":\"" + wallet_contract_address + "\", \"data\":\"" + data + "\"}]";
 
    const auto estimate_gas = ethereum::from_hex<int64_t>(rpc_client->get_estimate_gas(params));
@@ -914,9 +890,8 @@ void sidechain_net_handler_ethereum::handle_event(const std::string &block_numbe
          const boost::property_tree::ptree tx = tx_child.second;
          tx_idx = tx_idx + 1;
 
+         const std::string from = tx.get<std::string>("from");
          const std::string to = tx.get<std::string>("to");
-         std::string from = tx.get<std::string>("from");
-         std::transform(from.begin(), from.end(), from.begin(), ::tolower);
 
          std::string cmp_to = to;
          std::transform(cmp_to.begin(), cmp_to.end(), cmp_to.begin(), ::toupper);

libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp

@@ -30,8 +30,8 @@
 
 namespace graphene { namespace peerplays_sidechain {
 
-hive_rpc_client::hive_rpc_client(const std::vector<rpc_credentials> &credentials, bool debug_rpc_calls, bool simulate_connection_reselection) :
-      rpc_client(sidechain_type::hive, credentials, debug_rpc_calls, simulate_connection_reselection) {
+hive_rpc_client::hive_rpc_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls) :
+      rpc_client(url, user_name, password, debug_rpc_calls) {
 }
 
 std::string hive_rpc_client::account_history_api_get_transaction(std::string transaction_id) {
@@ -112,34 +112,20 @@ std::string hive_rpc_client::get_last_irreversible_block_num() {
    return retrieve_value_from_reply(reply_str, "last_irreversible_block_num");
 }
 
-uint64_t hive_rpc_client::ping(rpc_connection &conn) const {
-   const std::string reply = send_post_request(conn, "database_api.get_dynamic_global_properties", "", debug_rpc_calls);
-   if (!reply.empty()) {
-      std::stringstream ss(reply);
-      boost::property_tree::ptree json;
-      boost::property_tree::read_json(ss, json);
-      if (json.count("result"))
-         return json.get<uint64_t>("result.head_block_number");
-   }
-   return std::numeric_limits<uint64_t>::max();
-}
-
 sidechain_net_handler_hive::sidechain_net_handler_hive(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
-      sidechain_net_handler(sidechain_type::hive, _plugin, options) {
+      sidechain_net_handler(_plugin, options) {
+   sidechain = sidechain_type::hive;
 
    if (options.count("debug-rpc-calls")) {
       debug_rpc_calls = options.at("debug-rpc-calls").as<bool>();
    }
-   bool simulate_connection_reselection = options.at("simulate-rpc-connection-reselection").as<bool>();
 
-   std::vector<std::string> rpc_urls = options.at("hive-node-rpc-url").as<std::vector<std::string>>();
-   std::string rpc_user;
+   rpc_url = options.at("hive-node-rpc-url").as<std::string>();
    if (options.count("hive-rpc-user")) {
       rpc_user = options.at("hive-rpc-user").as<std::string>();
    } else {
       rpc_user = "";
    }
-   std::string rpc_password;
    if (options.count("hive-rpc-password")) {
       rpc_password = options.at("hive-rpc-password").as<std::string>();
    } else {
@@ -160,20 +146,11 @@ sidechain_net_handler_hive::sidechain_net_handler_hive(peerplays_sidechain_plugi
       }
    }
 
-   for (size_t i = 0; i < rpc_urls.size(); i++) {
-      rpc_credentials creds;
-      creds.url = rpc_urls[i];
-      creds.user = rpc_user;
-      creds.password = rpc_password;
-      _rpc_credentials.push_back(creds);
-   }
-   FC_ASSERT(!_rpc_credentials.empty());
-
-   rpc_client = new hive_rpc_client(_rpc_credentials, debug_rpc_calls, simulate_connection_reselection);
+   rpc_client = new hive_rpc_client(rpc_url, rpc_user, rpc_password, debug_rpc_calls);
 
    const std::string chain_id_str = rpc_client->get_chain_id();
    if (chain_id_str.empty()) {
-      elog("No Hive node running at ${url}", ("url", _rpc_credentials[0].url));
+      elog("No Hive node running at ${url}", ("url", rpc_url));
       FC_ASSERT(false);
    }
    chain_id = chain_id_type(chain_id_str);
@@ -203,8 +180,7 @@ sidechain_net_handler_hive::~sidechain_net_handler_hive() {
 }
 
 bool sidechain_net_handler_hive::process_proposal(const proposal_object &po) {
-
-   ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id(sidechain)));
+   //ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id(sidechain)));
 
    bool should_approve = false;
 
@@ -262,7 +238,7 @@ bool sidechain_net_handler_hive::process_proposal(const proposal_object &po) {
             std::string op_tx_str = op_obj_idx_1.get<sidechain_transaction_create_operation>().transaction;
 
             const auto &st_idx = database.get_index_type<sidechain_transaction_index>().indices().get<by_object_id>();
-            const auto st = st_idx.find(object_id);
+            const auto st = st_idx.find(obj_id);
             if (st == st_idx.end()) {
 
                std::string tx_str = "";
@@ -523,10 +499,6 @@ void sidechain_net_handler_hive::process_primary_wallet() {
             return;
          }
 
-         if (!plugin.can_son_participate(sidechain, chain::operation::tag<chain::son_wallet_update_operation>::value, op_id)) {
-            return;
-         }
-
          const chain::global_property_object &gpo = database.get_global_properties();
 
          const auto &active_sons = gpo.active_sons.at(sidechain);
@@ -605,7 +577,7 @@ void sidechain_net_handler_hive::process_primary_wallet() {
          stc_op.object_id = op_id;
          stc_op.sidechain = sidechain;
          stc_op.transaction = tx_str;
-         for (const auto &signer : signers) {
+         for (const auto &signer : gpo.active_sons.at(sidechain)) {
             son_info si;
             si.son_id = signer.son_id;
             si.weight = signer.weight;
@@ -667,11 +639,6 @@ void sidechain_net_handler_hive::process_sidechain_addresses() {
 }
 
 bool sidechain_net_handler_hive::process_deposit(const son_wallet_deposit_object &swdo) {
-
-   if (proposal_exists(chain::operation::tag<chain::son_wallet_deposit_process_operation>::value, swdo.id)) {
-      return false;
-   }
-
    const chain::global_property_object &gpo = database.get_global_properties();
 
    price asset_price;
@@ -718,11 +685,6 @@ bool sidechain_net_handler_hive::process_deposit(const son_wallet_deposit_object
 }
 
 bool sidechain_net_handler_hive::process_withdrawal(const son_wallet_withdraw_object &swwo) {
-
-   if (proposal_exists(chain::operation::tag<chain::son_wallet_withdraw_process_operation>::value, swwo.id)) {
-      return false;
-   }
-
    const chain::global_property_object &gpo = database.get_global_properties();
 
    //=====
@@ -858,14 +820,14 @@ bool sidechain_net_handler_hive::settle_sidechain_transaction(const sidechain_tr
       boost::property_tree::ptree tx_json;
       boost::property_tree::read_json(ss_tx, tx_json);
 
-      // const chain::global_property_object &gpo = database.get_global_properties();
+      //const chain::global_property_object &gpo = database.get_global_properties();
 
       std::string tx_txid = tx_json.get<std::string>("result.transaction_id");
       uint32_t tx_block_num = tx_json.get<uint32_t>("result.block_num");
       const uint32_t last_irreversible_block = std::stoul(rpc_client->get_last_irreversible_block_num());
 
-      // std::string tx_address = addr.get_address();
-      // int64_t tx_amount = -1;
+      //std::string tx_address = addr.get_address();
+      //int64_t tx_amount = -1;
 
       if (tx_block_num <= last_irreversible_block) {
          if (sto.object_id.is<son_wallet_withdraw_id_type>()) {
@@ -918,15 +880,15 @@ void sidechain_net_handler_hive::hive_listener_loop() {
       }
    }
 
-   // std::string reply = rpc_client->get_last_irreversible_block_num();
-   // if (!reply.empty()) {
-   //    uint64_t last_irreversible_block = std::stoul(reply);
-   //    if (last_irreversible_block != last_block_received) {
-   //       std::string event_data = std::to_string(last_irreversible_block);
-   //       handle_event(event_data);
-   //       last_block_received = last_irreversible_block;
-   //    }
-   // }
+   //std::string reply = rpc_client->get_last_irreversible_block_num();
+   //if (!reply.empty()) {
+   //   uint64_t last_irreversible_block = std::stoul(reply);
+   //   if (last_irreversible_block != last_block_received) {
+   //      std::string event_data = std::to_string(last_irreversible_block);
+   //      handle_event(event_data);
+   //      last_block_received = last_irreversible_block;
+   //   }
+   //}
 }
 
 void sidechain_net_handler_hive::handle_event(const std::string &event_data) {
@@ -960,7 +922,7 @@ void sidechain_net_handler_hive::handle_event(const std::string &event_data) {
                   const auto &amount_child = op_value.get_child("amount");
 
                   uint64_t amount = amount_child.get<uint64_t>("amount");
-                  // uint64_t precision = amount_child.get<uint64_t>("precision");
+                  //uint64_t precision = amount_child.get<uint64_t>("precision");
                   std::string nai = amount_child.get<std::string>("nai");
                   std::string sidechain_currency = "";
                   price sidechain_currency_price = {};

libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp

@@ -23,16 +23,17 @@
 namespace graphene { namespace peerplays_sidechain {
 
 sidechain_net_handler_peerplays::sidechain_net_handler_peerplays(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
-      sidechain_net_handler(sidechain_type::peerplays, _plugin, options) {
-   // const auto &assets_by_symbol = database.get_index_type<asset_index>().indices().get<by_symbol>();
-   // const auto get_asset_id = [&assets_by_symbol](const string &symbol) {
-   //    auto asset_itr = assets_by_symbol.find(symbol);
-   //    FC_ASSERT(asset_itr != assets_by_symbol.end(), "Unable to find asset '${sym}'", ("sym", symbol));
-   //    return asset_itr->get_id();
-   // };
-   // tracked_assets.push_back(get_asset_id("PBTC"));
-   // tracked_assets.push_back(get_asset_id("PETH"));
-   // tracked_assets.push_back(get_asset_id("PEOS"));
+      sidechain_net_handler(_plugin, options) {
+   sidechain = sidechain_type::peerplays;
+   //const auto &assets_by_symbol = database.get_index_type<asset_index>().indices().get<by_symbol>();
+   //const auto get_asset_id = [&assets_by_symbol](const string &symbol) {
+   //   auto asset_itr = assets_by_symbol.find(symbol);
+   //   FC_ASSERT(asset_itr != assets_by_symbol.end(), "Unable to find asset '${sym}'", ("sym", symbol));
+   //   return asset_itr->get_id();
+   //};
+   //tracked_assets.push_back(get_asset_id("PBTC"));
+   //tracked_assets.push_back(get_asset_id("PETH"));
+   //tracked_assets.push_back(get_asset_id("PEOS"));
 
    if (options.count("peerplays-private-key")) {
       const std::vector<std::string> pub_priv_keys = options["peerplays-private-key"].as<std::vector<std::string>>();
@@ -284,8 +285,8 @@ bool sidechain_net_handler_peerplays::settle_sidechain_transaction(const sidecha
    }
 
    if (sto.object_id.is<son_wallet_deposit_id_type>()) {
-      // auto swdo = database.get<son_wallet_deposit_object>(sto.object_id);
-      // settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency);
+      //auto swdo = database.get<son_wallet_deposit_object>(sto.object_id);
+      //settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency);
    }
 
    if (sto.object_id.is<son_wallet_withdraw_id_type>()) {

libraries/wallet/wallet.cpp

@@ -2773,21 +2773,12 @@ public:
       FC_ASSERT(son_obj, "Account ${son} is not registered as a son", ("son", son));
       FC_ASSERT(sidechain == sidechain_type::bitcoin || sidechain == sidechain_type::hive || sidechain == sidechain_type::ethereum, "Unexpected sidechain type");
 
-      bool update_vote_time = false;
       if (approve)
       {
          FC_ASSERT(son_obj->get_sidechain_vote_id(sidechain).valid(), "Invalid vote id, sidechain: ${sidechain}, son: ${son}", ("sidechain", sidechain)("son", *son_obj));
-         account_id_type stake_account = get_account_id(voting_account);
-         const auto gpos_info = _remote_db->get_gpos_info(stake_account);
-         const auto vesting_subperiod = _remote_db->get_global_properties().parameters.gpos_subperiod();
-         const auto gpos_start_time = fc::time_point_sec(_remote_db->get_global_properties().parameters.gpos_period_start());
-         const auto subperiod_start_time = gpos_start_time.sec_since_epoch() + (gpos_info.current_subperiod - 1) * vesting_subperiod;
-
          auto insert_result = voting_account_object.options.votes.insert(*son_obj->get_sidechain_vote_id(sidechain));
-         if (!insert_result.second && (gpos_info.last_voted_time.sec_since_epoch() >= subperiod_start_time))
-            FC_THROW("Account ${account} was already voting for son ${son} in the current GPOS sub-period", ("account", voting_account)("son", son));
-         else
-            update_vote_time = true;   //Allow user to vote in each sub-period(Update voting time, which is reference in calculating VF)
+         if (!insert_result.second)
+            FC_THROW("Account ${account} has already voted for son ${son} for sidechain ${sidechain}", ("account", voting_account)("son", son)("sidechain", sidechain));
       }
       else
       {
@@ -2796,11 +2787,9 @@ public:
          if (!votes_removed)
             FC_THROW("Account ${account} has already unvoted for son ${son} for sidechain ${sidechain}", ("account", voting_account)("son", son)("sidechain", sidechain));
       }
-      
       account_update_operation account_update_op;
       account_update_op.account = voting_account_object.id;
       account_update_op.new_options = voting_account_object.options;
-      account_update_op.extensions.value.update_last_voting_time = update_vote_time;
 
       signed_transaction tx;
       tx.operations.push_back( account_update_op );
@@ -2849,8 +2838,24 @@ public:
          if (!votes_removed)
             FC_THROW("Account ${account} is already not voting for SON ${son}", ("account", voting_account)("son", son));
       }
+      auto active_sidechains = active_sidechain_types(time_point::now());
+      auto num_son_map = *voting_account_object.options.extensions.value.num_son;
+
+      if ( num_son_map.size() != active_sidechains.size())
+      {
+         for (const auto& num_sidechain_son : num_son_map)
+         {
+            FC_ASSERT(active_sidechains.find(num_sidechain_son.first) != active_sidechains.end());
+            active_sidechains.erase(num_sidechain_son.first);
+         }
+
+         for (auto missing_num_son : active_sidechains)
+         {
+            num_son_map[missing_num_son] = 0;
+         }
+      }
       FC_ASSERT( voting_account_object.options.extensions.value.num_son.valid() , "Invalid son number" );
-      (*voting_account_object.options.extensions.value.num_son)[sidechain] = desired_number_of_sons;
+      num_son_map[sidechain] = desired_number_of_sons;
 
       account_update_operation account_update_op;
       account_update_op.account = voting_account_object.id;

tests/cli/son.cpp

@@ -40,7 +40,7 @@ public:
     {
         fixture_.init_nathan();
         fixture_.generate_blocks(HARDFORK_SON_FOR_ETHEREUM_TIME);
-        fixture_.generate_maintenance_block();
+        fixture_.generate_block();
     }
 
     void create_son(const std::string& account_name, const std::string& son_url,
@@ -740,19 +740,6 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test )
                                                              sidechain_type::ethereum, 0, true);
       BOOST_CHECK(generate_maintenance_block());
 
-      // Vote for less SONs than num_son (2 votes, but num_son is 3)
-      accepted.clear();
-      rejected.clear();
-      accepted.push_back("son1account");
-      accepted.push_back("son2account");
-      BOOST_CHECK_THROW(update_votes_tx = con.wallet_api_ptr->update_son_votes("nathan", accepted, rejected,
-                                                                               sidechain_type::bitcoin, 3, true), fc::exception);
-      BOOST_CHECK_THROW(update_votes_tx = con.wallet_api_ptr->update_son_votes("nathan", accepted, rejected,
-                                                                               sidechain_type::hive, 3, true), fc::exception);
-      BOOST_CHECK_THROW(update_votes_tx = con.wallet_api_ptr->update_son_votes("nathan", accepted, rejected,
-                                                                               sidechain_type::ethereum, 3, true), fc::exception);
-      generate_block();
-
       // Verify the votes
       son1_obj = con.wallet_api_ptr->get_son("son1account");
       son1_end_votes = son1_obj.total_votes;

tests/tests/nft_lottery_tests.cpp

@@ -193,34 +193,6 @@ BOOST_AUTO_TEST_CASE(tickets_purchase_fail_test)
     }
 }
 
-BOOST_AUTO_TEST_CASE(tickets_purchase_overflow)
-{
-   try
-   {
-      nft_metadata_id_type test_nft_md_id = db.get_index<nft_metadata_object>().get_next_id();
-      INVOKE(create_lottery_nft_md_test);
-      auto &test_nft_md_obj = test_nft_md_id(db);
-
-      nft_lottery_token_purchase_operation tpo;
-      tpo.fee = asset();
-      tpo.buyer = account_id_type();
-      tpo.lottery_id = test_nft_md_obj.id;
-      tpo.tickets_to_buy = 9223372036854775800; // Large number so that the overall amount overflows
-      trx.operations.push_back(tpo);
-      BOOST_REQUIRE_THROW(PUSH_TX(db, trx, ~0), fc::overflow_exception);
-      trx.operations.clear();
-
-      tpo.tickets_to_buy = -2; // Negative value should also be rejected
-      trx.operations.push_back(tpo);
-      BOOST_REQUIRE_THROW(PUSH_TX(db, trx, ~0), fc::exception);
-   }
-   catch (fc::exception &e)
-   {
-      edump((e.to_detail_string()));
-      throw;
-   }
-}
-
 BOOST_AUTO_TEST_CASE(lottery_end_by_stage_test)
 {
     try

tests/tests/son_operations_tests.cpp

@@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE( son_pay_test )
       BOOST_REQUIRE_EQUAL(son_stats_obj2->total_sidechain_txs_reported.at(sidechain_type::hive), 12);
       BOOST_REQUIRE_EQUAL(son_stats_obj2->total_sidechain_txs_reported.at(sidechain_type::ethereum), 18);
       // Check that Alice and Bob are paid for signing the transactions in the previous day/cycle
-      BOOST_REQUIRE_EQUAL(db.get_balance(obj1->son_account, asset_id_type()).amount.value, 79+obj1_balance);
+      BOOST_REQUIRE_EQUAL(db.get_balance(obj1->son_account, asset_id_type()).amount.value, 80+obj1_balance);
       BOOST_REQUIRE_EQUAL(db.get_balance(obj2->son_account, asset_id_type()).amount.value, 120+obj2_balance);
       // Check the SON Budget is again allocated after maintenance
       BOOST_CHECK( dpo.son_budget.value == 200);