Add SCRIPT_VERIFY_ANNEX deployment code

bitcoin-inquisition · Jan 17, 2023 · 4ccd693 · 4ccd693
1 parent 7c1d55f
commit 4ccd693
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -30,6 +30,7 @@ enum DeploymentPos : uint16_t {
     DEPLOYMENT_TESTDUMMY,
     DEPLOYMENT_CHECKTEMPLATEVERIFY, // Deployment of CTV (BIP 119)
     DEPLOYMENT_ANYPREVOUT,
+    DEPLOYMENT_ANNEX,
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1659,9 +1659,10 @@ UniValue DeploymentInfo(const CBlockIndex* blockindex, const Consensus::Params&
     SoftForkDescPushBack(blockindex, softforks, consensusParams, Consensus::DEPLOYMENT_TAPROOT);
     SoftForkDescPushBack(blockindex, softforks, consensusParams, Consensus::DEPLOYMENT_CHECKTEMPLATEVERIFY);
     SoftForkDescPushBack(blockindex, softforks, consensusParams, Consensus::DEPLOYMENT_ANYPREVOUT);
+    SoftForkDescPushBack(blockindex, softforks, consensusParams, Consensus::DEPLOYMENT_ANNEX);
     return softforks;
-}
 } // anon namespace
+}
 
 static RPCHelpMan getdeploymentinfo()
 {

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1872,6 +1872,11 @@ unsigned int GetBlockScriptFlags(const CBlockIndex* pindex, const Consensus::Par
         flags |= SCRIPT_VERIFY_DEFAULT_CHECK_TEMPLATE_VERIFY_HASH;
     }
 
+    // Enforce annex verification (BIPXXX)
+    if (DeploymentActiveAt(*pindex, consensusparams, Consensus::DEPLOYMENT_ANNEX)) {
+        flags |= SCRIPT_VERIFY_ANNEX;
+    }
+
     return flags;
 }