Merge pull request #5382 from EOSIO/release/1.2.x

Version 1.2.2
EOSIO · Aug 22, 2018 · 2ad4127 · 2ad4127
2 parents bf28f8b + 351738b
commit 2ad4127
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 62 deletions.
diff --git a/.buildkite/coverage.yml b/.buildkite/coverage.yml
@@ -15,7 +15,7 @@ steps:
     agents:
       - "role=linux-coverage"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
         mounts:

diff --git a/.buildkite/debug.yml b/.buildkite/debug.yml
@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
diff --git a/.buildkite/long_running_tests.yml b/.buildkite/long_running_tests.yml
@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -22,7 +22,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -37,7 +37,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -52,7 +52,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -67,7 +67,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -82,7 +82,7 @@ steps:
       - "role=linux-builder"
     artifact_paths: "build.tar.gz"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
@@ -128,7 +128,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu"
         workdir: /data/job
     timeout: 60
@@ -152,7 +152,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:ubuntu18"
         workdir: /data/job
     timeout: 60
@@ -176,7 +176,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:fedora"
         workdir: /data/job
     timeout: 60
@@ -200,7 +200,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:centos"
         workdir: /data/job
     timeout: 60
@@ -224,7 +224,7 @@ steps:
       - "build/genesis.json"
       - "build/config.ini"
     plugins:
-      docker#v1.1.1:
+      docker#v1.4.0:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )

diff --git a/Docker/README.md b/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.2.1 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.2.2 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.2.1 --build-arg branch=v1.2.1 .
+docker build -t eosio/eos:v1.2.2 --build-arg branch=v1.2.2 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

diff --git a/contracts/eosiolib/types.h b/contracts/eosiolib/types.h
@@ -27,13 +27,13 @@ typedef uint64_t account_name;
 
 /**
  * @brief Name of a permission
- * @details Name of an account
+ * @details Name of a permission
  */
 typedef uint64_t permission_name;
 
 /**
  * @brief Name of a table
- * @details Name of atable
+ * @details Name of a table
  */
 typedef uint64_t table_name;
 

diff --git a/libraries/fc b/libraries/fc
diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
@@ -1404,11 +1404,15 @@ void read_write::push_transaction(const read_write::push_transaction_params& par
             auto trx_trace_ptr = result.get<transaction_trace_ptr>();
 
             try {
-               fc::variant pretty_output;
-               pretty_output = db.to_variant_with_abi(*trx_trace_ptr, abi_serializer_max_time);
-
                chain::transaction_id_type id = trx_trace_ptr->id;
-               next(read_write::push_transaction_results{id, pretty_output});
+               fc::variant output;
+               try {
+                  output = db.to_variant_with_abi( *trx_trace_ptr, abi_serializer_max_time );
+               } catch( chain::abi_exception& ) {
+                  output = *trx_trace_ptr;
+               }
+
+               next(read_write::push_transaction_results{id, output});
             } CATCH_AND_CALL(next);
          }
       });
@@ -1472,6 +1476,8 @@ read_only::get_code_results read_only::get_code( const get_code_params& params )
    const auto& d = db.db();
    const auto& accnt  = d.get<account_object,by_name>( params.account_name );
 
+   EOS_ASSERT( params.code_as_wasm, unsupported_feature, "Returning WAST from get_code is no longer supported" );
+
    if( accnt.code.size() ) {
       if (params.code_as_wasm) {
          result.wasm = string(accnt.code.begin(), accnt.code.end());
@@ -1664,7 +1670,7 @@ read_only::get_required_keys_result read_only::get_required_keys( const get_requ
       abi_serializer::from_variant(params.transaction, pretty_input, resolver, abi_serializer_max_time);
    } EOS_RETHROW_EXCEPTIONS(chain::transaction_type_exception, "Invalid transaction")
 
-   auto required_keys_set = db.get_authorization_manager().get_required_keys(pretty_input, params.available_keys);
+   auto required_keys_set = db.get_authorization_manager().get_required_keys( pretty_input, params.available_keys, fc::seconds( pretty_input.delay_sec ));
    get_required_keys_result result;
    result.required_keys = required_keys_set;
    return result;