crazyfrog2001 · crazyfrog2001 · Jul 12, 2018 · Jul 13, 2018 · Jul 14, 2018 · Jul 23, 2018
diff --git a/INSTALL b/INSTALL
@@ -7,7 +7,7 @@ Use the autogen script to prepare the build environment.
     make
 user gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.5)   
 Precompiled binaries are available at github, see
-https://github.com/poppay/pop-binaries
+https://github.com/PopchainOrg/PopChain-gho
 
 Always verify the signatures and checksums.
 

diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
-AC_INIT([Pop Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/poppay/pop/issues],[popcore])
+AC_INIT([Pop Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/PopchainOrg/PopChain-gho],[popcore])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/pop-config.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -465,7 +465,7 @@ if test x$use_hardening != xno; then
   AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
   AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
   AX_CHECK_COMPILE_FLAG([-std=c++11],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -std=c++11"])
-  AX_CHECK_COMPILE_FLAG([-std=c11],[HARDENED_CFLAGS="${HARDENED_CLFAGS -std=c11}"])
+  AX_CHECK_COMPILE_FLAG([-std=c11],[HARDENED_CFLAGS="$(HARDENED_CLFAGS -std=c11)"])
 
   AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[
     AX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[

diff --git a/contrib/debian/control b/contrib/debian/control
@@ -1,8 +1,8 @@
 Source: pop
 Section: utils
 Priority: optional
-Maintainer: Holger Schinzel <holger@pop.org>
-Uploaders: Holger Schinzel <holger@pop.org>
+Maintainer: Holger Schinzel <holger@popchain.org>
+Uploaders: Holger Schinzel <holger@popchain.org>
 Build-Depends: debhelper,
  devscripts,
  automake,
@@ -24,9 +24,9 @@ Build-Depends: debhelper,
  libprotobuf-dev, protobuf-compiler,
  python
 Standards-Version: 3.9.2
-Homepage: https://www.pop.org/
-Vcs-Git: git://github.com/poppay/pop.git
-Vcs-Browser: https://github.com/poppay/pop
+Homepage: https://popchain.org/popchain
+Vcs-Git: git://github.com/PopchainOrg/PopChain-gho.git
+Vcs-Browser: https://github.com/PopchainOrg/PopChain-gho
 
 Package: popd
 Architecture: any

diff --git a/contrib/debian/examples/pop.conf b/contrib/debian/examples/pop.conf
@@ -44,11 +44,11 @@
 
 # Use as many addnode= settings as you like to connect to specific peers
 #addnode=69.164.218.197
-#addnode=10.0.0.2:9888
+#addnode=10.0.0.2:2888
 
 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers
 #connect=69.164.218.197
-#connect=10.0.0.1:9888
+#connect=10.0.0.1:2888
 
 # Listening mode, enabled by default except when 'connect' is being used
 #listen=1

diff --git a/contrib/debian/watch b/contrib/debian/watch
@@ -2,4 +2,4 @@
 version=3
 # use qa.debian.org redirector; see man uscan
 opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
- http://githubredir.debian.net/github/poppay/pop v(.*).tar.gz
+ https://github.com/PopchainOrg/PopChain-gho v(.*).tar.gz
diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md
@@ -19,8 +19,8 @@ Sanity checks:
 
 Once you've got the right hardware and software:
 
-    git clone git://github.com/poppay/pop.git
-    git clone git://github.com/devrandom/gitian-builder.git
+    git clone git://github.com/PopchainOrg/PopChain-gho.git
+    git clone git://github.com/PopchainOrg/PopChain-gho.git
     mkdir gitian-builder/inputs
     cd gitian-builder/inputs
 
@@ -61,5 +61,5 @@ Here's a description of Gavin's setup on OSX 10.6:
 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
 
 	export USE_LXC=1
-	git clone git://github.com/poppay/pop.git
+	git clone git://github.com/PopchainOrg/PopChain-gho.git
 	... etc
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -20,7 +20,7 @@ packages:
 - "python"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "pop"
 files: []
 script: |

diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -8,7 +8,7 @@ packages:
 - "faketime"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop-detached-sigs.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "signature"
 files:
 - "pop-osx-unsigned.tar.gz"

diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
@@ -23,7 +23,7 @@ packages:
 - "python"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "pop"
 files:
 - "MacOSX10.9.sdk.tar.gz"

diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml
@@ -17,7 +17,7 @@ packages:
 - "binutils-gold"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "pop"
 files:
 - "raspberrypi-tools.tar.gz"

diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -9,7 +9,7 @@ packages:
 - "autoconf"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop-detached-sigs.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "signature"
 files:
 - "osslsigncode-1.7.1.tar.gz"

diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
@@ -23,7 +23,7 @@ packages:
 - "python"
 reference_datetime: "2017-01-01 00:00:00"
 remotes:
-- "url": "https://github.com/poppay/pop.git"
+- "url": "https://github.com/PopchainOrg/PopChain-gho.git"
   "dir": "pop"
 files: []
 script: |

diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md
@@ -3,7 +3,7 @@ Construct a linear, no-fork, best version of the blockchain.
 
 ## Step 0: Install pop_hash
 
-https://github.com/poppay/pop_hash
+https://github.com/PopchainOrg/PopChain-gho
 
 ## Step 1: Download hash list
 

diff --git a/contrib/qos/README.md b/contrib/qos/README.md
@@ -1,5 +1,5 @@
 ### Qos ###
 
-This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Pop network. It limits outbound TCP traffic with a source or destination port of 9888, but not if the destination IP is within a LAN (defined as 192.168.x.x).
+This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Pop network. It limits outbound TCP traffic with a source or destination port of 2888, but not if the destination IP is within a LAN (defined as 192.168.x.x).
 
 This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
@@ -32,10 +32,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
 #	ret=$?
 #done
 
-#limit outgoing traffic to and from port 9888. but not when dealing with a host on the local network
+#limit outgoing traffic to and from port 2888. but not when dealing with a host on the local network
 #	(defined by $LOCALNET)
 #	--set-mark marks packages matching these criteria with the number "2"
 #	these packages are filtered by the tc filter with "handle 2"
 #	this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT}
-iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9888 ! -d ${LOCALNET} -j MARK --set-mark 0x2
-iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9888 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 2888 ! -d ${LOCALNET} -j MARK --set-mark 0x2
+iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 2888 ! -d ${LOCALNET} -j MARK --set-mark 0x2
diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
@@ -127,10 +127,10 @@ def main():
     g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
     g.write(' */\n')
     with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_main', 9888)
+        process_nodes(g, f, 'pnSeed6_main', 2888)
     g.write('\n')
     with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_test', 19888)
+        process_nodes(g, f, 'pnSeed6_test', 12888)
     g.write('#endif // UC_CHAINPARAMSSEEDS_H\n')
 
 if __name__ == '__main__':

diff --git a/contrib/verify-commits/pre-push-hook.sh b/contrib/verify-commits/pre-push-hook.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)poppay/pop(.git)?$ ]]; then
+if ! [[ "$2" =~ ^(git@)?(www.)?github.com(:|/)PopchainOrg/PopChain-gho(.git)?$ ]]; then
     exit 0
 fi
 

