bitshares · cogutvalera · Jan 5, 2018 · Apr 26, 2018 · Apr 26, 2018 · May 29, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,19 @@ sudo: true
 install:
  - echo "deb http://de.archive.ubuntu.com/ubuntu xenial main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
  - sudo apt-get update
- - sudo apt-get install --allow-unauthenticated g++ libboost-all-dev cmake libreadline-dev libssl-dev autoconf
+ - sudo apt-get install --allow-unauthenticated g++ libboost-all-dev cmake libreadline-dev libssl-dev autoconf parallel
+
+addons:
+  sonarcloud:
+    organization: "flwyiq7go36p6lipr64tbesy5jayad3q"
+    token:
+      secure: "Ik4xQhs9imtsFIC1SMAPmdLId9lVadY/4PEgo5tM4M5cQRvyt4xeuMMV+CRIT6tGEEqF71ea74qVJTxT7qinWZ3kmHliFjbqDxk1FbjCpK6NGQDyTdfWMVJFIlk7WefvtGAwFBkf6pSTs553bKNNM0HbBYQGKe08waLwv7R+lOmVjTTKIRF/cCVw+C5QQZdXFnUMTg+mRuUqGk4WvNNPmcBfkX0ekHPrXwAD5ATVS1q0iloA0nzHq8CPNmPE+IyXdPw0EBp+fl3cL9MgrlwRbELxrnCKFy+ObdjhDj7z3FDIxDe+03gVlgd+6Fame+9EJCeeeNLF4G4qNR1sLEvHRqVz12/NYnRU9hQL0c/jJtiUquOJA5+HqrhhB9XUZjS1xbHV3aIU5PR0bdDP6MKatvIVwRhwxwhaDXh7VSimis8eL+LvXT7EO+rGjco0c17RuzZpFCsKmXCej4Q8iDBMdOIWwe2WuWi8zb6MFvnLyK2EcM53hAn2yMwU+nprbpHwzU5oJTFZLD+J78zCSGk7uu7vsF+EEnheMwfqafP9MpMEXGXaXZiq7QKy3KvxQTg+1ozPIu+fgxvY0xdyrjJHOSJlrvXN7osjD4IDTs6D5cLAZ04WGIKsulZDr7ZN5n3gmA9h4cfhJsIEia0uQzLmWnfF6RksxWElK1i1+xmse7E="
 
 script:
- - cmake -DCMAKE_BUILD_TYPE=Debug -DBoost_USE_STATIC_LIBS=OFF .
- - make -j 2
-
+ - sed -i '/tests/d' libraries/fc/CMakeLists.txt
+ - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF  -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON .
+ - 'which build-wrapper-linux-x86-64 && build-wrapper-linux-x86-64 --out-dir bw-output make -j 2 cli_wallet witness_node chain_test || make -j 2 cli_wallet witness_node chain_test'
+ - set -o pipefail
+ - tests/chain_test 2>&1 | cat
+ - 'find libraries/[acdenptuw]*/CMakeFiles/*.dir programs/[cdgjsw]*/CMakeFiles/*.dir -type d | while read d; do gcov -o "$d" "${d/CMakeFiles*.dir//}"/*.cpp; done >/dev/null'
+ - 'which sonar-scanner && sonar-scanner || true'
diff --git a/Dockerfile b/Dockerfile
@@ -67,5 +67,8 @@ ADD docker/default_config.ini /etc/bitshares/config.ini
 ADD docker/bitsharesentry.sh /usr/local/bin/bitsharesentry.sh
 RUN chmod a+x /usr/local/bin/bitsharesentry.sh
 
+# Make Docker send SIGINT instead of SIGTERM to the daemon
+STOPSIGNAL SIGINT
+
 # default execute entry
