Merge pull request #5208 from EOSIO/feature/revert-enum-cleanup

revert change that broke upgrades without replay

libraries/chain/include/eosio/chain/types.hpp

@@ -109,15 +109,19 @@ namespace eosio { namespace chain {
     * wants to extend the core code then they will have to change the
     * packed_object::type field from enum_type to uint16 to avoid
     * warnings when converting packed_objects to/from json.
+    *
+    * UNUSED_ enums can be taken for new purposes but otherwise the offsets
+    * in this enumeration are potentially shared_memory breaking
     */
    enum object_type
    {
-      null_object_type,
+      null_object_type = 0,
       account_object_type,
       account_sequence_object_type,
       permission_object_type,
       permission_usage_object_type,
       permission_link_object_type,
+      UNUSED_action_code_object_type,
       key_value_object_type,
       index64_object_type,
       index128_object_type,
@@ -130,15 +134,24 @@ namespace eosio { namespace chain {
       transaction_object_type,
       generated_transaction_object_type,
       producer_object_type,
-      account_control_history_object_type, ///< Defined by history_plugin
-      public_key_history_object_type, ///< Defined by history_plugin
+      UNUSED_chain_property_object_type,
+      account_control_history_object_type,     ///< Defined by history_plugin
+      UNUSED_account_transaction_history_object_type,
+      UNUSED_transaction_history_object_type,
+      public_key_history_object_type,          ///< Defined by history_plugin
+      UNUSED_balance_object_type,
+      UNUSED_staked_balance_object_type,
+      UNUSED_producer_votes_object_type,
+      UNUSED_producer_schedule_object_type,
+      UNUSED_proxy_vote_object_type,
+      UNUSED_scope_sequence_object_type,
       table_id_object_type,
       resource_limits_object_type,
       resource_usage_object_type,
       resource_limits_state_object_type,
       resource_limits_config_object_type,
-      account_history_object_type, ///< Defined by history_plugin
-      action_history_object_type, ///< Defined by history_plugin
+      account_history_object_type,              ///< Defined by history_plugin
+      action_history_object_type,               ///< Defined by history_plugin
       reversible_block_object_type,
       OBJECT_TYPE_COUNT ///< Sentry value which contains the number of different object types
    };
@@ -170,35 +183,4 @@ namespace eosio { namespace chain {
 
 } }  // eosio::chain
 
-FC_REFLECT_ENUM(eosio::chain::object_type,
-                (null_object_type)
-                (account_object_type)
-                (account_sequence_object_type)
-                (permission_object_type)
-                (permission_usage_object_type)
-                (permission_link_object_type)
-                (key_value_object_type)
-                (index64_object_type)
-                (index128_object_type)
-                (index256_object_type)
-                (index_double_object_type)
-                (index_long_double_object_type)
-                (global_property_object_type)
-                (dynamic_global_property_object_type)
-                (block_summary_object_type)
-                (transaction_object_type)
-                (generated_transaction_object_type)
-                (producer_object_type)
-                (account_control_history_object_type)
-                (public_key_history_object_type)
-                (table_id_object_type)
-                (resource_limits_object_type)
-                (resource_usage_object_type)
-                (resource_limits_state_object_type)
-                (resource_limits_config_object_type)
-                (account_history_object_type)
-                (action_history_object_type)
-                (reversible_block_object_type)
-                (OBJECT_TYPE_COUNT)
-               )
 FC_REFLECT( eosio::chain::void_t, )