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

Prevent duplicate signatures when importing balances #129

Browse source
This commit is contained in:
Eric Frias 2015-07-05 16:02:59 -04:00
parent c0c6022338
commit 3ee8b0c2a4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/wallet/wallet.cpp
View file

@ -26,6 +26,9 @@
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>
#include <boost/range/algorithm_ext/insert.hpp> #include <boost/range/algorithm_ext/insert.hpp>
#include <boost/range/algorithm_ext/erase.hpp>
#include <boost/range/algorithm/unique.hpp>
#include <boost/range/algorithm/sort.hpp>
#include <fc/io/fstream.hpp> #include <fc/io/fstream.hpp>
#include <fc/io/json.hpp> #include <fc/io/json.hpp>
@ -1385,7 +1388,6 @@ public:
approving_key_set.insert( approving_key ); approving_key_set.insert( approving_key );
} }
tx.set_expiration(get_dynamic_global_properties().head_block_id); tx.set_expiration(get_dynamic_global_properties().head_block_id);
for( public_key_type& key : approving_key_set ) for( public_key_type& key : approving_key_set )
@ -2294,12 +2296,15 @@ signed_transaction wallet_api::import_balance( string name_or_id, const vector<s
for( auto a : required_addrs ) for( auto a : required_addrs )
tx.sign( keys[a] ); tx.sign( keys[a] );
// if the key for a balance object was the same as a key for the account we're importing it into,
// we may end up with duplicate signatures, so remove those
boost::erase(tx.signatures, boost::unique<boost::return_found_end>(boost::sort(tx.signatures)));
if( broadcast ) if( broadcast )
my->_remote_net->broadcast_transaction(tx); my->_remote_net->broadcast_transaction(tx);
return tx; return tx;
} FC_CAPTURE_AND_RETHROW( (name_or_id) ) } } FC_CAPTURE_AND_RETHROW( (name_or_id) ) }
map<public_key_type, string> wallet_api::dump_private_keys() map<public_key_type, string> wallet_api::dump_private_keys()