From d30bd0dfc7fc659ca166b16a0390f89fd1fa1440 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 5 Apr 2018 17:29:51 -0400 Subject: [PATCH 1/2] Fix for eos #2160 --- libraries/chain/contracts/abi_serializer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/chain/contracts/abi_serializer.cpp b/libraries/chain/contracts/abi_serializer.cpp index fd6fcbc4fb5..80f29e1e93b 100644 --- a/libraries/chain/contracts/abi_serializer.cpp +++ b/libraries/chain/contracts/abi_serializer.cpp @@ -97,6 +97,7 @@ namespace eosio { namespace chain { namespace contracts { built_in_types.emplace("action_name", pack_unpack()); built_in_types.emplace("scope_name", pack_unpack()); built_in_types.emplace("producer_schedule", pack_unpack()); + built_in_types.emplace("newaccount", pack_unpack()); } void abi_serializer::set_abi(const abi_def& abi) { @@ -123,6 +124,7 @@ namespace eosio { namespace chain { namespace contracts { * The ABI vector may contain duplicates which would make it * an invalid ABI */ + for( const auto& tt : typedefs ) FC_ASSERT( typedefs.size() == abi.types.size() ); FC_ASSERT( structs.size() == abi.structs.size() ); FC_ASSERT( actions.size() == abi.actions.size() ); From 4b64bb6f1603f2f6f856e7dc0e7299ccb1d81d8a Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 5 Apr 2018 17:31:26 -0400 Subject: [PATCH 2/2] Fix for eos #2160, forgot debug artifact --- libraries/chain/contracts/abi_serializer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/chain/contracts/abi_serializer.cpp b/libraries/chain/contracts/abi_serializer.cpp index 80f29e1e93b..16006096466 100644 --- a/libraries/chain/contracts/abi_serializer.cpp +++ b/libraries/chain/contracts/abi_serializer.cpp @@ -124,7 +124,6 @@ namespace eosio { namespace chain { namespace contracts { * The ABI vector may contain duplicates which would make it * an invalid ABI */ - for( const auto& tt : typedefs ) FC_ASSERT( typedefs.size() == abi.types.size() ); FC_ASSERT( structs.size() == abi.structs.size() ); FC_ASSERT( actions.size() == abi.actions.size() );