Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge commit '5da213f' into bitshares

Browse source
This commit is contained in:
Vikram Rajkumar 2016-11-17 15:17:27 -06:00
commit 4e4a359fb9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -146,7 +146,7 @@ necessary to use the wallet:
] ]
} }
Passwords are stored in `base64` as as salted `sha256` hashes. A simple Python script, `saltpass.py` is avaliable to obtain hash and salt values from a password. Passwords are stored in `base64` as salted `sha256` hashes. A simple Python script, `saltpass.py` is avaliable to obtain hash and salt values from a password.
A single asterisk `"*"` may be specified as username or password hash to accept any value. 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 `add_node` from the `network_node` API: With the above configuration, here is an example of how to call `add_node` from the `network_node` API:

2
libraries/db/include/graphene/db/generic_index.hpp
View file

@ -80,6 +80,8 @@ namespace graphene { namespace chain {
virtual const object* find( object_id_type id )const override virtual const object* find( object_id_type id )const override
{ {
static_assert(std::is_same<typename MultiIndexType::key_type, object_id_type>::value,
"First index of MultiIndexType MUST be object_id_type!");
auto itr = _indices.find( id ); auto itr = _indices.find( id );
if( itr == _indices.end() ) return nullptr; if( itr == _indices.end() ) return nullptr;
return &*itr; return &*itr;