Merge master (0.90.1) into develop (1.0.0-b2):

The merge also updates the RELEASENOTES.md with the release
notes for the 0.90.1 which were accidentally not included
in that release.
This commit is contained in:
Nikolaos D. Bougalis
2018-03-23 16:21:35 -07:00
49 changed files with 437 additions and 283 deletions

View File

@@ -83,10 +83,11 @@ public:
derivePublicKey(KeyType::secp256k1, seedSecretKey);
NodeID const seedNodeID = calcNodeID(seedPublicKey);
// Keys/ID when using [validation_token]
SecretKey const tokenSecretKey = *parseBase58<SecretKey>(
TokenType::TOKEN_NODE_PRIVATE, tokenSecretStr);
PublicKey const tokenPublicKey =
// Keys when using [validation_token]
auto const tokenSecretKey = *parseBase58<SecretKey>(
TokenType::NodePrivate, tokenSecretStr);
auto const tokenPublicKey =
derivePublicKey(KeyType::secp256k1, tokenSecretKey);
auto const m = Manifest::make_Manifest(