From c4b31088844803f93e4e20a56704144c2ee25d02 Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 25 Sep 2023 15:02:30 +0000 Subject: [PATCH 1/9] Update dependency versions used in Github Actions * ElasticSearch 7: 7.17.12 -> 7.17.13 * ElasticSearch 8: 8.9.1 -> 8.10.2 * OpenSSL: 1.1.1v -> 1.1.1w * CURL: 8.2.1 -> 8.3.0 --- .github/workflows/build-and-test.ubuntu-debug.yml | 4 ++-- .github/workflows/build-and-test.ubuntu-release.yml | 4 ++-- .github/workflows/build-and-test.win.yml | 4 ++-- .github/workflows/sonar-scan.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.ubuntu-debug.yml b/.github/workflows/build-and-test.ubuntu-debug.yml index 2743ca0c7..b026557ea 100644 --- a/.github/workflows/build-and-test.ubuntu-debug.yml +++ b/.github/workflows/build-and-test.ubuntu-debug.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.9.1 + image: elastic/elasticsearch:8.10.2 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node @@ -22,7 +22,7 @@ jobs: --env cluster.routing.allocation.disk.threshold_enabled=false --publish 9200:9200 elasticsearch7: - image: elastic/elasticsearch:7.17.12 + image: elastic/elasticsearch:7.17.13 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node diff --git a/.github/workflows/build-and-test.ubuntu-release.yml b/.github/workflows/build-and-test.ubuntu-release.yml index 1575f408c..9fc718e85 100644 --- a/.github/workflows/build-and-test.ubuntu-release.yml +++ b/.github/workflows/build-and-test.ubuntu-release.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.9.1 + image: elastic/elasticsearch:8.10.2 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node @@ -22,7 +22,7 @@ jobs: --env cluster.routing.allocation.disk.threshold_enabled=false --publish 9200:9200 elasticsearch7: - image: elastic/elasticsearch:7.17.12 + image: elastic/elasticsearch:7.17.13 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node diff --git a/.github/workflows/build-and-test.win.yml b/.github/workflows/build-and-test.win.yml index ad8bea77a..e2f21f64d 100644 --- a/.github/workflows/build-and-test.win.yml +++ b/.github/workflows/build-and-test.win.yml @@ -6,8 +6,8 @@ env: # The following are for windows cross-build only: BOOST_VERSION: 1_69_0 BOOST_DOTTED_VERSION: 1.69.0 - CURL_VERSION: 8.2.1 - OPENSSL_VERSION: 1.1.1v + CURL_VERSION: 8.3.0 + OPENSSL_VERSION: 1.1.1w ZLIB_VERSION: 1.3 jobs: prepare-mingw64-libs: diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 923bf5668..9d2dcd2ba 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} services: elasticsearch8: - image: elastic/elasticsearch:8.9.1 + image: elastic/elasticsearch:8.10.2 options: >- --env ES_JAVA_OPTS="-Xms512m -Xmx512m" --env discovery.type=single-node From 1c68b640587bbebaae224367e6cd1c2a2b9dbc55 Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 25 Sep 2023 19:07:48 +0000 Subject: [PATCH 2/9] Fix Doxygen warnings --- libraries/app/application.cpp | 16 ++++++++-------- .../include/graphene/protocol/operations.hpp | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index f7c340dde..b84fb0a16 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -634,7 +634,7 @@ bool application_impl::is_plugin_enabled(const string& name) const return !(_active_plugins.find(name) == _active_plugins.end()); } -/** +/* * If delegate has the item, the network has no need to fetch it. */ bool application_impl::has_item(const net::item_id& id) @@ -649,7 +649,7 @@ bool application_impl::has_item(const net::item_id& id) FC_CAPTURE_AND_RETHROW( (id) ) // GCOVR_EXCL_LINE } -/** +/* * @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 @@ -759,7 +759,7 @@ bool application_impl::is_included_block(const block_id_type& block_id) return block_id == block_id_in_preferred_chain; } -/** +/* * 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. @@ -816,7 +816,7 @@ std::vector application_impl::get_block_ids(const std::vectorget_chain_id(); } -/** +/* * 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 @@ -1018,7 +1018,7 @@ std::vector application_impl::get_blockchain_synopsis(const item_ha return synopsis; } FC_CAPTURE_AND_RETHROW() } // GCOVR_EXCL_LINE -/** +/* * 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 @@ -1030,7 +1030,7 @@ void application_impl::sync_status(uint32_t item_type, uint32_t item_count) // any status reports to GUI go here } -/** +/* * Call any time the number of connected peers changes. */ void application_impl::connection_count_changed(uint32_t c) @@ -1043,7 +1043,7 @@ uint32_t application_impl::get_block_number(const item_hash_t& block_id) return block_header::num_from_id(block_id); } FC_CAPTURE_AND_RETHROW( (block_id) ) } // GCOVR_EXCL_LINE -/** +/* * 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() */ diff --git a/libraries/protocol/include/graphene/protocol/operations.hpp b/libraries/protocol/include/graphene/protocol/operations.hpp index 0540f5721..aea9903a9 100644 --- a/libraries/protocol/include/graphene/protocol/operations.hpp +++ b/libraries/protocol/include/graphene/protocol/operations.hpp @@ -133,8 +133,6 @@ namespace graphene { namespace protocol { /* 77 */ limit_order_update_operation >; - /// @} // operations group - /** * Appends required authorites to the result vector. The authorities appended are not the * same as those returned by get_required_auth From dec5c10633d3abeb8f92163366f89961abb0eae0 Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 25 Sep 2023 15:37:55 +0000 Subject: [PATCH 3/9] Update docs submodule --- docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs b/docs index 6f6ea4ef1..8ba17318b 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 6f6ea4ef17c72bc7d5fbdab5f98d1bea364b8723 +Subproject commit 8ba17318bdb24277906256f7bd4f56fe033fb288 From f9a50cad236263aac946318ea30c49169c7ae38f Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 25 Sep 2023 15:40:46 +0000 Subject: [PATCH 4/9] Update CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index aaa29e509..2f8a19d2f 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -69,6 +69,7 @@ Jose Marcial Vieira Bisneto Jozef Knaperek Ken Code Krzysztof Szumny +Massimo Paladin Paul Brossier Roelandp Semen Martynov @@ -80,5 +81,6 @@ bitcube hammadsherwani <83015346+hammadsherwani@users.noreply.github.com> lafona liondani +litepresence lososeg sinetek From 36b26943c1c9ad95f086252fa4c820fb7c68c243 Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 25 Sep 2023 19:42:41 +0000 Subject: [PATCH 5/9] Set Mainnet 7.0 HF time to 2023-11-16 14:00:00 UTC --- libraries/chain/hardfork.d/CORE_1604.hf | 2 +- libraries/chain/hardfork.d/CORE_2535.hf | 3 +-- libraries/chain/hardfork.d/CORE_2587.hf | 3 +-- libraries/chain/hardfork.d/CORE_2591.hf | 3 +-- libraries/chain/hardfork.d/CORE_2595.hf | 3 +-- libraries/chain/hardfork.d/CORE_2604.hf | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libraries/chain/hardfork.d/CORE_1604.hf b/libraries/chain/hardfork.d/CORE_1604.hf index 078890df5..f5d73b107 100644 --- a/libraries/chain/hardfork.d/CORE_1604.hf +++ b/libraries/chain/hardfork.d/CORE_1604.hf @@ -1,5 +1,5 @@ // bitshares-core issue #1604 Operation to modify existing limit order #ifndef HARDFORK_CORE_1604_TIME -#define HARDFORK_CORE_1604_TIME (fc::time_point_sec(1893456000)) // Jan 1 00:00:00 2030 (Not yet scheduled) +#define HARDFORK_CORE_1604_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_1604_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_1604_TIME) #endif diff --git a/libraries/chain/hardfork.d/CORE_2535.hf b/libraries/chain/hardfork.d/CORE_2535.hf index 1326d21ab..b0d3dbc47 100644 --- a/libraries/chain/hardfork.d/CORE_2535.hf +++ b/libraries/chain/hardfork.d/CORE_2535.hf @@ -1,6 +1,5 @@ // bitshares-core issue #2535 Simple Order-Sends-Order (OSO) #ifndef HARDFORK_CORE_2535_TIME -// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled -#define HARDFORK_CORE_2535_TIME (fc::time_point_sec( 1893456000 )) +#define HARDFORK_CORE_2535_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_2535_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2535_TIME) #endif diff --git a/libraries/chain/hardfork.d/CORE_2587.hf b/libraries/chain/hardfork.d/CORE_2587.hf index cc98fa4f2..250fd3c7e 100644 --- a/libraries/chain/hardfork.d/CORE_2587.hf +++ b/libraries/chain/hardfork.d/CORE_2587.hf @@ -1,6 +1,5 @@ // bitshares-core issue #2587 settle more than total debt in individual settlement fund when no sufficient price feeds #ifndef HARDFORK_CORE_2587_TIME -// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled -#define HARDFORK_CORE_2587_TIME (fc::time_point_sec( 1893456000 )) +#define HARDFORK_CORE_2587_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_2587_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2587_TIME) #endif diff --git a/libraries/chain/hardfork.d/CORE_2591.hf b/libraries/chain/hardfork.d/CORE_2591.hf index 2dc9031d7..6fe866edb 100644 --- a/libraries/chain/hardfork.d/CORE_2591.hf +++ b/libraries/chain/hardfork.d/CORE_2591.hf @@ -1,6 +1,5 @@ // bitshares-core issue #2591 Tighter peg when collateral price rises and settlement fund or settlement order exists #ifndef HARDFORK_CORE_2591_TIME -// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled -#define HARDFORK_CORE_2591_TIME (fc::time_point_sec( 1893456000 )) +#define HARDFORK_CORE_2591_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_2591_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2591_TIME) #endif diff --git a/libraries/chain/hardfork.d/CORE_2595.hf b/libraries/chain/hardfork.d/CORE_2595.hf index e5192b242..46a8ef498 100644 --- a/libraries/chain/hardfork.d/CORE_2595.hf +++ b/libraries/chain/hardfork.d/CORE_2595.hf @@ -1,6 +1,5 @@ // bitshares-core issue #2595 Credit deal auto-repayment #ifndef HARDFORK_CORE_2595_TIME -// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled -#define HARDFORK_CORE_2595_TIME (fc::time_point_sec( 1893456000 )) +#define HARDFORK_CORE_2595_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_2595_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2595_TIME) #endif diff --git a/libraries/chain/hardfork.d/CORE_2604.hf b/libraries/chain/hardfork.d/CORE_2604.hf index b71dc3955..6d199ec14 100644 --- a/libraries/chain/hardfork.d/CORE_2604.hf +++ b/libraries/chain/hardfork.d/CORE_2604.hf @@ -1,6 +1,5 @@ // bitshares-core issue #2604 Allow updating liquidity pool fee rates with certain restrictions #ifndef HARDFORK_CORE_2604_TIME -// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled -#define HARDFORK_CORE_2604_TIME (fc::time_point_sec( 1893456000 )) +#define HARDFORK_CORE_2604_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC #define HARDFORK_CORE_2604_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2604_TIME) #endif From 9a5cf5c0ab2094524f28f155595969f65420b1f2 Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 1 Oct 2023 11:45:28 +0200 Subject: [PATCH 6/9] Update Doxygen links in README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6d44225ff..253870745 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ Use `gethelp ` to see more info about individual commands. E.G. The definition of all commands is available in the [wallet.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/wallet/include/graphene/wallet/wallet.hpp) souce code file. -Corresponding documentation can be found in the [Doxygen documentation](https://doxygen.bitshares.org/classgraphene_1_1wallet_1_1wallet__api.html). +Corresponding documentation can be found in the [Doxygen documentation](https://bitshares.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html). You can run the program with `--help` parameter to see more info: @@ -211,7 +211,7 @@ Questions can be posted in [Github Discussions](https://github.com/bitshares/bit BitShares UI bugs should be reported to the [UI issue tracker](https://github.com/bitshares/bitshares-ui/issues). -Up to date online Doxygen documentation can be found at [Doxygen.BitShares.org](https://doxygen.bitshares.org/hierarchy.html). +Up to date online Doxygen documentation can be found at [https://bitshares.github.io/doxygen](https://bitshares.github.io/doxygen/hierarchy.html). Using Built-In APIs @@ -246,8 +246,8 @@ The definition of all node APIs is available in the source code files including [database_api.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/app/include/graphene/app/database_api.hpp) and [api.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/app/include/graphene/app/api.hpp). Corresponding documentation can be found in Doxygen: -* [database API](https://doxygen.bitshares.org/classgraphene_1_1app_1_1database__api.html) -* [other APIs](https://doxygen.bitshares.org/namespacegraphene_1_1app.html) +* [database API](https://bitshares.github.io/doxygen/classgraphene_1_1app_1_1database__api.html) +* [other APIs](https://bitshares.github.io/doxygen/namespacegraphene_1_1app.html) ### Wallet API @@ -320,8 +320,8 @@ The restricted API sets are accessible via HTTP too using *basic access authenti $ curl --data '{"jsonrpc": "2.0", "method": "call", "params": ["network_node", "add_node", ["127.0.0.1:9090"]], "id": 1}' http://bytemaster:supersecret@127.0.0.1:8090/ Our `doxygen` documentation contains the most up-to-date information -about APIs for the [node](https://doxygen.bitshares.org/namespacegraphene_1_1app.html) and the -[wallet](https://doxygen.bitshares.org/classgraphene_1_1wallet_1_1wallet__api.html). +about APIs for the [node](https://bitshares.github.io/doxygen/namespacegraphene_1_1app.html) and the +[wallet](https://bitshares.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html). FAQ From 26a435052a02f3ba6fffc770888e433fb4b850ea Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 1 Oct 2023 12:11:20 +0200 Subject: [PATCH 7/9] Fix typos Thanks https://github.com/omahs for https://github.com/bitshares/bitshares-core/pull/2784 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 253870745..a5276441f 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,7 @@ Use `gethelp ` to see more info about individual commands. E.G. >>> gethelp get_order_book The definition of all commands is available in the -[wallet.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/wallet/include/graphene/wallet/wallet.hpp) souce code file. +[wallet.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/wallet/include/graphene/wallet/wallet.hpp) source code file. Corresponding documentation can be found in the [Doxygen documentation](https://bitshares.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html). You can run the program with `--help` parameter to see more info: @@ -304,7 +304,7 @@ Note: the `login` API set is always accessible. Passwords are stored in `base64` as salted `sha256` hashes. A simple Python script, [`saltpass.py`](https://github.com/bitshares/bitshares-core/blob/master/programs/witness_node/saltpass.py) -is avaliable to obtain hash and salt values from a password. +is available to obtain hash and salt values from a password. A single asterisk `"*"` may be specified as username or password hash to accept any value. With the above configuration, here is an example of how to call the `add_node` API from the `network_node` API set: From 8019ed9562f0b2fe3014fd5b5628b86a0d408d7f Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 1 Oct 2023 12:13:48 +0200 Subject: [PATCH 8/9] Fix typos Thanks to https://github.com/omahs for https://github.com/bitshares/bitshares-core/pull/2784 --- libraries/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/README.md b/libraries/README.md index 06f7fc9b8..065066e68 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -1,8 +1,8 @@ # BitShares Libraries -The libraries are the core of the project and defines everything where applications can build on top. +The libraries are the core of the project and define everything where applications can build on top. -A **graphene** blockchain software will use the `app` library to define what the application will do, what services it will offer. The blockchain is defined by the `chain` library and include all the objects, types, operations, protocols that builds current consensus blockchain. The lowest level in memory database of Bitshares is developed at the `db` library. The `fc` is a helper module broadly used in the libraries code, `egenesis` will help with the genesis file, `plugins` will be loaded optionally to the application. Wallet software like the cli_wallet will benefit from the `wallet` library. +A **graphene** blockchain software will use the `app` library to define what the application will do, what services it will offer. The blockchain is defined by the `chain` library and includes all the objects, types, operations, protocols that build current consensus blockchain. The lowest level in memory database of Bitshares is developed at the `db` library. The `fc` is a helper module broadly used in the libraries code, `egenesis` will help with the genesis file, `plugins` will be loaded optionally to the application. Wallet software like the cli_wallet will benefit from the `wallet` library. Code in libraries is the most important part of **bitshares-core** project and it is maintained by the Bitshares Core Team and contributors. # Available Libraries From 24e733b8af08feb797c2832ae1bb1f79e9c15a3a Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 1 Oct 2023 12:16:49 +0200 Subject: [PATCH 9/9] Fix a typo Thanks to https://github.com/omahs for https://github.com/bitshares/bitshares-core/pull/2784 --- programs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/README.md b/programs/README.md index c7ddb86b4..43d9cae81 100644 --- a/programs/README.md +++ b/programs/README.md @@ -2,7 +2,7 @@ The bitshares programs are a collection of binaries to run the blockchain, interact with it or utilities. -The main program is the `witness_node`, used to run a bitshares block producer, API or plugin node. The second in importance is the `cli_wallet`, used to interact with the blockchain. This 2 programs are the most used by the community and updated by the developers, rest of the programs are utilities. +The main program is the `witness_node`, used to run a bitshares block producer, API or plugin node. The second in importance is the `cli_wallet`, used to interact with the blockchain. These 2 programs are the most used by the community and updated by the developers, rest of the programs are utilities. Programs in here are part of the **bitshares-core** project and are maintained by the bitshares core team and contributors.