BSIP 40: Delete expired authorities in maintenance

libraries/chain/db_maint.cpp

@@ -44,6 +44,7 @@
 #include <graphene/chain/vote_count.hpp>
 #include <graphene/chain/witness_object.hpp>
 #include <graphene/chain/worker_object.hpp>
+#include <graphene/chain/custom_authority_object.hpp>
 
 namespace graphene { namespace chain {
 
@@ -1143,6 +1144,17 @@ void process_hf_935( database& db )
    }
 }
 
+/**
+ * @brief Remove any custom active authorities whose expiration dates are in the past
+ * @param db A mutable database reference
+ */
+void delete_expired_custom_authorities( database& db )
+{
+   const auto& index = db.get_index_type<custom_authority_index>().indices().get<by_expiration>();
+   while (!index.empty() && index.begin()->valid_to < db.head_block_time())
+      db.remove(*index.begin());
+}
+
 void database::perform_chain_maintenance(const signed_block& next_block, const global_property_object& global_props)
 {
    const auto& gpo = get_global_properties();
@@ -1323,6 +1335,7 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
    }
 
    process_bitassets();
+   delete_expired_custom_authorities(*this);
 
    // process_budget needs to run at the bottom because
    //   it needs to know the next_maintenance_time

libraries/chain/include/graphene/chain/custom_authority_object.hpp

@@ -65,6 +65,7 @@ namespace graphene { namespace chain {
    };
 
    struct by_account_custom;
+   struct by_expiration;
 
    /**
     * @ingroup object_index
@@ -74,13 +75,18 @@ namespace graphene { namespace chain {
       indexed_by<
          ordered_unique<tag<by_id>, member<object, object_id_type, &object::id>>,
          ordered_unique<tag<by_account_custom>,
-            composite_key<
-               custom_authority_object,
+            composite_key<custom_authority_object,
                member<custom_authority_object, account_id_type, &custom_authority_object::account>,
                member<custom_authority_object, unsigned_int, &custom_authority_object::operation_type>,
                member<custom_authority_object, bool, &custom_authority_object::enabled>,
                member<object, object_id_type, &object::id>
-            >
+            >>,
+         ordered_unique<tag<by_expiration>,
+            composite_key<custom_authority_object,
+               member<custom_authority_object, time_point_sec, &custom_authority_object::valid_to>,
+               member<object, object_id_type, &object::id>
+            >,
+            composite_key_compare<std::greater<time_point_sec>, std::less<object_id_type>>
          >
       >
    > custom_authority_multi_index_type;