Progress on #197

CMakeModules/wasm.cmake

@@ -124,13 +124,12 @@ macro(add_wast_target target INCLUDE_FOLDERS DESTINATION_FOLDER)
 
   add_custom_command(OUTPUT ${DESTINATION_FOLDER}/${target}.abi
     DEPENDS ${target}.s abi_generator
-    COMMAND rm -f ${DESTINATION_FOLDER}/${target}.abi
+    COMMAND rm -f "${DESTINATION_FOLDER}/${target}.abi.*"
     COMMAND ${WASM_CLANG} -c --std=c++14 --target=wasm32 -I ${INCLUDE_FOLDERS} -fparse-all-comments
             -Xclang -load -Xclang $<TARGET_FILE:abi_generator>
             -Xclang -plugin -Xclang generate-abi ${SOURCE_FILES}
             -Xclang -plugin-arg-generate-abi -Xclang -destination-file=${DESTINATION_FOLDER}/${target}.abi
             -Xclang -plugin-arg-generate-abi -Xclang -context=${target}
-    COMMAND 
     COMMENT "Generating ABI ${target}.abi"
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     VERBATIM

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",
@@ -34,4 +34,4 @@
       "key_types" : ["name"]
     }
   ]
-}
+}
\ No newline at end of file

contracts/currency/currency.hpp

@@ -37,6 +37,11 @@ namespace TOKEN_NAME {
    */
    typedef eosio::token<uint64_t,N(currency)> currency_tokens;
 
+   // union pepe {
+   //   unsigned long long a;
+   //   char b;
+   // };
+
    /**
     *  transfer requires that the sender and receiver be the first two
     *  accounts notified and that the sender has provided authorization.
@@ -58,7 +63,6 @@ namespace TOKEN_NAME {
    };
 
    /**
-<<<<<<< a12c91560b4de7d041857a3e3101258aea48c2ae
     *  @brief row in Account table stored within each scope
     *  @abi currency table
     */

contracts/exchange/exchange.hpp

@@ -43,7 +43,7 @@ namespace exchange {
    };
    static_assert( sizeof(ask) == 32+12, "unexpected padding" );
 
-   //@abi exchange table
+   //@abi exchange table i64
    struct PACKED( account ) {
       account( account_name o = account_name() ):owner(o){}