Merge remote-tracking branch 'upstream/2.0-dev' into 2.0-dev

paciofs · Feb 7, 2019 · 1a34510 · 1a34510
2 parents aac42f6 + ffaa0a7
commit 1a34510
Show file tree

Hide file tree

Showing 265 changed files with 1,048 additions and 380 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ MultiChain
 
 [MultiChain](http://www.multichain.com/) is an open source platform for private blockchains, which offers a rich set of features including extensive configurability, rapid deployment, permissions management, native assets and data streams. Although it is designed to enable private blockchains, MultiChain provides maximal compatibility with the bitcoin ecosystem, including the peer-to-peer protocol, transaction/block formats and [Bitcoin Core](https://bitcoin.org/en/bitcoin-core/) APIs/runtime parameters.
 
- Copyright (c) 2014-2017 Coin Sciences Ltd
+ Copyright (c) 2014-2019 Coin Sciences Ltd
  License: GNU General Public License version 3, see COPYING
 
  Portions copyright (c) 2009-2016 The Bitcoin Core developers
@@ -39,18 +39,15 @@ Clone MultiChain
 
  git clone https://github.com/MultiChain/multichain.git
 
-Prepare to build V8
+Prepare to download or build V8
 -------------------
 
  cd multichain
  set MULTICHAIN_HOME=$(pwd)
  mkdir v8build
  cd v8build
-
-Build Google's V8 JavaScript engine locally
--------------------------
-
-Please use the instructions in [V8.md](/V8.md/) to build and install V8 for use by MultiChain.
+
+You can use pre-built headers and binaries of Google's V8 JavaScript engine by downloading and expanding [linux-v8.tar.gz](https://github.com/MultiChain/multichain-binaries/raw/master/linux-v8.tar.gz) in the current directory. If, on the other hand, you prefer to build the V8 component yourself, please follow the instructions in [V8.md](/V8.md/).
 
 Compile MultiChain for Ubuntu (64-bit)
 -----------------------------

diff --git a/mac.md b/mac.md
@@ -56,17 +56,15 @@ The default brew cookbook for berkeley-db and boost builds static libraries, but
  git clone https://github.com/MultiChain/multichain.git
 
 
-## Prepare to build V8
+## Prepare to download or build V8
 
  cd multichain
  set MULTICHAIN_HOME=$(pwd)
  mkdir v8build
  cd v8build
 
-## Build Google's V8 JavaScript engine locally
-
-Please use the instructions in [V8_mac.md](/V8_mac.md/) to build and install V8 for use by MultiChain.
-
+
+You can use pre-built headers and binaries of Google's V8 JavaScript engine by downloading and expanding [macos-v8.tar.gz](https://github.com/MultiChain/multichain-binaries/raw/master/macos-v8.tar.gz) in the current directory. If, on the other hand, you prefer to build the V8 component yourself, please follow the instructions in [V8_mac.md](/V8_mac.md/).
 
 ## Compile MultiChain for Mac (64-bit)
 

diff --git a/src/chain/chain.cpp b/src/chain/chain.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chain/chain.h"

diff --git a/src/chain/chain.h b/src/chain/chain.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_CHAIN_H

diff --git a/src/chain/checkpoints.cpp b/src/chain/checkpoints.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chain/checkpoints.h"

diff --git a/src/chain/checkpoints.h b/src/chain/checkpoints.h
@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_CHECKPOINTS_H

diff --git a/src/chain/merkleblock.cpp b/src/chain/merkleblock.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chain/merkleblock.h"

diff --git a/src/chain/merkleblock.h b/src/chain/merkleblock.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_MERKLEBLOCK_H

diff --git a/src/chain/pow.cpp b/src/chain/pow.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT/X11 software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chain/pow.h"

diff --git a/src/chain/pow.h b/src/chain/pow.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT/X11 software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_POW_H

diff --git a/src/chain/txmempool.cpp b/src/chain/txmempool.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chain/txmempool.h"

diff --git a/src/chain/txmempool.h b/src/chain/txmempool.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_TXMEMPOOL_H

diff --git a/src/chain/undo.h b/src/chain/undo.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2013 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_UNDO_H

diff --git a/src/chainparams/buildgenesis.cpp b/src/chainparams/buildgenesis.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "multichain/multichain.h"

diff --git a/src/chainparams/chainparams.cpp b/src/chainparams/chainparams.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chainparams/chainparams.h"

diff --git a/src/chainparams/chainparams.h b/src/chainparams/chainparams.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_CHAINPARAMS_H

diff --git a/src/chainparams/chainparamsbase.cpp b/src/chainparams/chainparamsbase.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "chainparams/chainparamsbase.h"

diff --git a/src/chainparams/chainparamsbase.h b/src/chainparams/chainparamsbase.h
@@ -1,6 +1,6 @@
 // Copyright (c) 2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_CHAINPARAMSBASE_H

diff --git a/src/chainparams/globals.h b/src/chainparams/globals.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef GLOBALS_H

diff --git a/src/chainparams/paramlist.h b/src/chainparams/paramlist.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef MULTICHAINPARAMLIST_H

diff --git a/src/chainparams/params.cpp b/src/chainparams/params.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include "multichain/multichain.h"
@@ -165,6 +165,11 @@ void* mc_MultichainParams::GetParam(const char *param,int* size)
 
 int mc_MultichainParams::IsParamUpgradeValueInRange(const mc_OneMultichainParam *param,int version,int64_t value)
 {
+ if((param->m_Type & MC_PRM_DATA_TYPE_MASK) == MC_PRM_BOOLEAN)
+ {
+ return 1;
+ }
+
  if(value >= param->m_MinIntegerValue)
  {
  if(value <= param->m_MaxIntegerValue)
@@ -280,6 +285,20 @@ int mc_MultichainParams::CanBeUpgradedByVersion(const char *param,int version,in
  }
  }
 
+ if( (strcmp(param,"anyonecanconnect") == 0) ||
+ (strcmp(param,"anyonecansend") == 0) ||
+ (strcmp(param,"anyonecanreceive") == 0) ||
+ (strcmp(param,"anyonecanreceiveempty") == 0) ||
+ (strcmp(param,"anyonecancreate") == 0) ||
+ (strcmp(param,"anyonecanissue") == 0) ||
+ (strcmp(param,"anyonecanactivate") == 0) ) 
+ {
+ if(version >= 20007)
+ {
+ return m_lpCoord[2 * index + 1];
+ }
+ }
+
 
 
  return 0;
@@ -2199,3 +2218,31 @@ int mc_Features::ImplicitConnectPermission()
  return ret; 
 }
 
+int mc_Features::LicenseTokens()
+{
+ int ret=0;
+ if(mc_gState->m_NetworkParams->IsProtocolMultichain() == 0)
+ {
+ return 0;
+ }
+ int protocol=mc_gState->m_NetworkParams->ProtocolVersion();
+
+ if(protocol)
+ {
+ if(protocol >= 20007)
+ {
+ ret=1;
+ }
+ else
+ {
+ if(Filters() == 0)
+ {
+ ret=1;
+ } 
+ }
+ }
+
+ return ret; 
+}
+
+
diff --git a/src/chainparams/params.h b/src/chainparams/params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef MULTICHAINPARAMS_H

diff --git a/src/chainparams/state.h b/src/chainparams/state.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef MULTICHAIN_STATE_H
@@ -152,6 +152,7 @@ typedef struct mc_Features
  int FixedIn20006();
  int NonceInMinerSignature();
  int ImplicitConnectPermission();
+ int LicenseTokens();
 } mc_Features;
 
 typedef struct mc_BlockHeaderInfo

diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -1,6 +1,6 @@
 // Copyright (c) 2012-2014 The Bitcoin developers
 // Original code was distributed under the MIT software license.
-// Copyright (c) 2014-2017 Coin Sciences Ltd
+// Copyright (c) 2014-2019 Coin Sciences Ltd
 // MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_CHECKQUEUE_H

diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"

diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"

diff --git a/src/compat/glibcxx_compat.cpp b/src/compat/glibcxx_compat.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include <cstddef>
 #include <istream>

diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #include <list>
 #include <locale>

diff --git a/src/compat/sanity.h b/src/compat/sanity.h
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #ifndef BITCOIN_COMPAT_SANITY_H
 #define BITCOIN_COMPAT_SANITY_H

diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp
@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2014 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+// Copyright (c) 2014-2019 Coin Sciences Ltd
+// MultiChain code distributed under the GPLv3 license, see COPYING file.
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"