Skip to content

Commit 81f3763

Browse files
committed
Merge release branch into testnet_release
2 parents 5ba7dc7 + 2d44e48 commit 81f3763

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

.github/workflows/build-and-test.ubuntu-debug.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch8:
15-
image: elastic/elasticsearch:8.9.1
15+
image: elastic/elasticsearch:8.10.2
1616
options: >-
1717
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1818
--env discovery.type=single-node
@@ -22,7 +22,7 @@ jobs:
2222
--env cluster.routing.allocation.disk.threshold_enabled=false
2323
--publish 9200:9200
2424
elasticsearch7:
25-
image: elastic/elasticsearch:7.17.12
25+
image: elastic/elasticsearch:7.17.13
2626
options: >-
2727
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
2828
--env discovery.type=single-node

.github/workflows/build-and-test.ubuntu-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch8:
15-
image: elastic/elasticsearch:8.9.1
15+
image: elastic/elasticsearch:8.10.2
1616
options: >-
1717
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1818
--env discovery.type=single-node
@@ -22,7 +22,7 @@ jobs:
2222
--env cluster.routing.allocation.disk.threshold_enabled=false
2323
--publish 9200:9200
2424
elasticsearch7:
25-
image: elastic/elasticsearch:7.17.12
25+
image: elastic/elasticsearch:7.17.13
2626
options: >-
2727
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
2828
--env discovery.type=single-node

.github/workflows/build-and-test.win.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ env:
66
# The following are for windows cross-build only:
77
BOOST_VERSION: 1_69_0
88
BOOST_DOTTED_VERSION: 1.69.0
9-
CURL_VERSION: 8.2.1
10-
OPENSSL_VERSION: 1.1.1v
9+
CURL_VERSION: 8.3.0
10+
OPENSSL_VERSION: 1.1.1w
1111
ZLIB_VERSION: 1.3
1212
jobs:
1313
prepare-mingw64-libs:

.github/workflows/sonar-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch8:
15-
image: elastic/elasticsearch:8.9.1
15+
image: elastic/elasticsearch:8.10.2
1616
options: >-
1717
--env ES_JAVA_OPTS="-Xms512m -Xmx512m"
1818
--env discovery.type=single-node

CONTRIBUTORS.txt

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Jose Marcial Vieira Bisneto <[email protected]>
6969
Jozef Knaperek <[email protected]>
7070
7171
Krzysztof Szumny <[email protected]>
72+
Massimo Paladin <[email protected]>
7273
Paul Brossier <[email protected]>
7374
7475
Semen Martynov <[email protected]>
@@ -80,5 +81,6 @@ bitcube <[email protected]>
8081
hammadsherwani <[email protected]>
8182
8283
84+
litepresence <[email protected]>
8385
8486

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ Use `gethelp <COMMAND>` to see more info about individual commands. E.G.
184184
>>> gethelp get_order_book
185185

