remove ENABLE_KECCAK flag, since this softfork has activated (#572)

Author: arvidn

src/chia_dialect.rs

@@ -29,10 +29,6 @@ pub const LIMIT_HEAP: u32 = 0x0004;
 // This is a hard-fork and should only be enabled when it activates
 pub const ENABLE_KECCAK_OPS_OUTSIDE_GUARD: u32 = 0x0100;
 
-// enables the keccak softfork extension. This is a soft-fork and
-// should be set for blocks past the activation height.
-pub const ENABLE_KECCAK: u32 = 0x0200;
-
 // The default mode when running grnerators in mempool-mode (i.e. the stricter
 // mode)
 pub const MEMPOOL_MODE: u32 = NO_UNKNOWN_OPS | LIMIT_HEAP;
@@ -195,9 +191,7 @@ impl Dialect for ChiaDialect {
             0 => OperatorSet::Bls,
 
             // Extension 1 is for the keccak256 operator.
-            // This is only considered valid in the mempool if it's enabled with the flag.
-            // This is to prevent submission of spends with keccak until the softfork activates.
-            1 if (self.flags & ENABLE_KECCAK) != 0 => OperatorSet::Keccak,
+            1 => OperatorSet::Keccak,
 
             // Extensions 2 and beyond are considered invalid by the mempool.
             // However, all future extensions are valid in consensus mode and reserved for future softforks.

src/lib.rs

@@ -21,9 +21,7 @@ pub use allocator::{Allocator, Atom, NodePtr, SExp};
 pub use chia_dialect::ChiaDialect;
 pub use run_program::run_program;
 
-pub use chia_dialect::{
-    ENABLE_KECCAK, ENABLE_KECCAK_OPS_OUTSIDE_GUARD, LIMIT_HEAP, MEMPOOL_MODE, NO_UNKNOWN_OPS,
-};
+pub use chia_dialect::{ENABLE_KECCAK_OPS_OUTSIDE_GUARD, LIMIT_HEAP, MEMPOOL_MODE, NO_UNKNOWN_OPS};
 
 #[cfg(feature = "counters")]
 pub use run_program::run_program_with_counters;

src/run_program.rs

@@ -549,7 +549,7 @@ pub fn run_program_with_counters<'a, D: Dialect>(
 mod tests {
     use super::*;
 
-    use crate::chia_dialect::{ENABLE_KECCAK, ENABLE_KECCAK_OPS_OUTSIDE_GUARD, NO_UNKNOWN_OPS};
+    use crate::chia_dialect::{ENABLE_KECCAK_OPS_OUTSIDE_GUARD, NO_UNKNOWN_OPS};
     use crate::test_ops::parse_exp;
 
     use rstest::rstest;
@@ -1179,7 +1179,7 @@ mod tests {
         RunProgramTest {
             prg: "(softfork (q . 1432) (q . 1) (q a (i (= (coinid (q . 0x1234500000000000000000000000000000000000000000000000000000000000) (q . 0x6789abcdef000000000000000000000000000000000000000000000000000000) (q . 123456789)) (q . 0x69bfe81b052bfc6bd7f3fb9167fec61793175b897c16a35827f947d5cc98e4bc)) (q . 0) (q x)) (q . ())) (q . ()))",
             args: "()",
-            flags: ENABLE_KECCAK,
+            flags: 0,
             result: Some("()"),
             cost: 1513,
             err: "",
@@ -1189,7 +1189,7 @@ mod tests {
         RunProgramTest {
             prg: "(softfork (q . 1134) (q . 1) (q a (i (= (keccak256 (q . \"foobar\")) (q . 0x38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e)) (q . 0) (q x)) (q . ())) (q . ()))",
             args: "()",
-            flags: ENABLE_KECCAK,
+            flags: 0,
             result: Some("()"),
             cost: 1215,
             err: "",
@@ -1198,20 +1198,11 @@ mod tests {
         RunProgramTest {
             prg: "(softfork (q . 1134) (q . 1) (q a (i (= (keccak256 (q . \"foobar\")) (q . 0x58d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e)) (q . 0) (q x)) (q . ())) (q . ()))",
             args: "()",
-            flags: ENABLE_KECCAK,
+            flags: 0,
             result: None,
             cost: 1215,
             err: "clvm raise",
         },
-        // keccak is ignored when the softfork has not activated
-        RunProgramTest {
-            prg: "(softfork (q . 1134) (q . 1) (q a (i (= (keccak256 (q . \"foobar\")) (q . 0x58d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e)) (q . 0) (q x)) (q . ())) (q . ()))",
-            args: "()",
-            flags: 0,
-            result: Some("()"),
-            cost: 1215,
-            err: "",
-        },
 
         // === HARD FORK ===
         // new operators *outside* the softfork guard
@@ -1220,7 +1211,7 @@ mod tests {
         RunProgramTest {
             prg: "(a (i (= (keccak256 (q . \"foobar\")) (q . 0x38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e)) (q . 0) (q x)) (q . ()))",
             args: "()",
-            flags: ENABLE_KECCAK | ENABLE_KECCAK_OPS_OUTSIDE_GUARD,
+            flags: ENABLE_KECCAK_OPS_OUTSIDE_GUARD,
             result: Some("()"),
             cost: 994,
             err: "",
@@ -1445,7 +1436,7 @@ mod tests {
         #[case] prg: &'static str,
         #[case] fields: (u64, u8, u32), // cost, enabled, hard_fork_flag
         #[case] err: &'static str,
-        #[values(0, ENABLE_KECCAK)] flags: u32,
+        #[values(0)] flags: u32,
         #[values(false, true)] mempool: bool,
         #[values(0, 1, 2)] test_ext: u8,
     ) {
@@ -1456,9 +1447,10 @@ mod tests {
         let flags = flags | if mempool { NO_UNKNOWN_OPS } else { 0 };
 
         // softfork extensions that are enabled
+        #[allow(clippy::match_like_matches_macro)]
         let ext_enabled = match test_ext {
-            0 => true,
-            1 => (flags & ENABLE_KECCAK) != 0,
+            0 => true, // BLS
+            1 => true, // KECCAK
             _ => false,
         };