2.0 alpha 4 release

README.md

@@ -91,6 +91,12 @@ Install dependencies
     Install brew (follow instructions on brew.sh)
     brew install autoconf automake berkeley-db4 libtool boost openssl pkg-config rename
 
+on MacOS High Sierra
+
+    brew uninstall boost
+    brew install [email protected]
+    brew link [email protected] --force
+
 Prepare for static linking
 --------------------------
 Apple does not support statically linked binaries as [documented here](https://developer.apple.com/library/content/qa/qa1118/_index.html), however, it is convenient for end-users to launch a binary without having to first install brew, a third-party system designed for developers.
@@ -113,6 +119,8 @@ The default brew cookbook for berkeley-db and boost builds static libraries, but
         In 'def configure_args' change 'shared' to 'no-shared'
     brew install openssl --force
 
+
+
 Compile MultiChain for Mac (64-bit)
 --------------------------
 

src/Makefile.am

@@ -180,6 +180,7 @@ libbitcoin_server_a_SOURCES = \
   protocol/multichaintx.cpp \
   protocol/multichainblock.cpp \
   custom/custom_server.cpp \
+  protocol/relay.cpp \
   protocol/handshake.cpp \
   chain/merkleblock.cpp \
   miner/miner.cpp \
@@ -191,6 +192,9 @@ libbitcoin_server_a_SOURCES = \
   json/json_spirit_ubjson.cpp \
   rpc/rpcrawdata.cpp \
   rpc/rpcutils.cpp \
+  rpc/rpccache.cpp \
+  rpc/rpcchunks.cpp \
+  rpc/rpcdebug.cpp \
   rpc/rpchelp.cpp \
   rpc/rpcblockchain.cpp \
   rpc/rpcmining.cpp \
@@ -259,6 +263,8 @@ multichain_libbitcoin_multichain_a_SOURCES = \
   protocol/multichainscript.cpp \
   utils/dbwrapper.cpp \
   wallet/wallettxdb.cpp \
+  wallet/chunkdb.cpp \
+  wallet/chunkcollector.cpp \
   permissions/permission.cpp \
   entities/asset.cpp
 
@@ -522,6 +528,8 @@ libbitcoinconsensus_la_SOURCES = \
   protocol/multichainscript.cpp \
   utils/dbwrapper.cpp \
   wallet/wallettxdb.cpp \
+  wallet/chunkdb.cpp \
+  wallet/chunkcollector.cpp \
   permissions/permission.cpp \
   entities/asset.cpp \
   structs/hash.cpp \

src/chainparams/buildgenesis.cpp

@@ -125,14 +125,11 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
     root_stream_name_size=0;
     root_stream_name=NULL;
 
-    if(mc_gState->m_Features->Streams())
+    root_stream_name=(unsigned char *)GetParam("rootstreamname",&root_stream_name_size);        
+    if(IsProtocolMultichain() == 0)
     {
-        root_stream_name=(unsigned char *)GetParam("rootstreamname",&root_stream_name_size);        
-        if(IsProtocolMultichain() == 0)
-        {
-            root_stream_name_size=0;
-        }    
-    }
+        root_stream_name_size=0;
+    }    
 
     while(look_for_genesis)
     {                
@@ -141,7 +138,7 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
 
         txNew.vin.resize(1);
 
-        if(root_stream_name_size > ( (mc_gState->m_Features->FixedIn10008() != 0) ? 1 : 0 ))
+        if(root_stream_name_size > 1)
         {
             txNew.vout.resize(2);                        
         }
@@ -170,22 +167,15 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
 
             lpScript=new mc_Script;
 
-            if(mc_gState->m_Features->Streams())
-            {
-                lpScript->SetPermission(MC_PTP_GLOBAL_ALL,0,0xffffffff,timestamp);
-            }
-            else
-            {
-                lpScript->SetPermission(MC_PTP_ALL,0,0xffffffff,timestamp);                
-            }
+            lpScript->SetPermission(MC_PTP_GLOBAL_ALL,0,0xffffffff,timestamp);
 
             elem = lpScript->GetData(0,&elem_size);
             txNew.vout[0].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP;
 
             delete lpScript;            
         }
 
-        if(root_stream_name_size > ( (mc_gState->m_Features->FixedIn10008() != 0) ? 1 : 0 ))
+        if(root_stream_name_size > 1)
         {        
             txNew.vout[1].nValue=0;
             lpDetails=new mc_Script;
@@ -196,12 +186,9 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
                 lpDetails->SetSpecialParamValue(MC_ENT_SPRM_ANYONE_CAN_WRITE,&b,1);        
             }
 
