2.0 beta 3

.clang-format

@@ -0,0 +1,80 @@
+# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
+#
+# You may use this file under the terms of the 3-clause BSD license.
+# See the file LICENSE from this package for details.
+
+# This is the clang-format configuration style to be used by Qt,
+# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
+# https://wiki.qt.io/Coding_Conventions
+
+---
+# Webkit style was loosely based on the Qt style
+BasedOnStyle: WebKit
+
+Standard: Cpp11
+
+# Leave the line breaks up to the user.
+# Note that this may be changed at some point in the future.
+ColumnLimit: 120
+# How much weight do extra characters after the line length limit have.
+PenaltyExcessCharacter: 400
+
+# Disable reflow of qdoc comments: indentation rules are different.
+# Translation comments are also excluded.
+CommentPragmas: "^!|^:"
+
+# We want a space between the type and the star for pointer types.
+PointerBindsToType: false
+
+# We use template< without space.
+SpaceAfterTemplateKeyword: false
+
+# We want to break before the operators, but not before a '='.
+BreakBeforeBinaryOperators: NonAssignment
+
+BreakBeforeBraces: Allman
+# Braces are usually attached, but not after functions or class declarations.
+#BreakBeforeBraces: Custom
+#BraceWrapping:
+#    AfterClass: true
+#    AfterControlStatement: false
+#    AfterEnum: false
+#    AfterFunction: true
+#    AfterNamespace: false
+#    AfterObjCDeclaration: false
+#    AfterStruct: true
+#    AfterUnion: true
+#    BeforeCatch: false
+#    BeforeElse: false
+#    IndentBraces: false
+
+# When constructor initializers do not fit on one line, put them each on a new line.
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+# Indent initializers by 4 spaces
+ConstructorInitializerIndentWidth: 4
+
+# Indent width for line continuations.
+ContinuationIndentWidth: 8
+
+# No indentation for namespaces.
+NamespaceIndentation: None
+
+# Horizontally align arguments after an open bracket.
+# The coding style does not specify the following, but this is what gives
+# results closest to the existing code.
+AlignAfterOpenBracket: true
+AlwaysBreakTemplateDeclarations: true
+
+# Ideally we should also allow less short function in a single line, but
+# clang-format does not handle that.
+AllowShortFunctionsOnASingleLine: Inline
+
+# The coding style specifies some include order categories, but also tells to
+# separate categories with an empty line. It does not specify the order within
+# the categories. Since the SortInclude feature of clang-format does not
+# re-order includes separated by empty lines, the feature is not used.
+SortIncludes: false
+
+# macros for which the opening brace stays attached.
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
+

.gitignore

@@ -9,26 +9,33 @@ src/multichain-cli
 src/multichain-util
 src/multichaind
 src/multichaind-cold
+src/multichain-cli-wdebug
+src/multichain-util-wdebug
+src/multichaind-wdebug
+src/multichaind-cold-wdebug
 src/test/test_bitcoin
 src/qt/test/test_bitcoin-qt
 
+local/*
+openssl*
+
 # autoreconf
 Makefile.in
 aclocal.m4
 autom4te.cache/
-build-aux/config.guess
-build-aux/config.sub
-build-aux/depcomp
-build-aux/install-sh
-build-aux/ltmain.sh
-build-aux/m4/libtool.m4
-build-aux/m4/lt~obsolete.m4
-build-aux/m4/ltoptions.m4
-build-aux/m4/ltsugar.m4
-build-aux/m4/ltversion.m4
-build-aux/missing
-build-aux/compile
-build-aux/test-driver
+**/build-aux/config.guess
+**/build-aux/config.sub
+**/build-aux/depcomp
+**/build-aux/install-sh
+**/build-aux/ltmain.sh
+**/build-aux/m4/libtool.m4
+**/build-aux/m4/lt~obsolete.m4
+**/build-aux/m4/ltoptions.m4
+**/build-aux/m4/ltsugar.m4
+**/build-aux/m4/ltversion.m4
+**/build-aux/missing
+**/build-aux/compile
+**/build-aux/test-driver
 config.log
 config.status
 configure
@@ -115,7 +122,31 @@ qa/pull-tester/run-bitcoind-for-test.sh
 qa/pull-tester/tests-config.sh
 qa/pull-tester/cache/*
 qa/pull-tester/test.*/*
+test_filters.sh
 
 !src/leveldb*/Makefile
 
 /doc/doxygen/
+
+# V8
+v8build
+
+# Eclipse CDT
+.autotools
+.cproject
+.project
+.settings/
+
+# Qt Creator
+*.user
+*.config
+*.creator
+*.files
+*.includes
+
+.idea/
+cmake-build-debug
+x86_64-w64-mingw32
+*.dll
+
+!depends/clang_fix.config

README.md

@@ -3,9 +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.
 
-MultiChain is licensed under the GPLv3 open source license. We also offer commercial licenses for those wishing to integrate MultiChain into a proprietary software solution.
-
-    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
@@ -14,29 +12,47 @@ MultiChain is licensed under the GPLv3 open source license. We also offer commer
 System requirements
 -------------------
 
