Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
Merge Wallet
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Merge
Merge Wallet
Commits
10395e7a
Commit
10395e7a
authored
Mar 03, 2019
by
coin-server
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v1.0.1.1' into 'master'
V1.0.2 See merge request ProjectMerge/merge!19
parents
397c8491
c56da189
Changes
154
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
154 changed files
with
288 additions
and
465 deletions
+288
-465
COPYING
COPYING
+2
-2
configure.ac
configure.ac
+1
-1
qa/rpc-tests/util.py
qa/rpc-tests/util.py
+1
-1
qa/rpc-tests/util.sh
qa/rpc-tests/util.sh
+1
-1
src/accumulatormap.cpp
src/accumulatormap.cpp
+1
-1
src/accumulatormap.h
src/accumulatormap.h
+1
-1
src/accumulators.h
src/accumulators.h
+1
-1
src/activemasternode.cpp
src/activemasternode.cpp
+2
-2
src/activemasternode.h
src/activemasternode.h
+2
-2
src/bip38.h
src/bip38.h
+1
-1
src/chain.h
src/chain.h
+2
-2
src/chainparams.cpp
src/chainparams.cpp
+2
-2
src/checkpoints.cpp
src/checkpoints.cpp
+2
-2
src/clientversion.h
src/clientversion.h
+2
-2
src/coincontrol.h
src/coincontrol.h
+2
-2
src/coins.cpp
src/coins.cpp
+2
-2
src/core_read.cpp
src/core_read.cpp
+2
-2
src/denomination_functions.cpp
src/denomination_functions.cpp
+2
-2
src/denomination_functions.h
src/denomination_functions.h
+2
-2
src/hash.h
src/hash.h
+2
-2
src/init.cpp
src/init.cpp
+3
-3
src/kernel.cpp
src/kernel.cpp
+2
-2
src/kernel.h
src/kernel.h
+2
-2
src/key.h
src/key.h
+2
-2
src/libzerocoin/Accumulator.cpp
src/libzerocoin/Accumulator.cpp
+1
-1
src/libzerocoin/Accumulator.h
src/libzerocoin/Accumulator.h
+1
-1
src/libzerocoin/AccumulatorProofOfKnowledge.cpp
src/libzerocoin/AccumulatorProofOfKnowledge.cpp
+1
-1
src/libzerocoin/AccumulatorProofOfKnowledge.h
src/libzerocoin/AccumulatorProofOfKnowledge.h
+1
-1
src/libzerocoin/Coin.cpp
src/libzerocoin/Coin.cpp
+1
-1
src/libzerocoin/Coin.h
src/libzerocoin/Coin.h
+1
-1
src/libzerocoin/CoinSpend.cpp
src/libzerocoin/CoinSpend.cpp
+1
-1
src/libzerocoin/CoinSpend.h
src/libzerocoin/CoinSpend.h
+1
-1
src/libzerocoin/Commitment.cpp
src/libzerocoin/Commitment.cpp
+1
-1
src/libzerocoin/Commitment.h
src/libzerocoin/Commitment.h
+1
-1
src/libzerocoin/ParamGeneration.cpp
src/libzerocoin/ParamGeneration.cpp
+1
-1
src/libzerocoin/ParamGeneration.h
src/libzerocoin/ParamGeneration.h
+1
-1
src/libzerocoin/Params.cpp
src/libzerocoin/Params.cpp
+1
-1
src/libzerocoin/Params.h
src/libzerocoin/Params.h
+1
-1
src/libzerocoin/SerialNumberSignatureOfKnowledge.cpp
src/libzerocoin/SerialNumberSignatureOfKnowledge.cpp
+1
-1
src/libzerocoin/SerialNumberSignatureOfKnowledge.h
src/libzerocoin/SerialNumberSignatureOfKnowledge.h
+1
-1
src/libzerocoin/ZerocoinDefines.h
src/libzerocoin/ZerocoinDefines.h
+1
-1
src/libzerocoin/bignum.h
src/libzerocoin/bignum.h
+1
-1
src/libzerocoin/paramgen.cpp
src/libzerocoin/paramgen.cpp
+1
-1
src/main.cpp
src/main.cpp
+2
-2
src/main.h
src/main.h
+2
-2
src/masternode-budget.cpp
src/masternode-budget.cpp
+2
-2
src/masternode-budget.h
src/masternode-budget.h
+2
-2
src/masternode-payments.cpp
src/masternode-payments.cpp
+2
-2
src/masternode-payments.h
src/masternode-payments.h
+2
-2
src/masternode-sync.cpp
src/masternode-sync.cpp
+2
-2
src/masternode-sync.h
src/masternode-sync.h
+2
-2
src/masternode.cpp
src/masternode.cpp
+2
-2
src/masternode.h
src/masternode.h
+2
-2
src/masternodeconfig.cpp
src/masternodeconfig.cpp
+2
-2
src/masternodeconfig.h
src/masternodeconfig.h
+2
-2
src/masternodeman.cpp
src/masternodeman.cpp
+2
-2
src/masternodeman.h
src/masternodeman.h
+2
-2
src/merge-cli.cpp
src/merge-cli.cpp
+2
-2
src/merge-tx.cpp
src/merge-tx.cpp
+2
-2
src/merged.cpp
src/merged.cpp
+2
-2
src/merkleblock.cpp
src/merkleblock.cpp
+2
-2
src/miner.cpp
src/miner.cpp
+2
-2
src/net.cpp
src/net.cpp
+2
-2
src/net.h
src/net.h
+2
-2
src/noui.cpp
src/noui.cpp
+2
-2
src/obfuscation-relay.cpp
src/obfuscation-relay.cpp
+2
-2
src/obfuscation-relay.h
src/obfuscation-relay.h
+2
-2
src/obfuscation.cpp
src/obfuscation.cpp
+2
-2
src/obfuscation.h
src/obfuscation.h
+2
-2
src/pow.cpp
src/pow.cpp
+2
-2
src/primitives/transaction.cpp
src/primitives/transaction.cpp
+2
-2
src/primitives/transaction.h
src/primitives/transaction.h
+2
-2
src/primitives/zerocoin.cpp
src/primitives/zerocoin.cpp
+1
-1
src/primitives/zerocoin.h
src/primitives/zerocoin.h
+1
-1
src/qt/addressbookpage.cpp
src/qt/addressbookpage.cpp
+3
-8
src/qt/addresstablemodel.cpp
src/qt/addresstablemodel.cpp
+2
-2
src/qt/askpassphrasedialog.cpp
src/qt/askpassphrasedialog.cpp
+2
-2
src/qt/bip38tooldialog.cpp
src/qt/bip38tooldialog.cpp
+2
-5
src/qt/bitcoinaddressvalidator.cpp
src/qt/bitcoinaddressvalidator.cpp
+2
-2
src/qt/bitcoingui.cpp
src/qt/bitcoingui.cpp
+5
-21
src/qt/bitcoinunits.cpp
src/qt/bitcoinunits.cpp
+2
-2
src/qt/bitcoinunits.h
src/qt/bitcoinunits.h
+2
-2
src/qt/clientmodel.cpp
src/qt/clientmodel.cpp
+2
-2
src/qt/clientmodel.h
src/qt/clientmodel.h
+2
-2
src/qt/coincontroldialog.cpp
src/qt/coincontroldialog.cpp
+8
-14
src/qt/editaddressdialog.cpp
src/qt/editaddressdialog.cpp
+2
-2
src/qt/forms/optionsdialog.ui
src/qt/forms/optionsdialog.ui
+0
-24
src/qt/guiconstants.h
src/qt/guiconstants.h
+2
-2
src/qt/guiutil.cpp
src/qt/guiutil.cpp
+10
-36
src/qt/guiutil.h
src/qt/guiutil.h
+1
-1
src/qt/intro.cpp
src/qt/intro.cpp
+2
-2
src/qt/macdockiconhandler.mm
src/qt/macdockiconhandler.mm
+1
-9
src/qt/macnotificationhandler.mm
src/qt/macnotificationhandler.mm
+1
-1
src/qt/merge.cpp
src/qt/merge.cpp
+3
-47
src/qt/multisigdialog.cpp
src/qt/multisigdialog.cpp
+1
-1
src/qt/multisigdialog.h
src/qt/multisigdialog.h
+1
-1
src/qt/openuridialog.cpp
src/qt/openuridialog.cpp
+3
-5
src/qt/optionsdialog.cpp
src/qt/optionsdialog.cpp
+8
-26
src/qt/optionsmodel.cpp
src/qt/optionsmodel.cpp
+2
-2
src/qt/overviewpage.cpp
src/qt/overviewpage.cpp
+2
-2
src/qt/paymentrequestplus.cpp
src/qt/paymentrequestplus.cpp
+0
-2
src/qt/paymentserver.cpp
src/qt/paymentserver.cpp
+4
-13
src/qt/peertablemodel.cpp
src/qt/peertablemodel.cpp
+1
-2
src/qt/receiverequestdialog.cpp
src/qt/receiverequestdialog.cpp
+0
-3
src/qt/rpcconsole.cpp
src/qt/rpcconsole.cpp
+7
-8
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.cpp
+2
-2
src/qt/sendcoinsentry.cpp
src/qt/sendcoinsentry.cpp
+2
-4
src/qt/signverifymessagedialog.cpp
src/qt/signverifymessagedialog.cpp
+2
-4
src/qt/splashscreen.cpp
src/qt/splashscreen.cpp
+3
-3
src/qt/test/test_main.cpp
src/qt/test/test_main.cpp
+2
-2
src/qt/transactiondesc.cpp
src/qt/transactiondesc.cpp
+2
-2
src/qt/transactionrecord.cpp
src/qt/transactionrecord.cpp
+2
-2
src/qt/transactionview.cpp
src/qt/transactionview.cpp
+0
-4
src/qt/utilitydialog.cpp
src/qt/utilitydialog.cpp
+2
-2
src/qt/walletmodel.cpp
src/qt/walletmodel.cpp
+2
-2
src/qt/winshutdownmonitor.cpp
src/qt/winshutdownmonitor.cpp
+1
-1
src/qt/winshutdownmonitor.h
src/qt/winshutdownmonitor.h
+0
-2
src/qt/zpivcontroldialog.cpp
src/qt/zpivcontroldialog.cpp
+1
-1
src/qt/zpivcontroldialog.h
src/qt/zpivcontroldialog.h
+1
-1
src/rpcblockchain.cpp
src/rpcblockchain.cpp
+2
-2
src/rpcclient.cpp
src/rpcclient.cpp
+2
-2
src/rpcdump.cpp
src/rpcdump.cpp
+2
-2
src/rpcmasternode-budget.cpp
src/rpcmasternode-budget.cpp
+2
-2
src/rpcmasternode.cpp
src/rpcmasternode.cpp
+2
-2
src/rpcmining.cpp
src/rpcmining.cpp
+2
-2
src/rpcmisc.cpp
src/rpcmisc.cpp
+2
-2
src/rpcnet.cpp
src/rpcnet.cpp
+2
-2
src/rpcprotocol.cpp
src/rpcprotocol.cpp
+2
-2
src/rpcrawtransaction.cpp
src/rpcrawtransaction.cpp
+2
-2
src/rpcserver.cpp
src/rpcserver.cpp
+2
-2
src/rpcserver.h
src/rpcserver.h
+2
-2
src/rpcwallet.cpp
src/rpcwallet.cpp
+5
-4
src/serialize.h
src/serialize.h
+2
-2
src/spork.cpp
src/spork.cpp
+1
-1
src/spork.h
src/spork.h
+1
-1
src/sporkdb.cpp
src/sporkdb.cpp
+1
-1
src/sporkdb.h
src/sporkdb.h
+1
-1
src/swifttx.cpp
src/swifttx.cpp
+1
-1
src/swifttx.h
src/swifttx.h
+2
-2
src/test/main_tests.cpp
src/test/main_tests.cpp
+2
-2
src/test/netbase_tests.cpp
src/test/netbase_tests.cpp
+2
-2
src/txmempool.cpp
src/txmempool.cpp
+1
-1
src/txmempool.h
src/txmempool.h
+1
-1
src/uint256.h
src/uint256.h
+2
-2
src/util.cpp
src/util.cpp
+2
-2
src/util.h
src/util.h
+2
-2
src/utilstrencodings.cpp
src/utilstrencodings.cpp
+1
-1
src/utiltime.h
src/utiltime.h
+1
-1
src/version.h
src/version.h
+2
-2
src/wallet.cpp
src/wallet.cpp
+2
-2
src/wallet.h
src/wallet.h
+2
-2
src/wallet_ismine.cpp
src/wallet_ismine.cpp
+1
-1
src/walletdb.cpp
src/walletdb.cpp
+2
-2
src/walletdb.h
src/walletdb.h
+1
-1
No files found.
COPYING
View file @
10395e7a
Copyright (c) 2009-2015 Bitcoin Developers
Copyright (c) 2014-2015 Dash Developers
Copyright (c) 2015-201
7
PIVX Developers
Copyright (c) 2018 MERGE Developers
Copyright (c) 2015-201
8
PIVX Developers
Copyright (c) 2018
-2019
MERGE Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
...
...
configure.ac
View file @
10395e7a
...
...
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION,
1
)
define(_CLIENT_VERSION_REVISION,
2
)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
...
...
qa/rpc-tests/util.py
View file @
10395e7a
# Copyright (c) 2014 The Bitcoin Core developers
# Copyright (c) 2014-2015 The Dash developers
# Copyright (c) 2015-201
7 The PIVX d
evelopers
# Copyright (c) 2015-201
8 PIVX D
evelopers
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
#
...
...
qa/rpc-tests/util.sh
View file @
10395e7a
#!/usr/bin/env bash
# Copyright (c) 2014 The Bitcoin Core developers
# Copyright (c) 2014-2015 The Dash developers
# Copyright (c) 2015-201
7 The PIVX d
evelopers
# Copyright (c) 2015-201
8 PIVX D
evelopers
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/accumulatormap.cpp
View file @
10395e7a
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/accumulatormap.h
View file @
10395e7a
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef MERGE_ACCUMULATORMAP_H
...
...
src/accumulators.h
View file @
10395e7a
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/activemasternode.cpp
View file @
10395e7a
// Copyright (c) 2014-2016 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/activemasternode.h
View file @
10395e7a
// Copyright (c) 2014-2016 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/bip38.h
View file @
10395e7a
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/chain.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/chainparams.cpp
View file @
10395e7a
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/checkpoints.cpp
View file @
10395e7a
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/clientversion.h
View file @
10395e7a
...
...
@@ -16,7 +16,7 @@
//! These need to be macros, as clientversion.cpp's and MERGE*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION
1
#define CLIENT_VERSION_REVISION
2
#define CLIENT_VERSION_BUILD 0
//! Set to true for release, false for prerelease or test build
...
...
@@ -39,7 +39,7 @@
#define DO_STRINGIZE(X) #X
//! Copyright string used in Windows .rc files
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers, 2015-" STRINGIZE(COPYRIGHT_YEAR) " The Merge Core Developers"
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The Dash Core Developers, 2015-" STRINGIZE(COPYRIGHT_YEAR) " The
PIVX Core Developers, 2018-" STRINGIZE(COPYRIGHT_YEAR) " The
Merge Core Developers"
/**
* merged-res.rc includes this file, but it cannot cope with real c++ code.
...
...
src/coincontrol.h
View file @
10395e7a
// Copyright (c) 2011-2013 The Bitcoin developers
// Copyright (c) 2014-2016 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/coins.cpp
View file @
10395e7a
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/core_read.cpp
View file @
10395e7a
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/denomination_functions.cpp
View file @
10395e7a
...
...
@@ -6,8 +6,8 @@
* @copyright Copyright 2017 PIVX Developers
* @license This project is released under the MIT license.
**/
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "denomination_functions.h"
...
...
src/denomination_functions.h
View file @
10395e7a
...
...
@@ -6,8 +6,8 @@
* @copyright Copyright 2017 PIVX Developers
* @license This project is released under the MIT license.
**/
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "reverse_iterate.h"
#include "util.h"
...
...
src/hash.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/init.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
@@ -534,7 +534,7 @@ std::string LicenseInfo()
"
\n
"
+
FormatParagraph
(
strprintf
(
_
(
"Copyright (C) 2015-%i The PIVX Developers"
),
COPYRIGHT_YEAR
))
+
"
\n
"
+
"
\n
"
+
FormatParagraph
(
strprintf
(
_
(
"Copyright (C) %i The Merge Developers"
),
COPYRIGHT_YEAR
))
+
"
\n
"
+
FormatParagraph
(
strprintf
(
_
(
"Copyright (C)
2018-
%i The Merge Developers"
),
COPYRIGHT_YEAR
))
+
"
\n
"
+
"
\n
"
+
FormatParagraph
(
_
(
"This is experimental software."
))
+
"
\n
"
+
"
\n
"
+
...
...
src/kernel.cpp
View file @
10395e7a
/* @flow */
// Copyright (c) 2012-2013 The PPCoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/kernel.h
View file @
10395e7a
// Copyright (c) 2012-2013 The PPCoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_KERNEL_H
...
...
src/key.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/libzerocoin/Accumulator.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include <sstream>
#include <iostream>
...
...
src/libzerocoin/Accumulator.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef ACCUMULATOR_H_
#define ACCUMULATOR_H_
...
...
src/libzerocoin/AccumulatorProofOfKnowledge.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "AccumulatorProofOfKnowledge.h"
#include "hash.h"
...
...
src/libzerocoin/AccumulatorProofOfKnowledge.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef ACCUMULATEPROOF_H_
#define ACCUMULATEPROOF_H_
...
...
src/libzerocoin/Coin.cpp
View file @
10395e7a
...
...
@@ -11,7 +11,7 @@
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include <stdexcept>
#include <iostream>
#include "Coin.h"
...
...
src/libzerocoin/Coin.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef COIN_H_
#define COIN_H_
...
...
src/libzerocoin/CoinSpend.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "CoinSpend.h"
#include <iostream>
namespace
libzerocoin
...
...
src/libzerocoin/CoinSpend.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef COINSPEND_H_
#define COINSPEND_H_
...
...
src/libzerocoin/Commitment.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include <stdlib.h>
#include "Commitment.h"
...
...
src/libzerocoin/Commitment.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef COMMITMENT_H_
#define COMMITMENT_H_
...
...
src/libzerocoin/ParamGeneration.cpp
View file @
10395e7a
...
...
@@ -9,7 +9,7 @@
/// \copyright Copyright 2013 Ian Miers, Christina Garman and Matthew Green
/// \license This project is released under the MIT license.
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "ParamGeneration.h"
#include <string>
#include <cmath>
...
...
src/libzerocoin/ParamGeneration.h
View file @
10395e7a
...
...
@@ -8,7 +8,7 @@
/// \copyright Copyright 2013 Ian Miers, Christina Garman and Matthew Green
/// \license This project is released under the MIT license.
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef PARAMGENERATION_H_
#define PARAMGENERATION_H_
...
...
src/libzerocoin/Params.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include "Params.h"
#include "ParamGeneration.h"
...
...
src/libzerocoin/Params.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef PARAMS_H_
#define PARAMS_H_
...
...
src/libzerocoin/SerialNumberSignatureOfKnowledge.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include <streams.h>
#include "SerialNumberSignatureOfKnowledge.h"
...
...
src/libzerocoin/SerialNumberSignatureOfKnowledge.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef SERIALNUMBERPROOF_H_
#define SERIALNUMBERPROOF_H_
...
...
src/libzerocoin/ZerocoinDefines.h
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#ifndef ZEROCOIN_DEFINES_H_
#define ZEROCOIN_DEFINES_H_
...
...
src/libzerocoin/bignum.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2012 The Bitcoin developers
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_BIGNUM_H
...
...
src/libzerocoin/paramgen.cpp
View file @
10395e7a
...
...
@@ -10,7 +10,7 @@
* @license This project is released under the MIT license.
**/
// Copyright (c) 2017 The PIVX developers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
#include <string>
...
...
src/main.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/main.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-budget.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-budget.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-payments.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-payments.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-sync.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode-sync.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternode.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternodeconfig.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternodeconfig.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternodeman.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/masternodeman.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/merge-cli.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2015 The Bitcoin developers
// Copyright (c) 2009-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/merge-tx.cpp
View file @
10395e7a
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/merged.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/merkleblock.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/miner.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/net.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/net.h
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/noui.cpp
View file @
10395e7a
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/obfuscation-relay.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/obfuscation-relay.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/obfuscation.cpp
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/obfuscation.h
View file @
10395e7a
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers
// Copyright (c) 2018
The Merge d
evelopers
// Copyright (c) 2015-201
8 PIVX D
evelopers
// Copyright (c) 2018
-2019 MERGE D
evelopers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
...
...
src/pow.cpp
View file @
10395e7a
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-201
7 The PIVX d
evelopers