-            if(mc_gState->m_Features->FixedIn10007())
+            if( (root_stream_name_size > 1) && (root_stream_name[root_stream_name_size - 1] == 0x00) )
             {
-                if( (root_stream_name_size > 1) && (root_stream_name[root_stream_name_size - 1] == 0x00) )
-                {
-                    root_stream_name_size--;
-                }
+                root_stream_name_size--;
             }
 
             lpDetails->SetSpecialParamValue(MC_ENT_SPRM_NAME,root_stream_name,root_stream_name_size);
@@ -212,44 +199,11 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
 
             lpDetailsScript=new mc_Script;
 
-            if(mc_gState->m_Features->OpDropDetailsScripts())
-            {
-                lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM,0,script,bytes);
+            lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM,0,script,bytes);
 
-                elem = lpDetailsScript->GetData(0,&elem_size);
-                txNew.vout[1].scriptPubKey=CScript();
-                txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP << OP_RETURN;                        
-            }
-            else
-            {                
-                lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM);
-
-                lpDetailsScript->SetGeneralDetails(script,bytes);
-                txNew.vout[1].scriptPubKey=CScript();
-
-                for(int e=0;e<lpDetailsScript->GetNumElements();e++)
-                {
-                    elem = lpDetailsScript->GetData(e,&elem_size);
-                    if(e == (lpDetailsScript->GetNumElements() - 1) )
-                    {
-                        if(elem_size > 0)
-                        {
-                            txNew.vout[1].scriptPubKey << OP_RETURN << vector<unsigned char>(elem, elem + elem_size);
-                        }
-                        else
-                        {
-                            txNew.vout[1].scriptPubKey << OP_RETURN;
-                        }
-                    }
-                    else
-                    {
-                        if(elem_size > 0)
-                        {
-                            txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP;
-                        }                
-                    }
-                }
-            }
+            elem = lpDetailsScript->GetData(0,&elem_size);
+            txNew.vout[1].scriptPubKey=CScript();
+            txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP << OP_RETURN;                        
 
             delete lpDetails;
             delete lpDetailsScript;
@@ -310,14 +264,6 @@ int mc_MultichainParams::Build(const unsigned char* pubkey, int pubkey_size)
     {
         return err;
     }    
-    if(mc_gState->m_Features->Streams() == 0)
-    {
-        err=SetParam("genesisopreturnscript","[not set]",9);                        // Some value required to make parameter set valid, but valid value should start from OP_RETURN
-        if(err)
-        {
-            return err;
-        }    
-    }
 
     mc_HexToBin(hash,genesis.GetHash().ToString().c_str(),32);
     err=SetParam("genesishash",(const char*)hash,32);

src/chainparams/chainparams.cpp

@@ -609,16 +609,12 @@ class CMultiChainParams : public CMainParams {
         txNew.vin.resize(1);
 
         root_stream_name_size=0;
-        root_stream_name=NULL;
-        if(mc_gState->m_Features->Streams())
+        root_stream_name=(unsigned char *)mc_gState->m_NetworkParams->GetParam("rootstreamname",&root_stream_name_size);        
+        if(mc_gState->m_NetworkParams->IsProtocolMultichain() == 0)
         {
-            root_stream_name=(unsigned char *)mc_gState->m_NetworkParams->GetParam("rootstreamname",&root_stream_name_size);        
-            if(mc_gState->m_NetworkParams->IsProtocolMultichain() == 0)
-            {
-                root_stream_name_size=0;
-            }    
-        }
-        if(root_stream_name_size > ( (mc_gState->m_Features->FixedIn10008() != 0) ? 1 : 0 ) )
+            root_stream_name_size=0;
+        }    
+        if(root_stream_name_size > 1)
         {
             txNew.vout.resize(2);                        
         }
@@ -651,22 +647,15 @@ class CMultiChainParams : public CMainParams {
 
             lpScript=new mc_Script;
 
-            if(mc_gState->m_Features->Streams())
-            {
-                lpScript->SetPermission(MC_PTP_GLOBAL_ALL,0,0xffffffff,(uint32_t)mc_gState->m_NetworkParams->GetInt64Param("genesistimestamp"));
-            }
-            else
-            {
-                lpScript->SetPermission(MC_PTP_ALL,0,0xffffffff,(uint32_t)mc_gState->m_NetworkParams->GetInt64Param("genesistimestamp"));                
-            }
+            lpScript->SetPermission(MC_PTP_GLOBAL_ALL,0,0xffffffff,(uint32_t)mc_gState->m_NetworkParams->GetInt64Param("genesistimestamp"));
 
             elem = lpScript->GetData(0,&elem_size);
             txNew.vout[0].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP;
 
             delete lpScript;            
         }
 
