Skip to content

Commit

Permalink
NMN init2
Browse files Browse the repository at this point in the history
  • Loading branch information
f committed Apr 8, 2019
1 parent 3c8185d commit 569cd45
Show file tree
Hide file tree
Showing 605 changed files with 942 additions and 606 deletions.
Empty file modified .travis/lint_04_install.sh 100755 → 100644
Empty file.
Empty file modified .travis/lint_05_before_script.sh 100755 → 100644
Empty file.
Empty file modified .travis/lint_06_script.sh 100755 → 100644
Empty file.
Empty file modified .travis/test_03_before_install.sh 100755 → 100644
Empty file.
Empty file modified .travis/test_04_install.sh 100755 → 100644
Empty file.
Empty file modified .travis/test_05_before_script.sh 100755 → 100644
Empty file.
Empty file modified .travis/test_06_script.sh 100755 → 100644
Empty file.
Empty file modified autogen.sh 100755 → 100644
Empty file.
6 changes: 3 additions & 3 deletions configure.ac
@@ -1,8 +1,8 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
Expand Down
Empty file modified contrib/debian/rules 100755 → 100644
Empty file.
Empty file modified contrib/devtools/check-doc.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/fix-copyright-headers.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/git-subtree-check.sh 100755 → 100644
Empty file.
Empty file modified contrib/devtools/github-merge.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/lint-whitespace.sh 100755 → 100644
Empty file.
Empty file modified contrib/devtools/logprint-scanner.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/security-check.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/symbol-check.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/test-security-check.py 100755 → 100644
Empty file.
Empty file modified contrib/devtools/update-translations.py 100755 → 100644
Empty file.
Empty file modified contrib/filter-lcov.py 100755 → 100644
Empty file.
Empty file modified contrib/gitian-build.py 100755 → 100644
Empty file.
Empty file modified contrib/install_db4.sh 100755 → 100644
Empty file.
Empty file modified contrib/linearize/linearize-data.py 100755 → 100644
Empty file.
Empty file modified contrib/linearize/linearize-hashes.py 100755 → 100644
Empty file.
Empty file modified contrib/macdeploy/detached-sig-apply.sh 100755 → 100644
Empty file.
Empty file modified contrib/macdeploy/detached-sig-create.sh 100755 → 100644
Empty file.
Empty file modified contrib/macdeploy/extract-osx-sdk.sh 100755 → 100644
Empty file.
Empty file modified contrib/macdeploy/macdeployqtplus 100755 → 100644
Empty file.
Empty file modified contrib/qt_translations.py 100755 → 100644
Empty file.
Empty file modified contrib/spendfrom/spendfrom.py 100755 → 100644
Empty file.
Empty file modified contrib/testgen/gen_base58_test_vectors.py 100755 → 100644
Empty file.
Empty file modified contrib/tidy_datadir.sh 100755 → 100644
Empty file.
Empty file modified contrib/verifysfbinaries/verify.sh 100755 → 100644
Empty file.
Empty file modified contrib/windeploy/detached-sig-create.sh 100755 → 100644
Empty file.
Empty file modified contrib/zmq/zmq_sub.py 100755 → 100644
Empty file.
Empty file modified depends/config.guess 100755 → 100644
Empty file.
Empty file modified depends/config.sub 100755 → 100644
Empty file.
Empty file modified share/genbuild.sh 100755 → 100644
Empty file.
Empty file modified share/pixmaps/addressbook16.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/addressbook16mask.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/addressbook20.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/addressbook20mask.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin-bc.ico 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin.ico 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin128.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified share/pixmaps/bitcoin128.xpm 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin16.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified share/pixmaps/bitcoin16.xpm 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin256.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified share/pixmaps/bitcoin256.xpm 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin32.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified share/pixmaps/bitcoin32.xpm 100755 → 100644
Empty file.
Empty file modified share/pixmaps/bitcoin64.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified share/pixmaps/bitcoin64.xpm 100755 → 100644
Empty file.
Empty file modified share/pixmaps/check.ico 100755 → 100644
Empty file.
Empty file modified share/pixmaps/favicon.ico 100755 → 100644
Empty file.
Empty file modified share/pixmaps/nsis-header.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/nsis-wizard.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/send16.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/send16mask.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/send16masknoshadow.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/send20.bmp 100755 → 100644
Empty file.
Empty file modified share/pixmaps/send20mask.bmp 100755 → 100644
Empty file.
Empty file modified share/qt/extract_strings_qt.py 100755 → 100644
Empty file.
Empty file modified share/qt/make_spinner.py 100755 → 100644
Empty file.
Empty file modified share/qt/make_windows_icon.sh 100755 → 100644
Empty file.
Empty file modified share/rpcauth/rpcauth.py 100755 → 100644
Empty file.
Empty file modified src/Makefile.am 100755 → 100644
Empty file.
Empty file modified src/Makefile.qt.include 100755 → 100644
Empty file.
3 changes: 1 addition & 2 deletions src/accumulatorcheckpoints.cpp
@@ -1,4 +1,4 @@
// Copyright (c) 2018 The NMN developers
// Copyright (c) 2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -82,4 +82,3 @@ namespace AccumulatorCheckpoints
return Checkpoint();
}
}

