[Consensus] Bump TxVersion::SAPLING to 3

random-zebra · Fuzzbawls · commit 7c8724116eee · 2020-12-18T21:35:19.000-08:00
Github-Pull: #2051 Rebased-From: 3dfd813
diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp
@@ -51,7 +51,7 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
         },
         {
                 /*.strName =*/ "v5_shield",
-                /*.strInfo =*/ "Sapling Shield - start block v8 - start transaction v2",
+                /*.strInfo =*/ "Sapling Shield - start block v8 - start transaction v3",
         },
         {
                 /*.strName =*/ "Test_dummy",
diff --git a/src/init.cpp b/src/init.cpp
@@ -1465,9 +1465,6 @@ bool AppInit2()
 
     fReindex = gArgs.GetBoolArg("-reindex", false);
 
-    // Assume sapling active during reindex for proper v2 deserialization when loading the wallet
-    if (fReindex) g_IsSaplingActive = true;
-
     // Create blocks directory if it doesn't already exist
     fs::create_directories(GetDataDir() / "blocks");
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -235,7 +235,7 @@ class CTransaction
     /** Transaction Versions */
     enum TxVersion: int16_t {
         LEGACY      = 1,
-        SAPLING     = 2,
+        SAPLING     = 3,
         TOOHIGH
     };
 
diff --git a/src/sapling/sapling_validation.cpp b/src/sapling/sapling_validation.cpp
@@ -32,7 +32,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state, CAmount&
         return true;
     }
 
-    // From here, all of the checks are done in +v2 transactions.
+    // From here, all of the checks are done in v3+ transactions.
 
     // if the tx has shielded data, cannot be a coinstake, coinbase, zcspend and zcmint
     if (tx.IsCoinStake() || tx.IsCoinBase() || tx.HasZerocoinSpendInputs() || tx.HasZerocoinMintOutputs())
@@ -53,7 +53,7 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
 {
     // Basic checks that don't depend on any context
     const Consensus::Params& consensus = Params().GetConsensus();
-    // If the tx got to this point, must be +v2.
+    // If the tx got to this point, must be v3+.
     assert(tx.isSaplingVersion());
 
     // Check for non-zero valueBalance when there are no Sapling inputs or outputs
diff --git a/src/sapling/sapling_validation.h b/src/sapling/sapling_validation.h
@@ -14,7 +14,7 @@ class CValidationState;
 namespace SaplingValidation {
 
 /** Context-independent validity checks */
-// Note: for +v2, if the tx has no shielded data, this method returns true.
+// Note: for v3+, if the tx has no shielded data, this method returns true.
 // Note2: This function only performs shielded data related checks, it does NOT checks regular inputs and outputs.
 bool CheckTransaction(const CTransaction& tx, CValidationState& state, CAmount& nValueOut, bool fIsSaplingActive);
 bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidationState &state, CAmount& nValueOut);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4130,6 +4130,11 @@ bool CWallet::InitLoadWallet()
         return true;
     }
 
+    // Assume sapling active during initialization of the wallet for proper v3 deserialization
+    // before reindex/resync
+    const bool wasSaplingActive = g_IsSaplingActive;
+    if (!wasSaplingActive) g_IsSaplingActive = true;
+
     std::string walletFile = gArgs.GetArg("-wallet", DEFAULT_WALLET_DAT);
 
     CWallet * const pwallet = CreateWalletFromFile(walletFile);
@@ -4138,6 +4143,8 @@ bool CWallet::InitLoadWallet()
     }
     pwalletMain = pwallet;
 
+    // restore global flag to previous state
+    g_IsSaplingActive = wasSaplingActive;
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {`
`51`	`51`	`},`
`52`	`52`	`{`
`53`	`53`	`/.strName =/ "v5_shield",`
`54`		`- /.strInfo =/ "Sapling Shield - start block v8 - start transaction v2",`
	`54`	`+ /.strInfo =/ "Sapling Shield - start block v8 - start transaction v3",`
`55`	`55`	`},`
`56`	`56`	`{`
`57`	`57`	`/.strName =/ "Test_dummy",`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState& state, CAmount&`
`32`	`32`	`return true;`
`33`	`33`	`}`
`34`	`34`
`35`		`- // From here, all of the checks are done in +v2 transactions.`
	`35`	`+ // From here, all of the checks are done in v3+ transactions.`
`36`	`36`
`37`	`37`	`// if the tx has shielded data, cannot be a coinstake, coinbase, zcspend and zcmint`
`38`	`38`	`if (tx.IsCoinStake() \|\| tx.IsCoinBase() \|\| tx.HasZerocoinSpendInputs() \|\| tx.HasZerocoinMintOutputs())`
`@@ -53,7 +53,7 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio`
`53`	`53`	`{`
`54`	`54`	`// Basic checks that don't depend on any context`
`55`	`55`	`const Consensus::Params& consensus = Params().GetConsensus();`
`56`		`- // If the tx got to this point, must be +v2.`
	`56`	`+ // If the tx got to this point, must be v3+.`
`57`	`57`	`assert(tx.isSaplingVersion());`
`58`	`58`
`59`	`59`	`// Check for non-zero valueBalance when there are no Sapling inputs or outputs`
Original file line number	Diff line number	Diff line change
`@@ -4130,6 +4130,11 @@ bool CWallet::InitLoadWallet()`
`4130`	`4130`	`return true;`
`4131`	`4131`	`}`
`4132`	`4132`
	`4133`	`+ // Assume sapling active during initialization of the wallet for proper v3 deserialization`
	`4134`	`+ // before reindex/resync`
	`4135`	`+ const bool wasSaplingActive = g_IsSaplingActive;`
	`4136`	`+ if (!wasSaplingActive) g_IsSaplingActive = true;`
	`4137`	`+`
`4133`	`4138`	`std::string walletFile = gArgs.GetArg("-wallet", DEFAULT_WALLET_DAT);`
`4134`	`4139`
`4135`	`4140`	`CWallet * const pwallet = CreateWalletFromFile(walletFile);`
`@@ -4138,6 +4143,8 @@ bool CWallet::InitLoadWallet()`
`4138`	`4143`	`}`
`4139`	`4144`	`pwalletMain = pwallet;`
`4140`	`4145`
	`4146`	`+ // restore global flag to previous state`
	`4147`	`+ g_IsSaplingActive = wasSaplingActive;`
`4141`	`4148`	`return true;`
`4142`	`4149`	`}`
`4143`	`4150`