Merge changes from EOSIO master

CMakeLists.txt

@@ -20,7 +20,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 7)
+set(VERSION_PATCH 8)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( GUI_CLIENT_EXECUTABLE_NAME eosio )

Docker/README.md

@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.0.7 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.0.8 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.0.7 --build-arg branch=v1.0.7 .
+docker build -t eosio/eos:v1.0.8 --build-arg branch=v1.0.8 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.
@@ -181,7 +181,7 @@ Note: if you want to use the mongo db plugin, you have to enable it in your `dat
 
 ```
 # pull images
-docker pull eosio/eos:v1.0.7
+docker pull eosio/eos:v1.0.8
 
 # create volume
 docker volume create --name=nodeos-data-volume

Docker/docker-compose-eosio1.0.yaml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   nodeosd:
-    image: eosio/eos:v1.0.7
+    image: eosio/eos:v1.0.8
     command: /opt/eosio/bin/nodeosd.sh --data-dir /opt/eosio/bin/data-dir -e
     hostname: nodeosd
     ports:
@@ -14,7 +14,7 @@ services:
       - nodeos-data-volume:/opt/eosio/bin/data-dir
 
   keosd:
-    image: eosio/eos:v1.0.7
+    image: eosio/eos:v1.0.8
     command: /opt/eosio/bin/keosd --wallet-dir /opt/eosio/bin/data-dir --http-server-address=127.0.0.1:8900
     hostname: keosd
     links:

contracts/CMakeLists.txt

@@ -10,6 +10,7 @@ add_subdirectory(libc++)
 add_subdirectory(simple.token)
 add_subdirectory(eosio.token)
 add_subdirectory(eosio.msig)
+add_subdirectory(eosio.sudo)
 add_subdirectory(multi_index_test)
 add_subdirectory(eosio.system)
 add_subdirectory(identity)

contracts/eosio.sudo/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+file(GLOB ABI_FILES "*.abi")
+configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
+
+add_wast_executable(TARGET eosio.sudo
+  INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
+  LIBRARIES libc++ libc eosiolib
+  DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
+)

contracts/eosio.sudo/eosio.sudo.abi

@@ -0,0 +1,73 @@
+{
+  "version": "eosio::abi/1.0",
+  "types": [{
+      "new_type_name": "account_name",
+      "type": "name"
+   },{
+      "new_type_name": "permission_name",
+      "type": "name"
+   },{
+      "new_type_name": "action_name",
+      "type": "name"
+  }],
+  "structs": [{
+      "name": "permission_level",
+      "base": "",
+      "fields": [
+        {"name": "actor", "type": "account_name"},
+        {"name": "permission", "type": "permission_name"}
+      ]
+    },{
+      "name": "action",
+      "base": "",
+      "fields": [
+         {"name": "account", "type": "account_name"},
+         {"name": "name", "type": "action_name"},
+         {"name": "authorization", "type": "permission_level[]"},
+         {"name": "data", "type": "bytes"}
+      ]
+    },{
+      "name": "transaction_header",
+      "base": "",
+      "fields": [
+         {"name": "expiration", "type": "time_point_sec"},
+         {"name": "ref_block_num", "type": "uint16"},
+         {"name": "ref_block_prefix", "type": "uint32"},
+         {"name": "max_net_usage_words", "type": "varuint32"},
+         {"name": "max_cpu_usage_ms", "type": "uint8"},
+         {"name": "delay_sec", "type": "varuint32"}
+      ]
+   },{
+      "name": "extension",
+      "base": "",
+      "fields": [
+         {"name": "type", "type" : "uint16" },
+         {"name": "data", "type": "bytes"}
+      ]
+   },{
+      "name": "transaction",
+      "base": "transaction_header",
+      "fields": [
+         {"name": "context_free_actions", "type": "action[]"},
+         {"name": "actions", "type": "action[]"},
+         {"name": "transaction_extensions", "type": "extension[]"}
+      ]
+   },{
+      "name": "exec",
+      "base": "",
+      "fields": [
+        {"name":"executer", "type":"account_name"},
+        {"name":"trx", "type":"transaction"}
+      ]
+    }
+  ],
+  "actions": [{
+      "name": "exec",
+      "type": "exec",
+      "ricardian_contract": ""
+    }
+  ],
+  "tables": [],
+  "ricardian_clauses": [],
+  "abi_extensions": []
+}

