Merge branch 'dev_master' into testnet

gxchain · Feb 28, 2019 · f9b8c9a · f9b8c9a
2 parents 21b33a2 + 1c455ea
commit f9b8c9a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/contracts/graphenelib/print.hpp b/contracts/graphenelib/print.hpp
@@ -156,6 +156,26 @@ namespace graphene {
       prints(val?"true":"false");
    }
 
+   inline void print( public_key val){
+      print("0x");
+      printhex(val.data,sizeof(val.data));
+   }
+   inline void print( signature val){
+      print("0x");
+      printhex(val.data,sizeof(val.data));
+   }
+   inline void print( checksum256 val){
+      print("0x");
+      printhex(val.hash,sizeof(val.hash));
+   }
+   inline void print( checksum160 val){
+      print("0x");
+      printhex(val.hash,sizeof(val.hash));
+   }
+   inline void print( checksum512 val){
+      print("0x");
+      printhex(val.hash,sizeof(val.hash));
+   }
 
    template<typename T>
    inline void print( T&& t ) {

diff --git a/libraries/chain/abi_serializer.cpp b/libraries/chain/abi_serializer.cpp
@@ -88,6 +88,8 @@ void abi_serializer::configure_built_in_types()
     built_in_types.emplace("bytes", pack_unpack<bytes>());
     built_in_types.emplace("string", pack_unpack<string>());
 
+
+    built_in_types.emplace("block_id_type", pack_unpack<checksum160_type>());
     built_in_types.emplace("checksum160", pack_unpack<checksum160_type>());
     built_in_types.emplace("checksum256", pack_unpack<checksum256_type>());
     built_in_types.emplace("checksum512", pack_unpack<checksum512_type>());