186186
The definition of all commands is available in the
187-
[wallet.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/wallet/include/graphene/wallet/wallet.hpp) souce code file.
188-
Corresponding documentation can be found in the [Doxygen documentation](https://doxygen.bitshares.org/classgraphene_1_1wallet_1_1wallet__api.html).
187+
[wallet.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/wallet/include/graphene/wallet/wallet.hpp) source code file.
188+
Corresponding documentation can be found in the [Doxygen documentation](https://bitshares.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html).
189189

190190
You can run the program with `--help` parameter to see more info:
191191

@@ -205,7 +205,7 @@ Questions can be posted in [Github Discussions](https://github.com/bitshares/bit
205205

206206
BitShares UI bugs should be reported to the [UI issue tracker](https://github.com/bitshares/bitshares-ui/issues).
207207

208-
Up to date online Doxygen documentation can be found at [Doxygen.BitShares.org](https://doxygen.bitshares.org/hierarchy.html).
208+
Up to date online Doxygen documentation can be found at [https://bitshares.github.io/doxygen](https://bitshares.github.io/doxygen/hierarchy.html).
209209

210210

211211
Using Built-In APIs
@@ -240,8 +240,8 @@ The definition of all node APIs is available in the source code files including
240240
[database_api.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/app/include/graphene/app/database_api.hpp)
241241
and [api.hpp](https://github.com/bitshares/bitshares-core/blob/master/libraries/app/include/graphene/app/api.hpp).
242242
Corresponding documentation can be found in Doxygen:
243-
* [database API](https://doxygen.bitshares.org/classgraphene_1_1app_1_1database__api.html)
244-
* [other APIs](https://doxygen.bitshares.org/namespacegraphene_1_1app.html)
243+
* [database API](https://bitshares.github.io/doxygen/classgraphene_1_1app_1_1database__api.html)
244+
* [other APIs](https://bitshares.github.io/doxygen/namespacegraphene_1_1app.html)
245245

246246

247247
### Wallet API
@@ -298,7 +298,7 @@ Note: the `login` API set is always accessible.
298298

299299
Passwords are stored in `base64` as salted `sha256` hashes. A simple Python script,
300300
[`saltpass.py`](https://github.com/bitshares/bitshares-core/blob/master/programs/witness_node/saltpass.py)
301-
is avaliable to obtain hash and salt values from a password.
301+
is available to obtain hash and salt values from a password.
302302
A single asterisk `"*"` may be specified as username or password hash to accept any value.
303303

304304
With the above configuration, here is an example of how to call the `add_node` API from the `network_node` API set:
@@ -314,8 +314,8 @@ The restricted API sets are accessible via HTTP too using *basic access authenti
314314
$ curl --data '{"jsonrpc": "2.0", "method": "call", "params": ["network_node", "add_node", ["127.0.0.1:9090"]], "id": 1}' http://bytemaster:[email protected]:8090/
315315

316316
Our `doxygen` documentation contains the most up-to-date information
317-
about APIs for the [node](https://doxygen.bitshares.org/namespacegraphene_1_1app.html) and the
318-
[wallet](https://doxygen.bitshares.org/classgraphene_1_1wallet_1_1wallet__api.html).
317+
about APIs for the [node](https://bitshares.github.io/doxygen/namespacegraphene_1_1app.html) and the
318+
[wallet](https://bitshares.github.io/doxygen/classgraphene_1_1wallet_1_1wallet__api.html).
319319

320320

321321
FAQ

docs

Submodule docs updated from 6f6ea4e to 8ba1731

libraries/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# BitShares Libraries
22

3-
The libraries are the core of the project and defines everything where applications can build on top.
3+
The libraries are the core of the project and define everything where applications can build on top.
44

5-
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.
5+
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.
66

77
Code in libraries is the most important part of **bitshares-core** project and it is maintained by the Bitshares Core Team and contributors.
88
# Available Libraries

libraries/app/application.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ bool application_impl::is_plugin_enabled(const string& name) const
634634
return !(_active_plugins.find(name) == _active_plugins.end());
635635
}
636636

637-
/**
637+
/*
638638
* If delegate has the item, the network has no need to fetch it.
639639
*/
640640
bool application_impl::has_item(const net::item_id& id)
@@ -649,7 +649,7 @@ bool application_impl::has_item(const net::item_id& id)
649649
FC_CAPTURE_AND_RETHROW( (id) ) // GCOVR_EXCL_LINE
650650
}
651651

652-
/**
652+
/*
653653
* @brief allows the application to validate an item prior to broadcasting to peers.
654654
*
655655
* @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)
759759
return block_id == block_id_in_preferred_chain;
760760
}
761761

762-
/**
762+
/*
763763
* Assuming all data elements are ordered in some way, this method should
764764
* return up to limit ids that occur *after* the last ID in synopsis that
765765
* we recognize.
@@ -816,7 +816,7 @@ std::vector<item_hash_t> application_impl::get_block_ids(const std::vector<item_
816816
return result;
817817
} FC_CAPTURE_AND_RETHROW( (blockchain_synopsis)(remaining_item_count)(limit) ) } // GCOVR_EXCL_LINE
818818

819-
/**
819+
/*
820820
* Given the hash of the requested data, fetch the body.
821821
*/
822822
message application_impl::get_item(const item_id& id)
@@ -840,7 +840,7 @@ chain_id_type application_impl::get_chain_id() const
840840
return _chain_db->get_chain_id();
841841
}
842842

843-
/**
843+
/*
844844
* Returns a synopsis of the blockchain used for syncing. This consists of a list of
845845
* block hashes at intervals exponentially increasing towards the genesis block.
846846
* When syncing to a peer, the peer uses this data to determine if we're on the same
@@ -1018,7 +1018,7 @@ std::vector<item_hash_t> application_impl::get_blockchain_synopsis(const item_ha
10181018
return synopsis;
10191019
} FC_CAPTURE_AND_RETHROW() } // GCOVR_EXCL_LINE
10201020

1021-
/**
1021+
/*
10221022
* Call this after the call to handle_message succeeds.
10231023
*
10241024
* @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)
10301030
// any status reports to GUI go here
10311031
}
10321032

1033-
/**
1033+
/*
10341034
* Call any time the number of connected peers changes.
10351035
*/
10361036
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)
10431043
return block_header::num_from_id(block_id);
10441044
} FC_CAPTURE_AND_RETHROW( (block_id) ) } // GCOVR_EXCL_LINE
10451045

1046-
/**
1046+
/*
10471047
* Returns the time a block was produced (if block_id = 0, returns genesis time).
10481048
* If we don't know about the block, returns time_point_sec::min()
10491049
*/

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

-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ namespace graphene { namespace protocol {
133133
/* 77 */ limit_order_update_operation
134134
>;
135135

136-
/// @} // operations group
137-
138136
/**
139137
* Appends required authorites to the result vector. The authorities appended are not the
140138
* same as those returned by get_required_auth

programs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The bitshares programs are a collection of binaries to run the blockchain, interact with it or utilities.
44

5-
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.
5+
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.
66

77
Programs in here are part of the **bitshares-core** project and are maintained by the bitshares core team and contributors.
88

0 commit comments

Comments
 (0)