Merge pull request bitcoin#6 from ppcoin/master

sunny few PPCoin name changes update

.gitignore

@@ -14,7 +14,7 @@ src/build.h
 #compilation and Qt preprocessor part
 *.qm
 Makefile
-bitcoin-qt
+ppcoin-qt
 #resources cpp
 qrc_*.cpp
 #qt creator

README.md

@@ -1,26 +1,26 @@
 
-PPCoin Official Development Repo
-================================
+Peercoin Official Development Repo
+==================================
 
-### What is PPCoin?
-[PPCoin](http://ppcoin.org/) (abbreviated PPC), also known as Peercoin and Peer-to-Peer Coin is the first known [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency)  designed as a combined [proof-of-stake](http://ppcoin.org/static/ppcoin-paper.pdf)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) system. PPCoin is build upon [Bitcoin](http://bitcoin.org/en/), but unique in the fact that it is more energy efficiency, as proof-of-stake blocks require minimal energy consumption. Thus, with PPCoin energy consumption would decrease over time as proof-of-work blocks become less rewarding and coin generation becomes increasingly based on proof-of-stake block generation.
+### What is Peercoin (PPCoin)?
+[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.
 
-### PPCoin Resources
+### Peercoin Resources
 * Client and Source:
 [Client Binaries](http://sourceforge.net/projects/ppcoin/files/),
 [Source Code](https://github.com/ppcoin/ppcoin)
-* Documentation: [PPCoin Whitepaper](http://ppcoin.org/static/ppcoin-paper.pdf),
-[PPCoin Wiki](https://github.com/ppcoin/ppcoin/wiki)
+* Documentation: [Peercoin Whitepaper](http://peercoin.net/bin/peercoin-paper.pdf),
+[Peercoin Wiki](https://github.com/ppcoin/ppcoin/wiki)
 * Help: 
-[Forum](http://www.ppcointalk.org/),
-[Other Sites and Links...](http://www.ppcointalk.org/index.php?topic=4.0;topicseen)
+[Forum](http://www.peercointalk.org/),
+[Other Sites and Links...](http://www.peercointalk.org/index.php?topic=4.0;topicseen)
 
 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 [PPCoin Talk](http://www.ppcointalk.org/) for a broader community discussion. 
+* 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.ppcointalk.org/index.php?board=10.0).
+* For development ideas and help see [here](http://www.peercointalk.org/index.php?board=10.0).

share/qt/make_windows_icon.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 # create multiresolution windows icon
-ICON_SRC=../../src/qt/res/icons/bitcoin.png
-ICON_DST=../../src/qt/res/icons/bitcoin.ico
-convert ${ICON_SRC} -resize 16x16 bitcoin-16.png
-convert ${ICON_SRC} -resize 32x32 bitcoin-32.png
-convert ${ICON_SRC} -resize 48x48 bitcoin-48.png
-convert bitcoin-16.png bitcoin-32.png bitcoin-48.png ${ICON_DST}
+ICON_SRC=../../src/qt/res/icons/ppcoin.png
+ICON_DST=../../src/qt/res/icons/ppcoin.ico
+convert ${ICON_SRC} -resize 16x16 ppcoin-16.png
+convert ${ICON_SRC} -resize 32x32 ppcoin-32.png
+convert ${ICON_SRC} -resize 48x48 ppcoin-48.png
+convert ppcoin-48.png ppcoin-32.png ppcoin-16.png ${ICON_DST}
 

src/net.cpp

@@ -998,8 +998,10 @@ void MapPort(bool /* unused fMapPort */)
 // testnet dns seed begins with 't', all else are ppcoin dns seeds.
 static const char *strDNSSeed[][2] = {
     {"seed", "seed.ppcoin.net"},
+    {"seedppc", "seedppc.ppcoin.net"},
     {"altcointech", "dnsseed.ppc.altcointech.net"},
     {"tnseed", "tnseed.ppcoin.net"},
+    {"tnseedppc", "tnseedppc.ppcoin.net"},
 };
 
 void ThreadDNSAddressSeed(void* parg)
@@ -1065,9 +1067,12 @@ void ThreadDNSAddressSeed2(void* parg)
 
 
 
+// Physical IP seeds: 32-bit IPv4 addresses: e.g. 178.33.22.32 = 0x201621b2
 unsigned int pnSeed[] =
 {
-    0x231621b2, 0x4a54c854, 0x13cca445,
+    0x36a3b545, 0x3c1c26d8, 0x4031eb6d, 0x4d3463d1, 0x586a6854, 0x5da9ae65,
+    0x6deb7318, 0x9083fb63, 0x961bf618, 0xcabd2e4e, 0xcb766dd5, 0xdd514518,
+    0xdff010b8, 0xe9bb6044, 0xedb24a4c,
 };
 
 void DumpAddresses()

src/qt/askpassphrasedialog.cpp

@@ -109,7 +109,7 @@ void AskPassphraseDialog::accept()
                 if(model->setWalletEncrypted(true, newpass1))
                 {
                     QMessageBox::warning(this, tr("Wallet encrypted"),
-                                         tr("PPCoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer."));
+                                         tr("PPCoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your ppcoins from being stolen by malware infecting your computer."));
                     QApplication::quit();
                 }
                 else

src/qt/bitcoingui.cpp

@@ -71,7 +71,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     rpcConsole(0)
 {
     resize(850, 550);
-    setWindowTitle(tr("PPCoin Wallet"));
+    setWindowTitle(tr("Peercoin (PPCoin) Wallet"));
 #ifndef Q_WS_MAC
     setWindowIcon(QIcon(":icons/ppcoin"));
 #else

src/qt/forms/rpcconsole.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Bitcoin debug window</string>
+   <string>Peercoin (PPCoin) debug window</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

src/qt/rpcconsole.cpp

@@ -303,7 +303,7 @@ void RPCConsole::clear()
                 "b { color: #006060; } "
                 );
 
-    message(CMD_REPLY, tr("Welcome to the Bitcoin RPC console.<br>"
+    message(CMD_REPLY, tr("Welcome to the PPCoin RPC console.<br>"
                           "Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.<br>"
                           "Type <b>help</b> for an overview of available commands."), true);
 }

src/util.cpp

@@ -1116,6 +1116,8 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
     if (!comments.empty())
         ss << "(" << boost::algorithm::join(comments, "; ") << ")";
     ss << "/";
+    ss << "Peercoin:" << FormatVersion(PPCOIN_VERSION);
+    ss << "(" << CLIENT_BUILD << ")/";
     return ss.str();
 }
 

src/version.h

@@ -33,6 +33,12 @@ extern const std::string CLIENT_DATE;
 #define PPCOIN_VERSION_REVISION    0
 #define PPCOIN_VERSION_BUILD       0
 
+static const int PPCOIN_VERSION =
+                           1000000 * PPCOIN_VERSION_MAJOR
+                         +   10000 * PPCOIN_VERSION_MINOR
+                         +     100 * PPCOIN_VERSION_REVISION
+                         +       1 * PPCOIN_VERSION_BUILD;
+
 //
 // network protocol versioning
 //