-CMD /usr/local/bin/bitsharesentry.sh
+CMD ["/usr/local/bin/bitsharesentry.sh"]
diff --git a/Doxyfile b/Doxyfile
@@ -38,13 +38,13 @@ PROJECT_NAME           = "Bitshares-Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2.0.180202"
+PROJECT_NUMBER         = "2.0.180612"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Your share in the Decentralized Exchange"
+PROJECT_BRIEF          = "BitShares blockchain implementation and command-line interface software"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Getting Started
 Build instructions and additional documentation are available in the
 [wiki](https://github.com/bitshares/bitshares-core/wiki).
 
-We recommend building on Ubuntu 16.04 LTS, and the build dependencies may be installed with:
+We recommend building on Ubuntu 16.04 LTS (64-bit), and the build dependencies may be installed with:
 
     sudo apt-get update
     sudo apt-get install autoconf cmake git libboost-all-dev libssl-dev g++ libcurl4-openssl-dev
@@ -51,10 +51,12 @@ To build after all dependencies are installed:
 
 **NOTE:** BitShares requires an [OpenSSL](https://www.openssl.org/) version in the 1.0.x series. OpenSSL 1.1.0 and newer are NOT supported. If your system OpenSSL version is newer, then you will need to manually provide an older version of OpenSSL and specify it to CMake using `-DOPENSSL_INCLUDE_DIR`, `-DOPENSSL_SSL_LIBRARY`, and `-DOPENSSL_CRYPTO_LIBRARY`.
 
-**NOTE:** BitShares requires a [Boost](http://www.boost.org/) version in the range [1.57, 1.63]. Versions earlier than
-1.57 or newer than 1.63 are NOT supported. If your system Boost version is newer, then you will need to manually build
+**NOTE:** BitShares requires a [Boost](http://www.boost.org/) version in the range [1.57, 1.65]. Versions earlier than
+1.57 or newer than 1.65 are NOT supported. If your system Boost version is newer, then you will need to manually build
 an older version of Boost and specify it to CMake using `DBOOST_ROOT`.
 
+**NOTE:** BitShares requires a 64-bit operating system to build, and will not build on a 32-bit OS.
+
 After building, the witness node can be launched with:
 
     ./programs/witness_node/witness_node

diff --git a/docker/bitsharesentry.sh b/docker/bitsharesentry.sh
@@ -81,7 +81,7 @@ ln -f -s /etc/bitshares/config.ini /var/lib/bitshares
 # Plugins need to be provided in a space-separated list, which
 # makes it necessary to write it like this
 if [[ ! -z "$BITSHARESD_PLUGINS" ]]; then
-   $BITSHARESD --data-dir ${HOME} ${ARGS} ${BITSHARESD_ARGS} --plugins "${BITSHARESD_PLUGINS}"
+   exec $BITSHARESD --data-dir ${HOME} ${ARGS} ${BITSHARESD_ARGS} --plugins "${BITSHARESD_PLUGINS}"
 else
-   $BITSHARESD --data-dir ${HOME} ${ARGS} ${BITSHARESD_ARGS}
+   exec $BITSHARESD --data-dir ${HOME} ${ARGS} ${BITSHARESD_ARGS}
 fi
diff --git a/docker/default_config.ini b/docker/default_config.ini
@@ -1,5 +1,5 @@
 # Endpoint for P2P node to listen on
-p2p-endpoint = 0.0.0.0:9090
+p2p-endpoint = 0.0.0.0:2001
 
 # P2P nodes to connect to on startup (may specify multiple times)
 # seed-node = 

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_subdirectory( fc )
 add_subdirectory( db )
-add_subdirectory( deterministic_openssl_rand )
 add_subdirectory( chain )
 add_subdirectory( egenesis )
 add_subdirectory( net )

diff --git a/libraries/app/CMakeLists.txt b/libraries/app/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library( graphene_app
              application.cpp
              util.cpp
              database_api.cpp
-             impacted.cpp
              plugin.cpp
              ${HEADERS}
              ${EGENESIS_HEADERS}

diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp
@@ -26,7 +26,6 @@
 #include <graphene/app/api.hpp>
 #include <graphene/app/api_access.hpp>
 #include <graphene/app/application.hpp>
-#include <graphene/app/impacted.hpp>
 #include <graphene/chain/database.hpp>
 #include <graphene/chain/get_config.hpp>
 #include <graphene/utilities/key_conversion.hpp>
@@ -309,7 +308,7 @@ namespace graphene { namespace app {
        return result;
     }
 
-    vector<operation_history_object> history_api::get_account_history( account_id_type account,
+    vector<operation_history_object> history_api::get_account_history( const std::string account_id_or_name,
                                                                        operation_history_id_type stop,
                                                                        unsigned limit,
                                                                        operation_history_id_type start ) const
@@ -318,7 +317,9 @@ namespace graphene { namespace app {
        const auto& db = *_app.chain_database();
        FC_ASSERT( limit <= 100 );
        vector<operation_history_object> result;
+       account_id_type account;
        try {
+          account = database_api.get_account_id_from_string(account_id_or_name);
           const account_transaction_history_object& node = account(db).statistics(db).most_recent_op(db);
           if(start == operation_history_id_type() || start.instance.value > node.operation_id.instance.value)
              start = node.operation_id;
@@ -342,7 +343,7 @@ namespace graphene { namespace app {
        return result;
     }
 
-    vector<operation_history_object> history_api::get_account_history_operations( account_id_type account,
+    vector<operation_history_object> history_api::get_account_history_operations( const std::string account_id_or_name,
                                                                        int operation_id,
                                                                        operation_history_id_type start,
                                                                        operation_history_id_type stop,
@@ -352,6 +353,10 @@ namespace graphene { namespace app {
        const auto& db = *_app.chain_database();
        FC_ASSERT( limit <= 100 );
        vector<operation_history_object> result;
+       account_id_type account;
+       try {
+          account = database_api.get_account_id_from_string(account_id_or_name);
+       } catch(...) { return result; }
        const auto& stats = account(db).statistics(db);
        if( stats.most_recent_op == account_transaction_history_id_type() ) return result;
        const account_transaction_history_object* node = &stats.most_recent_op(db);
@@ -378,7 +383,7 @@ namespace graphene { namespace app {
     }
 
 
-    vector<operation_history_object> history_api::get_relative_account_history( account_id_type account,
+    vector<operation_history_object> history_api::get_relative_account_history( const std::string account_id_or_name,
                                                                                 uint32_t stop,
                                                                                 unsigned limit,
                                                                                 uint32_t start) const
@@ -387,13 +392,16 @@ namespace graphene { namespace app {
        const auto& db = *_app.chain_database();
        FC_ASSERT(limit <= 100);
        vector<operation_history_object> result;
+       account_id_type account;
+       try {
+          account = database_api.get_account_id_from_string(account_id_or_name);
+       } catch(...) { return result; }
        const auto& stats = account(db).statistics(db);
        if( start == 0 )
           start = stats.total_ops;
        else
           start = min( stats.total_ops, start );
 
-
        if( start >= stop && start > stats.removed_ops && limit > 0 )
        {
           const auto& hist_idx = db.get_index_type<account_transaction_history_index>();
@@ -419,12 +427,12 @@ namespace graphene { namespace app {
        return hist->tracked_buckets();
     }
 
-    history_operation_detail history_api::get_account_history_by_operations(account_id_type account, vector<uint16_t> operation_types, uint32_t start, unsigned limit)
+    history_operation_detail history_api::get_account_history_by_operations(const std::string account_id_or_name, vector<uint16_t> operation_types, uint32_t start, unsigned limit)
     {
-        FC_ASSERT(limit <= 100);
-        history_operation_detail result;
-        vector<operation_history_object> objs = get_relative_account_history(account, start, limit, limit + start - 1);
-        std::for_each(objs.begin(), objs.end(), [&](const operation_history_object &o) {
+       FC_ASSERT(limit <= 100);
+       history_operation_detail result;
+       vector<operation_history_object> objs = get_relative_account_history(account_id_or_name, start, limit, limit + start - 1);
+       std::for_each(objs.begin(), objs.end(), [&](const operation_history_object &o) {
                     if (operation_types.empty() || find(operation_types.begin(), operation_types.end(), o.op.which()) != operation_types.end()) {
                         result.operation_history_objs.push_back(o);
                      }
@@ -462,20 +470,6 @@ namespace graphene { namespace app {
 
     crypto_api::crypto_api(){};
 
-    blind_signature crypto_api::blind_sign( const extended_private_key_type& key, const blinded_hash& hash, int i )
-    {
-       return fc::ecc::extended_private_key( key ).blind_sign( hash, i );
-    }
-
-    signature_type crypto_api::unblind_signature( const extended_private_key_type& key,
-                                                     const extended_public_key_type& bob,
-                                                     const blind_signature& sig,
-                                                     const fc::sha256& hash,
-                                                     int i )
-    {
-       return fc::ecc::extended_private_key( key ).unblind_signature( extended_public_key( bob ), sig, hash, i );
-    }
-
     commitment_type crypto_api::blind( const blind_factor_type& blind, uint64_t value )
     {
        return fc::ecc::blind( blind, value );

diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
@@ -179,9 +179,10 @@ void application_impl::reset_p2p_node(const fc::path& data_dir)
          "seed.cubeconnex.com:1777",          // cube         (USA)
          "seed.roelandp.nl:1776",             // roelandp     (Canada)
          "seed04.bts-nodes.net:1776",         // Thom         (Australia)
-         "seed05.bts-nodes.net:1776",          // Thom         (USA)
-         "seed06.bts-nodes.net:1776",          // Thom         (USA)
-         "seed07.bts-nodes.net:1776",          // Thom         (Singapore)
+         "seed05.bts-nodes.net:1776",         // Thom         (USA)
+         "seed06.bts-nodes.net:1776",         // Thom         (USA)
+         "seed07.bts-nodes.net:1776",         // Thom         (Singapore)
+         "seed.bts.bangzi.info:55501",        // Bangzi       (Germany)
          "seeds.bitshares.eu:1776"            // pc           (http://seeds.quisquis.de/bitshares.html)
       };
       for( const string& endpoint_string : seeds )
@@ -436,7 +437,6 @@ void application_impl::startup()
       wild_access.allowed_apis.push_back( "database_api" );
       wild_access.allowed_apis.push_back( "network_broadcast_api" );
       wild_access.allowed_apis.push_back( "history_api" );
-      wild_access.allowed_apis.push_back( "crypto_api" );
       wild_access.allowed_apis.push_back( "orders_api" );
       _apiaccess.permission_map["*"] = wild_access;
    }