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

[SON-346] Sidechain transaction marked as complete even though current_weight < threshold, Fixed (#342)

Browse source
This commit is contained in:
obucina 2020-04-08 22:40:20 +02:00 committed by GitHub
parent 4f72269cf6
commit 44db4f5c9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/include/graphene/chain/protocol/sidechain_transaction.hpp
View file

@ -31,7 +31,6 @@ namespace graphene { namespace chain {
sidechain_transaction_id_type sidechain_transaction_id; sidechain_transaction_id_type sidechain_transaction_id;
std::string signature; std::string signature;
bool complete;
account_id_type fee_payer()const { return payer; } account_id_type fee_payer()const { return payer; }
share_type calculate_fee( const fee_parameters_type& k )const { return 0; } share_type calculate_fee( const fee_parameters_type& k )const { return 0; }
@ -63,8 +62,7 @@ FC_REFLECT( graphene::chain::sidechain_transaction_create_operation, (fee)(payer
FC_REFLECT( graphene::chain::sidechain_transaction_sign_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::sidechain_transaction_sign_operation::fee_parameters_type, (fee) )
FC_REFLECT( graphene::chain::sidechain_transaction_sign_operation, (fee)(payer) FC_REFLECT( graphene::chain::sidechain_transaction_sign_operation, (fee)(payer)
(sidechain_transaction_id) (sidechain_transaction_id)
(signature) (signature) )
(complete) )
FC_REFLECT( graphene::chain::sidechain_transaction_send_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::sidechain_transaction_send_operation::fee_parameters_type, (fee) )
FC_REFLECT( graphene::chain::sidechain_transaction_send_operation, (fee)(payer) FC_REFLECT( graphene::chain::sidechain_transaction_send_operation, (fee)(payer)

2
libraries/chain/sidechain_transaction_evaluator.cpp
View file

@ -94,7 +94,7 @@ object_id_type sidechain_transaction_sign_evaluator::do_apply(const sidechain_tr
sto.current_weight = sto.current_weight + sto.signers.at(i).weight; sto.current_weight = sto.current_weight + sto.signers.at(i).weight;
} }
} }
sto.complete = op.complete; sto.complete = (sto.current_weight >= sto.threshold);
}); });
db().modify(son_obj->statistics(db()), [&](son_statistics_object& sso) { db().modify(son_obj->statistics(db()), [&](son_statistics_object& sso) {

1
libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
View file

@ -378,7 +378,6 @@ void sidechain_net_handler::process_sidechain_transactions() {
sts_op.payer = plugin.get_current_son_object().son_account; sts_op.payer = plugin.get_current_son_object().son_account;
sts_op.sidechain_transaction_id = sto.id; sts_op.sidechain_transaction_id = sto.id;
sts_op.signature = processed_sidechain_tx; sts_op.signature = processed_sidechain_tx;
sts_op.complete = complete;
signed_transaction trx = database.create_signed_transaction(plugin.get_private_key(plugin.get_current_son_id()), sts_op); signed_transaction trx = database.create_signed_transaction(plugin.get_private_key(plugin.get_current_son_id()), sts_op);
trx.validate(); trx.validate();