diff --git a/doc/README.md b/doc/README.md
@@ -24,10 +24,10 @@ Drag Pop-Qt to your applications folder, and then run Pop-Qt.
 
 ### Need Help?
 
-* See the [Pop documentation](https://poppay.atlassian.net/wiki/display/DOC)
+* See the [Pop documentation](https://github.com/PopchainOrg/PopChain-gho/tree/master/doc)
 for help and more information.
-* Ask for help on [#poppay](http://webchat.freenode.net?channels=poppay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=poppay).
-* Ask for help on the [PopTalk](https://poptalk.org/) forums.
+* Ask for help on [#Telegram](https://t.me/popchain_global) on Freenode. If you don't have an IRC client use [Twitter](https://twitter.com/POPCHAIN_Global).
+* Ask for help on the [web](https://popchain.org/popchain) forums.
 
 Building
 ---------------------
@@ -57,8 +57,8 @@ The Pop Core repo's [root README](/README.md) contains relevant information on t
 - [Dnsseed Policy](dnsseed-policy.md)
 
 ### Resources
-* Discuss on the [PopTalk](https://poptalk.org/) forums, in the Development & Technical Discussion board.
-* Discuss on [#poppay](http://webchat.freenode.net/?channels=poppay) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=poppay).
+* Discuss on the [web](https://popchain.org/popchain) forums, in the Development & Technical Discussion board.
+* Discuss on [Telegram](https://t.me/popchain_global) on Freenode. If you don't have an IRC client use [Twitter](https://twitter.com/POPCHAIN_Global).
 
 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)

diff --git a/doc/README_windows.txt b/doc/README_windows.txt
@@ -19,5 +19,5 @@ depending on the speed of your computer and network connection, the synchronizat
 process can take anywhere from a few hours to a day or more.
 
 See the pop wiki at:
-  https://poppay.atlassian.net/wiki/
+  http://coinwik.org/POPCHAIN
 for more help and information.
diff --git a/doc/gitian-building.md b/doc/gitian-building.md
@@ -11,7 +11,7 @@ the same, tested dependencies are used and statically built into the executable.
 Multiple developers build the source code by following a specific descriptor
 ("recipe"), cryptographically sign the result, and upload the resulting signature.
 These results are compared and only if they match, the build is accepted and uploaded
-to pop.org.
+to popchain.org.
 
 More independent Gitian builders are needed, which is why this guide exists.
 It is preferred you follow these steps yourself instead of using someone else's
@@ -303,8 +303,8 @@ cd ..
 Clone the git repositories for Pop Core and Gitian.
 
 ```bash
-git clone https://github.com/devrandom/gitian-builder.git
-git clone https://github.com/poppay/pop
+git clone https://github.com/PopchainOrg/PopChain-gho.git
+git clone https://github.com/PopchainOrg/PopChain-gho.git
 ```
 
 Setting up the Gitian image
@@ -368,7 +368,7 @@ Output from `gbuild` will look something like
     remote: Total 57959 (delta 0), reused 0 (delta 0), pack-reused 57958
     Receiving objects: 100% (57959/57959), 53.76 MiB | 484.00 KiB/s, done.
     Resolving deltas: 100% (41590/41590), done.
-    From https://github.com/poppay/pop
+    From https://github.com/PopchainOrg/PopChain-gho
     ... (new tags, new branch etc)
     --- Building for precise amd64 ---
     Stopping target if it is up
@@ -394,7 +394,7 @@ and inputs.
 
 For example:
 ```bash
-URL=https://github.com/crowning-/pop.git
+URL=https://github.com/PopchainOrg/PopChain-gho.git
 COMMIT=b616fb8ef0d49a919b72b0388b091aaec5849b96
 ./bin/gbuild --commit pop=${COMMIT} --url pop=${URL} ../pop/contrib/gitian-descriptors/gitian-linux.yml
 ./bin/gbuild --commit pop=${COMMIT} --url pop=${URL} ../pop/contrib/gitian-descriptors/gitian-win.yml
@@ -444,10 +444,10 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr
 ```bash
 
 cd /some/root/path/
-git clone https://github.com/poppay/pop-detached-sigs.git
+git clone https://github.com/PopchainOrg/PopChain-gho.git
 
-UCPATH=/some/root/path/pop.git
-SIGPATH=/some/root/path/pop-detached-sigs.git
+UCPATH=/some/root/path/PopChain-gho.git
+SIGPATH=/some/root/path/PopChain-gho.git
 
 ./bin/gbuild --url pop=${UCPATH},signature=${SIGPATH} ../pop/contrib/gitian-descriptors/gitian-win-signer.yml
 ```
@@ -476,6 +476,6 @@ Uploading signatures (not yet implemented)
 ---------------------
 
 In the future it will be possible to push your signatures (both the `.assert` and `.assert.sig` files) to the
-[pop/gitian.sigs](https://github.com/poppay/gitian.sigs/) repository, or if that's not possible to create a pull
+[pop/gitian.sigs](https://github.com/PopchainOrg/PopChain-gho/) repository, or if that's not possible to create a pull
 request.
 There will be an official announcement when this repository is online.
diff --git a/doc/guide-startmany.md b/doc/guide-startmany.md
@@ -95,7 +95,7 @@ Issue the following:
 Make note of the hash (which is your collateral_output) and index.
 
 ### Enter your Popnode details into your popnode.conf file
-[From the pop github repo](https://github.com/poppay/pop/blob/master/doc/popnode_conf.md)
+[From the pop github repo](https://github.com/PopchainOrg/PopChain-gho/doc/popnode_conf.md)
 
 `popnode.conf` format is a space seperated text file. Each line consisting of an alias, IP address followed by port, popnode private key, collateral output transaction id and collateral output index.
 
@@ -106,8 +106,8 @@ alias ipaddress:port popnode_private_key collateral_output collateral_output_ind
 Example:
 
 ```
-pn01 127.0.0.1:9888 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
-pn02 127.0.0.2:9888 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0
+pn01 127.0.0.1:2888 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 2bcd3c84c84f87eaa86e4e56834c92927a07f9e18718810b92e0d0324456a67c 0
+pn02 127.0.0.2:2888 93WaAb3htPJEV8E9aQcN23Jt97bPex7YvWfgMDTUdWJvzmrMqey aa9f1034d973377a5e733272c3d0eced1de22555ad45d6b24abadff8087948d4 0
 ```
 
 ## What about the pop.conf file?
@@ -135,7 +135,7 @@ You can confirm that remote server is on the correct block by issuing
 
 ```pop-cli getinfo```
 
-and comparing with the official explorer at https://explorer.pop.org/chain/Pop
+and comparing with the official explorer at https://popchain.org/popchain
 
 ### Local
 

diff --git a/doc/keepass.md b/doc/keepass.md
@@ -51,4 +51,4 @@ At this point, the association is made. The next action depends on your particul
 
 At this point, the passphrase is stored in KeePassHttp. When Unlocking the wallet, one can use _keepass_ as the passphrase to trigger retrieval of the password. This works from the RPC commands as well as the GUI.
 
-Extended guide with screenshots is also available: https://poptalk.org/threads/keepass-integration.3620/
+Extended guide with screenshots is also available: https://popchain.org/popchain
diff --git a/doc/popnode_conf.md b/doc/popnode_conf.md
@@ -9,8 +9,8 @@ Pop Core allows controlling multiple remote popnodes from a single wallet. The w
 `popnode.conf` is a space separated text file. Each line consists of an alias, IP address followed by port, popnode private key, collateral output transaction id and collateral output index.
 
 Example:
-pn1 127.0.0.2:19888 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 7603c20a05258c208b58b0a0d77603b9fc93d47cfa403035f87f3ce0af814566 0
-pn2 127.0.0.4:19888 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv 5d898e78244f3206e0105f421cdb071d95d111a51cd88eb5511fc0dbf4bfd95f 1
+pn1 127.0.0.2:12888 93HaYBVUCYjEMeeH1Y4sBGLALQZE1Yc1K64xiqgX37tGBDQL8Xg 7603c20a05258c208b58b0a0d77603b9fc93d47cfa403035f87f3ce0af814566 0
+pn2 127.0.0.4:12888 92Da1aYg6sbenP6uwskJgEY2XWB5LwJ7bXRqc3UPeShtHWJDjDv 5d898e78244f3206e0105f421cdb071d95d111a51cd88eb5511fc0dbf4bfd95f 1
 ```
 _Note: IPs like 127.0.0.* are not allowed actually, we are using them here for explanatory purposes only. Make sure you have real reachable remote IPs in you `popnode.conf`._
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,4 @@ At this point, the association is made. The next action depends on your particul

		At this point, the passphrase is stored in KeePassHttp. When Unlocking the wallet, one can use _keepass_ as the passphrase to trigger retrieval of the password. This works from the RPC commands as well as the GUI.

		Extended guide with screenshots is also available: https://poptalk.org/threads/keepass-integration.3620/
		Extended guide with screenshots is also available: https://popchain.org/popchain