Merge pull request #19 from zcash/nu6-protocol-version

daira · web-flow · commit 500d3912ec3f · 2024-11-23T11:45:40.000Z
Updates for NU6 mainnet activation
diff --git a/db.h b/db.h
@@ -12,7 +12,7 @@
 
 #define MIN_RETRY 1000
 
-#define REQUIRE_VERSION 170100
+#define REQUIRE_VERSION 170120
 
 static inline int GetRequireHeight(const bool testnet = fTestNet)
 {
diff --git a/serialize.h b/serialize.h
@@ -60,7 +60,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int PROTOCOL_VERSION = 170110;
+static const int PROTOCOL_VERSION = 170120;
 
 // Used to bypass the rule against non-const reference to temporary
 // where it makes sense with wrappers such as CFlatData or CTxDB

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`#define MIN_RETRY 1000`
`14`	`14`
`15`		`-#define REQUIRE_VERSION 170100`
	`15`	`+#define REQUIRE_VERSION 170120`
`16`	`16`
`17`	`17`	`static inline int GetRequireHeight(const bool testnet = fTestNet)`
`18`	`18`	`{`