-        if(root_stream_name_size > ( (mc_gState->m_Features->FixedIn10008() != 0) ? 1 : 0 ))
+        if(root_stream_name_size > 1)
         {        
             txNew.vout[1].nValue=0;
             lpDetails=new mc_Script;
@@ -678,13 +667,10 @@ class CMultiChainParams : public CMainParams {
             }
 
 
-            if(mc_gState->m_Features->FixedIn10007())
+            if( (root_stream_name_size > 1) && (root_stream_name[root_stream_name_size - 1] == 0x00) )
             {
-                if( (root_stream_name_size > 1) && (root_stream_name[root_stream_name_size - 1] == 0x00) )
-                {
-                    root_stream_name_size--;
-                }           
-            }
+                root_stream_name_size--;
+            }           
 
 
             lpDetails->SetSpecialParamValue(MC_ENT_SPRM_NAME,root_stream_name,root_stream_name_size);
@@ -695,44 +681,11 @@ class CMultiChainParams : public CMainParams {
 
             lpDetailsScript=new mc_Script;
 
-            if(mc_gState->m_Features->OpDropDetailsScripts())
-            {
-                lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM,0,script,bytes);
+            lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM,0,script,bytes);
 
-                elem = lpDetailsScript->GetData(0,&elem_size);
-                txNew.vout[1].scriptPubKey=CScript();
-                txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP << OP_RETURN;                        
-            }
-            else
-            {                            
-                lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_STREAM);
-
-                lpDetailsScript->SetGeneralDetails(script,bytes);
-                txNew.vout[1].scriptPubKey=CScript();
-
-                for(int e=0;e<lpDetailsScript->GetNumElements();e++)
-                {
-                    elem = lpDetailsScript->GetData(e,&elem_size);
-                    if(e == (lpDetailsScript->GetNumElements() - 1) )
-                    {
-                        if(elem_size > 0)
-                        {
-                            txNew.vout[1].scriptPubKey << OP_RETURN << vector<unsigned char>(elem, elem + elem_size);
-                        }
-                        else
-                        {
-                            txNew.vout[1].scriptPubKey << OP_RETURN;
-                        }
-                    }
-                    else
-                    {
-                        if(elem_size > 0)
-                        {
-                            txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP;
-                        }                
-                    }
-                }
-            }
+            elem = lpDetailsScript->GetData(0,&elem_size);
+            txNew.vout[1].scriptPubKey=CScript();
+            txNew.vout[1].scriptPubKey << vector<unsigned char>(elem, elem + elem_size) << OP_DROP << OP_RETURN;                        
 
             delete lpDetails;
             delete lpDetailsScript;

src/chainparams/globals.h

@@ -5,6 +5,7 @@
 #define	GLOBALS_H
 
 mc_State* mc_gState;
+unsigned int MIN_OFFCHAIN_FEE = 0;                                              // new
 unsigned int MIN_RELAY_TX_FEE = 1000;                                           // new
 unsigned int MAX_OP_RETURN_RELAY = 40;                                          // standard.h
 unsigned int MAX_BLOCK_SIZE = 1000000;                                          // block.h
@@ -15,15 +16,20 @@ unsigned int MAX_BLOCK_SIGOPS = 20000;
 unsigned int MAX_TX_SIGOPS = 4000;                                              // main.h
 int COINBASE_MATURITY = 100;                                                    // main.h
 unsigned int MAX_SIZE = 0x02000000;                                             // serialize,h
+unsigned int OFFCHAIN_MSG_PADDING = 2048;                                       // main.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_STREAM_QUERY_ITEMS=5000;
 int MAX_FORMATTED_DATA_DEPTH=100;
 unsigned int MAX_OP_RETURN_OP_DROP_COUNT=100000000;
 uint32_t JSON_NO_DOUBLE_FORMATTING=0;                             
+int JSON_DOUBLE_DECIMAL_DIGITS=-1;                             
+int MAX_CHUNK_SIZE = 1048576; 
+int MAX_CHUNK_COUNT = 1024; 
 
 int MCP_MAX_STD_OP_RETURN_COUNT=0;
 int64_t MCP_INITIAL_BLOCK_REWARD=0;
@@ -34,6 +40,8 @@ int MCP_ANYONE_CAN_MINE=0;
 int MCP_ANYONE_CAN_CONNECT=0;
 int MCP_ANYONE_CAN_SEND=0;
 int MCP_ANYONE_CAN_RECEIVE=0;
+int MCP_ANYONE_CAN_CREATE=0;
+int MCP_ANYONE_CAN_ISSUE=0;
 int MCP_ANYONE_CAN_ACTIVATE=0;
 int64_t MCP_MINIMUM_PER_OUTPUT=0;
 int MCP_ALLOW_ARBITRARY_OUTPUTS=1;

