Merge pull request #6504 from EOSIO/release/1.5.x

Release 1.5.2

CMakeLists.txt

@@ -35,7 +35,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 5)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

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.5.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.5.2 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.5.1 --build-arg branch=v1.5.1 .
+docker build -t eosio/eos:v1.5.2 --build-arg branch=v1.5.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.

README.md

@@ -39,13 +39,13 @@ $ brew remove eosio
 ```
 #### Ubuntu 18.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio_1.5.1-1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.5.1-1-ubuntu-18.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.5.2/eosio_1.5.2-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.5.2-1-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio_1.5.1-1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.5.1-1-ubuntu-16.04_amd64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.5.2/eosio_1.5.2-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.5.2-1-ubuntu-16.04_amd64.deb
 ```
 #### Debian Package Uninstall
 ```sh
@@ -53,8 +53,8 @@ $ sudo apt remove eosio
 ```
 #### Centos RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio-1.5.1-1.el7.x86_64.rpm
-$ sudo yum install ./eosio-1.5.1-1.el7.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.5.2/eosio-1.5.2-1.el7.x86_64.rpm
+$ sudo yum install ./eosio-1.5.2-1.el7.x86_64.rpm
 ```
 #### Centos RPM Package Uninstall
 ```sh
@@ -62,8 +62,8 @@ $ sudo yum remove eosio.cdt
 ```
 #### Fedora RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.5.1/eosio-1.5.1-1.fc27.x86_64.rpm
-$ sudo yum install ./eosio-1.5.1-1.fc27.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.5.2/eosio-1.5.2-1.fc27.x86_64.rpm
+$ sudo yum install ./eosio-1.5.2-1.fc27.x86_64.rpm
 ```
 #### Fedora RPM Package Uninstall
 ```sh

plugins/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp

@@ -325,10 +325,20 @@ datastream<ST>& operator<<(datastream<ST>& ds, const history_serial_wrapper<eosi
    fc::raw::pack(ds, fc::unsigned_int(0));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.owner.value));
    fc::raw::pack(ds, as_type<uint64_t>(obj.obj.name.value));
-   if (obj.obj.parent._id)
-      fc::raw::pack(ds, as_type<uint64_t>(obj.db.get<eosio::chain::permission_object>(obj.obj.parent).name.value));
-   else
+   if (obj.obj.parent._id) {
+      auto&       index  = obj.db.get_index<eosio::chain::permission_index>();
+      const auto* parent = index.find(obj.obj.parent);
+      if (!parent) {
+         auto& undo = index.stack().back();
+         auto  it   = undo.removed_values.find(obj.obj.parent);
+         EOS_ASSERT(it != undo.removed_values.end(), eosio::chain::plugin_exception,
+                    "can not find parent of permission_object");
+         parent = &it->second;
+      }
+      fc::raw::pack(ds, as_type<uint64_t>(parent->name.value));
+   } else {
       fc::raw::pack(ds, as_type<uint64_t>(0));
+   }
    fc::raw::pack(ds, as_type<fc::time_point>(obj.obj.last_updated));
    fc::raw::pack(ds, make_history_serial_wrapper(obj.db, as_type<eosio::chain::shared_authority>(obj.obj.auth)));
    return ds;