-These compilation instructions have been tested on Ubuntu 14.04 x64 only.
+These compilation instructions have been tested on Ubuntu 16.04 x64 (xenial) and Ubuntu 18.04 x64 (bionic) only.
 
 C++ compilers are memory-hungry, so it is recommended to have at least 1 GB of memory available when compiling MultiChain. With less memory, compilation may take much longer due to swapfile thrashing.
 
 
-Linux Build Notes (on Ubuntu 14.04 x64)
+Linux Build Notes (on Ubuntu 16.04 x64 or later)
 =================
 
 Install dependencies
 --------------------
 
     sudo apt-get update
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
-    sudo apt-get install libboost-all-dev
-    sudo apt-get install git
-    sudo apt-get install software-properties-common
+    sudo apt-get install -y software-properties-common
+    sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config libssl-dev git python python-pip
     sudo add-apt-repository ppa:bitcoin/bitcoin
-    sudo apt-get update
-    sudo apt-get install libdb4.8-dev libdb4.8++-dev
+    sudo apt-get install -y libdb4.8-dev libdb4.8++-dev
+    sudo pip install pathlib2
+
+MultiChain requires Boost version no later than 1.65.
+
+    sudo apt-get install -y libboost1.65-all-dev
+
+Clone MultiChain
+----------------
+
+    git clone https://github.com/MultiChain/multichain.git
+
+Prepare to download or build V8
+-------------------
+
+    cd multichain
+    set MULTICHAIN_HOME=$(pwd)
+    mkdir v8build
+    cd v8build
+
+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)
 -----------------------------
 
+    cd $MULTICHAIN_HOME
     ./autogen.sh
     ./configure
     make
@@ -49,98 +65,13 @@ Notes
 * The release is built with GCC after which `strip multichaind` strings the debug symbols, which reduces the executable size by about 90%.
 
 
-Windows Build Notes (on Ubuntu 14.04 x64)
+Windows Build Notes
 =====================
 
-Install dependencies
---------------------
-
-    sudo apt-get update
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
-    sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev curl
-    sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
-    sudo apt-get install git
-    sudo add-apt-repository ppa:bitcoin/bitcoin
-    sudo apt-get update
-    sudo apt-get install libdb4.8-dev libdb4.8++-dev
-
-Compile MultiChain for Windows (64-bit)
-------------------------------
-
-    ./autogen.sh
-    cd depends
-    make HOST=x86_64-w64-mingw32 -j4
-    cd ..
-    ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 --enable-cxx --disable-shared --enable-static --with-pic
-    make
-
-Notes
------
-
-* This will build `multichaind.exe`, `multichain-cli.exe` and `multitchain-util.exe` in the `src` directory.
+Please see the instructions in [win.md](/win.md/) to build MultiChain for use with Windows.
 
 
 Mac Build Notes (on MacOS Sierra)
 ================
 
-Install dependencies
---------------------
-
-    Install XCode and XCode command line tools
-    Install git from git-scm
-    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 boost@1.57
-    brew link boost@1.57 --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.
-
-To create a statically linked MultiChain which only depends on default MacOS dylibs, the following steps are taken:
-
-1. Hide the brew boost dylibs from the build system:
-    rename -e 's/.dylib/.dylib.hidden/' /usr/local/opt/boost/lib/*.dylib
-
-2. Hide the brew berekley-db dylibs from the build system:
-    rename -e 's/.dylib/.dylib.hidden/' /usr/local/opt/berkeley-db\@4/lib/*.dylib
-
-3. Hide the brew openssl dylibs from the build system:
-    rename -e 's/.dylib/.dylib.hidden/' /usr/local/opt/openssl/lib/*.dylib
-
-The default brew cookbook for berkeley-db and boost builds static libraries, but the default cookbook for openssl only builds dylibs.
-
-3. Tell brew to build openssl static libraries:
-    brew edit openssl
-        In 'def configure_args' change 'shared' to 'no-shared'
-    brew install openssl --force
-
-
-
-Compile MultiChain for Mac (64-bit)
---------------------------
-
-    export LDFLAGS=-L/usr/local/opt/openssl/lib
-    export CPPFLAGS=-I/usr/local/opt/openssl/include
-    ./autogen.sh
-    ./configure --with-gui=no --with-libs=no --with-miniupnpc=no
-    make
-
-Clean up
---------
-
-    rename -e 's/.dylib.hidden/.dylib/' /usr/local/opt/berkeley-db\@4/lib/*.dylib.hidden
-    rename -e 's/.dylib.hidden/.dylib/' /usr/local/opt/boost/lib/*.dylib.hidden
-    rename -e 's/.dylib.hidden/.dylib/' /usr/local/opt/openssl/lib/*.dylib.hidden
-    brew edit openssl
-        In 'def configure_args' change 'no-shared' to 'shared'
-
-Notes
------
-
-* This will build `multichaind`, `multichain-cli` and `multichain-util` in the `src` directory.
-
+Please see the instructions in [mac.md](/mac.md/) to build MultiChain for use with MacOS.