Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

state history plugin: permission_object bug #6495 #6496

Merged
merged 1 commit into from
Dec 17, 2018
Merged

state history plugin: permission_object bug #6495 #6496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ...s/state_history_plugin/include/eosio/state_history_plugin/state_history_serialization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down