From d0e08dfaf390d6a475d3eeb13ca85a26a146f903 Mon Sep 17 00:00:00 2001
From: Kevin Heifner <heifnerk@objectcomputing.com>
Date: Wed, 23 May 2018 15:09:22 -0400
Subject: [PATCH] Add eosio::abi/1.0 as default version of abi_def

---
 libraries/chain/eosio_contract_abi.cpp        | 28 ++++++-------------
 .../chain/include/eosio/chain/abi_def.hpp     |  4 +--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/libraries/chain/eosio_contract_abi.cpp b/libraries/chain/eosio_contract_abi.cpp
index ab96d6df4..10bbba319 100644
--- a/libraries/chain/eosio_contract_abi.cpp
+++ b/libraries/chain/eosio_contract_abi.cpp
@@ -3,25 +3,6 @@
 
 namespace eosio { namespace chain {
 
-vector<type_def> built_in_types()
-{
-   vector<type_def> types;
-
-   types.push_back( type_def{"account_name",    "name"} );
-   types.push_back( type_def{"permission_name", "name"} );
-   types.push_back( type_def{"action_name",     "name"} );
-   types.push_back( type_def{"scope_name",      "name"} );
-   types.push_back( type_def{"table_name",      "name"} );
-   types.push_back( type_def{"transaction_id_type", "checksum256"} );
-   types.push_back( type_def{"block_id_type",       "checksum256"} );
-   types.push_back( type_def{"share_type",      "int64_t"} );
-   types.push_back( type_def{"time",            "uint32"} );
-   types.push_back( type_def{"weight_type",     "uint16"} );
-
-   return types;
-}
-
-
 abi_def eosio_contract_abi(const abi_def& eosio_system_abi)
 {
    abi_def eos_abi(eosio_system_abi);
@@ -30,7 +11,14 @@ abi_def eosio_contract_abi(const abi_def& eosio_system_abi)
       eos_abi.version = "eosio::abi/1.0";
    }
 
-   fc::move_append(eos_abi.types, built_in_types());
+   eos_abi.types.push_back( type_def{"account_name",    "name"} );
+   eos_abi.types.push_back( type_def{"permission_name", "name"} );
+   eos_abi.types.push_back( type_def{"action_name",     "name"} );
+   eos_abi.types.push_back( type_def{"scope_name",      "name"} );
+   eos_abi.types.push_back( type_def{"table_name",      "name"} );
+   eos_abi.types.push_back( type_def{"transaction_id_type", "checksum256"} );
+   eos_abi.types.push_back( type_def{"block_id_type",       "checksum256"} );
+   eos_abi.types.push_back( type_def{"weight_type",     "uint16"} );
 
    // transaction
    eos_abi.structs.emplace_back( struct_def {
diff --git a/libraries/chain/include/eosio/chain/abi_def.hpp b/libraries/chain/include/eosio/chain/abi_def.hpp
index c44105fa1..18f1366de 100644
--- a/libraries/chain/include/eosio/chain/abi_def.hpp
+++ b/libraries/chain/include/eosio/chain/abi_def.hpp
@@ -106,7 +106,7 @@ struct abi_def {
    ,error_messages(error_msgs)
    {}
 
-   string                version;
+   string                version = "eosio::abi/1.0";
    vector<type_def>      types;
    vector<struct_def>    structs;
    vector<action_def>    actions;
@@ -118,8 +118,6 @@ struct abi_def {
 
 abi_def eosio_contract_abi(const abi_def& eosio_system_abi);
 
-vector<type_def> built_in_types();
-
 } } /// namespace eosio::chain
 
 FC_REFLECT( eosio::chain::type_def                         , (new_type_name)(type) )
-- 
GitLab