* Fix examples in AUTOMATED_ABI_GENERATOR.md

* Fix currency.abi / exchange.abi / proxi.abi

AUTOMATED_ABI_GENERATOR.md

@@ -32,10 +32,10 @@ Generated types.gen.hpp ...
 #include <eoslib/string.hpp>
 
 //@abi action
-struct ActionName {
+struct action_name {
   uint64_t    param1;
   uint64_t    param2;
-  eos::string param3;
+  eosio::string param3;
 };
 ```
 
@@ -43,35 +43,35 @@ struct ActionName {
 {
   "types": [],
   "structs": [{
-      "name": "ActionName",
+      "name": "action_name",
       "base": "",
       "fields": {
-        "param1": "UInt64",
-        "param2": "UInt64",
-        "param3": "String"
+        "param1": "uint64",
+        "param2": "uint64",
+        "param3": "string"
       }
     }
   ],
   "actions": [{
-      "action": "actionname",
-      "type": "ActionName"
+      "action_name": "actionname",
+      "type": "action_name"
     }
   ],
   "tables": []
 }
 ```
 
-### Declaring multiple actions that use the same struct.
+### Declaring multiple actions using the same interface.
 
 ```c++
 #include <eoslib/types.hpp>
 #include <eoslib/string.hpp>
 
 //@abi action action1 action2
-struct ActionName {
+struct action_name {
   uint64_t param1;
   uint64_t param2;
-  eos::string   param3;
+  eosio::string   param3;
 };
 ```
 
@@ -79,21 +79,21 @@ struct ActionName {
 {
   "types": [],
   "structs": [{
-      "name": "ActionName",
+      "name": "action_name",
       "base": "",
       "fields": {
-        "param1": "UInt64",
-        "param2": "UInt64",
-        "param3": "String"
+        "param1": "uint64",
+        "param2": "uint64",
+        "param3": "string"
       }
     }
   ],
   "actions": [{
-      "action": "action1",
-      "type": "ActionName"
+      "action_name": "action1",
+      "type": "action_name"
     },{
-      "action": "action2",
-      "type": "ActionName"
+      "action_name": "action2",
+      "type": "action_name"
     }
   ],
   "tables": []
@@ -106,7 +106,7 @@ struct ActionName {
 #include <eoslib/string.hpp>
 
 //@abi table
-struct MyTable {
+struct my_table {
   uint64_t key;
 };
 ```
@@ -115,24 +115,24 @@ struct MyTable {
 {
   "types": [],
   "structs": [{
-      "name": "MyTable",
+      "name": "my_table",
       "base": "",
       "fields": {
-        "key": "UInt64"
+        "key": "uint64"
       }
     }
   ],
   "actions": [],
   "tables": [{
-      "table": "mytable",
-      "indextype": "i64",
-      "keynames": [
+      "table_name": "mytable",
+      "index_type": "i64",
+      "key_names": [
         "key"
       ],
-      "keytypes": [
-        "UInt64"
+      "key_types": [
+        "uint64"
       ],
-      "type": "MyTable"
+      "type": "my_table"
     }
   ]
 }
@@ -143,7 +143,7 @@ _a struct with 3 uint64_t can be both i64 or i64i64i64_
 #include <eoslib/types.hpp>
 
 //@abi table i64
-struct MyNewTable {
+struct my_new_table {
   uint64_t key;
   uint64_t name;
   uint64_t age;
@@ -154,26 +154,26 @@ struct MyNewTable {
 {
   "types": [],
   "structs": [{
-      "name": "MyNewTable",
+      "name": "my_new_table",
       "base": "",
       "fields": {
-        "key": "UInt64",
-        "name": "UInt64",
-        "age": "UInt64"
+        "key": "uint64",
+        "name": "uint64",
+        "age": "uint64"
       }
     }
   ],
   "actions": [],
   "tables": [{
-      "table": "mynewtable",
-      "indextype": "i64",
-      "keynames": [
+      "table_name": "mynewtable",
+      "index_type": "i64",
+      "key_names": [
         "key"
       ],
-      "keytypes": [
-        "UInt64"
+      "key_types": [
+        "uint64"
       ],
-      "type": "MyNewTable"
+      "type": "my_new_table"
     }
   ]
 }
@@ -188,38 +188,39 @@ struct MyNewTable {
  * @abi table
  * @abi action
  */ 
-struct MyType {
-  eos::string key;
-  eos::Name value;
+struct my_type {
+  eosio::string key;
+  eosio::name value;
 };
 ```
+
 ```json
 {
   "types": [],
   "structs": [{
-      "name": "MyType",
+      "name": "my_type",
       "base": "",
       "fields": {
-        "key": "String",
-        "value": "Name"
+        "key": "string",
+        "value": "name"
       }
     }
   ],
   "actions": [{
-      "action": "mytype",
-      "type": "MyType"
+      "action_name": "mytype",
+      "type": "my_type"
     }
   ],
   "tables": [{
-      "table": "mytype",
-      "indextype": "str",
-      "keynames": [
+      "table_name": "mytype",
+      "index_type": "str",
+      "key_names": [
         "key"
       ],
-      "keytypes": [
-        "String"
+      "key_types": [
+        "string"
       ],
-      "type": "MyType"
+      "type": "my_type"
     }
   ]
 }
@@ -229,47 +230,48 @@ struct MyType {
 
 ```c++
 #include <eoslib/types.hpp>
-struct Simple {
+struct simple {
   uint64_t u64;
 };
 
-typedef Simple SimpleAlias;
-typedef eos::Name NameAlias;
+typedef simple simple_alias;
+typedef eosio::name name_alias;
 
 //@abi action
-struct ActionOne : SimpleAlias {
+struct action_one : simple_alias {
   uint32_t u32;
-  NameAlias name;
+  name_alias name;
 };
 ```
+
 ```json
 {
   "types": [{
-      "newTypeName": "SimpleAlias",
-      "type": "Simple"
+      "new_type_name": "simple_alias",
+      "type": "simple"
     },{
-      "newTypeName": "NameAlias",
-      "type": "Name"
+      "new_type_name": "name_alias",
+      "type": "name"
     }
   ],
   "structs": [{
-      "name": "Simple",
+      "name": "simple",
       "base": "",
       "fields": {
-        "u64": "UInt64"
+        "u64": "uint64"
       }
     },{
-      "name": "ActionOne",
-      "base": "SimpleAlias",
+      "name": "action_one",
+      "base": "simple_alias",
       "fields": {
-        "u32": "UInt32",
-        "name": "NameAlias"
+        "u32": "uint32",
+        "name": "name_alias"
       }
     }
   ],
   "actions": [{
-      "action": "actionone",
-      "type": "ActionOne"
+      "action_name": "actionone",
+      "type": "action_one"
     }
   ],
   "tables": []
@@ -281,25 +283,25 @@ struct ActionOne : SimpleAlias {
 #include <eoslib/types.hpp>
 #include <eoslib/string.hpp>
 
-struct Simple {
+struct simple {
   uint32_t u32;
-  FixedString16 s16;
+  fixed_string16 s16;
 };
 
-struct MyComplexType {
+struct my_complex_type {
   uint64_t u64;
-  eos::string str;
-  Simple simple;
-  Bytes bytes;
-  PublicKey pub;
+  eosio::string str;
+  simple simple;
+  bytes bytes;
+  public_key pub;
 };
 
-typedef MyComplexType Complex;
+typedef my_complex_type complex;
 
 //@abi action
-struct TestAction {
+struct test_action {
   uint32_t u32;
-  Complex complex;
+  complex cplx;
 };
 ```
 
@@ -307,26 +309,26 @@ struct TestAction {
 void apply( uint64_t code, uint64_t action ) {
    if( code == N(mycontract) ) {
       if( action == N(testaction) ) {
-        auto test_action = eos::current_message_ex<TestAction>();
-        eos::print("TestAction content\n");
-        eos::dump(test_action);
+        auto msg = eosio::current_message<test_action>();
+        eosio::print("test_action content\n");
+        eosio::dump(msg);
          
-        Bytes bytes = eos::raw::to_bytes(test_action);
-        printhex(bytes.data, bytes.len);
+        bytes b = eosio::raw::pack(msg);
+        printhex(b.data, b.len);
      }
   }
 }
 ```
-Calling the contract with some test values
+Calling contract with test values
 ```bash
-eosc push message mycontract testaction '{"u32":"1000", "complex":{"u64":"472", "str":"hello", "bytes":"B0CA", "pub":"EOS8CY2pCW5THmzvPTgEh5WLEAxgpVFXaPogPvgvVpVWCYMRdzmwx", "simple":{"u32":"164","s16":"small-string"}}}' -S mycontract
+eosc push message mycontract testaction '{"u32":"1000", "cplx":{"u64":"472", "str":"hello", "bytes":"B0CA", "pub":"EOS8CY2pCW5THmzvPTgEh5WLEAxgpVFXaPogPvgvVpVWCYMRdzmwx", "simple":{"u32":"164","s16":"small-string"}}}' -S mycontract
 ```
 
 Will produce the following output in eosd console 
 ```bash
-TestAction content
+test_action content
 u32:[1000]
-complex:[
+cplx:[
   u64:[472]
   str:[hello]
   simple:[

contracts/currency/currency.abi

@@ -5,7 +5,7 @@
     }
   ],
   "structs": [{
-      "name": "Transfer",
+      "name": "transfer",
       "base": "",
       "fields": {
         "from": "account_name",
@@ -13,7 +13,7 @@
         "amount": "uint64"
       }
     },{
-      "name": "Account",
+      "name": "account",
       "base": "",
       "fields": {
         "key": "uint64",
@@ -30,7 +30,7 @@
       "table_name": "account",
       "type": "account",
       "index_type": "i64",
-      "key_names" : ["account"],
+      "key_names" : ["key"],
       "key_types" : ["name"]
     }
   ]

contracts/eoslib/raw.hpp

@@ -131,6 +131,24 @@ namespace eosio {
       }
    }
 
+  /**
+   *  Serialize a public_key into a stream
+   *  @param s stream to write
+   *  @param v value to be serialized
+   */
+   template<typename Stream> inline void pack( Stream& s, const public_key& value ) {
+      s.write( (char *)value.data, sizeof(public_key) );
+   }
+   
+  /**
+   *  Deserialize a public_key from a stream
+   *  @param s stream to read
+   *  @param v destination of deserialized public_key
+   */
+   template<typename Stream> inline void unpack( Stream& s, public_key& value ) {
+      s.read( (char *)value.data, sizeof(public_key) );
+   }
+
   /**
    *  Serialize a string into a stream
    *  @param s stream to write

contracts/eoslib/raw_fwd.hpp

@@ -15,6 +15,8 @@ namespace eosio { namespace raw {
    template<typename Stream> inline void unpack( Stream& s, unsigned_int& vi );
    template<typename Stream> inline void pack( Stream& s, const bytes& value );
    template<typename Stream> inline void unpack( Stream& s, bytes& value );
+   template<typename Stream> inline void pack( Stream& s, const public_key& value );
+   template<typename Stream> inline void unpack( Stream& s, public_key& value );
    template<typename Stream> inline void pack( Stream& s, const string& v );
    template<typename Stream> inline void unpack( Stream& s, string& v);
    template<typename Stream> inline void pack( Stream& s, const fixed_string32& v );

contracts/exchange/exchange.abi

@@ -49,12 +49,6 @@
     }
   ],
   "actions": [{
-      "action": "cancelbuy",
-      "type": "OrderID"
-    },{
-      "action": "cancelsell",
-      "type": "OrderID"
-    },{
       "action": "buy",
       "type": "buy_order"
     },{

contracts/exchange/exchange.hpp

@@ -9,7 +9,7 @@ namespace exchange {
    using currency::currency_tokens;
    using eos_tokens = eosio::tokens;
 
-   //@abi exchange action cancelbuy cancelsell
+   //@abi action cancelbuy cancelsell
    struct order_id {
       account_name name    = 0;
       uint64_t    number  = 0;
@@ -21,7 +21,7 @@ namespace exchange {
    struct PACKED( bid ) {
       order_id           buyer;
       price              at_price;
-      eosio::tokens        quantity;
+      eosio::tokens      quantity;
       time               expiration;
 
       void print() {

contracts/proxy/proxy.abi

@@ -11,11 +11,17 @@
         "key": "name",
         "owner": "name"
       }
+    },{
+      "name": "setowner",
+      "base": "",
+      "fields": {
+        "owner": "name"
+      }
     }
   ],
   "actions": [{
       "action_name": "setowner",
-      "type": "name"
+      "type": "setowner"
     }
   ],
   "tables": [{

programs/codegen/main.cpp

@@ -40,9 +40,9 @@ struct codegen {
          if( abis.is_struct(field_type) ) {
             output << "print(\"\\n\"); eosio::dump(value."<< field.name <<", tab+1);";
             output << "print_ident(tab);";
-         } else if( field_type == "String" ) {
+         } else if( field_type == "string" ) {
             output << "prints_l(value."<< field.name <<".get_data(), value."<< field.name <<".get_size());";
-         } else if( field_type == "FixedString32" || field_type == "FixedString16" ) {
+         } else if( field_type == "fixed_string32" || field_type == "fixed_string16" ) {
             output << "prints_l(value."<< field.name <<".str, value."<< field.name <<".len);";
          } else if( field_type == "Bytes" ) {
             output << "printhex(value."<< field.name <<".data, value."<< field.name <<".len);";
@@ -56,16 +56,16 @@ struct codegen {
                output << "printhex((void*)&value."<< field.name <<", sizeof(value."<< field.name <<"));";
             }
             
-         } else if( field_type == "Bytes" ) {
-            output << "printhex(value."<< field.name <<".data, value."<< field.name <<".len));";
-         } else if( field_type == "Name" || field_type == "AccountName" || field_type == "PermissionName" ||\
-          field_type == "TokenName" || field_type == "TableName" || field_type == "FuncName" ) {
+         } else if( field_type == "bytes" ) {
+            output << "printhex(value."<< field.name <<".data, value."<< field.name <<".len);";
+         } else if( field_type == "name" || field_type == "account_name" || field_type == "permission_name" ||\
+          field_type == "token_name" || field_type == "table_name" || field_type == "func_name" ) {
             output << "printn(value."<< field.name <<");";
-         } else if( field_type == "PublicKey" ) {
+         } else if( field_type == "public_key" ) {
             output << "printhex((void*)value."<< field.name <<".data, 33);";
-         } else if( field_type == "Time" ) {
+         } else if( field_type == "time" ) {
             output << "printi(value."<< field.name <<");";
-         } else if( field_type == "Price" ) {
+         } else if( field_type == "price" ) {
             output << "printi(value."<< field.name <<".base.amount);print(\"/\");printi(value."<< field.name <<".quote.amount);";
          } else {
             
@@ -119,6 +119,7 @@ struct codegen {
       ostringstream output;
       output << "#pragma once" << endl;
       output << "#include <eoslib/types.hpp>" << endl;
+      output << "#include <eoslib/message.hpp>" << endl;
       output << "#include <eoslib/datastream.hpp>" << endl;
       output << "#include <eoslib/raw_fwd.hpp>" << endl;