validate block signature as part of run_block_generator(). There is a…

…n opt-out for tests and maybe we'll need it in production too
Chia-Network · Oct 8, 2024 · f3dcac8 · f3dcac8
1 parent ee48cd2
commit f3dcac8
Show file tree

Hide file tree

Showing 25 changed files with 600 additions and 129 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/chia-bls/src/bls_cache.rs b/crates/chia-bls/src/bls_cache.rs
@@ -72,6 +72,13 @@ impl BlsCache {
 
         aggregate_verify_gt(sig, iter)
     }
+
+    pub fn update(&mut self, aug_msg: &[u8], gt: GTElement) {
+        let mut hasher = Sha256::new();
+        hasher.update(aug_msg.as_ref());
+        let hash: [u8; 32] = hasher.finalize();
+        self.cache.put(hash, gt);
+    }
 }
 
 #[cfg(feature = "py-bindings")]

diff --git a/crates/chia-consensus/benches/run-generator.rs b/crates/chia-consensus/benches/run-generator.rs
@@ -1,5 +1,6 @@
+use chia_bls::Signature;
 use chia_consensus::consensus_constants::TEST_CONSTANTS;
-use chia_consensus::gen::flags::ALLOW_BACKREFS;
+use chia_consensus::gen::flags::{ALLOW_BACKREFS, DONT_VALIDATE_SIGNATURE};
 use chia_consensus::gen::run_block_generator::{run_block_generator, run_block_generator2};
 use clvmr::serde::{node_from_bytes, node_to_bytes_backrefs};
 use clvmr::Allocator;
@@ -55,7 +56,9 @@ fn run(c: &mut Criterion) {
                         gen,
                         &block_refs,
                         11_000_000_000,
-                        ALLOW_BACKREFS,
+                        ALLOW_BACKREFS | DONT_VALIDATE_SIGNATURE,
+                        &Signature::default(),
+                        None,
                         &TEST_CONSTANTS,
                     );
                     let _ = black_box(conds);
@@ -74,6 +77,8 @@ fn run(c: &mut Criterion) {
                         &block_refs,
                         11_000_000_000,
                         ALLOW_BACKREFS,
+                        &Signature::default(),
+                        None,
                         &TEST_CONSTANTS,
                     );
                     let _ = black_box(conds);

diff --git a/crates/chia-consensus/fuzz/Cargo.toml b/crates/chia-consensus/fuzz/Cargo.toml
@@ -20,6 +20,7 @@ chia-protocol = { workspace = true }
 chia-sha2 = { workspace = true }
 chia-traits = { workspace = true }
 chia-consensus = { workspace = true }
+chia-bls = { workspace = true }
 hex-literal = { workspace = true }
 
 [[bin]]

diff --git a/crates/chia-consensus/fuzz/fuzz_targets/parse-spends.rs b/crates/chia-consensus/fuzz/fuzz_targets/parse-spends.rs
@@ -1,6 +1,7 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
 
+use chia_bls::Signature;
 use chia_consensus::gen::conditions::{parse_spends, MempoolVisitor};
 use chia_fuzz::{make_list, BitCursor};
 use clvmr::{Allocator, NodePtr};
@@ -14,7 +15,14 @@ fuzz_target!(|data: &[u8]| {
     // spends is a list of spends
     let input = a.new_pair(input, NodePtr::NIL).unwrap();
     for flags in &[0, STRICT_ARGS_COUNT, NO_UNKNOWN_CONDS] {
-        let _ret =
-            parse_spends::<MempoolVisitor>(&a, input, 33_000_000_000, *flags, &TEST_CONSTANTS);
+        let _ret = parse_spends::<MempoolVisitor>(
+            &a,
+            input,
+            33_000_000_000,
+            *flags,
+            &Signature::default(),
+            None,
+            &TEST_CONSTANTS,
+        );
     }
 });
diff --git a/crates/chia-consensus/fuzz/fuzz_targets/run-generator.rs b/crates/chia-consensus/fuzz/fuzz_targets/run-generator.rs
@@ -1,4 +1,5 @@
 #![no_main]
+use chia_bls::Signature;
 use chia_consensus::allocator::make_allocator;
 use chia_consensus::consensus_constants::TEST_CONSTANTS;
 use chia_consensus::gen::flags::ALLOW_BACKREFS;
@@ -15,6 +16,8 @@ fuzz_target!(|data: &[u8]| {
         [],
         110_000_000,
         ALLOW_BACKREFS,
+        &Signature::default(),
+        None,
         &TEST_CONSTANTS,
     );
     drop(a1);
@@ -26,6 +29,8 @@ fuzz_target!(|data: &[u8]| {
         [],
         110_000_000,
         ALLOW_BACKREFS,
+        &Signature::default(),
+        None,
         &TEST_CONSTANTS,
     );
     drop(a2);

diff --git a/crates/chia-consensus/src/fast_forward.rs b/crates/chia-consensus/src/fast_forward.rs
@@ -155,7 +155,6 @@ pub fn fast_forward_singleton(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::consensus_constants::ConsensusConstants;
     use crate::consensus_constants::TEST_CONSTANTS;
     use crate::gen::conditions::MempoolVisitor;
     use crate::gen::conditions::{
@@ -173,7 +172,7 @@ mod tests {
     use clvmr::chia_dialect::ChiaDialect;
     use clvmr::reduction::Reduction;
     use clvmr::run_program::run_program;
-    use clvmr::serde::{node_from_bytes, node_from_bytes_backrefs, node_to_bytes};
+    use clvmr::serde::{node_from_bytes, node_to_bytes};
     use hex_literal::hex;
     use rstest::rstest;
     use std::fs;