Merge pull request #46 from MultiChain/2.0-release

2.0 alpha 2

Author: mike31

src/Makefile.am

@@ -179,6 +179,7 @@ libbitcoin_server_a_SOURCES = \
   core/main.cpp \
   protocol/multichaintx.cpp \
   protocol/multichainblock.cpp \
+  custom/custom_server.cpp \
   protocol/handshake.cpp \
   chain/merkleblock.cpp \
   miner/miner.cpp \
@@ -252,6 +253,8 @@ multichain_libbitcoin_multichain_a_SOURCES = \
   utils/tools.cpp \
   utils/utilwrapper.cpp \
   version/version.cpp \
+  custom/custom.cpp \
+  custom/custom_multichain.cpp \
   chainparams/params.cpp \
   protocol/multichainscript.cpp \
   utils/dbwrapper.cpp \
@@ -513,6 +516,8 @@ libbitcoinconsensus_la_SOURCES = \
   utils/utilwrapper.cpp \
   chainparams/buildgenesis.cpp \
   version/version.cpp \
+  custom/custom.cpp \
+  custom/custom_multichain.cpp \
   chainparams/chainparams.cpp \
   protocol/multichainscript.cpp \
   utils/dbwrapper.cpp \

src/chainparams/chainparams.cpp

@@ -554,6 +554,14 @@ class CMultiChainParams : public CMainParams {
         }
     }
 
+    void SetMultiChainParam(const char*param_name,int64_t value)
+    {
+        if(strcmp(param_name,"targetblocktime") == 0)
+        {
+            nTargetSpacing=value;
+        }
+    }
+    
     void SetMultiChainRuntimeParams()
     {
         fMineBlocksOnDemand = GetBoolArg("-mineblocksondemand", false);
@@ -781,6 +789,12 @@ void SetMultiChainParams()
     multiChainParams.SetMultiChainParams();
 }
 
+void SetMultiChainParam(const char*param_name,int64_t value)
+{
+    multiChainParams.SetMultiChainParam(param_name,value);
+}
+
+
 void SetMultiChainRuntimeParams()
 {
     multiChainParams.SetMultiChainRuntimeParams();

src/chainparams/chainparams.h

@@ -166,6 +166,7 @@ bool SelectParamsFromCommandLine();
 bool SelectMultiChainParams(const char *NetworkName);
 bool InitializeMultiChainParams();
 void SetMultiChainParams();
+void SetMultiChainParam(const char*param_name,int64_t value);
 void SetMultiChainRuntimeParams();
 
 

src/chainparams/globals.h

@@ -11,12 +11,15 @@ unsigned int MAX_BLOCK_SIZE = 1000000;
 unsigned int DEFAULT_BLOCK_MAX_SIZE = 750000;                                   // main.h
 unsigned int MAX_BLOCKFILE_SIZE = 0x8000000;                                    // main.h
 unsigned int MAX_STANDARD_TX_SIZE = 100000;                                     // main.h
+unsigned int MAX_BLOCK_SIGOPS = 20000;                                          // main.h
+unsigned int MAX_TX_SIGOPS = 4000;                                              // main.h
 int COINBASE_MATURITY = 100;                                                    // main.h
 unsigned int MAX_SIZE = 0x02000000;                                             // serialize,h
 int64_t COIN = 100000000;                                                       // amount.h
 int64_t CENT = 1000000;                                                         // amount.h
 int64_t MAX_MONEY = 21000000 * COIN;                                            // amount.h
 unsigned int MAX_SCRIPT_ELEMENT_SIZE=520;                                       // script.h
+int MIN_BLOCKS_BETWEEN_UPGRADES = 100;                                          
 int MAX_OP_RETURN_SHOWN=16384;
 int MAX_FORMATTED_DATA_DEPTH=100;
 unsigned int MAX_OP_RETURN_OP_DROP_COUNT=100000000;

src/chainparams/paramlist.h

@@ -13,7 +13,7 @@ static const mc_OneMultichainParam MultichainParamArray[] =
     { "chaindescription"                       , "chain-description"                       ,
                    MC_PRM_STRING  | MC_PRM_USER | MC_PRM_CLONE | MC_PRM_SPECIAL ,256,         0,          0,         0, 0.0, 10001, 0, "-mc-chaindescription",
                    "rootstreamname","",
-                   "Chain description, embedded in genesis block coinbase, max 256 chars."},
+                   "Chain description, embedded in genesis block coinbase, max 90 chars."},
     { "rootstreamname"                       , "root-stream-name"                       ,
                    MC_PRM_STRING  | MC_PRM_USER | MC_PRM_CLONE  | MC_PRM_SPECIAL,256,         0,          0,         0, 0.0, 10006, 0, "-mc-rootstreamname",
                    "rootstreamopen","",
@@ -27,13 +27,17 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "targetblocktime","",
                    "Content of the 'testnet' field of API responses, for compatibility."},
     { "targetblocktime"                        , "target-block-time"                    ,
-                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,        15,         2,     86400, 0.0, 10001, 0, "-mc-targetblocktime",
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE | MC_PRM_TIME    , -1,        15,         2,     86400, 0.0, 10001, 0, "-mc-targetblocktime",
                    "maximumblocksize","",
                    "Target time between blocks (transaction confirmation delay), seconds."},
     { "maximumblocksize"                       , "maximum-block-size"               , 
-                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,   8388608,       1000,1000000000, 0.0, 10001, 0, "-mc-maximumblocksize",
-                   "defaultnetworkport","",
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,   8388608,       5000,1000000000, 0.0, 10001, 0, "-mc-maximumblocksize",
+                   "timingupgrademingap","",
                    "Maximum block size in bytes."},
+    { "timingupgrademingap"                        , "timing-upgrade-min-gap"                    ,
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE | MC_PRM_HIDDEN  , -1,        100,        1,     31536000, 0.0, 20002, 0, "-mc-timingupgrademingap",
+                   "defaultnetworkport","",
+                   "Minimal gap between time-related parameter upgrades. In blocks."},
     { "defaultnetworkport"                , "default-network-port"              ,
                    MC_PRM_UINT32  | MC_PRM_GENERATED | MC_PRM_CLONE                  , -1, MC_DEFAULT_NETWORK_PORT,       1024,     65535, 0.0, 10001, 0, "-mc-defaultnetworkport",
                    "defaultrpcport","",
@@ -159,7 +163,7 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "firstblockreward","Native blockchain currency (likely not required)",
                    "Initial block mining reward in raw native currency units."},
     { "rewardhalvinginterval"            , "reward-halving-interval"          ,
-                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,  52560000,         60,4294967295U, 0.0, 10001, 0, "-mc-rewardhalvinginterval",
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,  52560000,         60,1000000000, 0.0, 10001, 0, "-mc-rewardhalvinginterval",
                    "rewardspendabledelay","",
                    "Interval for halving of mining rewards, in blocks."},
     { "rewardspendabledelay"                  , "reward-spendable-delay"                  ,