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

Hack to allow address parsing code to handle both MUSE prefix and BTS

Browse source 
prefix
This commit is contained in:
Eric Frias 2015-11-09 16:36:47 -05:00
parent 9261314997
commit ed1121d3f6
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/include/graphene/chain/protocol/types.hpp
View file

@ -238,6 +238,7 @@ namespace graphene { namespace chain {
friend bool operator != ( const public_key_type& p1, const public_key_type& p2); friend bool operator != ( const public_key_type& p1, const public_key_type& p2);
// TODO: This is temporary for testing // TODO: This is temporary for testing
bool is_valid_v1( const std::string& base58str ); bool is_valid_v1( const std::string& base58str );
bool is_valid_muse( const std::string& base58str );
}; };
} } // graphene::chain } } // graphene::chain

23
libraries/chain/protocol/types.cpp
View file

@ -49,6 +49,15 @@ namespace graphene { namespace chain {
{ {
} }
try
{
if( is_valid_muse( base58str ) )
prefix = std::string( "MUSE" );
}
catch( ... )
{
}
const size_t prefix_len = prefix.size(); const size_t prefix_len = prefix.size();
FC_ASSERT( base58str.size() > prefix_len ); FC_ASSERT( base58str.size() > prefix_len );
FC_ASSERT( base58str.substr( 0, prefix_len ) == prefix , "", ("base58str", base58str) ); FC_ASSERT( base58str.substr( 0, prefix_len ) == prefix , "", ("base58str", base58str) );
@ -58,6 +67,20 @@ namespace graphene { namespace chain {
FC_ASSERT( fc::ripemd160::hash( key_data.data, key_data.size() )._hash[0] == bin_key.check ); FC_ASSERT( fc::ripemd160::hash( key_data.data, key_data.size() )._hash[0] == bin_key.check );
}; };
bool public_key_type::is_valid_muse( const std::string& base58str )
{
std::string prefix( "MUSE" );
const size_t prefix_len = prefix.size();
FC_ASSERT( base58str.size() > prefix_len );
FC_ASSERT( base58str.substr( 0, prefix_len ) == prefix , "", ("base58str", base58str) );
auto bin = fc::from_base58( base58str.substr( prefix_len ) );
auto bin_key = fc::raw::unpack<binary_key>(bin);
key_data = bin_key.data;
FC_ASSERT( fc::ripemd160::hash( key_data.data, key_data.size() )._hash[0] == bin_key.check );
return true;
}
// TODO: This is temporary for testing // TODO: This is temporary for testing
bool public_key_type::is_valid_v1( const std::string& base58str ) bool public_key_type::is_valid_v1( const std::string& base58str )
{ {