2 changes: 1 addition & 1 deletion src/accumulatorcheckpoints.h
@@ -1,4 +1,4 @@
// Copyright (c) 2018 The NMN developers
// Copyright (c) 2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
4 changes: 1 addition & 3 deletions src/accumulatormap.cpp
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2018 The NMN developers
// Copyright (c) 2017-2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -96,5 +96,3 @@ uint256 AccumulatorMap::GetCheckpoint()

return nCheckpoint;
}


2 changes: 1 addition & 1 deletion src/accumulatormap.h
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2018 The NMN developers
// Copyright (c) 2017-2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
2 changes: 1 addition & 1 deletion src/accumulators.cpp
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2018 The NMN developers
// Copyright (c) 2017-2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
2 changes: 1 addition & 1 deletion src/accumulators.h
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2018 The NMN developers
// Copyright (c) 2017-2018 The PIVX developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/activemasternode.cpp
@@ -1,5 +1,6 @@
// Copyright (c) 2014-2016 The Dash developers
// Copyright (c) 2015-2018 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/activemasternode.h
@@ -1,5 +1,6 @@
// Copyright (c) 2014-2016 The Dash developers
// Copyright (c) 2015-2018 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/addrman.cpp
@@ -1,6 +1,7 @@
// Copyright (c) 2012 Pieter Wuille
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
11 changes: 6 additions & 5 deletions src/addrman.h
@@ -1,6 +1,7 @@
// Copyright (c) 2012 Pieter Wuille
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -19,8 +20,8 @@
#include <stdint.h>
#include <vector>

/**
* Extended statistics about a CAddress
/**
* Extended statistics about a CAddress
*/
class CAddrInfo : public CAddress
{
Expand Down Expand Up @@ -165,8 +166,8 @@ class CAddrInfo : public CAddress
//! the maximum number of nodes to return in a getaddr call
#define ADDRMAN_GETADDR_MAX 2500

/**
* Stochastical (IP) address manager
/**
* Stochastical (IP) address manager
*/
class CAddrMan
{
Expand Down
3 changes: 2 additions & 1 deletion src/alert.cpp
@@ -1,6 +1,7 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/alert.h
@@ -1,6 +1,7 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2013 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/amount.cpp
@@ -1,6 +1,7 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/amount.h
@@ -1,6 +1,7 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/base58.cpp
@@ -1,5 +1,6 @@
// Copyright (c) 2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/base58.h
@@ -1,6 +1,7 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/bip38.cpp
@@ -1,4 +1,5 @@
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/bip38.h
@@ -1,4 +1,5 @@
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/blocksignature.cpp
@@ -1,4 +1,5 @@
// Copyright (c) 2017-2018 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
3 changes: 2 additions & 1 deletion src/blocksignature.h
@@ -1,4 +1,5 @@
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
5 changes: 3 additions & 2 deletions src/bloom.cpp
@@ -1,5 +1,6 @@
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand All @@ -26,7 +27,7 @@
using namespace std;

CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) :
/**
/**
* The ideal size for a bloom filter with a given number of elements and false positive rate is:
* - nElements * log(fp rate) / ln(2)^2
* We ignore filter parameters which will create a bloom filter larger than the protocol limits
Expand Down
9 changes: 5 additions & 4 deletions src/bloom.h
@@ -1,5 +1,6 @@
// Copyright (c) 2012-2014 The Bitcoin developers
// Copyright (c) 2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -34,11 +35,11 @@ enum bloomflags {
/**
* BloomFilter is a probabilistic filter which SPV clients provide
* so that we can filter the transactions we sends them.
*
*
* This allows for significantly more efficient transaction and block downloads.
*
*
* Because bloom filters are probabilistic, an SPV node can increase the false-
* positive rate, making us send them transactions which aren't actually theirs,
* positive rate, making us send them transactions which aren't actually theirs,
* allowing clients to trade more bandwidth for more privacy by obfuscating which
* keys are owned by them.
*/
Expand Down
5 changes: 3 additions & 2 deletions src/chain.cpp
@@ -1,6 +1,7 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2016-2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -77,4 +78,4 @@ uint256 CBlockIndex::GetBlockTrust() const
uint256 bnPoWTrust = ((~uint256(0) >> 20) / (bnTarget + 1));
return bnPoWTrust > 1 ? bnPoWTrust : 1;
}
}
}
11 changes: 6 additions & 5 deletions src/chain.h
@@ -1,6 +1,7 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2015-2017 The NMN developers
// Copyright (c) 2015-2018 The PIVX developers
// Copyright (c) 2019 The NMN developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -176,11 +177,11 @@ class CBlockIndex

//! (memory only) Sequential id assigned to distinguish order in which blocks are received.
uint32_t nSequenceId;

//! zerocoin specific fields
std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
std::vector<libzerocoin::CoinDenomination> vMintDenominationsInBlock;

void SetNull()
{
phashBlock = NULL;
Expand Down Expand Up @@ -252,7 +253,7 @@ class CBlockIndex
nStakeTime = 0;
}
}


CDiskBlockPos GetBlockPos() const
{
Expand Down Expand Up @@ -374,7 +375,7 @@ class CBlockIndex

/**
* Returns true if there are nRequired or more blocks of minVersion or above
* in the last Params().ToCheckBlockUpgradeMajority() blocks, starting at pstart
* in the last Params().ToCheckBlockUpgradeMajority() blocks, starting at pstart
* and going backwards.
*/
static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRequired);
Expand Down

0 comments on commit 569cd45

Please sign in to comment.