Merge #8932: Allow bitcoin-tx to create v2 transactions

laanwj · laanwj · commit 614d522c3e44 · 2016-10-18T11:45:07.000+02:00
b0aea80 Sync bitcoin-tx with tx version policy (BtcDrak)
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -164,7 +164,7 @@ static void RegisterLoad(const string& strInput)
 static void MutateTxVersion(CMutableTransaction& tx, const string& cmdVal)
 {
     int64_t newVersion = atoi64(cmdVal);
-    if (newVersion < 1 || newVersion > CTransaction::CURRENT_VERSION)
+    if (newVersion < 1 || newVersion > CTransaction::MAX_STANDARD_VERSION)
         throw runtime_error("Invalid TX version requested");
 
     tx.nVersion = (int) newVersion;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ static void RegisterLoad(const string& strInput)`
`164`	`164`	`static void MutateTxVersion(CMutableTransaction& tx, const string& cmdVal)`
`165`	`165`	`{`
`166`	`166`	`int64_t newVersion = atoi64(cmdVal);`
`167`		`- if (newVersion < 1 \|\| newVersion > CTransaction::CURRENT_VERSION)`
	`167`	`+ if (newVersion < 1 \|\| newVersion > CTransaction::MAX_STANDARD_VERSION)`
`168`	`168`	`throw runtime_error("Invalid TX version requested");`
`169`	`169`
`170`	`170`	`tx.nVersion = (int) newVersion;`