contracts/eosio.sudo/eosio.sudo.cpp

@@ -0,0 +1,37 @@
+#include <eosio.sudo/eosio.sudo.hpp>
+#include <eosiolib/transaction.hpp>
+
+namespace eosio {
+
+/*
+exec function manually parses input data (instead of taking parsed arguments from dispatcher)
+because parsing data in the dispatcher uses too much CPU if the included transaction is very big
+
+If we use dispatcher the function signature should be:
+
+void sudo::exec( account_name executer,
+                 transaction  trx )
+*/
+
+void sudo::exec() {
+   require_auth( _self );
+
+   constexpr size_t max_stack_buffer_size = 512;
+   size_t size = action_data_size();
+   char* buffer = (char*)( max_stack_buffer_size < size ? malloc(size) : alloca(size) );
+   read_action_data( buffer, size );
+
+   account_name executer;
+
+   datastream<const char*> ds( buffer, size );
+   ds >> executer;
+
+   require_auth( executer );
+
+   size_t trx_pos = ds.tellp();
+   send_deferred( (uint128_t(executer) << 64) | current_time(), executer, buffer+trx_pos, size-trx_pos );
+}
+
+} /// namespace eosio
+
+EOSIO_ABI( eosio::sudo, (exec) )

contracts/eosio.sudo/eosio.sudo.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <eosiolib/eosio.hpp>
+
+namespace eosio {
+
+   class sudo : public contract {
+      public:
+         sudo( account_name self ):contract(self){}
+
+         void exec();
+
+   };
+
+} /// namespace eosio

contracts/eosiolib/singleton.hpp

