From 14cca90a5546645e3dc1a344d13c0b86a7d86c44 Mon Sep 17 00:00:00 2001 From: Zvi Tarem Date: Thu, 31 Jan 2019 11:46:37 +0200 Subject: [PATCH 1/8] Propose dowloading pre-built V8 binaries --- README.md | 9 +++------ mac.md | 8 +++----- win.md | 7 ++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index cecbccfe..2e5b2e8e 100644 --- a/README.md +++ b/README.md @@ -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 index 513e90fa..fd77eaa7 100644 --- 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/win.md b/win.md index 6d7be43a..8b198fd1 100644 --- a/win.md +++ b/win.md @@ -50,7 +50,7 @@ On Windows: cd multichain set MULTICHAIN_HOME=%CD% -### Build the Google V8 JavaScript engine +### Prepare to download or build V8 On Windows: @@ -58,6 +58,11 @@ On Windows: mkdir v8build cd v8build + +You can use pre-built headers and binaries of Google's V8 JavaScript engine by downloading and expanding [windows-v8.zip](https://github.com/MultiChain/multichain-binaries/raw/master/windows-v8.zip) in the current directory. + +If, on the other hand, you prefer to build the V8 component yourself, please perform the following: + - Follow the instructions in [V8_win.md](V8_win.md) to fetch, configure and build Google's V8 JavaScript engine. - To facilitate building an additional library required by MultiChain, copy the following files to the Linux machine, in the same relative folder: From e8c68f8201c7cbb70c2d1f03822965838243c65c Mon Sep 17 00:00:00 2001 From: mike31 Date: Sun, 3 Feb 2019 14:51:57 +0200 Subject: [PATCH 2/8] Corrupted wallet message tweak --- src/core/init-cold.cpp | 2 +- src/core/init.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/init-cold.cpp b/src/core/init-cold.cpp index e72ec615..ec58b9c0 100644 --- a/src/core/init-cold.cpp +++ b/src/core/init-cold.cpp @@ -798,7 +798,7 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) { return InitError(_("wallet.dat corrupted. Please remove it and restart.")); } - return InitError(_("wallet.dat corrupted. Please try running MultiChain with -salvagewallet.")); + return InitError(_("wallet.dat is partially corrupted. Please try running MultiChain with -salvagewallet.")); } if(!pwalletMain->vchDefaultKey.IsValid()) diff --git a/src/core/init.cpp b/src/core/init.cpp index e9f90a4a..8875c786 100644 --- a/src/core/init.cpp +++ b/src/core/init.cpp @@ -1166,7 +1166,7 @@ bool AppInit2(boost::thread_group& threadGroup,int OutputPipe) { return InitError(_("wallet.dat corrupted. Please remove it and restart.")); } - return InitError(_("wallet.dat corrupted. Please try running MultiChain with -salvagewallet.")); + return InitError(_("wallet.dat is partially corrupted. Please try running MultiChain with -salvagewallet.")); } if(!pwalletMain->vchDefaultKey.IsValid()) From 5489cefe98395e0d2464e6201da4c190e3b88881 Mon Sep 17 00:00:00 2001 From: mike31 Date: Sun, 3 Feb 2019 14:55:03 +0200 Subject: [PATCH 3/8] Tweaks in Windows instructions --- win.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win.md b/win.md index 8b198fd1..7c918ab9 100644 --- a/win.md +++ b/win.md @@ -72,7 +72,9 @@ If, on the other hand, you prefer to build the V8 component yourself, please per On Linux: + export RELEASE_HOME=$MULTICHAIN_HOME/v8build/v8/out.gn/x64.release cd $RELEASE + mkdir obj python $MULTICHAIN_HOME/depends/v8_data_lib.py -m $MULTICHAIN_HOME -o win32 - Copy `obj/v8_data.lib` to `%MULTICHAIN_HOME%\v8build\v8\out.gn\x64.release\obj` on Windows. From 816e4cd3163b42a37c3c50d9c36c3118229afd4b Mon Sep 17 00:00:00 2001 From: mike31 Date: Mon, 4 Feb 2019 11:40:11 +0200 Subject: [PATCH 4/8] Fixed copyright information --- README.md | 2 +- src/chain/chain.cpp | 2 +- src/chain/chain.h | 2 +- src/chain/checkpoints.cpp | 2 +- src/chain/checkpoints.h | 2 +- src/chain/merkleblock.cpp | 2 +- src/chain/merkleblock.h | 2 +- src/chain/pow.cpp | 2 +- src/chain/pow.h | 2 +- src/chain/txmempool.cpp | 2 +- src/chain/txmempool.h | 2 +- src/chain/undo.h | 2 +- src/chainparams/buildgenesis.cpp | 2 +- src/chainparams/chainparams.cpp | 2 +- src/chainparams/chainparams.h | 2 +- src/chainparams/chainparamsbase.cpp | 2 +- src/chainparams/chainparamsbase.h | 2 +- src/chainparams/globals.h | 2 +- src/chainparams/paramlist.h | 2 +- src/chainparams/params.cpp | 2 +- src/chainparams/params.h | 2 +- src/chainparams/state.h | 2 +- src/checkqueue.h | 2 +- src/compat/glibc_compat.cpp | 2 ++ src/compat/glibc_sanity.cpp | 2 ++ src/compat/glibcxx_compat.cpp | 2 ++ src/compat/glibcxx_sanity.cpp | 2 ++ src/compat/sanity.h | 2 ++ src/compat/strnlen.cpp | 2 ++ src/core/init-cold.cpp | 2 +- src/core/init.cpp | 2 +- src/core/init.h | 2 +- src/core/main.cpp | 2 +- src/core/main.h | 2 +- src/custom/custom.cpp | 2 +- src/custom/custom.h | 2 +- src/custom/custom_multichain.cpp | 2 +- src/custom/custom_server.cpp | 2 +- src/entities/asset.cpp | 2 +- src/entities/asset.h | 2 +- src/filters/filter.cpp | 2 +- src/filters/filter.h | 2 +- src/filters/filter_cold.cpp | 2 +- src/filters/filter_win.cpp | 2 +- src/filters/filtercallback.cpp | 3 +++ src/filters/filtercallback.h | 3 +++ src/filters/filtercallback_cold.cpp | 3 +++ src/filters/ifiltercallback.h | 3 +++ src/filters/multichainfilter.cpp | 2 +- src/filters/multichainfilter.h | 2 +- src/filters/watchdog.cpp | 3 +++ src/filters/watchdog.h | 3 +++ src/json/json_spirit_ubjson.cpp | 2 +- src/json/json_spirit_ubjson.h | 2 +- src/keys/key.cpp | 2 +- src/keys/key.h | 2 +- src/keys/pubkey.cpp | 2 +- src/keys/pubkey.h | 2 +- src/miner/miner.cpp | 2 +- src/miner/miner.h | 2 +- src/multichain-cli-res.rc | 4 ++-- src/multichain-util-res.rc | 4 ++-- src/multichain/multichain-cli.cpp | 2 +- src/multichain/multichain-util.cpp | 2 +- src/multichain/multichain.h | 2 +- src/multichain/multichaind-cold.cpp | 2 +- src/multichain/multichaind.cpp | 2 +- src/multichaind-cold-res.rc | 4 ++-- src/multichaind-res.rc | 4 ++-- src/net/net.cpp | 2 +- src/net/net.h | 2 +- src/net/netbase.cpp | 2 +- src/net/netbase.h | 2 +- src/net/rest.cpp | 2 +- src/permissions/permission.cpp | 2 +- src/permissions/permission.h | 2 +- src/primitives/block.cpp | 2 +- src/primitives/block.h | 2 +- src/primitives/transaction.cpp | 2 +- src/primitives/transaction.h | 2 +- src/protocol/handshake.cpp | 2 +- src/protocol/multichainblock.cpp | 2 +- src/protocol/multichainscript.cpp | 2 +- src/protocol/multichainscript.h | 2 +- src/protocol/multichaintx.cpp | 2 +- src/protocol/netprotocol.cpp | 2 +- src/protocol/netprotocol.h | 2 +- src/protocol/relay.cpp | 2 +- src/protocol/relay.h | 2 +- src/rpc/rpcassets.cpp | 2 +- src/rpc/rpcblockchain.cpp | 2 +- src/rpc/rpccache.cpp | 2 +- src/rpc/rpcchunks.cpp | 2 +- src/rpc/rpcclient.cpp | 2 +- src/rpc/rpcclient.h | 2 +- src/rpc/rpcdebug.cpp | 2 +- src/rpc/rpcdump.cpp | 2 +- src/rpc/rpcexchange.cpp | 2 +- src/rpc/rpcfilters.cpp | 2 +- src/rpc/rpchelp.cpp | 2 +- src/rpc/rpclist-cold.cpp | 2 +- src/rpc/rpclist.cpp | 2 +- src/rpc/rpcmining.cpp | 2 +- src/rpc/rpcmisc.cpp | 2 +- src/rpc/rpcnet.cpp | 2 +- src/rpc/rpcpermissions.cpp | 2 +- src/rpc/rpcprotocol.cpp | 2 +- src/rpc/rpcprotocol.h | 2 +- src/rpc/rpcrawdata.cpp | 2 +- src/rpc/rpcrawtransaction.cpp | 2 +- src/rpc/rpcserver.cpp | 2 +- src/rpc/rpcserver.h | 2 +- src/rpc/rpcstreams.cpp | 2 +- src/rpc/rpcupgrades.cpp | 2 +- src/rpc/rpcutils.cpp | 2 +- src/rpc/rpcutils.h | 2 +- src/rpc/rpcwallet.cpp | 2 +- src/rpc/rpcwallet.h | 2 +- src/rpc/rpcwalletsend.cpp | 2 +- src/rpc/rpcwallettxs.cpp | 2 +- src/rpc/rpcwalletutils.cpp | 2 +- src/script/bitcoinconsensus.cpp | 2 +- src/script/bitcoinconsensus.h | 2 +- src/script/interpreter.cpp | 2 +- src/script/interpreter.h | 2 +- src/script/script.cpp | 2 +- src/script/script.h | 2 +- src/script/script_error.cpp | 2 +- src/script/script_error.h | 2 +- src/script/sigcache.cpp | 2 +- src/script/sigcache.h | 2 +- src/script/sign.cpp | 2 +- src/script/sign.h | 2 +- src/script/standard.cpp | 2 +- src/script/standard.h | 2 +- src/storage/addrman.cpp | 2 +- src/storage/addrman.h | 2 +- src/storage/coins.cpp | 2 +- src/storage/coins.h | 2 +- src/storage/leveldbwrapper.cpp | 2 +- src/storage/leveldbwrapper.h | 2 +- src/storage/txdb.cpp | 2 +- src/storage/txdb.h | 2 +- src/structs/alert.cpp | 2 +- src/structs/alert.h | 2 +- src/structs/amount.cpp | 2 +- src/structs/amount.h | 2 +- src/structs/base58.cpp | 2 +- src/structs/base58.h | 2 +- src/structs/bloom.cpp | 2 +- src/structs/bloom.h | 2 +- src/structs/hash.cpp | 2 +- src/structs/hash.h | 2 +- src/structs/limitedmap.h | 2 +- src/structs/uint256.cpp | 2 +- src/structs/uint256.h | 2 +- src/ui/noui.cpp | 2 +- src/ui/noui.h | 2 +- src/ui/ui_interface.h | 2 +- src/univalue/univalue_read.cpp | 2 +- src/univalue/univalue_utffilter.h | 2 +- src/utils/allocators.cpp | 2 +- src/utils/allocators.h | 2 +- src/utils/compat.h | 2 +- src/utils/compressor.cpp | 2 +- src/utils/compressor.h | 2 +- src/utils/core_io.h | 2 +- src/utils/core_read.cpp | 2 +- src/utils/core_write.cpp | 2 +- src/utils/dbwrapper.cpp | 2 +- src/utils/dbwrapper.h | 2 +- src/utils/declare.h | 2 +- src/utils/define.h | 2 +- src/utils/mruset.h | 2 +- src/utils/random.cpp | 2 +- src/utils/random.h | 2 +- src/utils/serialize.h | 2 +- src/utils/streams.h | 2 +- src/utils/sync.cpp | 2 +- src/utils/sync.h | 2 +- src/utils/systemdependent.cpp | 2 +- src/utils/threadsafety.h | 2 +- src/utils/timedata.cpp | 2 +- src/utils/timedata.h | 2 +- src/utils/tools.cpp | 2 +- src/utils/util.cpp | 2 +- src/utils/util.h | 2 +- src/utils/utility.cpp | 2 +- src/utils/utilmoneystr.cpp | 2 +- src/utils/utilmoneystr.h | 2 +- src/utils/utilparse.cpp | 2 +- src/utils/utilparse.h | 2 +- src/utils/utilstrencodings.cpp | 2 +- src/utils/utilstrencodings.h | 2 +- src/utils/utiltime.cpp | 2 +- src/utils/utiltime.h | 2 +- src/utils/utilwrapper.cpp | 2 +- src/v8/callbacks.cpp | 2 +- src/v8/callbacks.h | 2 +- src/v8/callbacks_win.cpp | 2 +- src/v8/v8blob.cpp | 3 +++ src/v8/v8blob.h | 3 +++ src/v8/v8engine.cpp | 2 +- src/v8/v8engine.h | 2 +- src/v8/v8filter.cpp | 2 +- src/v8/v8filter.h | 2 +- src/v8/v8json_spirit.cpp | 2 +- src/v8/v8json_spirit.h | 3 +++ src/v8/v8ubjson.cpp | 3 +++ src/v8/v8ubjson.h | 3 +++ src/v8/v8utils.h | 2 +- src/v8_win/callbacks.cpp | 2 +- src/v8_win/callbacks.h | 2 +- src/v8_win/callbacks_win.cpp | 2 +- src/v8_win/declspec.h | 3 +++ src/v8_win/multichain-v8.rc | Bin 5394 -> 5440 bytes src/v8_win/v8_win.cpp | 3 +++ src/v8_win/v8_win.h | 3 +++ src/v8_win/v8blob.cpp | 3 +++ src/v8_win/v8blob.h | 3 +++ src/v8_win/v8engine.cpp | 2 +- src/v8_win/v8engine.h | 2 +- src/v8_win/v8filter.cpp | 2 +- src/v8_win/v8filter.h | 2 +- src/v8_win/v8json_spirit.cpp | 2 +- src/v8_win/v8json_spirit.h | 3 +++ src/v8_win/v8ubjson.cpp | 3 +++ src/v8_win/v8ubjson.h | 3 +++ src/v8_win/v8utils.cpp | 3 +++ src/v8_win/v8utils.h | 2 +- src/version/bcversion.h | 2 +- src/version/clientversion.cpp | 2 +- src/version/clientversion.h | 5 +++-- src/version/version.cpp | 2 +- src/version/version.h | 2 +- src/wallet/chunkcollector.cpp | 2 +- src/wallet/chunkcollector.h | 2 +- src/wallet/chunkdb.cpp | 2 +- src/wallet/chunkdb.h | 2 +- src/wallet/coincontrol.h | 2 +- src/wallet/crypter.cpp | 2 +- src/wallet/crypter.h | 2 +- src/wallet/db.cpp | 2 +- src/wallet/db.h | 2 +- src/wallet/dbconst.h | 2 +- src/wallet/dbflat.cpp | 2 +- src/wallet/dbflat.h | 2 +- src/wallet/dbwrap.h | 2 +- src/wallet/dbwrap_com.cpp | 2 +- src/wallet/keystore.cpp | 2 +- src/wallet/keystore.h | 2 +- src/wallet/wallet.cpp | 2 +- src/wallet/wallet.h | 2 +- src/wallet/wallet_ismine.cpp | 2 +- src/wallet/wallet_ismine.h | 2 +- src/wallet/walletcoins.cpp | 2 +- src/wallet/walletdb.cpp | 2 +- src/wallet/walletdb.h | 2 +- src/wallet/wallettxdb.cpp | 2 +- src/wallet/wallettxdb.h | 2 +- src/wallet/wallettxs.cpp | 2 +- src/wallet/wallettxs.h | 2 +- 262 files changed, 313 insertions(+), 240 deletions(-) diff --git a/README.md b/README.md index 2e5b2e8e..56e8ce8a 100644 --- 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 diff --git a/src/chain/chain.cpp b/src/chain/chain.cpp index 2277bfd2..c5259c9b 100644 --- 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 index 8ec3516f..4a7584f4 100644 --- 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 index 84d6f94b..942800a1 100644 --- 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 index 1e38c28c..022dbb40 100644 --- 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 index 6ff4da25..6947fb2b 100644 --- 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 index 545c746f..8df6420c 100644 --- 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 index 6ebc7283..6c790d07 100644 --- 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 index 41d0f066..768356f1 100644 --- 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 index 62a4df50..3b303c0c 100644 --- 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 index 612ee3ac..c39071ad 100644 --- 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 index b30c30c1..827f6791 100644 --- 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 index 13a8e145..35411022 100644 --- 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 index 7c74b525..e0ca04fd 100644 --- 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 index 44c51c17..441dcdf7 100644 --- 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 index 14f2bb6c..e6c498b0 100644 --- 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 index 28c26629..0456ba9d 100644 --- 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 index 17b5adbc..5287472c 100644 --- 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 index 48920b59..00d259fc 100644 --- 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 index 8762f03d..4907620f 100644 --- 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" diff --git a/src/chainparams/params.h b/src/chainparams/params.h index 14613aa1..ba52bc44 100644 --- 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 index de94fdee..2a10c8c0 100644 --- 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 diff --git a/src/checkqueue.h b/src/checkqueue.h index 72b8be1c..96c5d56c 100644 --- 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 index f149a08c..4dc62686 100644 --- 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 index 607e23b5..1b622574 100644 --- 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 index e0b4ac51..8b4a0dfd 100644 --- 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 #include diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp index aafa4a6a..738960cf 100644 --- 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 #include diff --git a/src/compat/sanity.h b/src/compat/sanity.h index 7f5bc1a4..a1e5f8f7 100644 --- 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 index 7f3e1598..dbeebadd 100644 --- 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" diff --git a/src/core/init-cold.cpp b/src/core/init-cold.cpp index ec58b9c0..ea109c97 100644 --- a/src/core/init-cold.cpp +++ b/src/core/init-cold.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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. #if defined(HAVE_CONFIG_H) diff --git a/src/core/init.cpp b/src/core/init.cpp index 8875c786..89877b5f 100644 --- a/src/core/init.cpp +++ b/src/core/init.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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. #if defined(HAVE_CONFIG_H) diff --git a/src/core/init.h b/src/core/init.h index 7c483423..7c1abe24 100644 --- a/src/core/init.h +++ b/src/core/init.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_INIT_H diff --git a/src/core/main.cpp b/src/core/main.cpp index 179b0474..4a6a1607 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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 "core/main.h" diff --git a/src/core/main.h b/src/core/main.h index de3f7db9..316be9b3 100644 --- a/src/core/main.h +++ b/src/core/main.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_MAIN_H diff --git a/src/custom/custom.cpp b/src/custom/custom.cpp index c759d078..6831956e 100644 --- a/src/custom/custom.cpp +++ b/src/custom/custom.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 "custom/custom.h" diff --git a/src/custom/custom.h b/src/custom/custom.h index 9d134eb6..778622e9 100644 --- a/src/custom/custom.h +++ b/src/custom/custom.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. #include "core/main.h" diff --git a/src/custom/custom_multichain.cpp b/src/custom/custom_multichain.cpp index b67933ce..e5e63938 100644 --- a/src/custom/custom_multichain.cpp +++ b/src/custom/custom_multichain.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/custom/custom_server.cpp b/src/custom/custom_server.cpp index 7fac2277..dba72aa8 100644 --- a/src/custom/custom_server.cpp +++ b/src/custom/custom_server.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 "custom/custom.h" diff --git a/src/entities/asset.cpp b/src/entities/asset.cpp index 1a6e2a5d..7151e59a 100644 --- a/src/entities/asset.cpp +++ b/src/entities/asset.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/entities/asset.h b/src/entities/asset.h index 371d83fa..dcce356b 100644 --- a/src/entities/asset.h +++ b/src/entities/asset.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_ASSET_H diff --git a/src/filters/filter.cpp b/src/filters/filter.cpp index 183fb714..981ec98a 100644 --- a/src/filters/filter.cpp +++ b/src/filters/filter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "filters/filter.h" diff --git a/src/filters/filter.h b/src/filters/filter.h index 1b007fd5..38fd316c 100644 --- a/src/filters/filter.h +++ b/src/filters/filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_FILTER_H diff --git a/src/filters/filter_cold.cpp b/src/filters/filter_cold.cpp index 65b1ca90..1260f603 100644 --- a/src/filters/filter_cold.cpp +++ b/src/filters/filter_cold.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "filters/filter.h" diff --git a/src/filters/filter_win.cpp b/src/filters/filter_win.cpp index 7f04c225..656efabc 100644 --- a/src/filters/filter_win.cpp +++ b/src/filters/filter_win.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "filters/filter.h" diff --git a/src/filters/filtercallback.cpp b/src/filters/filtercallback.cpp index 516f219b..b71854cb 100644 --- a/src/filters/filtercallback.cpp +++ b/src/filters/filtercallback.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "filters/filtercallback.h" #include "rpc/rpcserver.h" #include "utils/util.h" diff --git a/src/filters/filtercallback.h b/src/filters/filtercallback.h index 2f58e188..91f53fba 100644 --- a/src/filters/filtercallback.h +++ b/src/filters/filtercallback.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef FILTERCALLBACK_H #define FILTERCALLBACK_H diff --git a/src/filters/filtercallback_cold.cpp b/src/filters/filtercallback_cold.cpp index c48746c8..e1906130 100644 --- a/src/filters/filtercallback_cold.cpp +++ b/src/filters/filtercallback_cold.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "filters/filtercallback.h" #ifdef WIN32 diff --git a/src/filters/ifiltercallback.h b/src/filters/ifiltercallback.h index 843f67a9..7019e482 100644 --- a/src/filters/ifiltercallback.h +++ b/src/filters/ifiltercallback.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef IFILTERCALLBACK_H #define IFILTERCALLBACK_H diff --git a/src/filters/multichainfilter.cpp b/src/filters/multichainfilter.cpp index 8d013eec..4a89908d 100644 --- a/src/filters/multichainfilter.cpp +++ b/src/filters/multichainfilter.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 "filters/multichainfilter.h" diff --git a/src/filters/multichainfilter.h b/src/filters/multichainfilter.h index 227a357e..e7afebed 100644 --- a/src/filters/multichainfilter.h +++ b/src/filters/multichainfilter.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 MULTICHAINFILTER_H diff --git a/src/filters/watchdog.cpp b/src/filters/watchdog.cpp index 6c97d0a5..b2a2895c 100644 --- a/src/filters/watchdog.cpp +++ b/src/filters/watchdog.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "watchdog.h" #include "core/init.h" //#include "protocol/filter.h" diff --git a/src/filters/watchdog.h b/src/filters/watchdog.h index c38aa5fa..da69d71b 100644 --- a/src/filters/watchdog.h +++ b/src/filters/watchdog.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef WATCHDOG_H #define WATCHDOG_H diff --git a/src/json/json_spirit_ubjson.cpp b/src/json/json_spirit_ubjson.cpp index 04a2f941..7faee3a2 100644 --- a/src/json/json_spirit_ubjson.cpp +++ b/src/json/json_spirit_ubjson.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 "json/json_spirit_ubjson.h" diff --git a/src/json/json_spirit_ubjson.h b/src/json/json_spirit_ubjson.h index 0b5939f8..92dd88c1 100644 --- a/src/json/json_spirit_ubjson.h +++ b/src/json/json_spirit_ubjson.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 JSON_SPIRIT_UBJSON_H diff --git a/src/keys/key.cpp b/src/keys/key.cpp index ae35f9a6..5d2868b5 100644 --- a/src/keys/key.cpp +++ b/src/keys/key.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2016 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 "keys/key.h" diff --git a/src/keys/key.h b/src/keys/key.h index 2a120386..77f59d88 100644 --- a/src/keys/key.h +++ b/src/keys/key.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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_KEY_H diff --git a/src/keys/pubkey.cpp b/src/keys/pubkey.cpp index 77e3e76d..1a0a4cfe 100644 --- a/src/keys/pubkey.cpp +++ b/src/keys/pubkey.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2016 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 "keys/pubkey.h" diff --git a/src/keys/pubkey.h b/src/keys/pubkey.h index 9d8123a0..126db894 100644 --- a/src/keys/pubkey.h +++ b/src/keys/pubkey.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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_PUBKEY_H diff --git a/src/miner/miner.cpp b/src/miner/miner.cpp index 2f277062..885a514a 100644 --- a/src/miner/miner.cpp +++ b/src/miner/miner.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 "miner/miner.h" diff --git a/src/miner/miner.h b/src/miner/miner.h index 1c4810da..95d970e3 100644 --- a/src/miner/miner.h +++ b/src/miner/miner.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_MINER_H diff --git a/src/multichain-cli-res.rc b/src/multichain-cli-res.rc index 173d3d13..2a22aaf6 100644 --- a/src/multichain-cli-res.rc +++ b/src/multichain-cli-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichain-cli (OSS RPC client for MultiChain)" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", WIN_VERSION VALUE "InternalName", "multichain-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichain-cli.exe" VALUE "ProductName", "multichain-cli" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", WIN_VERSION END END diff --git a/src/multichain-util-res.rc b/src/multichain-util-res.rc index 09b285f0..2a084e8e 100644 --- a/src/multichain-util-res.rc +++ b/src/multichain-util-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichain-util (Utilities for MultiChain)" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", WIN_VERSION VALUE "InternalName", "multichain-util" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichain-util.exe" VALUE "ProductName", "multichain-util" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", WIN_VERSION END END diff --git a/src/multichain/multichain-cli.cpp b/src/multichain/multichain-cli.cpp index 64c35a6b..e6e67c6b 100644 --- a/src/multichain/multichain-cli.cpp +++ b/src/multichain/multichain-cli.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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/multichain/multichain-util.cpp b/src/multichain/multichain-util.cpp index 06879e68..ae6fc2b8 100644 --- a/src/multichain/multichain-util.cpp +++ b/src/multichain/multichain-util.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/multichain/multichain.h b/src/multichain/multichain.h index 72be1973..776b1865 100644 --- a/src/multichain/multichain.h +++ b/src/multichain/multichain.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_H diff --git a/src/multichain/multichaind-cold.cpp b/src/multichain/multichaind-cold.cpp index cf3587ee..60337143 100644 --- a/src/multichain/multichaind-cold.cpp +++ b/src/multichain/multichaind-cold.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "version/clientversion.h" diff --git a/src/multichain/multichaind.cpp b/src/multichain/multichaind.cpp index c9560b10..96310f24 100644 --- a/src/multichain/multichaind.cpp +++ b/src/multichain/multichaind.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "version/clientversion.h" diff --git a/src/multichaind-cold-res.rc b/src/multichaind-cold-res.rc index a2a959fd..220e50d1 100644 --- a/src/multichaind-cold-res.rc +++ b/src/multichaind-cold-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichaind-cold (OSS daemon/client for MultiChain)" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", WIN_VERSION VALUE "InternalName", "multichaind-cold" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichaind-cold.exe" VALUE "ProductName", "multichaind-cold" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", WIN_VERSION END END diff --git a/src/multichaind-res.rc b/src/multichaind-res.rc index 9e4b7dc2..0237cd9c 100644 --- a/src/multichaind-res.rc +++ b/src/multichaind-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichaind (OSS daemon/client for MultiChain)" - VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "FileVersion", WIN_VERSION VALUE "InternalName", "multichaind" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichaind.exe" VALUE "ProductName", "multichaind" - VALUE "ProductVersion", VER_PRODUCTVERSION_STR + VALUE "ProductVersion", WIN_VERSION END END diff --git a/src/net/net.cpp b/src/net/net.cpp index c0079396..f3121460 100644 --- a/src/net/net.cpp +++ b/src/net/net.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. #if defined(HAVE_CONFIG_H) diff --git a/src/net/net.h b/src/net/net.h index 7ffd02ab..b0b634b8 100644 --- a/src/net/net.h +++ b/src/net/net.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_NET_H diff --git a/src/net/netbase.cpp b/src/net/netbase.cpp index 2dbfa403..1920b1c6 100644 --- a/src/net/netbase.cpp +++ b/src/net/netbase.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. #ifdef HAVE_CONFIG_H diff --git a/src/net/netbase.h b/src/net/netbase.h index cea2037c..6c0af1b3 100644 --- a/src/net/netbase.h +++ b/src/net/netbase.h @@ -1,6 +1,6 @@ // 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_NETBASE_H diff --git a/src/net/rest.cpp b/src/net/rest.cpp index 0ccef9aa..82bd1549 100644 --- a/src/net/rest.cpp +++ b/src/net/rest.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 "primitives/block.h" diff --git a/src/permissions/permission.cpp b/src/permissions/permission.cpp index c9e0af7f..abc3d480 100644 --- a/src/permissions/permission.cpp +++ b/src/permissions/permission.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/permissions/permission.h b/src/permissions/permission.h index 997dcfb6..547e448e 100644 --- a/src/permissions/permission.h +++ b/src/permissions/permission.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_PERMISSION_H diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index fe5519c3..3ba859c5 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "primitives/block.h" diff --git a/src/primitives/block.h b/src/primitives/block.h index 0ed1e7c8..427b5243 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_PRIMITIVES_BLOCK_H diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 909cf51d..f9198098 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "primitives/transaction.h" diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 45260d14..e53e3d48 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_PRIMITIVES_TRANSACTION_H diff --git a/src/protocol/handshake.cpp b/src/protocol/handshake.cpp index 3b25285f..201f540e 100644 --- a/src/protocol/handshake.cpp +++ b/src/protocol/handshake.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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 "core/init.h" diff --git a/src/protocol/multichainblock.cpp b/src/protocol/multichainblock.cpp index 9a1c1169..663a1523 100644 --- a/src/protocol/multichainblock.cpp +++ b/src/protocol/multichainblock.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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 "core/main.h" diff --git a/src/protocol/multichainscript.cpp b/src/protocol/multichainscript.cpp index 31232575..f2689294 100644 --- a/src/protocol/multichainscript.cpp +++ b/src/protocol/multichainscript.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/protocol/multichainscript.h b/src/protocol/multichainscript.h index 9bd48084..a00c55dc 100644 --- a/src/protocol/multichainscript.h +++ b/src/protocol/multichainscript.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 MULTICHAINSCRIPT_H diff --git a/src/protocol/multichaintx.cpp b/src/protocol/multichaintx.cpp index cc3f8bc9..3439dd69 100644 --- a/src/protocol/multichaintx.cpp +++ b/src/protocol/multichaintx.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 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 "core/main.h" diff --git a/src/protocol/netprotocol.cpp b/src/protocol/netprotocol.cpp index 0474c134..c1737bb1 100644 --- a/src/protocol/netprotocol.cpp +++ b/src/protocol/netprotocol.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 "protocol/netprotocol.h" diff --git a/src/protocol/netprotocol.h b/src/protocol/netprotocol.h index a123a994..cefe2f78 100644 --- a/src/protocol/netprotocol.h +++ b/src/protocol/netprotocol.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/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 __cplusplus diff --git a/src/protocol/relay.cpp b/src/protocol/relay.cpp index 5540e225..e56b38c1 100644 --- a/src/protocol/relay.cpp +++ b/src/protocol/relay.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 "protocol/relay.h" diff --git a/src/protocol/relay.h b/src/protocol/relay.h index 82cfee02..de4f6d77 100644 --- a/src/protocol/relay.h +++ b/src/protocol/relay.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. diff --git a/src/rpc/rpcassets.cpp b/src/rpc/rpcassets.cpp index 06c69d93..3a2c193f 100644 --- a/src/rpc/rpcassets.cpp +++ b/src/rpc/rpcassets.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcblockchain.cpp b/src/rpc/rpcblockchain.cpp index 53f86bdf..3990526f 100644 --- a/src/rpc/rpcblockchain.cpp +++ b/src/rpc/rpcblockchain.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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/rpc/rpccache.cpp b/src/rpc/rpccache.cpp index 87d1dd9f..fd1b0dc1 100644 --- a/src/rpc/rpccache.cpp +++ b/src/rpc/rpccache.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 "rpc/rpcutils.h" diff --git a/src/rpc/rpcchunks.cpp b/src/rpc/rpcchunks.cpp index d7c0a6eb..74ef4466 100644 --- a/src/rpc/rpcchunks.cpp +++ b/src/rpc/rpcchunks.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 "core/init.h" diff --git a/src/rpc/rpcclient.cpp b/src/rpc/rpcclient.cpp index 0aeeaaee..341774b8 100644 --- a/src/rpc/rpcclient.cpp +++ b/src/rpc/rpcclient.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcclient.h" diff --git a/src/rpc/rpcclient.h b/src/rpc/rpcclient.h index 88e16e53..32b1d6a9 100644 --- a/src/rpc/rpcclient.h +++ b/src/rpc/rpcclient.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_RPCCLIENT_H diff --git a/src/rpc/rpcdebug.cpp b/src/rpc/rpcdebug.cpp index d53eacaf..e0844905 100644 --- a/src/rpc/rpcdebug.cpp +++ b/src/rpc/rpcdebug.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 "core/init.h" diff --git a/src/rpc/rpcdump.cpp b/src/rpc/rpcdump.cpp index aec2c379..83d765ff 100644 --- a/src/rpc/rpcdump.cpp +++ b/src/rpc/rpcdump.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "structs/base58.h" diff --git a/src/rpc/rpcexchange.cpp b/src/rpc/rpcexchange.cpp index b30f9860..46110ba4 100644 --- a/src/rpc/rpcexchange.cpp +++ b/src/rpc/rpcexchange.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcfilters.cpp b/src/rpc/rpcfilters.cpp index 81638619..97e4842c 100644 --- a/src/rpc/rpcfilters.cpp +++ b/src/rpc/rpcfilters.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpchelp.cpp b/src/rpc/rpchelp.cpp index 948f0f17..77b53562 100644 --- a/src/rpc/rpchelp.cpp +++ b/src/rpc/rpchelp.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpclist-cold.cpp b/src/rpc/rpclist-cold.cpp index b283e6bc..15070afd 100644 --- a/src/rpc/rpclist-cold.cpp +++ b/src/rpc/rpclist-cold.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. #if defined(HAVE_CONFIG_H) diff --git a/src/rpc/rpclist.cpp b/src/rpc/rpclist.cpp index 24bdc8f4..226fc107 100644 --- a/src/rpc/rpclist.cpp +++ b/src/rpc/rpclist.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. #if defined(HAVE_CONFIG_H) diff --git a/src/rpc/rpcmining.cpp b/src/rpc/rpcmining.cpp index 9e9b2db9..74187154 100644 --- a/src/rpc/rpcmining.cpp +++ b/src/rpc/rpcmining.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "structs/amount.h" diff --git a/src/rpc/rpcmisc.cpp b/src/rpc/rpcmisc.cpp index 0dbd8643..360fbaae 100644 --- a/src/rpc/rpcmisc.cpp +++ b/src/rpc/rpcmisc.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "structs/base58.h" diff --git a/src/rpc/rpcnet.cpp b/src/rpc/rpcnet.cpp index 21477127..749252f9 100644 --- a/src/rpc/rpcnet.cpp +++ b/src/rpc/rpcnet.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcserver.h" diff --git a/src/rpc/rpcpermissions.cpp b/src/rpc/rpcpermissions.cpp index 891ccc11..6437e07d 100644 --- a/src/rpc/rpcpermissions.cpp +++ b/src/rpc/rpcpermissions.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcprotocol.cpp b/src/rpc/rpcprotocol.cpp index 59045275..d95a616a 100644 --- a/src/rpc/rpcprotocol.cpp +++ b/src/rpc/rpcprotocol.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcprotocol.h" diff --git a/src/rpc/rpcprotocol.h b/src/rpc/rpcprotocol.h index b26d972c..49247afc 100644 --- a/src/rpc/rpcprotocol.h +++ b/src/rpc/rpcprotocol.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_RPCPROTOCOL_H diff --git a/src/rpc/rpcrawdata.cpp b/src/rpc/rpcrawdata.cpp index cfdb4654..2a1fa126 100644 --- a/src/rpc/rpcrawdata.cpp +++ b/src/rpc/rpcrawdata.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcutils.h" diff --git a/src/rpc/rpcrawtransaction.cpp b/src/rpc/rpcrawtransaction.cpp index b64bfbd9..74ddc6d3 100644 --- a/src/rpc/rpcrawtransaction.cpp +++ b/src/rpc/rpcrawtransaction.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "structs/base58.h" diff --git a/src/rpc/rpcserver.cpp b/src/rpc/rpcserver.cpp index ac0cbd45..c925ac00 100644 --- a/src/rpc/rpcserver.cpp +++ b/src/rpc/rpcserver.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcserver.h" diff --git a/src/rpc/rpcserver.h b/src/rpc/rpcserver.h index d0b70c0e..94b8e9ea 100644 --- a/src/rpc/rpcserver.h +++ b/src/rpc/rpcserver.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_RPCSERVER_H diff --git a/src/rpc/rpcstreams.cpp b/src/rpc/rpcstreams.cpp index 7ddbd660..6a41e77a 100644 --- a/src/rpc/rpcstreams.cpp +++ b/src/rpc/rpcstreams.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcupgrades.cpp b/src/rpc/rpcupgrades.cpp index 18a586be..3598d9f1 100644 --- a/src/rpc/rpcupgrades.cpp +++ b/src/rpc/rpcupgrades.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcutils.cpp b/src/rpc/rpcutils.cpp index 00b003a7..013c01cc 100644 --- a/src/rpc/rpcutils.cpp +++ b/src/rpc/rpcutils.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "rpc/rpcutils.h" diff --git a/src/rpc/rpcutils.h b/src/rpc/rpcutils.h index 65532522..870c328f 100644 --- a/src/rpc/rpcutils.h +++ b/src/rpc/rpcutils.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 RPCMULTICHAINUTILS_H diff --git a/src/rpc/rpcwallet.cpp b/src/rpc/rpcwallet.cpp index 0338b511..eb519817 100644 --- a/src/rpc/rpcwallet.cpp +++ b/src/rpc/rpcwallet.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "structs/amount.h" diff --git a/src/rpc/rpcwallet.h b/src/rpc/rpcwallet.h index b212d645..ec3c801c 100644 --- a/src/rpc/rpcwallet.h +++ b/src/rpc/rpcwallet.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 RPCWALLET_H diff --git a/src/rpc/rpcwalletsend.cpp b/src/rpc/rpcwalletsend.cpp index 43b4ee7d..2951f426 100644 --- a/src/rpc/rpcwalletsend.cpp +++ b/src/rpc/rpcwalletsend.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcwallettxs.cpp b/src/rpc/rpcwallettxs.cpp index b9183ed0..f0324954 100644 --- a/src/rpc/rpcwallettxs.cpp +++ b/src/rpc/rpcwallettxs.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/rpc/rpcwalletutils.cpp b/src/rpc/rpcwalletutils.cpp index 48859cb2..e1c4b251 100644 --- a/src/rpc/rpcwalletutils.cpp +++ b/src/rpc/rpcwalletutils.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp index 05bb1734..b0482741 100644 --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/bitcoinconsensus.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "bitcoinconsensus.h" diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 40a094a9..dd09ff38 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_BITCOINCONSENSUS_H diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 8f08b69b..8852c032 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "interpreter.h" diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 0406c234..973a7c68 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_INTERPRETER_H diff --git a/src/script/script.cpp b/src/script/script.cpp index 5f6e8947..a24bc6d7 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "script.h" diff --git a/src/script/script.h b/src/script/script.h index 6bc23673..935febdd 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_SCRIPT_H diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index cf39d40f..1308d2e7 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "script_error.h" diff --git a/src/script/script_error.h b/src/script/script_error.h index 4bdfccca..4ee17c3c 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_SCRIPT_ERROR_H diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 5bbcfd56..8121a72f 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "sigcache.h" diff --git a/src/script/sigcache.h b/src/script/sigcache.h index dd53157c..49c0658a 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_SIGCACHE_H diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 8a2126f5..60d179ad 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "utils/util.h" diff --git a/src/script/sign.h b/src/script/sign.h index 81e71992..7530c391 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_SIGN_H diff --git a/src/script/standard.cpp b/src/script/standard.cpp index ce040d90..9212482c 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "script/standard.h" diff --git a/src/script/standard.h b/src/script/standard.h index 3982c964..f837e445 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_SCRIPT_STANDARD_H diff --git a/src/storage/addrman.cpp b/src/storage/addrman.cpp index ef717c30..3fd5237d 100644 --- a/src/storage/addrman.cpp +++ b/src/storage/addrman.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012 Pieter Wuille // 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 "storage/addrman.h" diff --git a/src/storage/addrman.h b/src/storage/addrman.h index 8ba0ef31..da0dba2b 100644 --- a/src/storage/addrman.h +++ b/src/storage/addrman.h @@ -1,6 +1,6 @@ // Copyright (c) 2012 Pieter Wuille // 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_ADDRMAN_H diff --git a/src/storage/coins.cpp b/src/storage/coins.cpp index f73c92ef..54d251ca 100644 --- a/src/storage/coins.cpp +++ b/src/storage/coins.cpp @@ -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. #include "storage/coins.h" diff --git a/src/storage/coins.h b/src/storage/coins.h index 878fda9e..05138496 100644 --- a/src/storage/coins.h +++ b/src/storage/coins.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_COINS_H diff --git a/src/storage/leveldbwrapper.cpp b/src/storage/leveldbwrapper.cpp index 8c5a9236..24efd8a0 100644 --- a/src/storage/leveldbwrapper.cpp +++ b/src/storage/leveldbwrapper.cpp @@ -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. #include "storage/leveldbwrapper.h" diff --git a/src/storage/leveldbwrapper.h b/src/storage/leveldbwrapper.h index 7cd7a58d..52e14a3a 100644 --- a/src/storage/leveldbwrapper.h +++ b/src/storage/leveldbwrapper.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_LEVELDBWRAPPER_H diff --git a/src/storage/txdb.cpp b/src/storage/txdb.cpp index aac7e851..00aa891c 100644 --- a/src/storage/txdb.cpp +++ b/src/storage/txdb.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 "storage/txdb.h" diff --git a/src/storage/txdb.h b/src/storage/txdb.h index aa9d5ad6..3a0a83b7 100644 --- a/src/storage/txdb.h +++ b/src/storage/txdb.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_TXDB_H diff --git a/src/structs/alert.cpp b/src/structs/alert.cpp index aad90188..535cd4f2 100644 --- a/src/structs/alert.cpp +++ b/src/structs/alert.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 "structs/alert.h" diff --git a/src/structs/alert.h b/src/structs/alert.h index 59b543ab..0e9e3d69 100644 --- a/src/structs/alert.h +++ b/src/structs/alert.h @@ -1,7 +1,7 @@ // Copyright (c) 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_ALERT_H diff --git a/src/structs/amount.cpp b/src/structs/amount.cpp index 0503637b..93416b3d 100644 --- a/src/structs/amount.cpp +++ b/src/structs/amount.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 "structs/amount.h" diff --git a/src/structs/amount.h b/src/structs/amount.h index b894f3fb..b5f9a072 100644 --- a/src/structs/amount.h +++ b/src/structs/amount.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_AMOUNT_H diff --git a/src/structs/base58.cpp b/src/structs/base58.cpp index 4cbc500c..a3b817c5 100644 --- a/src/structs/base58.cpp +++ b/src/structs/base58.cpp @@ -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. #include "structs/base58.h" diff --git a/src/structs/base58.h b/src/structs/base58.h index 4e3c379b..af1fee7e 100644 --- a/src/structs/base58.h +++ b/src/structs/base58.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. /** diff --git a/src/structs/bloom.cpp b/src/structs/bloom.cpp index 6e19b976..d664d727 100644 --- a/src/structs/bloom.cpp +++ b/src/structs/bloom.cpp @@ -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. #include "structs/bloom.h" diff --git a/src/structs/bloom.h b/src/structs/bloom.h index 29b85f51..8f6c1435 100644 --- a/src/structs/bloom.h +++ b/src/structs/bloom.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_BLOOM_H diff --git a/src/structs/hash.cpp b/src/structs/hash.cpp index b1a5887a..20d7ee50 100644 --- a/src/structs/hash.cpp +++ b/src/structs/hash.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2013-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 "structs/hash.h" diff --git a/src/structs/hash.h b/src/structs/hash.h index 6b394d6a..bcc14669 100644 --- a/src/structs/hash.h +++ b/src/structs/hash.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_HASH_H diff --git a/src/structs/limitedmap.h b/src/structs/limitedmap.h index e1f88cfd..11ccf633 100644 --- a/src/structs/limitedmap.h +++ b/src/structs/limitedmap.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_LIMITEDMAP_H diff --git a/src/structs/uint256.cpp b/src/structs/uint256.cpp index fa4f9efb..a6a0a35e 100644 --- a/src/structs/uint256.cpp +++ b/src/structs/uint256.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 "structs/uint256.h" diff --git a/src/structs/uint256.h b/src/structs/uint256.h index 5647410e..5616919b 100644 --- a/src/structs/uint256.h +++ b/src/structs/uint256.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_UINT256_H diff --git a/src/ui/noui.cpp b/src/ui/noui.cpp index 5d0e2b47..d7755897 100644 --- a/src/ui/noui.cpp +++ b/src/ui/noui.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 "ui/noui.h" diff --git a/src/ui/noui.h b/src/ui/noui.h index 0dc69dbb..0d106609 100644 --- a/src/ui/noui.h +++ b/src/ui/noui.h @@ -1,6 +1,6 @@ // Copyright (c) 2013 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_NOUI_H diff --git a/src/ui/ui_interface.h b/src/ui/ui_interface.h index 4e2cea19..8591cfe9 100644 --- a/src/ui/ui_interface.h +++ b/src/ui/ui_interface.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2012 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_UI_INTERFACE_H diff --git a/src/univalue/univalue_read.cpp b/src/univalue/univalue_read.cpp index 18362a25..ad348dcd 100644 --- a/src/univalue/univalue_read.cpp +++ b/src/univalue/univalue_read.cpp @@ -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. #include diff --git a/src/univalue/univalue_utffilter.h b/src/univalue/univalue_utffilter.h index 9040274c..e29c09de 100644 --- a/src/univalue/univalue_utffilter.h +++ b/src/univalue/univalue_utffilter.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 UNIVALUE_UTFFILTER_H #define UNIVALUE_UTFFILTER_H diff --git a/src/utils/allocators.cpp b/src/utils/allocators.cpp index 55a96f78..fdc43946 100644 --- a/src/utils/allocators.cpp +++ b/src/utils/allocators.cpp @@ -1,6 +1,6 @@ // 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. #include "utils/allocators.h" diff --git a/src/utils/allocators.h b/src/utils/allocators.h index 90e44fdc..bed01c74 100644 --- a/src/utils/allocators.h +++ b/src/utils/allocators.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_ALLOCATORS_H diff --git a/src/utils/compat.h b/src/utils/compat.h index 4bdfb866..451de249 100644 --- a/src/utils/compat.h +++ b/src/utils/compat.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_COMPAT_H diff --git a/src/utils/compressor.cpp b/src/utils/compressor.cpp index 93c24e39..0b1b134a 100644 --- a/src/utils/compressor.cpp +++ b/src/utils/compressor.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 "utils/compressor.h" diff --git a/src/utils/compressor.h b/src/utils/compressor.h index 2fed78bd..c9a7f272 100644 --- a/src/utils/compressor.h +++ b/src/utils/compressor.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_COMPRESSOR_H diff --git a/src/utils/core_io.h b/src/utils/core_io.h index dcd7c6e3..f6a2642c 100644 --- a/src/utils/core_io.h +++ b/src/utils/core_io.h @@ -1,6 +1,6 @@ // 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_CORE_IO_H diff --git a/src/utils/core_read.cpp b/src/utils/core_read.cpp index 190a5d15..e17611ad 100644 --- a/src/utils/core_read.cpp +++ b/src/utils/core_read.cpp @@ -1,6 +1,6 @@ // 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 "utils/core_io.h" diff --git a/src/utils/core_write.cpp b/src/utils/core_write.cpp index 450df404..99ffe1d5 100644 --- a/src/utils/core_write.cpp +++ b/src/utils/core_write.cpp @@ -1,6 +1,6 @@ // 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 "utils/core_io.h" diff --git a/src/utils/dbwrapper.cpp b/src/utils/dbwrapper.cpp index f6897957..480d2590 100644 --- a/src/utils/dbwrapper.cpp +++ b/src/utils/dbwrapper.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 "utils/declare.h" diff --git a/src/utils/dbwrapper.h b/src/utils/dbwrapper.h index 2c00e327..ba6e1408 100644 --- a/src/utils/dbwrapper.h +++ b/src/utils/dbwrapper.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 MULTICHAINDB_H diff --git a/src/utils/declare.h b/src/utils/declare.h index 8ac1d15b..c52b72a2 100644 --- a/src/utils/declare.h +++ b/src/utils/declare.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_DECLARE_H diff --git a/src/utils/define.h b/src/utils/define.h index 4fa65322..52a432aa 100644 --- a/src/utils/define.h +++ b/src/utils/define.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_DEFINE_H diff --git a/src/utils/mruset.h b/src/utils/mruset.h index cd55abc2..8c2533c0 100644 --- a/src/utils/mruset.h +++ b/src/utils/mruset.h @@ -1,6 +1,6 @@ // Copyright (c) 2012 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_MRUSET_H diff --git a/src/utils/random.cpp b/src/utils/random.cpp index d65b69ff..a24c33d6 100644 --- a/src/utils/random.cpp +++ b/src/utils/random.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 "utils/random.h" diff --git a/src/utils/random.h b/src/utils/random.h index d619acf3..4782f098 100644 --- a/src/utils/random.h +++ b/src/utils/random.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_RANDOM_H diff --git a/src/utils/serialize.h b/src/utils/serialize.h index a289a73e..133c9837 100644 --- a/src/utils/serialize.h +++ b/src/utils/serialize.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_SERIALIZE_H diff --git a/src/utils/streams.h b/src/utils/streams.h index 246a2026..b30e65a3 100644 --- a/src/utils/streams.h +++ b/src/utils/streams.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_STREAMS_H diff --git a/src/utils/sync.cpp b/src/utils/sync.cpp index 1e29a673..1141475b 100644 --- a/src/utils/sync.cpp +++ b/src/utils/sync.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2012 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 "utils/sync.h" diff --git a/src/utils/sync.h b/src/utils/sync.h index 1edd9f47..6ffa5b6d 100644 --- a/src/utils/sync.h +++ b/src/utils/sync.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/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_SYNC_H diff --git a/src/utils/systemdependent.cpp b/src/utils/systemdependent.cpp index f935d988..05c4e5e0 100644 --- a/src/utils/systemdependent.cpp +++ b/src/utils/systemdependent.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/utils/threadsafety.h b/src/utils/threadsafety.h index e772e4c2..e0858511 100644 --- a/src/utils/threadsafety.h +++ b/src/utils/threadsafety.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 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_THREADSAFETY_H diff --git a/src/utils/timedata.cpp b/src/utils/timedata.cpp index 623bbfb8..e706c936 100644 --- a/src/utils/timedata.cpp +++ b/src/utils/timedata.cpp @@ -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. #include "utils/timedata.h" diff --git a/src/utils/timedata.h b/src/utils/timedata.h index 7c40b4a8..3bcc97f1 100644 --- a/src/utils/timedata.h +++ b/src/utils/timedata.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_TIMEDATA_H diff --git a/src/utils/tools.cpp b/src/utils/tools.cpp index ede25ea9..33d50d20 100644 --- a/src/utils/tools.cpp +++ b/src/utils/tools.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/utils/util.cpp b/src/utils/util.cpp index bad1e5ad..1b2e0259 100644 --- a/src/utils/util.cpp +++ b/src/utils/util.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. #if defined(HAVE_CONFIG_H) diff --git a/src/utils/util.h b/src/utils/util.h index 710a711e..27d3c475 100644 --- a/src/utils/util.h +++ b/src/utils/util.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. /** diff --git a/src/utils/utility.cpp b/src/utils/utility.cpp index 3ebf0d70..809bf163 100644 --- a/src/utils/utility.cpp +++ b/src/utils/utility.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/utils/utilmoneystr.cpp b/src/utils/utilmoneystr.cpp index 964b8cb3..5716aad0 100644 --- a/src/utils/utilmoneystr.cpp +++ b/src/utils/utilmoneystr.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 "utilmoneystr.h" diff --git a/src/utils/utilmoneystr.h b/src/utils/utilmoneystr.h index 21b8caa7..428ef17d 100644 --- a/src/utils/utilmoneystr.h +++ b/src/utils/utilmoneystr.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. /** diff --git a/src/utils/utilparse.cpp b/src/utils/utilparse.cpp index 634eb94a..5cbb45a7 100644 --- a/src/utils/utilparse.cpp +++ b/src/utils/utilparse.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 "utils/utilparse.h" diff --git a/src/utils/utilparse.h b/src/utils/utilparse.h index d2afd9f1..71a4cb0d 100644 --- a/src/utils/utilparse.h +++ b/src/utils/utilparse.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 MULTICHAINUTILS_H diff --git a/src/utils/utilstrencodings.cpp b/src/utils/utilstrencodings.cpp index 205b1d75..10ad1bbe 100644 --- a/src/utils/utilstrencodings.cpp +++ b/src/utils/utilstrencodings.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 "utils/utilstrencodings.h" diff --git a/src/utils/utilstrencodings.h b/src/utils/utilstrencodings.h index 79018470..72b7c3ce 100644 --- a/src/utils/utilstrencodings.h +++ b/src/utils/utilstrencodings.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. /** diff --git a/src/utils/utiltime.cpp b/src/utils/utiltime.cpp index 87e36112..5c8341bc 100644 --- a/src/utils/utiltime.cpp +++ b/src/utils/utiltime.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. #if defined(HAVE_CONFIG_H) diff --git a/src/utils/utiltime.h b/src/utils/utiltime.h index 9959d56c..3d485eeb 100644 --- a/src/utils/utiltime.h +++ b/src/utils/utiltime.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_UTILTIME_H diff --git a/src/utils/utilwrapper.cpp b/src/utils/utilwrapper.cpp index 66ff33bb..4a834b42 100644 --- a/src/utils/utilwrapper.cpp +++ b/src/utils/utilwrapper.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "multichain/multichain.h" diff --git a/src/v8/callbacks.cpp b/src/v8/callbacks.cpp index 0f8d36d3..beff0e09 100644 --- a/src/v8/callbacks.cpp +++ b/src/v8/callbacks.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8/callbacks.h" diff --git a/src/v8/callbacks.h b/src/v8/callbacks.h index f1ab77fb..80369634 100644 --- a/src/v8/callbacks.h +++ b/src/v8/callbacks.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_CALLBACKS_H_ diff --git a/src/v8/callbacks_win.cpp b/src/v8/callbacks_win.cpp index 257b2e43..f9870b25 100644 --- a/src/v8/callbacks_win.cpp +++ b/src/v8/callbacks_win.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8/callbacks.h" diff --git a/src/v8/v8blob.cpp b/src/v8/v8blob.cpp index ac09acb7..27bef007 100644 --- a/src/v8/v8blob.cpp +++ b/src/v8/v8blob.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "v8blob.h" #include diff --git a/src/v8/v8blob.h b/src/v8/v8blob.h index c715e063..69ca3b4c 100644 --- a/src/v8/v8blob.h +++ b/src/v8/v8blob.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8BLOB_H #define V8BLOB_H diff --git a/src/v8/v8engine.cpp b/src/v8/v8engine.cpp index 67840580..43e1cfd9 100644 --- a/src/v8/v8engine.cpp +++ b/src/v8/v8engine.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8/v8engine.h" diff --git a/src/v8/v8engine.h b/src/v8/v8engine.h index 632b70a4..f8b8f89b 100644 --- a/src/v8/v8engine.h +++ b/src/v8/v8engine.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_V8ENGINE_H_ diff --git a/src/v8/v8filter.cpp b/src/v8/v8filter.cpp index 33eb39c4..a20f052a 100644 --- a/src/v8/v8filter.cpp +++ b/src/v8/v8filter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8/v8filter.h" diff --git a/src/v8/v8filter.h b/src/v8/v8filter.h index 23c2ff57..3c16ac26 100644 --- a/src/v8/v8filter.h +++ b/src/v8/v8filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_V8FILTER_H_ diff --git a/src/v8/v8json_spirit.cpp b/src/v8/v8json_spirit.cpp index 326f3bea..4db05bb3 100644 --- a/src/v8/v8json_spirit.cpp +++ b/src/v8/v8json_spirit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8/v8json_spirit.h" diff --git a/src/v8/v8json_spirit.h b/src/v8/v8json_spirit.h index e4aa4c61..5408911a 100644 --- a/src/v8/v8json_spirit.h +++ b/src/v8/v8json_spirit.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8JSON_SPIRIT_H #define V8JSON_SPIRIT_H diff --git a/src/v8/v8ubjson.cpp b/src/v8/v8ubjson.cpp index f4d160de..e9d3ba9d 100644 --- a/src/v8/v8ubjson.cpp +++ b/src/v8/v8ubjson.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "v8/v8ubjson.h" #include "utils/define.h" #include "v8/v8blob.h" diff --git a/src/v8/v8ubjson.h b/src/v8/v8ubjson.h index ae468a26..c31f78bd 100644 --- a/src/v8/v8ubjson.h +++ b/src/v8/v8ubjson.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8UBJSON_H #define V8UBJSON_H diff --git a/src/v8/v8utils.h b/src/v8/v8utils.h index fbaeaac0..72ee67c2 100644 --- a/src/v8/v8utils.h +++ b/src/v8/v8utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef V8UTILS_H_ diff --git a/src/v8_win/callbacks.cpp b/src/v8_win/callbacks.cpp index ada90cf9..36a2e830 100644 --- a/src/v8_win/callbacks.cpp +++ b/src/v8_win/callbacks.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8_win/callbacks.h" diff --git a/src/v8_win/callbacks.h b/src/v8_win/callbacks.h index f1ab77fb..80369634 100644 --- a/src/v8_win/callbacks.h +++ b/src/v8_win/callbacks.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_CALLBACKS_H_ diff --git a/src/v8_win/callbacks_win.cpp b/src/v8_win/callbacks_win.cpp index f1d6d36b..3c2faeb9 100644 --- a/src/v8_win/callbacks_win.cpp +++ b/src/v8_win/callbacks_win.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8_win/callbacks.h" diff --git a/src/v8_win/declspec.h b/src/v8_win/declspec.h index 36175ce6..11a05d81 100644 --- a/src/v8_win/declspec.h +++ b/src/v8_win/declspec.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef DECLSPEC_H #define DECLSPEC_H diff --git a/src/v8_win/multichain-v8.rc b/src/v8_win/multichain-v8.rc index e1c18e5a8d106286c8868e2ead8a1ebd61fbefc6..7aefb83b0c6e7abcee0ed37bfa3afa65f150edea 100644 GIT binary patch delta 87 zcmbQFbwF!F3%_+TgC>IlgAs!PgCTBd?QZ`TI*JWfiV9;YQn!J%$eDf^<3l;#(v=Jfz delta 40 wcmX@0HA!nj3qP+jgC>IlgAs!PgCT?E #include diff --git a/src/v8_win/v8blob.h b/src/v8_win/v8blob.h index 4523e7e2..3ba2a76a 100644 --- a/src/v8_win/v8blob.h +++ b/src/v8_win/v8blob.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8BLOB_H #define V8BLOB_H diff --git a/src/v8_win/v8engine.cpp b/src/v8_win/v8engine.cpp index f4465565..5774ad07 100644 --- a/src/v8_win/v8engine.cpp +++ b/src/v8_win/v8engine.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8_win/v8engine.h" diff --git a/src/v8_win/v8engine.h b/src/v8_win/v8engine.h index ae03ab96..433aaf01 100644 --- a/src/v8_win/v8engine.h +++ b/src/v8_win/v8engine.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_V8ENGINE_H_ diff --git a/src/v8_win/v8filter.cpp b/src/v8_win/v8filter.cpp index b09e7227..85f35be8 100644 --- a/src/v8_win/v8filter.cpp +++ b/src/v8_win/v8filter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8_win/v8filter.h" diff --git a/src/v8_win/v8filter.h b/src/v8_win/v8filter.h index 5d05b254..a63b3949 100644 --- a/src/v8_win/v8filter.h +++ b/src/v8_win/v8filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef MULTICHAIN_V8FILTER_H_ diff --git a/src/v8_win/v8json_spirit.cpp b/src/v8_win/v8json_spirit.cpp index 3d5e46ec..9f9f83d0 100644 --- a/src/v8_win/v8json_spirit.cpp +++ b/src/v8_win/v8json_spirit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "v8_win/v8json_spirit.h" diff --git a/src/v8_win/v8json_spirit.h b/src/v8_win/v8json_spirit.h index 6083eb28..71a18206 100644 --- a/src/v8_win/v8json_spirit.h +++ b/src/v8_win/v8json_spirit.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8JSON_SPIRIT_H #define V8JSON_SPIRIT_H diff --git a/src/v8_win/v8ubjson.cpp b/src/v8_win/v8ubjson.cpp index 79466381..fdcaa48b 100644 --- a/src/v8_win/v8ubjson.cpp +++ b/src/v8_win/v8ubjson.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "v8_win/v8ubjson.h" #include "v8_win/v8blob.h" #include "v8_win/v8utils.h" diff --git a/src/v8_win/v8ubjson.h b/src/v8_win/v8ubjson.h index 350adcf7..682d0895 100644 --- a/src/v8_win/v8ubjson.h +++ b/src/v8_win/v8ubjson.h @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #ifndef V8UBJSON_H #define V8UBJSON_H diff --git a/src/v8_win/v8utils.cpp b/src/v8_win/v8utils.cpp index b3d11b8d..acf89ee5 100644 --- a/src/v8_win/v8utils.cpp +++ b/src/v8_win/v8utils.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. + #include "v8_win/v8utils.h" #include "spdlog/sinks/stdout_color_sinks.h" #include "spdlog/sinks/basic_file_sink.h" diff --git a/src/v8_win/v8utils.h b/src/v8_win/v8utils.h index f744b5cf..31d2592c 100644 --- a/src/v8_win/v8utils.h +++ b/src/v8_win/v8utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2018 Coin Sciences Ltd +// Copyright (c) 2014-2019 Coin Sciences Ltd // MultiChain code distributed under the GPLv3 license, see COPYING file. #ifndef V8UTILS_H_ diff --git a/src/version/bcversion.h b/src/version/bcversion.h index e3d48fb8..c7575ecc 100644 --- a/src/version/bcversion.h +++ b/src/version/bcversion.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_VERSION_H diff --git a/src/version/clientversion.cpp b/src/version/clientversion.cpp index 6a13b8c6..f12d46d9 100644 --- a/src/version/clientversion.cpp +++ b/src/version/clientversion.cpp @@ -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. #include "version/clientversion.h" diff --git a/src/version/clientversion.h b/src/version/clientversion.h index 51235172..3f098990 100644 --- a/src/version/clientversion.h +++ b/src/version/clientversion.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_CLIENTVERSION_H @@ -27,7 +27,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2015 +#define COPYRIGHT_YEAR 2019 #endif //HAVE_CONFIG_H @@ -41,6 +41,7 @@ //! Copyright string used in Windows .rc files /* MCHN START */ #define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " Coin Sciences Ltd" +#define WIN_VERSION 2.0.0.2 /* MCHN END */ /** * bitcoind-res.rc includes this file, but it cannot cope with real c++ code. diff --git a/src/version/version.cpp b/src/version/version.cpp index 47cf6940..ca2c58c6 100644 --- a/src/version/version.cpp +++ b/src/version/version.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/version/version.h b/src/version/version.h index 06886129..b167da21 100644 --- a/src/version/version.h +++ b/src/version/version.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 MULTICHAINVERSION_H diff --git a/src/wallet/chunkcollector.cpp b/src/wallet/chunkcollector.cpp index f1b72ed1..bd550947 100644 --- a/src/wallet/chunkcollector.cpp +++ b/src/wallet/chunkcollector.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/wallet/chunkcollector.h b/src/wallet/chunkcollector.h index ee2c3e2f..49cbb953 100644 --- a/src/wallet/chunkcollector.h +++ b/src/wallet/chunkcollector.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_CHUNKCOLLECTOR_H diff --git a/src/wallet/chunkdb.cpp b/src/wallet/chunkdb.cpp index 9a771f16..4a264bb8 100644 --- a/src/wallet/chunkdb.cpp +++ b/src/wallet/chunkdb.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/wallet/chunkdb.h b/src/wallet/chunkdb.h index 2d95f973..c50849e3 100644 --- a/src/wallet/chunkdb.h +++ b/src/wallet/chunkdb.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_CHUNKDB_H diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index dcaff799..ae74c588 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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_COINCONTROL_H diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp index 9c7102ca..22210731 100644 --- a/src/wallet/crypter.cpp +++ b/src/wallet/crypter.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "crypter.h" diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 53a2c59b..94082026 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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_CRYPTER_H diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index bb427d34..685691d0 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/db.h" diff --git a/src/wallet/db.h b/src/wallet/db.h index 1fc737a9..03e17e9e 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_DB_H diff --git a/src/wallet/dbconst.h b/src/wallet/dbconst.h index 0551ce19..3512b10c 100644 --- a/src/wallet/dbconst.h +++ b/src/wallet/dbconst.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/wallet/dbflat.cpp b/src/wallet/dbflat.cpp index 74fe50b5..29382c6d 100644 --- a/src/wallet/dbflat.cpp +++ b/src/wallet/dbflat.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/dbflat.h" diff --git a/src/wallet/dbflat.h b/src/wallet/dbflat.h index 1f272d00..5590292c 100644 --- a/src/wallet/dbflat.h +++ b/src/wallet/dbflat.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/wallet/dbwrap.h b/src/wallet/dbwrap.h index 042e5c5a..55c214fa 100644 --- a/src/wallet/dbwrap.h +++ b/src/wallet/dbwrap.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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. diff --git a/src/wallet/dbwrap_com.cpp b/src/wallet/dbwrap_com.cpp index 08710c38..30a45f11 100644 --- a/src/wallet/dbwrap_com.cpp +++ b/src/wallet/dbwrap_com.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/dbwrap.h" diff --git a/src/wallet/keystore.cpp b/src/wallet/keystore.cpp index 3b448e75..5d32ece7 100644 --- a/src/wallet/keystore.cpp +++ b/src/wallet/keystore.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 "wallet/keystore.h" diff --git a/src/wallet/keystore.h b/src/wallet/keystore.h index baa5ac94..b58a32c0 100644 --- a/src/wallet/keystore.h +++ b/src/wallet/keystore.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_KEYSTORE_H diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d7554e77..de8782b2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/wallet.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 60f9f555..ce21d696 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_WALLET_H diff --git a/src/wallet/wallet_ismine.cpp b/src/wallet/wallet_ismine.cpp index 27bafbf4..97080405 100644 --- a/src/wallet/wallet_ismine.cpp +++ b/src/wallet/wallet_ismine.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet_ismine.h" diff --git a/src/wallet/wallet_ismine.h b/src/wallet/wallet_ismine.h index ac490604..46470aa3 100644 --- a/src/wallet/wallet_ismine.h +++ b/src/wallet/wallet_ismine.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_WALLET_ISMINE_H diff --git a/src/wallet/walletcoins.cpp b/src/wallet/walletcoins.cpp index 8d8d5871..5323245b 100644 --- a/src/wallet/walletcoins.cpp +++ b/src/wallet/walletcoins.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/wallet.h" diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 0958b490..159c1540 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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 "walletdb.h" diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 9c5705a0..4498db33 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2014-2016 The Bitcoin Core 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_WALLETDB_H diff --git a/src/wallet/wallettxdb.cpp b/src/wallet/wallettxdb.cpp index 68e412cf..b76473c3 100644 --- a/src/wallet/wallettxdb.cpp +++ b/src/wallet/wallettxdb.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/wallet/wallettxdb.h b/src/wallet/wallettxdb.h index 2f655f2c..68e0c7a0 100644 --- a/src/wallet/wallettxdb.h +++ b/src/wallet/wallettxdb.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_WALLETTXDB_H diff --git a/src/wallet/wallettxs.cpp b/src/wallet/wallettxs.cpp index 6f6c62ad..e2f07a78 100644 --- a/src/wallet/wallettxs.cpp +++ b/src/wallet/wallettxs.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 "wallet/wallettxs.h" diff --git a/src/wallet/wallettxs.h b/src/wallet/wallettxs.h index 55c9902b..ea14461a 100644 --- a/src/wallet/wallettxs.h +++ b/src/wallet/wallettxs.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Bitcoin Core 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 MULTICHAIN_WALLETTXS_H From 03e72d9daaffcc4c3e83280ef32e4090cd103732 Mon Sep 17 00:00:00 2001 From: mike31 Date: Mon, 4 Feb 2019 12:38:56 +0200 Subject: [PATCH 5/8] Fixed Windows version and LevelDB copyright --- src/leveldb/db/db_impl.cc | 2 ++ src/multichain-cli-res.rc | 4 ++-- src/multichain-util-res.rc | 4 ++-- src/multichaind-cold-res.rc | 4 ++-- src/multichaind-res.rc | 4 ++-- src/version/clientversion.h | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/leveldb/db/db_impl.cc b/src/leveldb/db/db_impl.cc index f0c15b90..72c39354 100644 --- a/src/leveldb/db/db_impl.cc +++ b/src/leveldb/db/db_impl.cc @@ -1,3 +1,5 @@ +// Copyright (c) 2014-2019 Coin Sciences Ltd +// MultiChain code distributed under the GPLv3 license, see COPYING file. // Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. diff --git a/src/multichain-cli-res.rc b/src/multichain-cli-res.rc index 2a22aaf6..827b582d 100644 --- a/src/multichain-cli-res.rc +++ b/src/multichain-cli-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichain-cli (OSS RPC client for MultiChain)" - VALUE "FileVersion", WIN_VERSION + VALUE "FileVersion", WIN_VERSION_STR VALUE "InternalName", "multichain-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichain-cli.exe" VALUE "ProductName", "multichain-cli" - VALUE "ProductVersion", WIN_VERSION + VALUE "ProductVersion", WIN_VERSION_STR END END diff --git a/src/multichain-util-res.rc b/src/multichain-util-res.rc index 2a084e8e..a023fd42 100644 --- a/src/multichain-util-res.rc +++ b/src/multichain-util-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichain-util (Utilities for MultiChain)" - VALUE "FileVersion", WIN_VERSION + VALUE "FileVersion", WIN_VERSION_STR VALUE "InternalName", "multichain-util" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichain-util.exe" VALUE "ProductName", "multichain-util" - VALUE "ProductVersion", WIN_VERSION + VALUE "ProductVersion", WIN_VERSION_STR END END diff --git a/src/multichaind-cold-res.rc b/src/multichaind-cold-res.rc index 220e50d1..10c6e613 100644 --- a/src/multichaind-cold-res.rc +++ b/src/multichaind-cold-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichaind-cold (OSS daemon/client for MultiChain)" - VALUE "FileVersion", WIN_VERSION + VALUE "FileVersion", WIN_VERSION_STR VALUE "InternalName", "multichaind-cold" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichaind-cold.exe" VALUE "ProductName", "multichaind-cold" - VALUE "ProductVersion", WIN_VERSION + VALUE "ProductVersion", WIN_VERSION_STR END END diff --git a/src/multichaind-res.rc b/src/multichaind-res.rc index 0237cd9c..e1858f9f 100644 --- a/src/multichaind-res.rc +++ b/src/multichaind-res.rc @@ -18,13 +18,13 @@ BEGIN BEGIN VALUE "CompanyName", "Coin Sciences Ltd" VALUE "FileDescription", "multichaind (OSS daemon/client for MultiChain)" - VALUE "FileVersion", WIN_VERSION + VALUE "FileVersion", WIN_VERSION_STR VALUE "InternalName", "multichaind" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "The software product under this license is provided free of charge. Full terms are shown at: http://www.multichain.com/terms-of-service/." VALUE "OriginalFilename", "multichaind.exe" VALUE "ProductName", "multichaind" - VALUE "ProductVersion", WIN_VERSION + VALUE "ProductVersion", WIN_VERSION_STR END END diff --git a/src/version/clientversion.h b/src/version/clientversion.h index 3f098990..05e690cc 100644 --- a/src/version/clientversion.h +++ b/src/version/clientversion.h @@ -41,7 +41,7 @@ //! Copyright string used in Windows .rc files /* MCHN START */ #define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " Coin Sciences Ltd" -#define WIN_VERSION 2.0.0.2 +#define WIN_VERSION_STR "2.0.0.2" /* MCHN END */ /** * bitcoind-res.rc includes this file, but it cannot cope with real c++ code. From 117244782ebe65906d3976a7d66c0126268ff53b Mon Sep 17 00:00:00 2001 From: mike31 Date: Wed, 6 Feb 2019 18:09:53 +0200 Subject: [PATCH 6/8] Protocol changes required for enterprise version --- src/chainparams/params.cpp | 28 +++ src/chainparams/state.h | 1 + src/core/init-cold.cpp | 23 +- src/core/main.cpp | 46 ++-- src/entities/asset.cpp | 8 +- src/entities/asset.h | 16 +- src/protocol/multichaintx.cpp | 462 +++++++++++++++++++++++++++++----- src/rpc/rpcdebug.cpp | 101 +++++++- src/rpc/rpcutils.cpp | 2 +- 9 files changed, 591 insertions(+), 96 deletions(-) diff --git a/src/chainparams/params.cpp b/src/chainparams/params.cpp index 4907620f..b876ba18 100644 --- a/src/chainparams/params.cpp +++ b/src/chainparams/params.cpp @@ -2199,3 +2199,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/state.h b/src/chainparams/state.h index 2a10c8c0..a3bdb54a 100644 --- a/src/chainparams/state.h +++ b/src/chainparams/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/core/init-cold.cpp b/src/core/init-cold.cpp index ea109c97..07f46f60 100644 --- a/src/core/init-cold.cpp +++ b/src/core/init-cold.cpp @@ -440,11 +440,8 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) currentwalletdatversion=GetWalletDatVersion(pathWalletDat.string()); boost::filesystem::path pathWallet=GetDataDir() / "wallet"; - if(currentwalletdatversion == 2) - { - } LogPrintf("Wallet file exists. WalletDBVersion: %d.\n", currentwalletdatversion); - if( (currentwalletdatversion == 3) && (GetArg("-walletdbversion",0) != 3) ) + if( (currentwalletdatversion == 3) && (GetArg("-walletdbversion",MC_TDB_WALLET_VERSION) != 3) ) { return InitError(_("Wallet downgrade is not allowed")); } @@ -537,6 +534,8 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) // if (!CWalletDB::Recover(bitdbwrap, strWalletFile, true)) if(!WalletDBRecover(bitdbwrap,strWalletFile,true)) return false; + sprintf(bufOutput,"\nTo work properly with salvaged addresses, you have to call importaddress API and restart MultiChain with -rescan\n\n"); + bytes_written=write(OutputPipe,bufOutput,strlen(bufOutput)); } if (filesystem::exists(GetDataDir() / strWalletFile)) @@ -677,8 +676,6 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) pwalletTxsMain=new mc_WalletTxs; mc_TxEntity entity; boost::filesystem::path pathWallet=GetDataDir() / "wallet"; - bool upgrade_wallet_dat=false; - if(mc_gState->m_WalletMode == MC_WMD_NONE) { if(boost::filesystem::exists(pathWallet)) @@ -690,10 +687,6 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) { if(!boost::filesystem::exists(pathWallet)) { - if(mc_gState->m_Permissions->m_Block >= 0) - { - upgrade_wallet_dat=true; - } if((mc_gState->m_Permissions->m_Block >= 0) && !GetBoolArg("-rescan", false)) { if(mc_gState->m_WalletMode == MC_WMD_AUTO) @@ -710,9 +703,13 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) { new_wallet_txs=true; if(mc_gState->m_WalletMode == MC_WMD_AUTO) - { - mc_gState->m_WalletMode = MC_WMD_TXS | MC_WMD_ADDRESS_TXS | MC_WMD_FLAT_DAT_FILE; + { + mc_gState->m_WalletMode = MC_WMD_TXS | MC_WMD_ADDRESS_TXS; wallet_mode=MC_TDB_WALLET_VERSION; + if(wallet_mode > 2) + { + mc_gState->m_WalletMode |= MC_WMD_FLAT_DAT_FILE; + } } } } @@ -798,7 +795,7 @@ bool AppInit2_Cold(boost::thread_group& threadGroup,int OutputPipe) { return InitError(_("wallet.dat corrupted. Please remove it and restart.")); } - return InitError(_("wallet.dat is partially corrupted. Please try running MultiChain with -salvagewallet.")); + return InitError(_("wallet.dat corrupted. Please try running MultiChain with -salvagewallet.")); } if(!pwalletMain->vchDefaultKey.IsValid()) diff --git a/src/core/main.cpp b/src/core/main.cpp index 4a6a1607..22e24f47 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -57,6 +57,7 @@ bool AcceptMultiChainTransaction(const CTransaction& tx, string& reason, int64_t *mandatory_fee_out, uint32_t *replay); +bool Is_MultiChainLicenseTokenTransfer(const CTransaction& tx); bool ExtractDestinationScriptValid(const CScript& scriptPubKey, CTxDestination& addressRet); bool AcceptAssetTransfers(const CTransaction& tx, const CCoinsViewCache &inputs, string& reason); bool AcceptAssetGenesis(const CTransaction &tx,int offset,bool accept,string& reason); @@ -2081,6 +2082,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi CAmount nValueIn = 0; CAmount nFees = 0; int async_count=0; + bool fIsLicenseTokenTransfer=Is_MultiChainLicenseTokenTransfer(tx); vector vSendPermissionFlags; @@ -2110,28 +2112,36 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi CTxDestination addressRet; if(ExtractDestinationScriptValid(coins->vout[prevout.n].scriptPubKey, addressRet)) { - CKeyID *lpKeyID=boost::get (&addressRet); - if(lpKeyID != NULL) - { - if(!mc_gState->m_Permissions->CanSend(NULL,(unsigned char*)(lpKeyID))) + if(!fIsLicenseTokenTransfer) + { + CKeyID *lpKeyID=boost::get (&addressRet); + if(lpKeyID != NULL) { - return state.Invalid(error("CheckInputs() : %s input %d doesn't have send permission", tx.GetHash().ToString(),i)); - } - send_permission_flags=SCRIPT_VERIFY_SKIP_SEND_PERMISSION_CHECK; - async_count++; + if(!mc_gState->m_Permissions->CanSend(NULL,(unsigned char*)(lpKeyID))) + { + return state.Invalid(error("CheckInputs() : %s input %d doesn't have send permission", tx.GetHash().ToString(),i)); + } + send_permission_flags=SCRIPT_VERIFY_SKIP_SEND_PERMISSION_CHECK; + async_count++; + } + else + { + CScriptID *lpScriptID=boost::get (&addressRet); + if(lpScriptID) + { + if(mc_gState->m_Permissions->CanSend(NULL,(unsigned char*)(lpScriptID))) + { + send_permission_flags=SCRIPT_VERIFY_SKIP_SEND_PERMISSION_CHECK; + async_count++; + } + } + } } else { - CScriptID *lpScriptID=boost::get (&addressRet); - if(lpScriptID) - { - if(mc_gState->m_Permissions->CanSend(NULL,(unsigned char*)(lpScriptID))) - { - send_permission_flags=SCRIPT_VERIFY_SKIP_SEND_PERMISSION_CHECK; - async_count++; - } - } - } + send_permission_flags=SCRIPT_VERIFY_SKIP_SEND_PERMISSION_CHECK; + async_count++; + } } } diff --git a/src/entities/asset.cpp b/src/entities/asset.cpp index 7151e59a..895c558f 100644 --- a/src/entities/asset.cpp +++ b/src/entities/asset.cpp @@ -883,7 +883,7 @@ int mc_AssetDB::InsertEntity(const void* txid, int offset, int entity_type, cons } -int mc_AssetDB::InsertAsset(const void* txid, int offset, uint64_t quantity, const char *name, int multiple, const void* script, size_t script_size, const void* special_script, size_t special_script_size,int update_mempool) +int mc_AssetDB::InsertAsset(const void* txid, int offset, int asset_type, uint64_t quantity, const char *name, int multiple, const void* script, size_t script_size, const void* special_script, size_t special_script_size,int update_mempool) { mc_EntityLedgerRow aldRow; mc_EntityDetails details; @@ -903,7 +903,7 @@ int mc_AssetDB::InsertAsset(const void* txid, int offset, uint64_t quantity, con aldRow.m_Offset=-(m_MemPool->GetCount()+1); } aldRow.m_Quantity=quantity; - aldRow.m_EntityType=MC_ENT_TYPE_ASSET; + aldRow.m_EntityType=asset_type; aldRow.m_FirstPos=-(m_MemPool->GetCount()+1);//-1; // Unconfirmed issue, from 10007 we can create followons for them, so we should differentiate aldRow.m_LastPos=0; aldRow.m_ChainPos=-1; @@ -2089,6 +2089,10 @@ uint32_t mc_AssetDB::MaxEntityType() { return MC_ENT_TYPE_UPGRADE; } + if(mc_gState->m_Features->LicenseTokens() == 0) + { + return MC_ENT_TYPE_FILTER; + } return MC_ENT_TYPE_MAX; } diff --git a/src/entities/asset.h b/src/entities/asset.h index dcce356b..87de27d0 100644 --- a/src/entities/asset.h +++ b/src/entities/asset.h @@ -56,7 +56,8 @@ #define MC_ENT_TYPE_STREAM_MAX 0x0F #define MC_ENT_TYPE_UPGRADE 0x10 #define MC_ENT_TYPE_FILTER 0x11 -#define MC_ENT_TYPE_MAX 0x11 +#define MC_ENT_TYPE_LICENSE_TOKEN 0x12 +#define MC_ENT_TYPE_MAX 0x12 #define MC_ENT_SPRM_NAME 0x01 #define MC_ENT_SPRM_FOLLOW_ONS 0x02 @@ -73,6 +74,17 @@ #define MC_ENT_SPRM_FILTER_CODE 0x46 #define MC_ENT_SPRM_FILTER_TYPE 0x47 +#define MC_ENT_SPRM_LICENSE_REQUEST_HASH 0x60 +#define MC_ENT_SPRM_LICENSE_REQUEST_ADDRESS 0x61 +#define MC_ENT_SPRM_LICENSE_CONFIRMATION_TIME 0x62 +#define MC_ENT_SPRM_LICENSE_CONFIRMATION_REF 0x63 +#define MC_ENT_SPRM_LICENSE_PUBKEY 0x69 +#define MC_ENT_SPRM_LICENSE_MIN_VERSION 0x6A +#define MC_ENT_SPRM_LICENSE_MIN_PROTOCOL 0x6B +#define MC_ENT_SPRM_LICENSE_DETAILS 0x6E +#define MC_ENT_SPRM_LICENSE_SIGNATURE 0x6F + + #define MC_ENT_SPRM_TIMESTAMP 0x81 #define MC_ENT_SPRM_CHUNK_HASH 0x82 #define MC_ENT_SPRM_SOURCE_TXID 0x83 @@ -261,7 +273,7 @@ typedef struct mc_AssetDB int Initialize(const char *name,int mode); int InsertEntity(const void* txid, int offset, int entity_type, const void *script,size_t script_size, const void* special_script, size_t special_script_size,int update_mempool); - int InsertAsset(const void* txid, int offset, uint64_t quantity,const char *name,int multiple,const void *script,size_t script_size, const void* special_script, size_t special_script_size,int update_mempool); + int InsertAsset(const void* txid, int offset, int asset_type, uint64_t quantity,const char *name,int multiple,const void *script,size_t script_size, const void* special_script, size_t special_script_size,int update_mempool); int InsertAssetFollowOn(const void* txid, int offset, uint64_t quantity, const void *script,size_t script_size, const void* special_script, size_t special_script_size,const void* original_txid,int update_mempool); int Commit(); int RollBack(int block); diff --git a/src/protocol/multichaintx.cpp b/src/protocol/multichaintx.cpp index 3439dd69..dde67155 100644 --- a/src/protocol/multichaintx.cpp +++ b/src/protocol/multichaintx.cpp @@ -29,6 +29,7 @@ bool ExtractDestinations10008(const CScript& scriptPubKey, txnouttype& typeRet, #define MC_MTX_OUTPUT_DETAIL_FLAG_NO_DESTINATION 0x00000040 #define MC_MTX_OUTPUT_DETAIL_FLAG_PERMISSION_FILTER 0x00000080 #define MC_MTX_OUTPUT_DETAIL_FLAG_PERMISSION_NOT_FILTER 0x00000100 +#define MC_MTX_OUTPUT_DETAIL_FLAG_LICENSE_TRANSFER 0x00000200 typedef struct CMultiChainTxDetails { @@ -40,6 +41,8 @@ typedef struct CMultiChainTxDetails bool fAdminMinerGrant; // Admin/miner grant in this transaction bool fAssetIssuance; // New/followon issuance in this tx bool fIsStandardCoinbase; // Tx is standard coinbase - filters should not be applied + bool fLicenseTokenIssuance; // New license token + bool fLicenseTokenTransfer; // License token transfer vector vInputScriptTypes; // Input script types vector vInputDestinations; // Addresses used in input scripts @@ -108,6 +111,8 @@ void CMultiChainTxDetails::Zero() fAdminMinerGrant=false; fAssetIssuance=false; fIsStandardCoinbase=false; + fLicenseTokenIssuance=false; + fLicenseTokenTransfer=false; details_script_size=0; details_script_type=-1; @@ -1267,6 +1272,123 @@ bool MultiChainTransaction_ProcessPermissions(const CTransaction& tx, return true; } +bool Is_MultiChainLicenseTokenTransfer(const CTransaction& tx) +{ + mc_EntityDetails entity; + if(tx.IsCoinBase()) + { + return false; + } + if(tx.vout.size() != 1) + { + return false; + } + if(tx.vin.size() != 1) + { + return false; + } + if(mc_gState->m_Features->LicenseTokens() == 0) + { + return false; + } + + MultiChainTransaction_SetTmpOutputScript(tx.vout[0].scriptPubKey); + if(mc_gState->m_TmpScript->GetNumElements() == 0) + { + return false; + } + + mc_gState->m_TmpAssetsOut->Clear(); + mc_gState->m_TmpScript->SetElement(0); + if(mc_gState->m_TmpScript->GetAssetQuantities(mc_gState->m_TmpAssetsOut,MC_SCR_ASSET_SCRIPT_TYPE_TRANSFER) != MC_ERR_NOERROR) + { + return false; + } + + if(mc_gState->m_Assets->FindEntityByFullRef(&entity,mc_gState->m_TmpAssetsOut->GetRow(0))) + { + if(entity.GetEntityType() == MC_ENT_TYPE_LICENSE_TOKEN) + { + return true; + } + } + + return false; +} + +bool MultiChainTransaction_CheckLicenseTokenTransfer(const CTransaction& tx, + int unchecked_row, + CMultiChainTxDetails *details, + string& reason) +{ + bool token_transfer=false; + int err; + mc_EntityDetails entity; + uint32_t script_type=MC_SCR_ASSET_SCRIPT_TYPE_TRANSFER; + + if(mc_gState->m_Features->LicenseTokens() == 0) + { + return true; + } + + for(int i=unchecked_row;im_TmpAssetsOut->GetCount();i++) + { + if(mc_gState->m_Assets->FindEntityByFullRef(&entity,mc_gState->m_TmpAssetsOut->GetRow(i))) + { + if(entity.GetEntityType() == MC_ENT_TYPE_LICENSE_TOKEN) + { + token_transfer=true; + } + } + } + + if(!token_transfer) + { + return true; + } + + if(tx.vout.size() != 1) + { + reason="License token transfer tx should have one output"; + return false; + } + + if(tx.vin.size() != 1) + { + reason="License token transfer tx should have one input"; + return false; + } + + if(mc_gState->m_TmpScript->GetNumElements() != 3) + { + reason="License token transfer script rejected - wrong number of elements"; + return false; + } + + if(details->vInputHashTypes[0] != SIGHASH_ALL) + { + reason="License token transfer script rejected - wrong signature type"; + return false; + } + + if(mc_gState->m_TmpAssetsOut->GetCount() != 1) + { + reason="License token transfer script rejected - wrong script"; + return false; + } + + if(mc_GetABQuantity(mc_gState->m_TmpAssetsOut->GetRow(0)) != 1) + { + reason="License token transfer script rejected - wrong number of license token units"; + return false; + } + + details->vOutputScriptFlags[0] |= MC_MTX_OUTPUT_DETAIL_FLAG_LICENSE_TRANSFER; + details->fLicenseTokenTransfer=true; + return true; +} + + bool MultiChainTransaction_CheckAssetTransfers(const CTransaction& tx, int offset, int vout, @@ -1288,13 +1410,22 @@ bool MultiChainTransaction_CheckAssetTransfers(const CTransaction& tx, } } + int unchecked_row=mc_gState->m_TmpAssetsOut->GetCount(); if(!mc_ExtractOutputAssetQuantities(mc_gState->m_TmpAssetsOut,reason,false))// Filling output asset quantity list { return false; + } + + if(!MultiChainTransaction_CheckLicenseTokenTransfer(tx,unchecked_row,details,reason)) + { + return false; } + + // Check for dust and receive permissions // Not required for pure grants - if(details->vOutputScriptFlags[vout] & MC_MTX_OUTPUT_DETAIL_FLAG_NOT_PURE_PERMISSION) + if( ( (details->vOutputScriptFlags[vout] & MC_MTX_OUTPUT_DETAIL_FLAG_NOT_PURE_PERMISSION) != 0 ) && + ( (details->vOutputScriptFlags[vout] & MC_MTX_OUTPUT_DETAIL_FLAG_LICENSE_TRANSFER) == 0 ) ) { if((offset < 0) && Params().RequireStandard()) // If not in block - part of IsStandard check { @@ -1424,8 +1555,6 @@ bool MultiChainTransaction_CheckOutputs(const CTransaction& tx, } } - mc_gState->m_TmpAssetsOut->Clear(); - for (unsigned int vout = 0; vout < tx.vout.size(); vout++) { // Entity items (stream items, upgrade approvals, updates) @@ -1437,7 +1566,22 @@ bool MultiChainTransaction_CheckOutputs(const CTransaction& tx, { return false; } - } + } // Assets quantities and permission checks + } + + return true; +} + + +bool MultiChainTransaction_CheckTransfers(const CTransaction& tx, // Tx to check + int offset, // Tx offset in block, -1 if in memppol + CMultiChainTxDetails *details, // Tx details object + string& reason) // Error message +{ + mc_gState->m_TmpAssetsOut->Clear(); + + for (unsigned int vout = 0; vout < tx.vout.size(); vout++) + { // Assets quantities and permission checks if(details->vOutputScriptFlags[vout] & MC_MTX_OUTPUT_DETAIL_FLAG_NOT_OP_RETURN) { @@ -1454,7 +1598,7 @@ bool MultiChainTransaction_CheckOutputs(const CTransaction& tx, { return false; } - + return true; } @@ -1481,7 +1625,126 @@ bool MultiChainTransaction_CheckMandatoryFee(CMultiChainTxDetails *details, return true; } +bool MultiChainTransaction_CheckLicenseTokenDetails(CMultiChainTxDetails *details, // Tx details object + void *token_address, // Address the token is issued to + string& reason) // Error message +{ + uint32_t offset,next_offset,param_value_start; + unsigned int timestamp; + size_t param_value_size; + bool is_open=false; + size_t value_sizes[256]; + int value_starts[256]; + unsigned char code; + + memset(value_sizes,0,256*sizeof(size_t)); + memset(value_starts,0,256*sizeof(int)); + + offset=0; + + while((int)offsetdetails_script_size) + { + next_offset=mc_GetParamFromDetailsScript(details->details_script,details->details_script_size,offset,¶m_value_start,¶m_value_size); + if(param_value_start > 0) + { + if(details->details_script[offset] == 0) + { + code=details->details_script[offset+1]; + if(value_starts[code]) + { + reason="License token issue script rejected - multiple values for the same code in details script"; + return false; + } + value_sizes[code]=param_value_size; + value_starts[code]=param_value_start; + } + } + offset=next_offset; + } + + if( (value_starts[MC_ENT_SPRM_NAME] == 0) || (value_sizes[MC_ENT_SPRM_NAME] == 0) ) + { + reason="License token issue script rejected - no name"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_REQUEST_HASH] == 0 ) + { + reason="License token issue script rejected - invalid request hash"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_REQUEST_ADDRESS] != sizeof(uint160) ) + { + reason="License token issue script rejected - invalid request address"; + return false; + } + if(memcmp(token_address,details->details_script+value_starts[MC_ENT_SPRM_LICENSE_REQUEST_ADDRESS],value_sizes[MC_ENT_SPRM_LICENSE_REQUEST_ADDRESS])) + { + reason="License token issue script rejected - request address mismatch"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_CONFIRMATION_TIME] < 4 ) + { + reason="License token issue script rejected - invalid confirmation time"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_CONFIRMATION_REF] == 0 ) + { + reason="License token issue script rejected - invalid confirmation reference"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_PUBKEY] == 0 ) + { + reason="License token issue script rejected - invalid pubkey"; + return false; + } + if( (value_sizes[MC_ENT_SPRM_LICENSE_MIN_VERSION] < 4 ) || + (value_sizes[MC_ENT_SPRM_LICENSE_MIN_VERSION] > 8 )) + { + reason="License token issue script rejected - invalid version"; + return false; + } + if( mc_gState->GetNumericVersion() < mc_GetLE(details->details_script+value_starts[MC_ENT_SPRM_LICENSE_MIN_VERSION],value_sizes[MC_ENT_SPRM_LICENSE_MIN_VERSION]) ) + { + reason="License token issue script rejected - Not supported in this version of MultiChain"; + return false; + } + if( (value_sizes[MC_ENT_SPRM_LICENSE_MIN_PROTOCOL] < 4 ) || + (value_sizes[MC_ENT_SPRM_LICENSE_MIN_PROTOCOL] > 8 )) + { + reason="License token issue script rejected - invalid protocol"; + return false; + } + if( mc_gState->m_NetworkParams->ProtocolVersion() < mc_GetLE(details->details_script+value_starts[MC_ENT_SPRM_LICENSE_MIN_PROTOCOL],value_sizes[MC_ENT_SPRM_LICENSE_MIN_PROTOCOL]) ) + { + reason="License token issue script rejected - Not supported in this protocol version"; + return false; + } + if( value_sizes[MC_ENT_SPRM_LICENSE_SIGNATURE] == 0 ) + { + reason="License token issue script rejected - invalid signature"; + return false; + } + if( (value_sizes[MC_ENT_SPRM_TIMESTAMP] != 4 )) + { + reason="License token issue script rejected - invalid timestamp"; + return false; + } + + timestamp=(unsigned int)mc_GetLE(details->details_script+value_starts[MC_ENT_SPRM_TIMESTAMP],value_sizes[MC_ENT_SPRM_TIMESTAMP]); + if(timestamp < chainActive.Tip()->nTime-30*86400) + { + reason="License token issue script rejected - timestamp is too far in the past"; + return false; + } + if(timestamp > chainActive.Tip()->nTime+30*86400) + { + reason="License token issue script rejected - timestamp is too far in the future"; + return false; + } + + return true; +} bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, // Tx to check int offset, // Tx offset in block, -1 if in memppol @@ -1495,7 +1758,7 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, mc_EntityDetails entity; mc_EntityDetails this_entity; char asset_name[MC_ENT_MAX_NAME_SIZE+1]; - int multiple; + int multiple,out_count,issue_vout; int err; int64_t quantity,total; uint256 txid; @@ -1508,6 +1771,7 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, size_t value_size; unsigned char short_txid[MC_AST_SHORT_TXID_SIZE]; CTxDestination addressRet; + unsigned char token_address[20]; if(tx.IsCoinBase()) { @@ -1526,6 +1790,9 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, multiple=1; new_issue=false; follow_on=false; + out_count=0; + issue_vout=-1; + if(details->details_script_type == 0) // New asset with details script { @@ -1582,6 +1849,11 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, err=mc_gState->m_TmpScript->GetAssetGenesis(&quantity); if(err == 0) // Asset genesis issuance { + out_count++; + if(e == 0) + { + issue_vout=vout; + } issue_in_output=true; new_issue=true; if(quantity+total<0) @@ -1611,14 +1883,17 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, if(lpKeyID != NULL) { address=CBitcoinAddress(*lpKeyID); + memcpy(token_address,lpKeyID,sizeof(uint160)); } else { address=CBitcoinAddress(*lpScriptID); + memcpy(token_address,lpScriptID,sizeof(uint160)); } if(update_mempool) { - if(fDebug)LogPrint("mchn","Found asset issue script in tx %s for %s - (%ld)\n", + if(fDebug)LogPrint("mchn","Found %s issue script in tx %s for %s - (%ld)\n", + (details->new_entity_type == MC_ENT_TYPE_LICENSE_TOKEN) ? "license token" : "asset", tx.GetHash().GetHex().c_str(), address.ToString().c_str(),quantity); } @@ -1751,6 +2026,15 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, } } + if(details->new_entity_type == MC_ENT_TYPE_LICENSE_TOKEN) + { + if(!new_issue) + { + reason="License token issue script rejected - issuance output not found"; + return false; + } + } + if(!new_issue && !follow_on) { return true; @@ -1762,8 +2046,51 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, { if(details->new_entity_type != MC_ENT_TYPE_ASSET) { - reason="Asset issue script rejected - not allowed in this transaction, conflicts with other entities"; - return false; + if(details->new_entity_type == MC_ENT_TYPE_LICENSE_TOKEN) + { + if(mc_gState->m_Features->LicenseTokens()) + { + if(out_count != 1) + { + reason="License token issue script rejected - should have exactly one issuance output"; + return false; + } + if(multiple != 1) + { + reason="License token issue script rejected - should have multiple=1"; + return false; + } + if(total != 1) + { + reason="License token issue script rejected - should have single unit"; + return false; + } + if(issue_vout < 0) + { + reason="License token issue script rejected - issuance element should be the first element in script"; + return false; + } + + MultiChainTransaction_SetTmpOutputScript(tx.vout[issue_vout].scriptPubKey); + if(mc_gState->m_TmpScript->GetNumElements() != 3) + { + reason="License token issue script rejected - wrong number of elements"; + return false; + } + + if(!MultiChainTransaction_CheckLicenseTokenDetails(details,token_address,reason)) + { + return false; + } + details->vOutputScriptFlags[issue_vout] |= MC_MTX_OUTPUT_DETAIL_FLAG_LICENSE_TRANSFER; + details->fLicenseTokenIssuance=true; + } + } + if(!details->fLicenseTokenIssuance) + { + reason="Asset issue script rejected - not allowed in this transaction, conflicts with other entities"; + return false; + } } } @@ -1783,6 +2110,7 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, { can_issue=true; } + can_issue |= details->fLicenseTokenIssuance; } else { @@ -1815,57 +2143,61 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, mc_gState->m_TmpScript->Clear(); mc_gState->m_TmpScript->AddElement(); - unsigned char issuer_buf[24]; - memset(issuer_buf,0,sizeof(issuer_buf)); - flags=MC_PFL_NONE; - uint32_t timestamp=0; - set stored_issuers; - - // First per-entity record in permission database - // We'll need it for scanning asset-related rows - if(new_issue) + + if(!details->fLicenseTokenIssuance) { - err=MC_ERR_NOERROR; + unsigned char issuer_buf[24]; + memset(issuer_buf,0,sizeof(issuer_buf)); + flags=MC_PFL_NONE; + uint32_t timestamp=0; + set stored_issuers; - txid=tx.GetHash(); - err=mc_gState->m_Permissions->SetPermission(&txid,issuer_buf,MC_PTP_CONNECT, - (unsigned char*)issuers[0].begin(),0,(uint32_t)(-1),timestamp,flags | MC_PFL_ENTITY_GENESIS ,update_mempool,offset); - } + // First per-entity record in permission database + // We'll need it for scanning asset-related rows + if(new_issue) + { + err=MC_ERR_NOERROR; - uint32_t all_permissions=MC_PTP_ADMIN | MC_PTP_ISSUE; - if(mc_gState->m_Features->PerAssetPermissions()) - { - all_permissions |= MC_PTP_ACTIVATE | MC_PTP_SEND | MC_PTP_RECEIVE; - } - - for (unsigned int i = 0; i < issuers.size(); i++) // Setting per-asset permissions and creating issuers script - { - if(err == MC_ERR_NOERROR) + txid=tx.GetHash(); + err=mc_gState->m_Permissions->SetPermission(&txid,issuer_buf,MC_PTP_CONNECT, + (unsigned char*)issuers[0].begin(),0,(uint32_t)(-1),timestamp,flags | MC_PFL_ENTITY_GENESIS ,update_mempool,offset); + } + + uint32_t all_permissions=MC_PTP_ADMIN | MC_PTP_ISSUE; + if(mc_gState->m_Features->PerAssetPermissions()) + { + all_permissions |= MC_PTP_ACTIVATE | MC_PTP_SEND | MC_PTP_RECEIVE; + } + + for (unsigned int i = 0; i < issuers.size(); i++) // Setting per-asset permissions and creating issuers script { - if(stored_issuers.count(issuers[i]) == 0) + if(err == MC_ERR_NOERROR) { - memcpy(issuer_buf,issuers[i].begin(),sizeof(uint160)); - mc_PutLE(issuer_buf+sizeof(uint160),&issuer_flags[i],4); - if((int)i < mc_gState->m_Assets->MaxStoredIssuers()) // Adding list of issuers to the asset script + if(stored_issuers.count(issuers[i]) == 0) { - mc_gState->m_TmpScript->SetSpecialParamValue(MC_ENT_SPRM_ISSUER,issuer_buf,sizeof(issuer_buf)); - } - if(new_issue) // Setting first permission record - to scan from - { - err=mc_gState->m_Permissions->SetPermission(&txid,issuer_buf,all_permissions, - (unsigned char*)issuers[0].begin(),0,(uint32_t)(-1),timestamp,flags | MC_PFL_ENTITY_GENESIS ,update_mempool,offset); + memcpy(issuer_buf,issuers[i].begin(),sizeof(uint160)); + mc_PutLE(issuer_buf+sizeof(uint160),&issuer_flags[i],4); + if((int)i < mc_gState->m_Assets->MaxStoredIssuers()) // Adding list of issuers to the asset script + { + mc_gState->m_TmpScript->SetSpecialParamValue(MC_ENT_SPRM_ISSUER,issuer_buf,sizeof(issuer_buf)); + } + if(new_issue) // Setting first permission record - to scan from + { + err=mc_gState->m_Permissions->SetPermission(&txid,issuer_buf,all_permissions, + (unsigned char*)issuers[0].begin(),0,(uint32_t)(-1),timestamp,flags | MC_PFL_ENTITY_GENESIS ,update_mempool,offset); + } + stored_issuers.insert(issuers[i]); } - stored_issuers.insert(issuers[i]); } - } - } + } - memset(issuer_buf,0,sizeof(issuer_buf)); - mc_gState->m_TmpScript->SetSpecialParamValue(MC_ENT_SPRM_ISSUER,issuer_buf,1); - if(err) - { - reason="Cannot update permission database for issued asset"; - return false; + memset(issuer_buf,0,sizeof(issuer_buf)); + mc_gState->m_TmpScript->SetSpecialParamValue(MC_ENT_SPRM_ISSUER,issuer_buf,1); + if(err) + { + reason="Cannot update permission database for issued asset"; + return false; + } } const unsigned char *special_script; @@ -1874,7 +2206,8 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, txid=tx.GetHash(); if(new_issue) // Updating entity database { - err=mc_gState->m_Assets->InsertAsset(&txid,offset,total,asset_name,multiple,details->details_script,details->details_script_size,special_script,special_script_size,update_mempool); + err=mc_gState->m_Assets->InsertAsset(&txid,offset,details->fLicenseTokenIssuance ? MC_ENT_TYPE_LICENSE_TOKEN : MC_ENT_TYPE_ASSET, + total,asset_name,multiple,details->details_script,details->details_script_size,special_script,special_script_size,update_mempool); } else { @@ -1912,7 +2245,8 @@ bool MultiChainTransaction_ProcessAssetIssuance(const CTransaction& tx, { if(new_issue) { - if(fDebug)LogPrint("mchn","New asset. TxID: %s, AssetRef: %d-%d-%d, Name: %s\n", + if(fDebug)LogPrint("mchn","New %s. TxID: %s, AssetRef: %d-%d-%d, Name: %s\n", + details->fLicenseTokenIssuance ? "license token" : "asset", tx.GetHash().GetHex().c_str(), mc_gState->m_Assets->m_Block+1,offset,(int)(*((unsigned char*)&txid+0))+256*(int)(*((unsigned char*)&txid+1)), this_entity.GetName()); @@ -1953,6 +2287,11 @@ bool MultiChainTransaction_ProcessEntityCreation(const CTransaction& tx, return true; } + if(details->new_entity_type == MC_ENT_TYPE_LICENSE_TOKEN) // Processed in another place + { + return true; + } + vector openers; vector opener_flags; unsigned char opener_buf[24]; @@ -2189,7 +2528,7 @@ bool MultiChainTransaction_VerifyNotFilteredRestrictions(const CTransaction& tx, return true; } } - + MultiChainTransaction_SetTmpOutputScript(tx.vout[vout].scriptPubKey); if(vout == details->emergency_disapproval_output) @@ -2361,19 +2700,24 @@ bool AcceptMultiChainTransaction (const CTransaction& tx, fReject=true; goto exitlbl; } + + if(!MultiChainTransaction_ProcessAssetIssuance(tx,offset,accept,&details,reason)) // Asset genesis/followon + { + fReject=true; + goto exitlbl; + } if(!MultiChainTransaction_CheckMandatoryFee(&details,&mandatory_fee,reason)) { fReject=true; goto exitlbl; - } - // Asset genesis/followon - if(!MultiChainTransaction_ProcessAssetIssuance(tx,offset,accept,&details,reason)) + } + + if(!MultiChainTransaction_CheckTransfers(tx,offset,&details,reason)) // Transfers and receive permissions { fReject=true; goto exitlbl; } - // Creating of (pseudo)streams/upgrades if(!MultiChainTransaction_ProcessEntityCreation(tx,offset,accept,&details,reason)) { @@ -2393,7 +2737,7 @@ bool AcceptMultiChainTransaction (const CTransaction& tx, goto exitlbl; } - if( (details.emergency_disapproval_output < 0) && !details.fIsStandardCoinbase) + if( (details.emergency_disapproval_output < 0) && !details.fIsStandardCoinbase && !details.fLicenseTokenTransfer) { if(mc_gState->m_Features->Filters()) { diff --git a/src/rpc/rpcdebug.cpp b/src/rpc/rpcdebug.cpp index e0844905..7b786088 100644 --- a/src/rpc/rpcdebug.cpp +++ b/src/rpc/rpcdebug.cpp @@ -2,7 +2,7 @@ // MultiChain code distributed under the GPLv3 license, see COPYING file. #include "core/init.h" -#include "rpc/rpcutils.h" +#include "rpc/rpcwallet.h" #include "protocol/relay.h" #include "wallet/wallettxs.h" #include "net/net.h" @@ -222,9 +222,108 @@ double mcd_ReadRows(mc_Database *m_DB,int key_size,int row_count,int read_type) return ta-tb; } +Value mcd_DebugIssueLicenseToken(const Object& params) +{ + string name=mcd_ParamStringValue(params,"name",""); + int multiple=mcd_ParamIntValue(params,"multiple",1); + int64_t quantity=mcd_ParamIntValue(params,"quantity",1); + + CBitcoinAddress from_address(mcd_ParamStringValue(params,"from_address","")); + if (!from_address.IsValid()) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); + CBitcoinAddress to_address(mcd_ParamStringValue(params,"to_address","")); + if (!to_address.IsValid()) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); + CBitcoinAddress req_address(mcd_ParamStringValue(params,"req_address","")); + if (!req_address.IsValid()) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); + + mc_Script *lpScript=mc_gState->m_TmpBuffers->m_RpcScript3; + lpScript->Clear(); + + unsigned char hash[32]; + memset(hash,0xbc,32); + + lpScript->SetAssetGenesis(quantity); + lpScript->AddElement(); + lpScript->SetData(hash,30); + lpScript->AddElement(); + + mc_Script *lpDetailsScript=mc_gState->m_TmpBuffers->m_RpcScript1; + lpDetailsScript->Clear(); + mc_Script *lpDetails=mc_gState->m_TmpBuffers->m_RpcScript2; + lpDetails->Clear(); + + lpDetails->Clear(); + lpDetails->AddElement(); + + CKeyID KeyID; + req_address.GetKeyID(KeyID); + int64_t dummy_int64=0; + int version=20000202; + int protocol=20007; + unsigned int timestamp=mc_TimeNowAsUInt(); + + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_REQUEST_HASH,hash,32); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_REQUEST_ADDRESS,(unsigned char*)&KeyID,20); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_NAME,(const unsigned char*)(name.c_str()),name.size());//+1); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_ASSET_MULTIPLE,(unsigned char*)&multiple,4); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_CONFIRMATION_TIME,(unsigned char*)&dummy_int64,4); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_CONFIRMATION_REF,(unsigned char*)&dummy_int64,2); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_PUBKEY,(unsigned char*)&dummy_int64,2); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_MIN_VERSION,(unsigned char*)&version,4); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_MIN_PROTOCOL,(unsigned char*)&protocol,4); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_LICENSE_SIGNATURE,(unsigned char*)&dummy_int64,1); + lpDetails->SetSpecialParamValue(MC_ENT_SPRM_TIMESTAMP,(unsigned char*)×tamp,4); + + int err; + size_t bytes; + const unsigned char *script; + size_t elem_size; + const unsigned char *elem; + CScript scriptOpReturn=CScript(); + + + vector addresses; + vector fromaddresses; + + + script=lpDetails->GetData(0,&bytes); + + lpDetailsScript->Clear(); + + err=lpDetailsScript->SetNewEntityType(MC_ENT_TYPE_LICENSE_TOKEN,0,script,bytes); + if(err) + { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid custom fields, too long"); + } + + elem = lpDetailsScript->GetData(0,&elem_size); + scriptOpReturn << vector(elem, elem + elem_size) << OP_DROP << OP_RETURN; + + + + addresses.push_back(to_address.Get()); + fromaddresses.push_back(from_address.Get()); + CWalletTx wtx; + + EnsureWalletIsUnlocked(); + + { + LOCK (pwalletMain->cs_wallet_send); + + SendMoneyToSeveralAddresses(addresses, 0, wtx, lpScript, scriptOpReturn,fromaddresses); + } + + return wtx.GetHash().GetHex(); +} Value mcd_DebugRequest(string method,const Object& params) { + if(method == "issuelicensetoken") + { + return mcd_DebugIssueLicenseToken(params); + } if(method == "dbopen") { mc_Database *m_DB; diff --git a/src/rpc/rpcutils.cpp b/src/rpc/rpcutils.cpp index 013c01cc..f9e840f1 100644 --- a/src/rpc/rpcutils.cpp +++ b/src/rpc/rpcutils.cpp @@ -2388,7 +2388,7 @@ string ParseRawOutputObject(Value param,CAmount& nAmount,mc_Script *lpScript, in if(a.name_.size()) { asset_name=a.name_; - asset_error=ParseAssetKeyToFullAssetRef(asset_name.c_str(),buf,&multiple,NULL, MC_ENT_TYPE_ASSET); + asset_error=ParseAssetKeyToFullAssetRef(asset_name.c_str(),buf,&multiple,NULL, (verify_level & 0x0200) ? MC_ENT_TYPE_ASSET : MC_ENT_TYPE_ANY); if(asset_error) { goto exitlbl; From fb533dce8bdcfb45cc796832bfe7244823b5d2a5 Mon Sep 17 00:00:00 2001 From: mike31 Date: Wed, 6 Feb 2019 18:10:10 +0200 Subject: [PATCH 7/8] Version 2.0 beta 2 --- src/version/version.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version/version.cpp b/src/version/version.cpp index ca2c58c6..dd1a8145 100644 --- a/src/version/version.cpp +++ b/src/version/version.cpp @@ -13,8 +13,8 @@ int mc_State::VersionInfo(int version) return custom_version; } - int this_build=20000201; - int this_protocol=20006; + int this_build=20000202; + int this_protocol=20007; if(version < 0) { From ffaa0a7fe5c5449b81cbd73b7ba406d35ef4ea69 Mon Sep 17 00:00:00 2001 From: mike31 Date: Thu, 7 Feb 2019 10:51:07 +0200 Subject: [PATCH 8/8] anyone-can-* upgrades --- src/chainparams/params.cpp | 19 +++++++++ src/core/main.cpp | 35 ++++++++++++++++ src/protocol/multichainblock.cpp | 72 +++++++++++++++++++------------- src/rpc/rpcmisc.cpp | 30 ++++++++++++- 4 files changed, 126 insertions(+), 30 deletions(-) diff --git a/src/chainparams/params.cpp b/src/chainparams/params.cpp index b876ba18..bf932df6 100644 --- a/src/chainparams/params.cpp +++ b/src/chainparams/params.cpp @@ -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; diff --git a/src/core/main.cpp b/src/core/main.cpp index 22e24f47..6981476d 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -440,6 +440,41 @@ int SetUpgradedParamValue(const mc_OneMultichainParam *param,int64_t value) MAX_CHUNK_COUNT=value; } + if(strcmp(param->m_Name,"anyonecanconnect") == 0) + { + MCP_ANYONE_CAN_CONNECT=value; + } + + if(strcmp(param->m_Name,"anyonecansend") == 0) + { + MCP_ANYONE_CAN_SEND=value; + } + + if(strcmp(param->m_Name,"anyonecanreceive") == 0) + { + MCP_ANYONE_CAN_RECEIVE=value; + } + + if(strcmp(param->m_Name,"anyonecanreceiveempty") == 0) + { + MCP_ANYONE_CAN_RECEIVE_EMPTY=value; + } + + if(strcmp(param->m_Name,"anyonecancreate") == 0) + { + MCP_ANYONE_CAN_CREATE=value; + } + + if(strcmp(param->m_Name,"anyonecanissue") == 0) + { + MCP_ANYONE_CAN_ISSUE=value; + } + + if(strcmp(param->m_Name,"anyonecanactivate") == 0) + { + MCP_ANYONE_CAN_ACTIVATE=value; + } + return MC_ERR_NOERROR; } diff --git a/src/protocol/multichainblock.cpp b/src/protocol/multichainblock.cpp index 663a1523..86e97d84 100644 --- a/src/protocol/multichainblock.cpp +++ b/src/protocol/multichainblock.cpp @@ -191,33 +191,40 @@ int CreateUpgradeLists(int current_height,vector *vParams, if (it != map_last_upgrade.end()) { take_it=false; - if( ( (param.m_Param->m_Type & MC_PRM_TIME) == 0 ) || - ((*vParams)[it->second].m_Block + MIN_BLOCKS_BETWEEN_UPGRADES <= upgrade.m_AppliedBlock) ) + if(( param.m_Param->m_Type & MC_PRM_DATA_TYPE_MASK) == MC_PRM_BOOLEAN ) { - int64_t old_value=(*vParams)[it->second].m_Value; - if(param.m_Value >= old_value) + take_it=true; + } + else + { + if( ( (param.m_Param->m_Type & MC_PRM_TIME) == 0 ) || + ((*vParams)[it->second].m_Block + MIN_BLOCKS_BETWEEN_UPGRADES <= upgrade.m_AppliedBlock) ) { - if(param_value <= 2*old_value) + int64_t old_value=(*vParams)[it->second].m_Value; + if(param.m_Value >= old_value) { - take_it=true; + if(param_value <= 2*old_value) + { + take_it=true; + } } - } - else - { - if(old_value <= 2*param_value) + else { - take_it=true; - } + if(old_value <= 2*param_value) + { + take_it=true; + } + } + if(!take_it) + { + param.m_Skipped =MC_PSK_DOUBLE_RANGE; + } } - if(!take_it) + else { - param.m_Skipped =MC_PSK_DOUBLE_RANGE; + param.m_Skipped = MC_PSK_FRESH_UPGRADE; } } - else - { - param.m_Skipped = MC_PSK_FRESH_UPGRADE; - } if(take_it) { it->second=(int)vParams->size(); @@ -226,21 +233,28 @@ int CreateUpgradeLists(int current_height,vector *vParams, else { take_it=false; - int64_t old_value=mc_gState->m_NetworkParams->GetInt64Param(param.m_Param->m_Name); - - if(param.m_Value >= old_value) + if(( param.m_Param->m_Type & MC_PRM_DATA_TYPE_MASK) == MC_PRM_BOOLEAN ) { - if(param_value <= 2*old_value) - { - take_it=true; - } + take_it=true; } - else + else { - if(old_value <= 2*param_value) + int64_t old_value=mc_gState->m_NetworkParams->GetInt64Param(param.m_Param->m_Name); + + if(param.m_Value >= old_value) { - take_it=true; - } + if(param_value <= 2*old_value) + { + take_it=true; + } + } + else + { + if(old_value <= 2*param_value) + { + take_it=true; + } + } } if(!take_it) { diff --git a/src/rpc/rpcmisc.cpp b/src/rpc/rpcmisc.cpp index 360fbaae..df827d76 100644 --- a/src/rpc/rpcmisc.cpp +++ b/src/rpc/rpcmisc.cpp @@ -742,8 +742,36 @@ Value getblockchainparams(const json_spirit::Array& params, bool fHelp) { param_value=(int)MAX_CHUNK_COUNT; } + if(strcmp("anyonecanconnect",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_CONNECT != 0); + } + if(strcmp("anyonecansend",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_SEND != 0); + } + if(strcmp("anyonecanreceive",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_RECEIVE != 0); + } + if(strcmp("anyonecanreceiveempty",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_RECEIVE_EMPTY != 0); + } + if(strcmp("anyonecancreate",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_CREATE != 0); + } + if(strcmp("anyonecanissue",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_ISSUE != 0); + } + if(strcmp("anyonecanactivate",(mc_gState->m_NetworkParams->m_lpParams+i)->m_Name) == 0) + { + param_value=(MCP_ANYONE_CAN_ACTIVATE != 0); + } } - + if(!hidden) { obj.push_back(Pair(param_name,param_value));