src/chainparams/paramlist.h

@@ -32,8 +32,16 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "Target time between blocks (transaction confirmation delay), seconds."},
     { "maximumblocksize"                       , "maximum-block-size"               , 
                    MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,   8388608,       5000,1000000000, 0.0, 10001, 0, "-mc-maximumblocksize",
-                   "timingupgrademingap","",
+                   "maximumchunksize","",
                    "Maximum block size in bytes."},
+    { "maximumchunksize"                       , "maximum-chunk-size"               , 
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,   1048576,        256,  16777216, 0.0, 20003, 0, "-mc-maximumchunksize",
+                   "maximumchunkcount","",
+                   "Maximum chunk size for off-chain items in bytes."},
+    { "maximumchunkcount"                       , "maximum-chunk-count"               , 
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,      1024,         16,      2048, 0.0, 20003, 0, "-mc-maximumchunkcount",
+                   "timingupgrademingap","",
+                   "Maximum number of chunks in one off-chain item."},
     { "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","",
@@ -127,7 +135,7 @@ static const mc_OneMultichainParam MultichainParamArray[] =
     { "adminconsensuscreate"                , "admin-consensus-create"              , 
                    MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE | MC_PRM_DECIMAL , -1,         0,          0,   1000000, 0.0, 10006, 0, "-mc-adminconsensuscreate",            
                    "adminconsensusissue","",
-                   "<admin-consensus-issue>*<active admins> to change create permissions."},
+                   "<admin-consensus-create>*<active admins> to change create permissions."},
     { "adminconsensusissue"                , "admin-consensus-issue"              , 
                    MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE | MC_PRM_DECIMAL , -1,         0,          0,   1000000, 0.0, 10003, 0, "-mc-adminconsensusissue",            
                    "lockadminminerounds","",
@@ -176,8 +184,12 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "Minimum native currency per output (anti-dust), in raw units.\nIf set to -1, this is calculated from minimum-relay-fee."},
     { "maximumperoutput"                     , "maximum-per-output"                     , 
                    MC_PRM_INT64   | MC_PRM_USER | MC_PRM_CLONE                  , -1,         100000000000000,         0,1000000000000000000, 0.0, 10001, 0, "-mc-maximumperoutput",
-                   "minimumrelayfee","",
+                   "minimumoffchainfee","",
                    "Maximum native currency per output, in raw units."},
+    { "minimumoffchainfee"                     , "minimum-offchain-fee"                     ,
+                   MC_PRM_INT64   | MC_PRM_USER | MC_PRM_CLONE                  , -1,         0,          0,1000000000, 0.0, 20003, 0, "-mc-minimumoffchainfee",
+                   "minimumrelayfee","",
+                   "Minimum fee for publishing off-chain data items, per 1000 bytes, in raw units of native currency."},
     { "minimumrelayfee"                     , "minimum-relay-fee"                     ,
                    MC_PRM_INT64   | MC_PRM_USER | MC_PRM_CLONE                  , -1,         0,          0,1000000000, 0.0, 10001, 0, "-mc-minimumrelayfee",
                    "nativecurrencymultiple","",
@@ -214,7 +226,7 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "maxstdopreturnscount","",
                    "Maximum size of standard transactions, in bytes."},
     { "maxstdopreturnscount"                  , "max-std-op-returns-count"                  , 
-                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,        10,          0,      1024, 0.0, 10006, 0, "-mc-maxstdopreturnscount",
+                   MC_PRM_UINT32  | MC_PRM_USER | MC_PRM_CLONE                  , -1,        32,          0,      1024, 0.0, 10006, 0, "-mc-maxstdopreturnscount",
                    "maxstdopreturnsize","",
                    "Maximum number of OP_RETURN metadata outputs in standard transactions."},                   
     { "maxstdopreturnsize"                  , "max-std-op-return-size"                  , 
@@ -226,7 +238,7 @@ static const mc_OneMultichainParam MultichainParamArray[] =
                    "maxstdelementsize","",
                    "Maximum number of OP_DROPs per output in standard transactions."},
     { "maxstdelementsize"                    , "max-std-element-size"                    ,
-                   MC_PRM_INT64   | MC_PRM_USER | MC_PRM_CLONE                  , -1,      8192,        128,     32768, 0.0, 10003, 0, "-mc-maxscriptelementsize",
+                   MC_PRM_INT64   | MC_PRM_USER | MC_PRM_CLONE                  , -1,     40000,        128,     80000, 0.0, 10003, 0, "-mc-maxscriptelementsize",
                    "maxstdopdropsize","",
                    "Maximum size of data elements in standard transactions, in bytes."},