Merge pull request #4475 from EOSIO/release/1.0.x

v1.0.8

Author: b1bart

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/README.md

@@ -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.abi

@@ -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.cpp

@@ -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/eosio.sudo/eosio.sudo.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 ) {