-
Notifications
You must be signed in to change notification settings - Fork 647
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2790 from bitshares/develop_to_hardfork
Merge develop branch into hardfork branch
- Loading branch information
Showing
26 changed files
with
73 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,6 +69,7 @@ Jose Marcial Vieira Bisneto <[email protected]> | |
Jozef Knaperek <[email protected]> | ||
Ken Code <[email protected]> | ||
Krzysztof Szumny <[email protected]> | ||
Massimo Paladin <[email protected]> | ||
Paul Brossier <[email protected]> | ||
Roelandp <[email protected]> | ||
Semen Martynov <[email protected]> | ||
|
@@ -80,5 +81,6 @@ bitcube <[email protected]> | |
hammadsherwani <[email protected]> | ||
lafona <[email protected]> | ||
liondani <[email protected]> | ||
litepresence <[email protected]> | ||
lososeg <[email protected]> | ||
sinetek <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -190,8 +190,8 @@ Use `gethelp <COMMAND>` 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. | ||
Corresponding documentation can be found in the [Doxygen documentation](https://doxygen.bitshares.org/classgraphene_1_1wallet_1_1wallet__api.html). | ||
[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: | ||
|
||
|
@@ -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 | ||
|
@@ -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: | ||
|
@@ -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:[email protected]: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 | ||
|
Submodule docs
updated
from 6f6ea4 to 8ba173
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.