Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

various updates to support bitshares

Browse source
This commit is contained in:
Daniel Larimer 2013-06-06 19:20:51 -04:00
parent 639a0c795a
commit 0fd0574c05
3 changed files with 97 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/fc/crypto/elliptic.hpp
View file

@ -5,8 +5,12 @@
#include <fc/fwd.hpp> #include <fc/fwd.hpp>
#include <fc/array.hpp> #include <fc/array.hpp>
#include <vector> #include <vector>
#include <fc/io/raw_fwd.hpp>
namespace fc { namespace ecc { namespace fc
{
namespace ecc
{
namespace detail namespace detail
{ {
@ -59,4 +63,37 @@ namespace fc { namespace ecc {
private: private:
fc::fwd<detail::private_key_impl,8> my; fc::fwd<detail::private_key_impl,8> my;
}; };
} } // fc::ecc } // namespace ecc
namespace raw
{
template<typename Stream>
inline void pack( Stream& s, const fc::ecc::public_key& v )
{
pack( s, v.serialize() );
}
template<typename Stream>
inline void unpack( Stream& s, fc::ecc::public_key& v )
{
std::vector<char> d;
unpack( s, d );
v = fc::ecc::public_key( fc::move(d) );
}
template<typename Stream>
inline void pack( Stream& s, const fc::ecc::private_key& v )
{
pack( s, v.get_secret() );
}
template<typename Stream>
inline void unpack( Stream& s, fc::ecc::private_key& v )
{
fc::sha256 secret;
unpack( s, secret );
v = fc::ecc::private_key::regenerate( secret );
}
} // namespace raw
} // fc

4
include/fc/io/raw.hpp
View file

@ -127,7 +127,9 @@ namespace fc {
template<typename Stream> inline void unpack( Stream& s, fc::string& v ) { template<typename Stream> inline void unpack( Stream& s, fc::string& v ) {
std::vector<char> tmp; unpack(s,tmp); std::vector<char> tmp; unpack(s,tmp);
v = fc::string(tmp.begin(),tmp.end()); if( tmp.size() )
v = fc::string(tmp.data(),tmp.data()+tmp.size());
else v = fc::string();
} }
// bool // bool

12
include/fc/io/raw_fwd.hpp
View file

@ -1,13 +1,23 @@
#pragma once #pragma once
#include <fc/io/varint.hpp> #include <fc/io/varint.hpp>
#include <fc/array.hpp> #include <fc/array.hpp>
#include <vector>
#include <string>
namespace fc { namespace raw { namespace fc {
namespace ecc { class public_key; class private_key; }
namespace raw {
template<typename Stream, typename T> void unpack( Stream& s, fc::optional<T>& v ); template<typename Stream, typename T> void unpack( Stream& s, fc::optional<T>& v );
template<typename Stream, typename T> void pack( Stream& s, const fc::optional<T>& v ); template<typename Stream, typename T> void pack( Stream& s, const fc::optional<T>& v );
template<typename Stream> void unpack( Stream& s, fc::string& ); template<typename Stream> void unpack( Stream& s, fc::string& );
template<typename Stream> void pack( Stream& s, const fc::string& ); template<typename Stream> void pack( Stream& s, const fc::string& );
template<typename Stream> void unpack( Stream& s, std::string& );
template<typename Stream> void pack( Stream& s, const std::string& );
template<typename Stream> void unpack( Stream& s, fc::ecc::public_key& );
template<typename Stream> void pack( Stream& s, const fc::ecc::public_key& );
template<typename Stream> void unpack( Stream& s, fc::ecc::private_key& );
template<typename Stream> void pack( Stream& s, const fc::ecc::private_key& );
template<typename Stream, typename T> inline void pack( Stream& s, const T& v ); template<typename Stream, typename T> inline void pack( Stream& s, const T& v );
template<typename Stream, typename T> inline void unpack( Stream& s, T& v ); template<typename Stream, typename T> inline void unpack( Stream& s, T& v );