Validation: guard v2 shielded transaction serialization for pre-v5 upgrade window.

furszy · furszy · commit ac8824439a44 · 2020-09-21T18:47:01.000-03:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -2650,6 +2650,7 @@ void FlushStateToDisk()
 void static UpdateTip(CBlockIndex* pindexNew)
 {
     chainActive.SetTip(pindexNew);
+    g_IsSaplingActive = Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_V5_DUMMY);
 
     // New best block
     nTimeBestReceived = GetTime();
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -17,6 +17,9 @@
 
 extern bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow);
 
+// contextual flag to guard the serialization for v5 upgrade.
+// can be removed once v5 enforcement is activated.
+std::atomic<bool> g_IsSaplingActive{false};
 
 std::string BaseOutPoint::ToStringShort() const
 {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -16,10 +16,15 @@
 
 #include "sapling/sapling_transaction.h"
 
+#include <atomic>
 #include <list>
 
 class CTransaction;
 
+// contextual flag to guard the serialization for v5 upgrade.
+// can be removed once v5 enforcement is activated.
+extern std::atomic<bool> g_IsSaplingActive;
+
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class BaseOutPoint
 {
@@ -276,7 +281,7 @@ class CTransaction
         READWRITE(*const_cast<std::vector<CTxOut>*>(&vout));
         READWRITE(*const_cast<uint32_t*>(&nLockTime));
 
-        if (nVersion == CTransaction::SAPLING_VERSION) {
+        if (g_IsSaplingActive && nVersion == CTransaction::SAPLING_VERSION) {
             READWRITE(*const_cast<Optional<SaplingTxData>*>(&sapData));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2650,6 +2650,7 @@ void FlushStateToDisk()`
`2650`	`2650`	`void static UpdateTip(CBlockIndex* pindexNew)`
`2651`	`2651`	`{`
`2652`	`2652`	`chainActive.SetTip(pindexNew);`
	`2653`	`+ g_IsSaplingActive = Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_V5_DUMMY);`
`2653`	`2654`
`2654`	`2655`	`// New best block`
`2655`	`2656`	`nTimeBestReceived = GetTime();`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`
`18`	`18`	`extern bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow);`
`19`	`19`
	`20`	`+// contextual flag to guard the serialization for v5 upgrade.`
	`21`	`+// can be removed once v5 enforcement is activated.`
	`22`	`+std::atomic<bool> g_IsSaplingActive{false};`
`20`	`23`
`21`	`24`	`std::string BaseOutPoint::ToStringShort() const`
`22`	`25`	`{`