Progress #17: Fix account key genesis initialization

This commit is contained in:
Nathan Hourt 2015-07-08 16:44:18 -04:00
parent 6436f0142f
commit 8d3fd20db2

View file

@ -261,13 +261,11 @@ void database::init_genesis(const genesis_state_type& genesis_state)
cop.name = account.name; cop.name = account.name;
cop.registrar = GRAPHENE_TEMP_ACCOUNT; cop.registrar = GRAPHENE_TEMP_ACCOUNT;
cop.owner = authority(1, account.owner_key, 1); cop.owner = authority(1, account.owner_key, 1);
if( account.owner_key != account.active_key ) if( account.owner_key != account.active_key && account.active_key != public_key_type() )
{ cop.active = authority(1, account.active_key, 1);
cop.active = authority(1, account.owner_key, 1); else
} else {
cop.active = cop.owner; cop.active = cop.owner;
} cop.options.memo_key = account.active_key;
cop.options.memo_key = account.owner_key;
account_id_type account_id(apply_operation(genesis_eval_state, cop).get<object_id_type>()); account_id_type account_id(apply_operation(genesis_eval_state, cop).get<object_id_type>());
if( account.is_lifetime_member ) if( account.is_lifetime_member )