Merge pull request #1897 from evoskuil/master

Update stub silent payment batch for SoA table, add CPU stub.

Author: evoskuil

include/bitcoin/system/crypto/secp256k1_batch.hpp

@@ -35,9 +35,6 @@ namespace batched {
 using link = data_array<3>;
 using link_t = unsigned_type<sizeof(link)>;
 using links_t = std::vector<link_t>;
-using tx_link = data_array<4>;
-using tx_link_t = unsigned_type<sizeof(tx_link)>;
-using tx_links_t = std::vector<tx_link_t>;
 } // namespace batched
 
 namespace ecdsa {
@@ -106,16 +103,23 @@ namespace silent
 /// Span matches serialized buffer.
 struct BC_API batch
 {
-    using span = std::span<const batch>;
-    using prefix_bytes = data_array<sizeof(uint64_t)>;
-    using handler = std::function<void(const code&, batched::tx_link_t)>;
+    using prefix = data_array<8>;
+    using tx_link = data_array<4>;
+    using tx_link_t = unsigned_type<sizeof(tx_link)>;
+    ////using tx_links_t = std::vector<tx_link_t>;
+    using handler = std::function<void(const code&, tx_link_t)>;
+
+    std::span<const prefix> prefixes;
+    std::span<const ec_compressed> compresseds;
+    std::span<const tx_link> correlates;
 
-    prefix_bytes prefix;
-    ec_compressed compressed;
-    batched::tx_link link;
+    static void scan(const stopper& cancel, const batch& batch,
+        const ec_secret& scan_key, const handler& callback,
+        bool turbo) NOEXCEPT;
 
-    static void scan(const stopper& cancel, const span& batch,
-        const ec_secret& scan_key, const handler& callback) NOEXCEPT;
+protected:
+    static bool get_match(tx_link_t& out, const batch& batch,
+        size_t row, const ec_secret& scan_key) NOEXCEPT;
 };
 
 } // namespace silent

src/crypto/secp256k1/batch.cpp

@@ -292,6 +292,16 @@ links_t schnorr::batch::get_failures(const stopper& cancel,
     return fails;
 }
 
+// get_match (silent)
+// ----------------------------------------------------------------------------
+
+bool silent::batch::get_match(tx_link_t& , const batch& , size_t ,
+    const ec_secret& ) NOEXCEPT
+{
+    // TODO: implement.
+    return false;
+}
+
 // evaluate
 // ----------------------------------------------------------------------------
 // static/protected
@@ -347,7 +357,7 @@ links_t schnorr::batch::verify(const stopper& cancel,
 
 #if defined(HAVE_ULTRAFAST)
 
-void silent::batch::scan(const stopper& , const span& ,
+void silent::batch::scan(const stopper& , const batch& ,
     const ec_secret& , const handler& ) NOEXCEPT
 {
     // TODO: iterate over chunked subsets or entire set.
@@ -356,11 +366,29 @@ void silent::batch::scan(const stopper& , const span& ,
 
 #else
 
-void silent::batch::scan(const stopper& , const span& ,
-    const ec_secret& , const handler& ) NOEXCEPT
+void silent::batch::scan(const stopper& cancel, const batch& batch,
+    const ec_secret& scan_key, const handler& callback, bool turbo) NOEXCEPT
 {
-    // TODO: iterate results set in cancellable parallel loop over full space.
-    // TODO: correlate matches to tx link and invoke callback.
+    const auto policy = poolstl::execution::par_if(turbo);
+
+    // Three spans are corresponding arrays of equal length.
+    const auto count = batch.correlates.size();
+    BC_ASSERT(batch.prefixes.size() == count);
+    BC_ASSERT(batch.compresseds.size() == count);
+
+    std::vector<size_t> it(count);
+    std::iota(it.begin(), it.end(), zero);
+
+    // Return from scan with !cancel implies complete.
+    std::for_each(policy, it.cbegin(), it.cend(), [&](size_t row) NOEXCEPT
+    {
+        if (cancel)
+            return;
+
+        tx_link_t tx{};
+        if (get_match(tx, batch, row, scan_key))
+            callback({}, tx);
+    });
 }
 
 #endif