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

Merge branch 'hive-fix-son-account-owner-authority' into 'develop'

Browse source 
Update Hive's son-account owner authority on primary wallet update

See merge request PBSA/peerplays!192
This commit is contained in:
serkixenos 2022-12-16 04:32:04 +00:00
commit 6037e89df0
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
View file

@ -256,13 +256,14 @@ bool sidechain_net_handler_hive::process_proposal(const proposal_object &po) {
const std::string memo_key = rpc_client->get_account_memo_key(wallet_account_name); const std::string memo_key = rpc_client->get_account_memo_key(wallet_account_name);
hive::authority active; hive::authority a;
active.weight_threshold = total_weight * 2 / 3 + 1; a.weight_threshold = total_weight * 2 / 3 + 1;
active.account_auths = account_auths; a.account_auths = account_auths;
hive::account_update_operation auo; hive::account_update_operation auo;
auo.account = wallet_account_name; auo.account = wallet_account_name;
auo.active = active; auo.owner = a;
auo.active = a;
auo.memo_key = op_trx.operations[0].get<hive::account_update_operation>().memo_key; auo.memo_key = op_trx.operations[0].get<hive::account_update_operation>().memo_key;
hive::signed_transaction htrx; hive::signed_transaction htrx;
@ -505,13 +506,14 @@ void sidechain_net_handler_hive::process_primary_wallet() {
return; return;
} }
hive::authority active; hive::authority a;
active.weight_threshold = total_weight * 2 / 3 + 1; a.weight_threshold = total_weight * 2 / 3 + 1;
active.account_auths = account_auths; a.account_auths = account_auths;
hive::account_update_operation auo; hive::account_update_operation auo;
auo.account = wallet_account_name; auo.account = wallet_account_name;
auo.active = active; auo.owner = a;
auo.active = a;
auo.memo_key = hive::public_key_type(memo_key); auo.memo_key = hive::public_key_type(memo_key);
const std::string block_id_str = rpc_client->get_head_block_id(); const std::string block_id_str = rpc_client->get_head_block_id();
@ -546,12 +548,27 @@ void sidechain_net_handler_hive::process_primary_wallet() {
proposal_op.proposed_ops.emplace_back(swu_op); proposal_op.proposed_ops.emplace_back(swu_op);
const auto signers = [this, &prev_sw, &active_sw, &swi] {
std::vector<son_info> signers;
//! Check if we don't have any previous set of active SONs use the current one
if (prev_sw != swi.rend()) {
if (!prev_sw->sons.at(sidechain).empty())
signers = prev_sw->sons.at(sidechain);
else
signers = active_sw->sons.at(sidechain);
} else {
signers = active_sw->sons.at(sidechain);
}
return signers;
}();
sidechain_transaction_create_operation stc_op; sidechain_transaction_create_operation stc_op;
stc_op.payer = gpo.parameters.son_account(); stc_op.payer = gpo.parameters.son_account();
stc_op.object_id = active_sw->id; stc_op.object_id = active_sw->id;
stc_op.sidechain = sidechain; stc_op.sidechain = sidechain;
stc_op.transaction = tx_str; stc_op.transaction = tx_str;
stc_op.signers = gpo.active_sons.at(sidechain); stc_op.signers = signers;
proposal_op.proposed_ops.emplace_back(stc_op); proposal_op.proposed_ops.emplace_back(stc_op);