Merge remote-tracking branch 'origin/develop'

Author: rv-auditor

include/runtime/proof_trace_writer.h

@@ -194,7 +194,7 @@ class proof_trace_file_writer : public proof_trace_writer {
 };
 
 class proof_trace_callback_writer : public proof_trace_writer {
-private:
+protected:
   struct kore_term_construction {
     void *subject;
     uint64_t block_header;
@@ -212,9 +212,9 @@ class proof_trace_callback_writer : public proof_trace_writer {
   };
 
   struct kore_configuration_construction {
-    void *subject;
+    block *subject;
 
-    kore_configuration_construction(void *subject)
+    kore_configuration_construction(block *subject)
         : subject(subject) { }
   };
 
@@ -279,6 +279,7 @@ class proof_trace_callback_writer : public proof_trace_writer {
     }
   };
 
+private:
   std::optional<call_event_construction> current_call_event_;
 
   std::optional<rewrite_event_construction> current_rewrite_event_{