4MB block size with sapling

src/consensus/consensus.h

@@ -19,7 +19,7 @@ static const int32_t SAPLING_MIN_TX_VERSION = 4;
 /** The maximum allowed Sapling transaction version (network rule) */
 static const int32_t SAPLING_MAX_TX_VERSION = 4;
 /** The maximum allowed size for a serialized block, in bytes (network rule) */
-static const unsigned int MAX_BLOCK_SIZE = 2000000;
+//static const unsigned int MAX_BLOCK_SIZE = 2000000;
 /** The maximum allowed number of signature check operations in a block (network rule) */
 extern unsigned int MAX_BLOCK_SIGOPS;
 /** The maximum size of a transaction (network rule) */

src/consensus/params.h

@@ -10,6 +10,8 @@
 
 #include <boost/optional.hpp>
 
+int32_t MAX_BLOCK_SIZE(int32_t height);
+
 namespace Consensus {
 
 /**
@@ -40,7 +42,6 @@ struct NetworkUpgrade {
      * Height of the first block for which the new consensus rules will be active
      */
     int nActivationHeight;
-
     /**
      * Special value for nActivationHeight indicating that the upgrade is always active.
      * This is useful for testing, as it means tests don't need to deal with the activation