@@ -46,7 +46,7 @@ namespace  eosio {
          T get_or_create( account_name bill_to_account, const T& def = T() ) {
             auto itr = _t.find( pk_value );
             return itr != _t.end() ? itr->value
-               : _t.emplace(bill_to_account, [&](row& r) { r.value = def; });
+               : _t.emplace(bill_to_account, [&](row& r) { r.value = def; })->value;
          }
 
          void set( const T& value, account_name bill_to_account ) {

eosio_build.sh

@@ -198,7 +198,6 @@
 
 		export BOOST_ROOT="${HOME}/opt/boost"
 		OPENSSL_ROOT_DIR=/usr/include/openssl
-		WASM_ROOT="${HOME}/opt/wasm"
 	fi
 
 	if [ "$ARCH" == "Darwin" ]; then
@@ -207,7 +206,6 @@
 		C_COMPILER=clang
 		MONGOD_CONF=/usr/local/etc/mongod.conf
 		OPENSSL_ROOT_DIR=/usr/local/opt/openssl
-		WASM_ROOT=/usr/local/wasm
 	fi
 
 	. "$FILE"

libraries/CMakeLists.txt

@@ -8,3 +8,6 @@ add_subdirectory( appbase )
 add_subdirectory( chain )
 add_subdirectory( testing )
 add_subdirectory( abi_generator )
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/chainbase/include/chainbase DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/softfloat/source/include DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/eosio/softfloat)

libraries/chain/abi_serializer.cpp

@@ -177,11 +177,12 @@ namespace eosio { namespace chain {
       }
    }
 
-   bool abi_serializer::_is_type(const type_name& rtype, size_t recursion_depth)const {
+   bool abi_serializer::_is_type(const type_name& rtype, size_t recursion_depth, const fc::time_point& deadline)const {
+      FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
       if( ++recursion_depth > max_recursion_depth) return false;
       auto type = fundamental_type(rtype);
       if( built_in_types.find(type) != built_in_types.end() ) return true;
-      if( typedefs.find(type) != typedefs.end() ) return _is_type(typedefs.find(type)->second, recursion_depth);
+      if( typedefs.find(type) != typedefs.end() ) return _is_type(typedefs.find(type)->second, recursion_depth, deadline);
       if( structs.find(type) != structs.end() ) return true;
       return false;
    }
@@ -193,10 +194,12 @@ namespace eosio { namespace chain {
    }
 
    void abi_serializer::validate()const {
+      const fc::time_point deadline = fc::time_point::now() + max_serialization_time;
       for( const auto& t : typedefs ) { try {
          vector<type_name> types_seen{t.first, t.second};
          auto itr = typedefs.find(t.second);
          while( itr != typedefs.end() ) {
+            FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
             FC_ASSERT( find(types_seen.begin(), types_seen.end(), itr->second) == types_seen.end(), "Circular reference in type ${type}", ("type",t.first) );
             types_seen.emplace_back(itr->second);
             itr = typedefs.find(itr->second);
@@ -210,21 +213,25 @@ namespace eosio { namespace chain {
             struct_def current = s.second;
             vector<type_name> types_seen{current.name};
             while( current.base != type_name() ) {
+               FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
                const auto& base = get_struct(current.base); //<-- force struct to inherit from another struct
                FC_ASSERT( find(types_seen.begin(), types_seen.end(), base.name) == types_seen.end(), "Circular reference in struct ${type}", ("type",s.second.name) );
                types_seen.emplace_back(base.name);
                current = base;
             }
          }
          for( const auto& field : s.second.fields ) { try {
+            FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
             FC_ASSERT(is_type(field.type) );
          } FC_CAPTURE_AND_RETHROW( (field) ) }
       } FC_CAPTURE_AND_RETHROW( (s) ) }
       for( const auto& a : actions ) { try {
+        FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
         FC_ASSERT(is_type(a.second), "", ("type",a.second) );
       } FC_CAPTURE_AND_RETHROW( (a)  ) }
 
       for( const auto& t : tables ) { try {
+        FC_ASSERT( fc::time_point::now() < deadline, "serialization time limit ${t}us exceeded", ("t", max_serialization_time) );
         FC_ASSERT(is_type(t.second), "", ("type",t.second) );
       } FC_CAPTURE_AND_RETHROW( (t)  ) }
    }

libraries/chain/apply_context.cpp

@@ -191,7 +191,7 @@ void apply_context::execute_inline( action&& a ) {
       EOS_ASSERT( actor != nullptr, action_validate_exception,
                   "inline action's authorizing actor ${account} does not exist", ("account", auth.actor) );
       EOS_ASSERT( control.get_authorization_manager().find_permission(auth) != nullptr, action_validate_exception,
-                  "inline action's authorizations include a non-existent permission: {permission}",
+                  "inline action's authorizations include a non-existent permission: ${permission}",
                   ("permission", auth) );
    }
 

libraries/chain/controller.cpp

@@ -395,29 +395,40 @@ struct controller_impl {
 
 
 
+   /**
+    * @post regardless of the success of commit block there is no active pending block
+    */
    void commit_block( bool add_to_fork_db ) {
-      if( add_to_fork_db ) {
-         pending->_pending_block_state->validated = true;
-         auto new_bsp = fork_db.add( pending->_pending_block_state );
-         emit( self.accepted_block_header, pending->_pending_block_state );
-         head = fork_db.head();
-         FC_ASSERT( new_bsp == head, "committed block did not become the new head in fork database" );
+      auto reset_pending_on_exit = fc::make_scoped_exit([this]{
+         pending.reset();
+      });
 
-      }
+      try {
+         if (add_to_fork_db) {
+            pending->_pending_block_state->validated = true;
+            auto new_bsp = fork_db.add(pending->_pending_block_state);
+            emit(self.accepted_block_header, pending->_pending_block_state);
+            head = fork_db.head();
+            FC_ASSERT(new_bsp == head, "committed block did not become the new head in fork database");
+         }
 
-  //    ilog((fc::json::to_pretty_string(*pending->_pending_block_state->block)));
-      emit( self.accepted_block, pending->_pending_block_state );
+         if( !replaying ) {
+            reversible_blocks.create<reversible_block_object>( [&]( auto& ubo ) {
+               ubo.blocknum = pending->_pending_block_state->block_num;
+               ubo.set_block( pending->_pending_block_state->block );
+            });
+         }
 
-      if( !replaying ) {
-         reversible_blocks.create<reversible_block_object>( [&]( auto& ubo ) {
-            ubo.blocknum = pending->_pending_block_state->block_num;
-            ubo.set_block( pending->_pending_block_state->block );
-         });
+         emit( self.accepted_block, pending->_pending_block_state );
+      } catch (...) {
+         // dont bother resetting pending, instead abort the block
+         reset_pending_on_exit.cancel();
+         abort_block();
+         throw;
       }
 
+      // push the state for pending.
       pending->push();
-      pending.reset();
-
    }
 
    // The returned scoped_exit should not exceed the lifetime of the pending which existed when make_block_restore_point was called.

libraries/chain/eosio_contract.cpp

@@ -92,7 +92,7 @@ void apply_eosio_newaccount(apply_context& context) {
    }
 
    auto existing_account = db.find<account_object, by_name>(create.name);
-   EOS_ASSERT(existing_account == nullptr, action_validate_exception,
+   EOS_ASSERT(existing_account == nullptr, account_name_exists_exception,
               "Cannot create account named ${name}, as that name is already taken",
               ("name", create.name));
 
@@ -282,7 +282,8 @@ void apply_eosio_deleteauth(apply_context& context) {
       const auto& index = db.get_index<permission_link_index, by_permission_name>();
       auto range = index.equal_range(boost::make_tuple(remove.account, remove.permission));
       EOS_ASSERT(range.first == range.second, action_validate_exception,
-                 "Cannot delete a linked authority. Unlink the authority first");
+                 "Cannot delete a linked authority. Unlink the authority first. This authority is linked to ${code}::${type}.", 
+                 ("code", string(range.first->code))("type", string(range.first->message_type)));
    }
 
    const auto& permission = authorization.get_permission({remove.account, remove.permission});

libraries/chain/include/eosio/chain/abi_serializer.hpp

@@ -43,7 +43,7 @@ struct abi_serializer {
    bool      is_array(const type_name& type)const;
    bool      is_optional(const type_name& type)const;
    bool      is_type(const type_name& type)const {
-      return _is_type(type, 0);
+      return _is_type(type, 0, fc::time_point::now() + max_serialization_time);
    }
    bool      is_builtin_type(const type_name& type)const;
    bool      is_integer(const type_name& type) const;
@@ -126,7 +126,7 @@ struct abi_serializer {
    void _binary_to_variant(const type_name& type, fc::datastream<const char*>& stream, fc::mutable_variant_object& obj,
                            size_t recursion_depth, const fc::time_point& deadline)const;
 
-   bool _is_type(const type_name& type, size_t recursion_depth)const;
+   bool _is_type(const type_name& type, size_t recursion_depth, const fc::time_point& deadline)const;
 
    friend struct impl::abi_from_variant;
    friend struct impl::abi_to_variant;

libraries/chain/include/eosio/chain/wast_to_wasm.hpp

@@ -9,7 +9,7 @@
 namespace eosio { namespace chain {
 
 std::vector<uint8_t> wast_to_wasm( const std::string& wast );
-std::string  wasm_to_wast( const std::vector<uint8_t>& wasm );
-std::string  wasm_to_wast( const uint8_t* data, uint64_t size );
+std::string  wasm_to_wast( const std::vector<uint8_t>& wasm, bool strip_names );
+std::string  wasm_to_wast( const uint8_t* data, uint64_t size, bool strip_names );
 
 } } /// eosio::chain