Skip to content

Commit

Permalink
Merge pull request bitcoin#509 from peercoin/develop
Browse files Browse the repository at this point in the history
developed patches
  • Loading branch information
peerchemist committed Feb 5, 2020
2 parents 2d58c98 + 96b3216 commit dd567df
Show file tree
Hide file tree
Showing 61 changed files with 260 additions and 231 deletions.
13 changes: 4 additions & 9 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<!-- This issue tracker is only for technical issues related to Bitcoin Core.
<!-- This issue tracker is only for technical issues related to reference implementation of the Peercoin.
General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
General Peercoin questions and/or support requests are best directed to the Peercoin Forum: https://talk.peercoin.net/.
<!-- Describe the issue -->
<!--- What behavior did you expect? -->
Expand All @@ -13,9 +9,8 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p

<!--- How reliably can you reproduce the issue, what are the steps to do so? -->

<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->

<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
<!-- What version of Peercoin are you using, where did you get it (website, self-compiled, etc)? Which OS do you use, on which platform? -->

<!-- Any extra information that might be useful in the debugging process. -->

<!--- This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. -->
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2011-2019 Peercoin Developers
Copyright (c) 2011-2020 Peercoin Developers
Copyright (c) 2009-2018 The Bitcoin Core developers
Copyright (c) 2009-2018 Bitcoin Developers

Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2012-2019 The Peercoin developers
# Copyright (c) 2012-2020 The Peercoin developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Peercoin Official Development Repo
[![Build Status](https://travis-ci.org/peercoin/peercoin.svg?branch=master)](https://travis-ci.org/peercoin/peercoin)

### What is Peercoin?
[Peercoin](https://peercoin.net) (abbreviated PPC), previously known as PPCoin, is the first [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) design introducing [proof-of-stake consensus](https://peercoin.net/resources.html#whitepaper) as a security model, with a combined [proof-of-stake](https://peercoin.net/resources.html#whitepaper)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) minting system. Peercoin is based on [Bitcoin](https://bitcoin.org), while introducing many important innovations to cryptocurrency field including new security model, energy efficiency, better minting model and more adaptive response to rapid change in network computation power.
[Peercoin](https://peercoin.net) (abbreviated PPC), previously known as PPCoin, is the first [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) design introducing [proof-of-stake consensus](https://peercoin.net/resources#whitepaper) as a security model, with a combined [proof-of-stake](https://peercoin.net/resources#whitepaper)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) minting system. Peercoin is based on [Bitcoin](https://bitcoin.org), while introducing many important innovations to cryptocurrency field including new security model, energy efficiency, better minting model and more adaptive response to rapid change in network computation power.

### Peercoin Resources
* Client and Source:
[Client Binaries](https://peercoin.net/wallet.html),
[Client Binaries](https://peercoin.net/wallet),
[Source Code](https://github.com/peercoin/peercoin)
* Documentation: [Peercoin Whitepaper](https://peercoin.net/resources.html#whitepaper),
[Peercoin Wiki](https://github.com/peercoin/peercoin/wiki)
* Documentation: [Peercoin Whitepaper](https://peercoin.net/resources#whitepaper),
[Peercoin Docs](https://docs.peercoin.net)
* Help:
[Forum](https://talk.peercoin.net),
[Intro & Important Links](https://talk.peercoin.net/t/what-is-peercoin-intro-important-links/2889)
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ define(_CLIENT_VERSION_REVISION, 3)
define(_CLIENT_VERSION_BUILD, 0)
define(_PEERCOIN_VERSION_MAJOR, 0)
define(_PEERCOIN_VERSION_MINOR, 8)
define(_PEERCOIN_VERSION_REVISION, 4)
define(_PEERCOIN_VERSION_REVISION, 5)
define(_PEERCOIN_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)
define(_COPYRIGHT_YEAR, 2020)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Peercoin]])
AC_INIT([Peercoin],[_PEERCOIN_VERSION_MAJOR._PEERCOIN_VERSION_MINOR._PEERCOIN_VERSION_REVISION],[https://github.com/peercoin/peercoin/issues],[peercoin],[https://peercoin.net/])
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Contact: Stichting Peercoin Foundation <foundation@peercoin.net>
Source: https://github.com/peercoin/peercoin

Files: *
Copyright: 2012-2019, Peercoin Developers
Copyright: 2011-2020 Peercoin Developers
License: Expat
Comment: The Peercoin Developers encompasses the current developers listed on https://github.com/peercoin/peercoin,
as well as the numerous contributors to the project.
Expand Down
4 changes: 2 additions & 2 deletions doc/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Bitcoin Core"
PROJECT_NAME = "Peercoin"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
Expand All @@ -51,7 +51,7 @@ PROJECT_BRIEF = "P2P Digital Currency"
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.

PROJECT_LOGO = doc/bitcoin_logo_doxygen.png
PROJECT_LOGO = src/qt/res/icons/peercoin.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
Expand Down
13 changes: 7 additions & 6 deletions doc/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Peercoin 0.8.4 BETA
Peercoin 0.8.5 BETA

Setup
---------------------
Peercoin Core is the original Peercoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Peercoin transactions (which is currently more than 100 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
Peercoin is the original Peercoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Peercoin transactions (which is currently less than one gigabyte); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.

To download Peercoin Core, visit [peercoin.net](https://peercoin.net/download).
To download Peercoin, visit [peercoin.net](https://peercoin.net/download).

Running
---------------------
Expand All @@ -23,12 +23,13 @@ Unpack the files into a directory, and then run peercoin-qt.exe.

### OS X

Drag Peercoin-Core to your applications folder, and then run Peercoin-Core.
Drag Peercoin to your applications folder, and then run Peercoin.

### Need Help?

* See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page)
for help and more information. Peercoin is very similar to bitcoin, so you can use their wiki.
* See the documentation at the [Peercoin Wiki](https://docs.peercoin.net/)
for help and more information.
* Peercoin is very similar to bitcoin, so you can use their wiki [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page).
* Ask for help on [#general](https://peercoin.chat/) on peercoin.chat.

Building
Expand Down
10 changes: 5 additions & 5 deletions doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Peercoin 0.8.4 BETA
Peercoin 0.8.5 BETA

Copyright (c) 2011-2019 Peercoin Developers
Distributed under the MIT/X11 software license, see the accompanying
Copyright (c) 2011-2020 Peercoin Developers
Distributed under the MIT software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
the OpenSSL Toolkit (http://www.openssl.org/). This product includes
Expand All @@ -25,6 +25,6 @@ However, it downloads and stores the entire history of Peercoin transactions;
depending on the speed of your computer and network connection, the synchronization
process can take anywhere from a few hours to a day or more.

See the bitcoin wiki at:
https://en.bitcoin.it/wiki/Main_Page
See the peercoin documentation at:
https://docs.peercoin.net/
for more help and information.
2 changes: 1 addition & 1 deletion doc/REST-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ Only supports JSON as output format.

Risks
-------------
Running a web browser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `<script src="http://127.0.0.1:8332/rest/tx/1234567890.json">` which might break the nodes privacy.
Running a web browser on the same node with a REST enabled peercoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `<script src="http://127.0.0.1:8332/rest/tx/1234567890.json">` which might break the nodes privacy.
2 changes: 1 addition & 1 deletion doc/assets-attribution.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The list of assets used in the bitcoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).
The list of assets used in the peercoin source and their attribution can now be found in [contrib/debian/copyright](../contrib/debian/copyright).
4 changes: 2 additions & 2 deletions doc/benchmarking.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Benchmarking
============

Bitcoin Core has an internal benchmarking framework, with benchmarks
Peercoin has an internal benchmarking framework, with benchmarks
for cryptographic algorithms such as SHA1, SHA256, SHA512 and RIPEMD160. As well as the rolling bloom filter.

Running
---------------------
After compiling bitcoin-core, the benchmarks can be run with:
After compiling peercoin, the benchmarks can be run with:

src/bench/bench_bitcoin

Expand Down
6 changes: 3 additions & 3 deletions doc/build-netbsd.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ NetBSD build guide
======================
(updated for NetBSD 7.0)

This guide describes how to build bitcoind and command-line utilities on NetBSD.
This guide describes how to build peercoind and command-line utilities on NetBSD.

This guide does not contain instructions for building the GUI.

Expand All @@ -25,12 +25,12 @@ python27

Download the source code:
```
git clone https://github.com/bitcoin/bitcoin
git clone https://github.com/peercoin/peercoin
```

See [dependencies.md](dependencies.md) for a complete overview.

### Building Bitcoin Core
### Building Peercoin

**Important**: Use `gmake` (the non-GNU `make` will exit with an error).

Expand Down
6 changes: 3 additions & 3 deletions doc/build-openbsd.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ OpenBSD build guide
======================
(updated for OpenBSD 6.2)

This guide describes how to build bitcoind and command-line utilities on OpenBSD.
This guide describes how to build peercoind and command-line utilities on OpenBSD.

OpenBSD is most commonly used as a server OS, so this guide does not contain instructions for building the GUI.

Expand All @@ -18,7 +18,7 @@ pkg_add automake # (select highest version, e.g. 1.15)
pkg_add python # (select highest version, e.g. 3.6)
pkg_add boost

git clone https://github.com/bitcoin/bitcoin.git
git clone https://github.com/peercoin/peercoin.git
```

See [dependencies.md](dependencies.md) for a complete overview.
Expand Down Expand Up @@ -49,7 +49,7 @@ from the root of the repository. Then set `BDB_PREFIX` for the next section:
export BDB_PREFIX="$PWD/db4"
```

### Building Bitcoin Core
### Building Peercoin

**Important**: use `gmake`, not `make`. The non-GNU `make` will exit with a horrible error.

Expand Down
6 changes: 3 additions & 3 deletions doc/build-unix.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
UNIX BUILD NOTES
====================
Some notes on how to build Peercoin Core in Unix.
Some notes on how to build Peercoin in Unix.

(for OpenBSD specific instructions, see [build-openbsd.md](build-openbsd.md))

Expand Down Expand Up @@ -55,7 +55,7 @@ Memory Requirements
--------------------

C++ compilers are memory-hungry. It is recommended to have at least 1.5 GB of
memory available when compiling Peercoin Core. On systems with less, gcc can be
memory available when compiling Peercoin. On systems with less, gcc can be
tuned to conserve memory with additional CXXFLAGS:


Expand All @@ -80,7 +80,7 @@ install necessary parts of boost:
sudo apt-get install libboost-all-dev

BerkeleyDB is required for the wallet functionality.
Historically Bitcoin was first deployed with now deprecated BerkeleyDB-4.8, which has resulted in the need to upkeep the compatibility with those ancient deployments to this day. BerkeleyDB-4.8 is not compatible with more modern BerkeleyDB-5.1 and BerkeleyDB-5.3. Peercoin has inherited this in the first versions and this is why Peercoin is still officially shipped out with BerkeleyDB-4.8.
Historically Peercoin was first deployed with now deprecated BerkeleyDB-4.8, which has resulted in the need to upkeep the compatibility with those ancient deployments to this day. BerkeleyDB-4.8 is not compatible with more modern BerkeleyDB-5.1 and BerkeleyDB-5.3. Peercoin has inherited this in the first versions and this is why Peercoin is still officially shipped out with BerkeleyDB-4.8.
However if you running a new wallet on a new installation there is absolutely no need to run old and deprecated BerkeleyDB-4.8. Just use the one avaliable in the repository of your distribution.

**For Ubuntu only:** db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
Expand Down
30 changes: 15 additions & 15 deletions doc/build-windows.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
WINDOWS BUILD NOTES
====================

Below are some notes on how to build Bitcoin Core for Windows.
Below are some notes on how to build Peercoin for Windows.

The options known to work for building Bitcoin Core on Windows are:
The options known to work for building Peercoin on Windows are:

* On Linux using the [Mingw-w64](https://mingw-w64.org/doku.php) cross compiler tool chain. Ubuntu Bionic 18.04 is required
and is the platform used to build the Bitcoin Core Windows release binaries.
and is the platform used to build the Peercoin Windows release binaries.
* On Windows using [Windows
Subsystem for Linux (WSL)](https://msdn.microsoft.com/commandline/wsl/about) and the Mingw-w64 cross compiler tool chain.

Expand Down Expand Up @@ -78,15 +78,15 @@ Ubuntu Bionic 18.04 <sup>[1](#footnote1)</sup>:

Once the tool chain is installed the build steps are common:

Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
Note that for WSL the Peercoin source path MUST be somewhere in the default mount file system, for
example /usr/src/peercoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
This means you cannot use a directory that located directly on the host Windows file system to perform the build.

The next three steps are an example of how to acquire the source in an appropriate way.

cd /usr/src
sudo git clone https://github.com/bitcoin/bitcoin.git
sudo chmod -R a+rw bitcoin
sudo git clone https://github.com/peercoin/peercoin.git
sudo chmod -R a+rw peercoin

Once the source code is ready the build steps are below.

Expand All @@ -108,15 +108,15 @@ For Ubuntu Bionic 18.04 and Windows Subsystem for Linux <sup>[1](#footnote1)</su

sudo update-alternatives --config i686-w64-mingw32-g++ # Set the default mingw32 g++ compiler option to posix.

Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for
example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
Note that for WSL the Peercoin source path MUST be somewhere in the default mount file system, for
example /usr/src/peercoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.
This means you cannot use a directory that located directly on the host Windows file system to perform the build.

The next three steps are an example of how to acquire the source in an appropriate way.

cd /usr/src
sudo git clone https://github.com/bitcoin/bitcoin.git
sudo chmod -R a+rw bitcoin
sudo git clone https://github.com/peercoin/peercoin.git
sudo chmod -R a+rw peercoin

Then build using:

Expand All @@ -138,9 +138,9 @@ Installation
After building using the Windows subsystem it can be useful to copy the compiled
executables to a directory on the windows drive in the same directory structure
as they appear in the release `.zip` archive. This can be done in the following
way. This will install to `c:\workspace\bitcoin`, for example:
way. This will install to `c:\workspace\peercoin`, for example:

make install DESTDIR=/mnt/c/workspace/bitcoin
make install DESTDIR=/mnt/c/workspace/peercoin

Footnotes
---------
Expand All @@ -149,5 +149,5 @@ Footnotes
compiler options to allow a choice between either posix or win32 threads. The default option is win32 threads which is the more
efficient since it will result in binary code that links directly with the Windows kernel32.lib. Unfortunately, the headers
required to support win32 threads conflict with some of the classes in the C++11 standard library in particular std::mutex.
It's not possible to build the bitcoin code using the win32 version of the Mingw-w64 cross compilers (at least not without
modifying headers in the bitcoin source code).
It's not possible to build the peercoin code using the win32 version of the Mingw-w64 cross compilers (at least not without
modifying headers in the peercoin source code).
2 changes: 1 addition & 1 deletion doc/dependencies.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Dependencies
============

These are the dependencies currently used by Bitcoin Core. You can find instructions for installing them in the `build-*.md` file for your platform.
These are the dependencies currently used by Peercoin. You can find instructions for installing them in the `build-*.md` file for your platform.

| Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html) |
| --- | --- | --- | --- | --- | --- |
Expand Down
Loading

0 comments on commit dd567df

Please sign in to comment.