diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml index 68bca8940d..e1fad2984e 100644 --- a/.github/workflows/build-and-test.win.yml +++ b/.github/workflows/build-and-test.win.yml @@ -30,7 +30,7 @@ jobs: - name: Download library sources if: steps.cache-libs.outputs.cache-hit != 'true' run: | - curl -LO https://dl.bintray.com/boostorg/release/${{ env.BOOST_DOTTED_VERSION }}/source/boost_${{ env.BOOST_VERSION }}.tar.bz2 + curl -LO https://boostorg.jfrog.io/artifactory/main/release/${{ env.BOOST_DOTTED_VERSION }}/source/boost_${{ env.BOOST_VERSION }}.tar.bz2 curl -LO https://curl.haxx.se/download/curl-${{ env.CURL_VERSION }}.tar.bz2 curl -LO https://www.openssl.org/source/openssl-${{ env.OPENSSL_VERSION }}.tar.gz curl -LO https://zlib.net/zlib-${{ env.ZLIB_VERSION }}.tar.gz diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 6a0a654748..356e2d8af0 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -75,6 +75,7 @@ Troglodactyl VoR0220 alt bitcube +hammadsherwani <83015346+hammadsherwani@users.noreply.github.com> lafona liondani lososeg diff --git a/Doxyfile b/Doxyfile index 3d8c8770a5..7467d92fa0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "BitShares-Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "5.1.0" +PROJECT_NUMBER = "5.2.0" # 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 diff --git a/docs b/docs index 0a09ebbfd7..aa766179d5 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 0a09ebbfd71c6e80bb8cf87dbd1794f425a1d300 +Subproject commit aa766179d5a206581e7507c365646ec24d23b638 diff --git a/libraries/egenesis/seed-nodes.txt b/libraries/egenesis/seed-nodes.txt index 4816708ad3..192b93475d 100644 --- a/libraries/egenesis/seed-nodes.txt +++ b/libraries/egenesis/seed-nodes.txt @@ -6,4 +6,5 @@ "seed2.xbts.io:1776", // xbts.io (Germany) "seed1.bitshares.im:1776", // clone (USA) "seed.bitshares.org:666", // bitshares.org (France) +"seed.bitshares.rocks:1776", // bitshares.rocks (USA) "seeds.btsnodes.com:1776", // Community diff --git a/libraries/fc b/libraries/fc index 0954033fa5..02b7593a96 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 0954033fa5f2991352a922114fdf4a0667ec5a18 +Subproject commit 02b7593a96b02d9966358c59d22f344d86fa9a19 diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index 51bffa0880..034779a8c4 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -91,40 +91,6 @@ #include "node_impl.hxx" -//#define ENABLE_DEBUG_ULOGS - -#ifdef DEFAULT_LOGGER -# undef DEFAULT_LOGGER -#endif -#define DEFAULT_LOGGER "p2p" - -#define INVOCATION_COUNTER(name) \ - static size_t total_ ## name ## _counter = 0; \ - static size_t active_ ## name ## _counter = 0; \ - struct name ## _invocation_logger { \ - size_t *total; \ - size_t *active; \ - name ## _invocation_logger(size_t *total, size_t *active) : \ - total(total), active(active) \ - { \ - ++*total; \ - ++*active; \ - dlog("NEWDEBUG: Entering " #name ", now ${total} total calls, ${active} active calls", ("total", *total)("active", *active)); \ - } \ - ~name ## _invocation_logger() \ - { \ - --*active; \ - dlog("NEWDEBUG: Leaving " #name ", now ${total} total calls, ${active} active calls", ("total", *total)("active", *active)); \ - } \ - } invocation_logger(&total_ ## name ## _counter, &active_ ## name ## _counter) - -//log these messages even at warn level when operating on the test network -#ifdef GRAPHENE_TEST_NETWORK -#define testnetlog wlog -#else -#define testnetlog(...) do {} while (0) -#endif - namespace graphene { namespace net { namespace detail { void blockchain_tied_message_cache::block_accepted() diff --git a/libraries/net/node_impl.hxx b/libraries/net/node_impl.hxx index 303c3b65a1..2b395223c8 100644 --- a/libraries/net/node_impl.hxx +++ b/libraries/net/node_impl.hxx @@ -16,6 +16,20 @@ namespace bmi = boost::multi_index; #define P2P_IN_DEDICATED_THREAD +//#define ENABLE_DEBUG_ULOGS + +#ifdef DEFAULT_LOGGER +# undef DEFAULT_LOGGER +#endif +#define DEFAULT_LOGGER "p2p" + +//log these messages even at warn level when operating on the test network +#ifdef GRAPHENE_TEST_NETWORK +#define testnetlog wlog +#else +#define testnetlog(...) do {} while (0) +#endif + /******* * A class to wrap std::unordered_set for multithreading */ diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp index 58fba86a05..df4347dc9c 100644 --- a/tests/cli/main.cpp +++ b/tests/cli/main.cpp @@ -108,7 +108,14 @@ std::shared_ptr start_application(fc::temp_directory auto sharable_cfg = std::make_shared(); auto& cfg = *sharable_cfg; server_port_number = fc::network::get_available_port(); + auto p2p_port = server_port_number; + for( size_t i = 0; i < 10 && p2p_port == server_port_number; ++i ) + { + p2p_port = fc::network::get_available_port(); + } + BOOST_REQUIRE( p2p_port != server_port_number ); fc::set_option( cfg, "rpc-endpoint", string("127.0.0.1:") + std::to_string(server_port_number) ); + fc::set_option( cfg, "p2p-endpoint", string("0.0.0.0:") + std::to_string(p2p_port) ); fc::set_option( cfg, "genesis-json", create_genesis_file(app_dir) ); fc::set_option( cfg, "seed-nodes", string("[]") ); fc::set_option( cfg, "custom-operations-start-block", uint32_t(1) ); diff --git a/tests/performance/README.md b/tests/performance/README.md index 67b9b4afaf..b7b2d406e5 100644 --- a/tests/performance/README.md +++ b/tests/performance/README.md @@ -6,7 +6,8 @@ of our current implementation. The subject was talked about in detail at BitFest Amsterdam, Sep 22, 2018. The original description of the 100,000 transactions per second test can be -found at https://bitshares.org/blog/2015/06/08/measuring-performance/ . +found at +https://web.archive.org/web/20181111215859/https://bitshares.org/blog/2015/06/08/measuring-performance/ . Prepare ------- diff --git a/tests/performance/genesis_allocation.cpp b/tests/performance/genesis_allocation.cpp index f3c06fe4a8..7ec3029b77 100644 --- a/tests/performance/genesis_allocation.cpp +++ b/tests/performance/genesis_allocation.cpp @@ -28,8 +28,6 @@ #include -#include - #include extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;