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

Start #116 Index Version Checking

Browse source 
- adding changes for #115 that didn't make the last commit
This commit is contained in:
Daniel Larimer 2015-06-30 18:40:46 -04:00
parent 187ceb28b6
commit 18a99584a2
7 changed files with 51 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/CMakeLists.txt
View file

@ -6,6 +6,7 @@ add_library( graphene_chain
type_id.cpp
address.cpp
pts_address.cpp
asset.cpp
predicate.cpp

4
libraries/chain/db_block.cpp
View file

@ -453,7 +453,7 @@ processed_transaction database::_apply_transaction( const signed_transaction& tr
eval_state._sigs.reserve( trx.signatures.size() );
for( const auto& sig : trx.signatures )
FC_ASSERT( eval_state._sigs.insert( std::make_pair( address(fc::ecc::public_key( sig, trx.digest() )), false) ).second, "Multiple signatures by same key detected" ) ;
FC_ASSERT( eval_state._sigs.insert( std::make_pair( public_key_type(fc::ecc::public_key( sig, trx.digest() )), false) ).second, "Multiple signatures by same key detected" ) ;
}
//If we're skipping tapos check, but not dupe check, assume all transactions have maximum expiration time.
@ -532,7 +532,7 @@ processed_transaction database::_apply_transaction( const signed_transaction& tr
for( const auto& sig : trx.signatures )
FC_ASSERT(eval_state._sigs.insert(
std::make_pair(address(fc::ecc::public_key(sig, trx.digest(tapos_block_summary.block_id) )),
std::make_pair(public_key_type(fc::ecc::public_key(sig, trx.digest(tapos_block_summary.block_id) )),
false)).second, "Multiple signatures by same key detected");
}

4
libraries/chain/include/graphene/chain/balance_evaluator.hpp
View file

@ -21,8 +21,8 @@ public:
database& d = db();
balance = &op.balance_to_claim(d);
FC_ASSERT(trx_state->_sigs.count(balance->owner) == 1);
trx_state->_sigs[balance->owner] = true;
FC_ASSERT(trx_state->signed_by( balance->owner, true /*maybe pts*/ ));
FC_ASSERT(op.total_claimed.asset_id == balance->asset_type());
if( balance->vesting_policy.valid() ) {

9
libraries/chain/include/graphene/chain/transaction_evaluation_state.hpp
View file

@ -41,6 +41,7 @@ namespace graphene { namespace chain {
database& db()const { FC_ASSERT( _db ); return *_db; }
bool signed_by( key_id_type id );
bool signed_by( const address& a, bool maybe_pts = false );
/** derived from signatures on transaction
flat_set<address> signed_by;
@ -56,9 +57,9 @@ namespace graphene { namespace chain {
/** When an address is referenced via check authority it is flagged as being used,
* all addresses must be flagged as being used or the transaction will fail.
*/
flat_map<address, bool> _sigs;
const signed_transaction* _trx = nullptr;
database* _db = nullptr;
bool _is_proposed_trx = false;
flat_map<public_key_type, bool> _sigs;
const signed_transaction* _trx = nullptr;
database* _db = nullptr;
bool _is_proposed_trx = false;
};
} } // namespace graphene::chain

2
libraries/chain/proposal_object.cpp
View file

@ -38,7 +38,7 @@ bool proposal_object::is_authorized_to_execute(database& db) const
signed_transaction tmp;
dry_run_eval._trx = &tmp;
for( auto key_id : available_key_approvals )
dry_run_eval._sigs.insert( std::make_pair(key_id(db).key_address(),true) );
dry_run_eval._sigs.insert( std::make_pair(key_id(db).key(),true) );
//insert into dry_run_eval->_trx.signatures
//dry_run_eval.signed_by.insert(available_key_approvals.begin(), available_key_approvals.end());

23
libraries/chain/transaction_evaluation_state.cpp
View file

@ -99,10 +99,31 @@ namespace graphene { namespace chain {
assert(_trx);
assert(_db);
//wdump((_sigs)(id(*_db).key_address())(*_trx) );
auto itr = _sigs.find( id(*_db).key_address() );
auto itr = _sigs.find( id(*_db).key() );
if( itr != _sigs.end() )
return itr->second = true;
return false;
}
bool transaction_evaluation_state::signed_by( const address& a, bool maybe_pts )
{
if( _db->get_node_properties().skip_flags & (database::skip_authority_check|database::skip_transaction_signatures) )
return true;
for( auto itr = _sigs.begin(); itr != _sigs.end(); ++itr )
{
if( itr->first == a ) return itr->second = true;
if( maybe_pts )
{
//pts normal
if( pts_address( itr->first, false, 56 ) == a ) return itr->second = true;
//pts compressed
if( pts_address( itr->first, true, 56 ) == a ) return itr->second = true;
// btc normal
if( pts_address( itr->first, false, 0 ) == a ) return itr->second = true;
// btc compressed
if( pts_address( itr->first, true, 0 ) == a ) return itr->second = true;
}
}
return false;
}
} } // namespace graphene::chain

19
libraries/db/include/graphene/db/index.hpp
View file

@ -19,6 +19,8 @@
#include <graphene/db/object.hpp>
#include <fc/interprocess/file_mapping.hpp>
#include <fc/io/raw.hpp>
#include <fc/io/json.hpp>
#include <fc/crypto/sha256.hpp>
#include <fstream>
namespace graphene { namespace db {
@ -205,13 +207,26 @@ namespace graphene { namespace db {
virtual void use_next_id()override { ++_next_id.number; }
virtual void set_next_id( object_id_type id )override { _next_id = id; }
fc::sha256 get_object_version()const
{
// TODO: use something other than json to describe the type and detect changes in serialization
// json will only detect adding, removing, or renaming fields but will not detect changing types
// or changes in the contents of optional values.
auto json_obj = fc::json::to_string( object_type() );
return fc::sha256::hash(json_obj);
}
virtual void open( const path& db )override
{
if( !fc::exists( db ) ) return;
fc::file_mapping fm( db.generic_string().c_str(), fc::read_only );
fc::mapped_region mr( fm, fc::read_only, 0, fc::file_size(db) );
fc::datastream<const char*> ds( (const char*)mr.get_address(), mr.get_size() );
fc::sha256 open_ver;
fc::raw::unpack(ds, _next_id);
fc::raw::unpack(ds, open_ver);
FC_ASSERT( open_ver == get_object_version(), "Incompatible Version, the serialization of objects in this index has changed" );
try {
vector<char> tmp;
while( true )
@ -227,7 +242,9 @@ namespace graphene { namespace db {
std::ofstream out( db.generic_string(),
std::ofstream::binary | std::ofstream::out | std::ofstream::trunc );
FC_ASSERT( out );
out.write( (char*)&_next_id, sizeof(_next_id) );
auto ver = get_object_version();
fc::raw::pack( out, _next_id );
fc::raw::pack( out, ver );
this->inspect_all_objects( [&]( const object& o ) {
auto vec = fc::raw::pack( static_cast<const object_type&>(o) );
auto packed_vec = fc::raw::pack( vec );