Merge commit '5da213f' into bitshares

README.md

@@ -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.
 
 With the above configuration, here is an example of how to call `add_node` from the `network_node` API:

libraries/db/include/graphene/db/generic_index.hpp

@@ -80,6 +80,8 @@ namespace graphene { namespace chain {
 
          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 );
             if( itr == _indices.end() ) return nullptr;
             return &*itr;