Skip to content

Commit

Permalink
Merge pull request #57 from brossi/unity.version-numbering
Browse files Browse the repository at this point in the history
Update versioning in anticipation of the general Peerunity release
  • Loading branch information
brossi committed May 23, 2014
2 parents 742e0fe + 7d49f10 commit 4bb1b1d
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 139 deletions.
34 changes: 19 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
Community Peercoin and Peershares Client
==================================
# Peerunity Official Developent Repository

### What is Peercoin (PPCoin)?
## What is Peerunity?

Peerunity is a Peercoin network-compatible, community-developed wallet client.

The project has been designed to provide people with a stable, secure, and feature-rich alternative to the Peercoin reference wallet (http://github.com/ppcoin/ppcoin).

To help faciliate broad community cooperation, a number of trusted Peercoin/Peershares community leaders have write permissions to the project's codebase, allowing for decentralization and continuity. Community members, old and new, are encouraged to find ways to contribute to the success of the project. If you have experience with programming, product design, QA engineering, translation, or have a different set of skills that you want to bring to the project, your involvement is appreciated!


### Peerunity Resources
* Source: [Source Code](https://github.com/Peerunity/Peerunity)
* Documentation: [Build Instructions](https://github.com/Peerunity/Peerunity/tree/master/doc)
* Support: [Peerunity Forum](http://www.peercointalk.org/index.php?board=64.0), [Issue Tracker](https://github.com/Peerunity/Peerunity/issues?state=open)


### About Peercoin
[Peercoin](http://peercoin.net/) (abbreviated PPC), also known as PPCoin and Peer-to-Peer Coin is the first [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) design introducing [proof-of-stake consensus](http://peercoin.net/bin/peercoin-paper.pdf) as a security model, with a combined [proof-of-stake](http://peercoin.net/bin/peercoin-paper.pdf)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) minting system. Peercoin is based on [Bitcoin](http://bitcoin.org/en/), 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](http://sourceforge.net/projects/ppcoin/files/),
[Source Code](https://github.com/ppcoin/ppcoin)
* Documentation: [Peercoin Whitepaper](http://peercoin.net/bin/peercoin-paper.pdf),
[Peercoin Wiki](https://github.com/ppcoin/ppcoin/wiki)
* Help:
[Forum](http://www.peercointalk.org/),
[Other Sites and Links...](http://www.peercointalk.org/index.php?topic=4.0;topicseen)

Repo Guidelines
================================
# Repo Guidelines

* Developers work in their own forks, then submit pull requests when they think their feature or bug fix is ready.
* If it is a simple/trivial/non-controversial change, then one of the development team members simply pulls it.
* If it is a more complicated or potentially controversial change, then the change may be discussed in the pull request, or the requester may be asked to start a discussion [Peercoin Talk](http://www.peercointalk.org/) for a broader community discussion.
* The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial.
* From time to time a pull request will become outdated. If this occurs, and the pull is no longer automatically mergeable; a comment on the pull will be used to issue a warning of closure. Pull requests closed in this manner will have their corresponding issue labeled 'stagnant'.
* For development ideas and help see [here](http://www.peercointalk.org/index.php?board=10.0).
* For development ideas and help see [here](http://www.peercointalk.org/index.php?board=10.0).
112 changes: 61 additions & 51 deletions doc/README
Original file line number Diff line number Diff line change
@@ -1,73 +1,83 @@
Peercoin (PPCoin) 0.4.0 BETA
Peerunity 0.1.0
Copyright (c) 2014 Peerunity developers

Copyright (c) 2011-2014 Peercoin (PPCoin) Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt 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
cryptographic software written by Eric Young (eay@cryptsoft.com).


Intro
-----
PPCoin is a free open source project derived from Bitcoin, with
the goal of providing a long-term energy-efficient crypto-currency.
Built on the foundation of Bitcoin, innovations such as proof-of-stake
help further advance the field of crypto-currency.
About Peerunity
---------------
Peerunity is a Peercoin network-compatible, community-developed wallet client.

The project has been designed to provide people with a
stable, secure, and feature-rich alternative to the Peercoin reference
wallet (http://github.com/ppcoin/ppcoin).

Setup
-----
Unpack the files into a directory and run:
bin/32/ppcoin-qt (GUI, 32-bit)
bin/32/ppcoind (headless, 32-bit)
bin/64/ppcoin-qt (GUI, 64-bit)
bin/64/ppcoind (headless, 64-bit)
To help faciliate broad community cooperation, a number of trusted
Peercoin/Peershares community leaders have write permissions to the project's
codebase, allowing for decentralization and continuity. Community members,
old and new, are encouraged to find ways to contribute to the success of
the project. If you have experience with programming, product design,
QA engineering, translation, or have a different set of skills that you want to
bring to the project, your involvement is appreciated!

The software automatically finds other nodes to connect to. You can
enable Universal Plug and Play (UPnP) with your router/firewall
or forward port 9901 (TCP) to your computer so you can receive
incoming connections. PPCoin works without incoming connections,
but allowing incoming connections helps the PPCoin network.

Development Roadmap
-------------------
* Updated branding and wallet design
* Integrated support for multiple Peershares offerings
* An improved minting experience

Upgrade
-------
All your existing coins/transactions should be intact with the upgrade.
To upgrade from 0.3, first backup wallet
ppcoind backupwallet <destination_backup_file>
Then shutdown ppcoind by
ppcoind stop
Uninstall v0.3 client, download and install v0.4 client.
Start up the new ppcoind (0.4.0).
If upgrade is performed after upgrade deadline then blockchain re-download
is required.

Resources
---------
Peerunity source code: https://github.com/Peerunity/Peerunity

See the documentation/wiki at github:
http://github.com/ppcoin/ppcoin
for help and more information.
For the most current instructions covering how to compile Peerunity from
source on a variety of operating systems, please visit:
https://github.com/Peerunity/Peerunity/tree/master/doc

Open software issues can be viewed, and new issues can be reported at:
https://github.com/Peerunity/Peerunity/issues?state=open

------------------
Bitcoin 0.6.3 BETA
Peerunity discussion forums (hosted by PeercoinTalk.org):
http://www.peercointalk.org/index.php?board=64.0



Acknowledgements
----------------
Peerunity owes it's existance to the time and effort put forth by
the developers and supporters of the following projects:


Peercoin (PPCoin) 0.4.0 BETA
Copyright (c) 2011-2014 Bitcoin Developers

Distributed under the MIT/X11 software license
(http://www.opensource.org/licenses/mit-license.php)

Peercoin is a free open source project with the goal of providing a
long-term energy-efficient crypto-currency. Built on the foundation
of Bitcoin, innovations such as proof-of-stake help further advance
the field of crypto-currency.

http://github.com/ppcoin/ppcoin

Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt 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
cryptographic software written by Eric Young (eay@cryptsoft.com).

------------------
Bitcoin 0.6.3 BETA
Copyright (c) 2009-2012 Bitcoin Developers

Intro
-----
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
Distributed under the MIT/X11 software license
(http://www.opensource.org/licenses/mit-license.php)

Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.

See the documentation at the bitcoin wiki:
https://en.bitcoin.it/wiki/Main_Page
for help and more information.
https://en.bitcoin.it/wiki/Main_Page
113 changes: 61 additions & 52 deletions doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,74 +1,83 @@
Peercoin (PPCoin) 0.4.0 BETA
Peerunity 0.1.0
Copyright (c) 2014 Peerunity developers

Copyright (c) 2011-2014 Peercoin (PPCoin) Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt 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
cryptographic software written by Eric Young (eay@cryptsoft.com).


Intro
-----
PPCoin is a free open source project derived from Bitcoin, with
the goal of providing a long-term energy-efficient crypto-currency.
Built on the foundation of Bitcoin, innovations such as proof-of-stake
help further advance the field of crypto-currency.
About Peerunity
---------------
Peerunity is a Peercoin network-compatible, community-developed wallet client.

The project has been designed to provide people with a
stable, secure, and feature-rich alternative to the Peercoin reference
wallet (http://github.com/ppcoin/ppcoin).

Setup
-----
After completing windows setup then run ppcoin-qt.
Alternatively you can run windows command line (cmd) in ppcoin program dir.
cd daemon
ppcoind
You would need to create a configuration file ppcoin.conf in the default
wallet directory. Grant access to ppcoind/ppcoin-qt in anti-virus and firewall
applications if necessary.
To help faciliate broad community cooperation, a number of trusted
Peercoin/Peershares community leaders have write permissions to the project's
codebase, allowing for decentralization and continuity. Community members,
old and new, are encouraged to find ways to contribute to the success of
the project. If you have experience with programming, product design,
QA engineering, translation, or have a different set of skills that you want to
bring to the project, your involvement is appreciated!

The software automatically finds other nodes to connect to. You can
enable Universal Plug and Play (UPnP) with your router/firewall
or forward port 9901 (TCP) to your computer so you can receive
incoming connections. PPCoin works without incoming connections,
but allowing incoming connections helps the PPCoin network.

Development Roadmap
-------------------
* Updated branding and wallet design
* Integrated support for multiple Peershares offerings
* An improved minting experience

Upgrade
-------
All your existing coins/transactions should be intact with the upgrade.
To upgrade from 0.3, first backup wallet in qt menu or by command line
ppcoind backupwallet <destination_backup_file>
Then shutdown ppcoind by
ppcoind stop
Uninstall v0.3 client, download and install v0.4 client.
If upgrade is performed after upgrade deadline, blockchain re-download is
required.

Resources
---------
Peerunity source code: https://github.com/Peerunity/Peerunity

See the documentation/wiki at github:
http://github.com/ppcoin/ppcoin
for help and more information.
For the most current instructions covering how to compile Peerunity from
source on a variety of operating systems, please visit:
https://github.com/Peerunity/Peerunity/tree/master/doc

Open software issues can be viewed, and new issues can be reported at:
https://github.com/Peerunity/Peerunity/issues?state=open

------------------
Bitcoin 0.6.3 BETA
Peerunity discussion forums (hosted by PeercoinTalk.org):
http://www.peercointalk.org/index.php?board=64.0



Acknowledgements
----------------
Peerunity owes it's existance to the time and effort put forth by
the developers and supporters of the following projects:


Peercoin (PPCoin) 0.4.0 BETA
Copyright (c) 2011-2014 Bitcoin Developers

Distributed under the MIT/X11 software license
(http://www.opensource.org/licenses/mit-license.php)

Peercoin is a free open source project with the goal of providing a
long-term energy-efficient crypto-currency. Built on the foundation
of Bitcoin, innovations such as proof-of-stake help further advance
the field of crypto-currency.

http://github.com/ppcoin/ppcoin

Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file license.txt 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
cryptographic software written by Eric Young (eay@cryptsoft.com).

------------------
Bitcoin 0.6.3 BETA
Copyright (c) 2009-2012 Bitcoin Developers

Intro
-----
Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
Distributed under the MIT/X11 software license
(http://www.opensource.org/licenses/mit-license.php)

Bitcoin is a free open source peer-to-peer electronic cash system that is
completely decentralized, without the need for a central server or trusted
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.

See the bitcoin wiki at:
https://en.bitcoin.it/wiki/Main_Page
for more help and information.
https://en.bitcoin.it/wiki/Main_Page
2 changes: 1 addition & 1 deletion peerunity.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = peerunity
VERSION = 0.0.99.0
VERSION = 0.1.0.0
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand Down
8 changes: 1 addition & 7 deletions share/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.4.0
!define VERSION 0.1.0.0
!define COMPANY "Peerunity project"
!define URL http://github.com/peerunity/peerunity/

Expand Down Expand Up @@ -107,12 +107,6 @@ Section -post SEC0001
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1

# bitcoin: URI handling disabled for 0.6.0
# WriteRegStr HKCR "bitcoin" "URL Protocol" ""
# WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"
# WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe
# WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "$$1"'
SectionEnd

# Macro for selecting uninstaller sections
Expand Down
16 changes: 12 additions & 4 deletions src/version.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
// Copyright (c) 2012 The Bitcoin developers
// Copyright (c) 2014 The Peerunity developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <string>

#include "version.h"

// Name of client reported in the 'version' message. Report the same name
// for both bitcoind and bitcoin-qt, to make it harder for attackers to
// for both peerunityd and peerunity(-qt), to make it harder for attackers to
// target servers or GUI users specifically.
const std::string CLIENT_NAME("Satoshi");

// For the current run of Peerunity releases, the client name should be selected from
// the list of ancient coinage, from oldest known to more recent.
// You can find ideas for future client names, here: http://en.wikipedia.org/wiki/List_of_historical_currencies

// Version 0.1.0 is named for the Lydian stater, an electrum coin
// Reference: http://www.fleur-de-coin.com/articles/oldest-coin
const std::string CLIENT_NAME("Stater");

// Client version number
#define CLIENT_VERSION_SUFFIX ""
Expand Down Expand Up @@ -49,9 +57,9 @@ const std::string CLIENT_NAME("Satoshi");

#ifndef BUILD_DESC
# ifdef GIT_COMMIT_ID
# define BUILD_DESC BUILD_DESC_FROM_COMMIT(PPCOIN_VERSION_MAJOR, PPCOIN_VERSION_MINOR, PPCOIN_VERSION_REVISION, PPCOIN_VERSION_BUILD, GIT_COMMIT_ID)
# define BUILD_DESC BUILD_DESC_FROM_COMMIT(PEERUNITY_VERSION_MAJOR, PEERUNITY_VERSION_MINOR, PEERUNITY_VERSION_REVISION, PEERUNITY_VERSION_BUILD, GIT_COMMIT_ID)
# else
# define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(PPCOIN_VERSION_MAJOR, PPCOIN_VERSION_MINOR, PPCOIN_VERSION_REVISION, PPCOIN_VERSION_BUILD)
# define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(PEERUNITY_VERSION_MAJOR, PEERUNITY_VERSION_MINOR, PEERUNITY_VERSION_REVISION, PEERUNITY_VERSION_BUILD)
# endif
#endif

Expand Down
Loading

0 comments on commit 4bb1b1d

Please sign in to comment.