Merge pull request #782 from evoskuil/master

Add schnorr and ecdsa table config settings parse.

Author: evoskuil

console/executor.cpp

@@ -111,13 +111,6 @@ void executor::handle_stop(int signal)
 // Manage race between console stop and server stop.
 void executor::stop(int signal)
 {
-    ////if (auto* log = fopen("shutdown.log", "a"))
-    ////{
-    ////    fprintf(log, "stop %lu at %llu\n", signal, GetTickCount64());
-    ////    fflush(log);
-    ////    fclose(log);
-    ////}
-
     // Implementation is limited to signal safe code.
     static_assert(std::atomic<int>::is_always_lock_free);
 

console/executor_dumps.cpp

@@ -101,6 +101,8 @@ void executor::dump_body_sizes() const
         query_.outs_body_size() %
         query_.candidate_body_size() %
         query_.confirmed_body_size() %
+        query_.ecdsa_body_size() %
+        query_.schnorr_body_size() %
         query_.duplicate_body_size() %
         query_.prevout_body_size() %
         query_.strong_tx_body_size() %
@@ -121,6 +123,8 @@ void executor::dump_records() const
         query_.outs_records() %
         query_.candidate_records() %
         query_.confirmed_records() %
+        query_.ecdsa_records() %
+        query_.schnorr_records() %
         query_.duplicate_records() %
         query_.strong_tx_records() %
         query_.filter_bk_records() %

console/localize.hpp

@@ -84,14 +84,16 @@
     "   outs      :%8%\n" \
     "   candidate :%9%\n" \
     "   confirmed :%10%\n" \
-    "   duplicate :%11%\n" \
-    "   prevout   :%12%\n" \
-    "   strong_tx :%13%\n" \
-    "   valid_bk  :%14%\n" \
-    "   valid_tx  :%15%\n" \
-    "   filter_bk :%16%\n" \
-    "   filter_tx :%17%\n" \
-    "   address   :%18%"
+    "   ecdsa     :%11%\n" \
+    "   schnorr   :%12%\n" \
+    "   duplicate :%13%\n" \
+    "   prevout   :%14%\n" \
+    "   strong_tx :%15%\n" \
+    "   valid_bk  :%16%\n" \
+    "   valid_tx  :%17%\n" \
+    "   filter_bk :%18%\n" \
+    "   filter_tx :%19%\n" \
+    "   address   :%20%"
 #define BS_INFORMATION_RECORDS \
     "Table records...\n" \
     "   header    :%1%\n" \
@@ -101,10 +103,12 @@
     "   outs      :%5%\n" \
     "   candidate :%6%\n" \
     "   confirmed :%7%\n" \
-    "   duplicate :%8%\n" \
-    "   strong_tx :%9%\n" \
-    "   filter_bk :%10%\n" \
-    "   address   :%11%"
+    "   ecdsa     :%8%\n" \
+    "   schnorr   :%9%\n" \
+    "   duplicate :%10%\n" \
+    "   strong_tx :%11%\n" \
+    "   filter_bk :%12%\n" \
+    "   address   :%13%"
 #define BS_INFORMATION_SLABS \
     "Table slabs..."
 #define BS_INFORMATION_SLABS_ROW \

src/parser.cpp

@@ -142,6 +142,12 @@ parser::parser(system::chain::selection context,
 
     // database (caches)
 
+    configured.database.ecdsa_size = 1;
+    configured.database.ecdsa_rate = 5;
+
+    configured.database.schnorr_size = 1;
+    configured.database.schnorr_rate = 5;
+
     configured.database.duplicate_buckets = 1024;
     configured.database.duplicate_size = 44;
     configured.database.duplicate_rate = 5;
@@ -1329,15 +1335,20 @@ options_metadata parser::load_settings() THROWS
         "Defer confirmation, defaults to 'false'."
     )
     (
-        "node.fee_estimate_horizon",
-        value<uint16_t>(&configured.node.fee_estimate_horizon),
-        "Fee estimation horizon, limited to 1008, defaults to '0' (0 disables)."
+        "node.batch_signatures",
+        value<bool>(&configured.node.batch_signatures),
+        "Verify signatures in a batch for each concurrency window, defaults to 'true'."
     )
     ////(
     ////    "node.headers_first",
     ////    value<bool>(&configured.node.headers_first),
     ////    "Obtain current header chain before obtaining associated blocks, defaults to 'true'."
     ////)
+    (
+        "node.fee_estimate_horizon",
+        value<uint16_t>(&configured.node.fee_estimate_horizon),
+        "Fee estimation horizon, limited to 1008, defaults to '0' (0 disables)."
+    )
     (
         "node.minimum_fee_rate",
         value<float>(&configured.node.minimum_fee_rate),
@@ -1589,6 +1600,30 @@ options_metadata parser::load_settings() THROWS
         "The percentage expansion of the strong_tx table body, defaults to '5'."
     )
 
+    /* ecdsa */
+    (
+        "database.ecdsa_size",
+        value<uint64_t>(&configured.database.ecdsa_size),
+        "The minimum allocation of the ecdsa table body, defaults to '1'."
+    )
+    (
+        "database.ecdsa_rate",
+        value<uint16_t>(&configured.database.ecdsa_rate),
+        "The percentage expansion of the ecdsa table body, defaults to '5'."
+    )
+
+    /* schnorr */
+    (
+        "database.schnorr_size",
+        value<uint64_t>(&configured.database.schnorr_size),
+        "The minimum allocation of the schnorr table body, defaults to '1'."
+    )
+    (
+        "database.schnorr_rate",
+        value<uint16_t>(&configured.database.schnorr_rate),
+        "The percentage expansion of the schnorr table body, defaults to '5'."
+    )
+
     /* duplicate */
     (
         "database.duplicate_buckets",