Fix flags

benthecarman · Apr 30, 2024 · c23afab · c23afab
1 parent fc227d0
commit c23afab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/deploymentinfo.cpp b/src/deploymentinfo.cpp
@@ -21,10 +21,6 @@ const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_B
         /*.name =*/ "covtools",
         /*.gbt_force =*/ true,
     },
-    {
-        /*.name =*/ "cat",
-        /*.gbt_force =*/ true,
-    },
     {
         /*.name =*/ "opcat",
         /*.gbt_force =*/ true,

diff --git a/src/script/interpreter.h b/src/script/interpreter.h
@@ -180,13 +180,13 @@ enum : uint32_t {
     SCRIPT_VERIFY_INTERNALKEY = (1U << 31),
 
     // Making OP_INTERNALKEY non-standard
-    SCRIPT_VERIFY_DISCOURAGE_INTERNALKEY = (1U << 32),
+    SCRIPT_VERIFY_DISCOURAGE_INTERNALKEY = (1U << 30),
 
     // Validating OP_CHECKSIGFROMSTACK
     SCRIPT_VERIFY_CHECKSIGFROMSTACK = (1U << 31),
 
     // Making OP_CHECKSIGFROMSTACK non-standard
-    SCRIPT_VERIFY_DISCOURAGE_CHECKSIGFROMSTACK = (1U << 32),
+    SCRIPT_VERIFY_DISCOURAGE_CHECKSIGFROMSTACK = (1U << 30),
 
     // Constants to point to the highest flag in use. Add new flags above this line.
     //

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2245,12 +2245,12 @@ static unsigned int GetBlockScriptFlags(const CBlockIndex& block_index, const Ch
     }
 
     // Enforce CHECKSIGFROMSTACK(VERIFY) (BIN-2024-0003)
-    if (DeploymentActiveAt(block_index, chainman, Consensus::DEPLOYMENT_CHECKSIGFROMSTACK)) {
+    if (DeploymentActiveAt(block_index, chainman, Consensus::DEPLOYMENT_LN_HANCE)) {
         flags |= SCRIPT_VERIFY_CHECKSIGFROMSTACK;
     }
 
     // Process INTERNALKEY (BIN-2024-0004)
-    if (DeploymentActiveAt(block_index, chainman, Consensus::DEPLOYMENT_INTERNALKEY)) {
+    if (DeploymentActiveAt(block_index, chainman, Consensus::DEPLOYMENT_LN_HANCE)) {
         flags |= SCRIPT_VERIFY_INTERNALKEY;
     }