Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
10 changes: 5 additions & 5 deletions contrib/debian/control
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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://popchain.org/popchain

Package: popd
Architecture: any
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/watch
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions contrib/gitian-descriptors/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-rpi2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion contrib/verify-commits/pre-push-hook.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 6 additions & 6 deletions doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------
Expand Down Expand Up @@ -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 here](https://twitter.com/POPCHAIN_Global).

### Miscellaneous
- [Assets Attribution](assets-attribution.md)
Expand All @@ -70,4 +70,4 @@ License
---------------------
Distributed under the [MIT software license](http://www.opensource.org/licenses/mit-license.php).
This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](https://www.openssl.org/). This product includes
cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.

2 changes: 1 addition & 1 deletion doc/README_windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
18 changes: 9 additions & 9 deletions doc/gitian-building.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
```
Expand Down Expand Up @@ -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](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.
6 changes: 3 additions & 3 deletions doc/guide-startmany.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/tree/master/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.

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -174,6 +174,6 @@ Command output should have "_Popnode successfully started_" in its `status` fiel

### Local

Search your Popnodes on https://popninja.pl/popnodes.html
Search your Popnodes on https://popchain.org/popchain

_Hint: Bookmark it, you definitely will be using this site a lot._
2 changes: 1 addition & 1 deletion doc/keepass.md
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
2 changes: 1 addition & 1 deletion doc/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pop Core version 0.12.1 is now available from:

<https://www.pop.org/downloads/>
<https://popchain.org/popchain/downloads/>



Expand Down
24 changes: 12 additions & 12 deletions doc/release-process.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Release Process
====================

* Update translations, see [translation_process.md](https://github.com/poppay/pop/blob/master/doc/translation_process.md#syncing-with-transifex)
* Update translations, see [translation_process.md](https://github.com/PopchainOrg/PopChain-gho)
* Update hardcoded [seeds](/contrib/seeds)

* * *
Expand All @@ -10,10 +10,10 @@ Release Process
Check out the source code in the following directory hierarchy.

cd /path/to/your/toplevel/build
git clone https://github.com/poppay/gitian.sigs.git
git clone https://github.com/poppay/pop-detached-sigs.git
git clone https://github.com/devrandom/gitian-builder.git
git clone https://github.com/poppay/pop.git
git clone https://github.com/PopchainOrg/PopChain-gho.git
git clone https://github.com/PopchainOrg/PopChain-gho.git
git clone https://github.com/PopchainOrg/PopChain-gho.git
git clone https://github.com/PopchainOrg/PopChain-gho.git

###Pop Core maintainers/release engineers, update (commit) version in sources

Expand Down Expand Up @@ -139,7 +139,7 @@ Commit your signature to gitian.sigs:

Wait for Windows/OS X detached signatures:
Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys.
Detached signatures will then be committed to the [pop-detached-sigs](https://github.com/poppay/pop-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
Detached signatures will then be committed to the [pop-detached-sigs](https://github.com/PopchainOrg/PopChain-gho) repository, which can be combined with the unsigned apps to create signed binaries.

Create (and optionally verify) the signed OS X binary:

Expand Down Expand Up @@ -182,21 +182,21 @@ rm SHA256SUMS
(the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files)
Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spurious/nonsensical entry.

- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the pop.org server
- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the popchain.org server

- Update pop.org
- Update popchain.org

- Announce the release:

- Release on Pop forum: https://www.pop.org/forum/topic/official-announcements.54/
- Release on Pop forum: https://github.com/PopchainOrg/PopChain-gho

- Pop-development mailing list

- Update title of #poppay on Freenode IRC
- Update title of #popchain on Freenode IRC

- Optionally reddit /r/Poppay, ... but this will usually sort out itself
- Optionally reddit /r/popchain, ... but this will usually sort out itself

- Notify flare so that he can start building [the PPAs](https://launchpad.net/~pop.org/+archive/ubuntu/pop)
- Notify flare so that he can start building [the PPAs](https://github.com/PopchainOrg/PopChain-gho)

- Add release notes for the new version to the directory `doc/release-notes` in git master

Expand Down
6 changes: 3 additions & 3 deletions share/qt/Info.plist.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>org.pop.PopPayment</string>
<string>org.pop.Payment</string>
<key>CFBundleURLSchemes</key>
<array>
<string>pop</string>
Expand All @@ -60,7 +60,7 @@
<key>UTTypeIdentifier</key>
<string>org.pop.paymentrequest</string>
<key>UTTypeDescription</key>
<string>Pop payment request</string>
<string>payment request</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
Expand All @@ -71,7 +71,7 @@
<string>application/x-pop-payment-request</string>
<key>public.filename-extension</key>
<array>
<string>poppaymentrequest</string>
<string>paymentrequest</string>
</array>
</dict>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion share/setup.nsi.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SetCompressor /SOLID lzma
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
!define COMPANY "Pop Core project"
!define URL https://www.pop.org/
!define URL https://popchain.org/popchain

# MUI Symbol Definitions
!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"
Expand Down
Loading