Skip to content

Commit

Permalink
Merge pull request #320 from HorizenOfficial/org_rename
Browse files Browse the repository at this point in the history
Rename org to HorizenOfficial bitcore
  • Loading branch information
cronicc authored Jul 27, 2020
2 parents 58e3633 + 20ced39 commit f81e416
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This issue tracker is only for technical issues related to Zen.

General Zen questions and/or support requests are best directed to the [Discord](https://horizen.global/invite/discord), or [Support Portal](https://support.horizen.global).

For reporting security vulnerabilities or for sensitive discussions with our security team, please see the [Bug Bounty Policy and Scope](https://horizenofficial.atlassian.net/wiki/spaces/ZEN/pages/136871957/Bug+Bounty+Submission+Policy+and+Scope), or send an encrypted email to [email protected] with information. The public key for that address is available [here](https://zencashofficial.github.io/keys/).
For reporting security vulnerabilities or for sensitive discussions with our security team, please see the [Bug Bounty Policy and Scope](https://horizenofficial.atlassian.net/wiki/spaces/ZEN/pages/136871957/Bug+Bounty+Submission+Policy+and+Scope), or send an encrypted email to [email protected] with information. The public key for that address is available [here](https://HorizenOfficial.github.io/keys/).

### Describe the issue
Please provide a general summary of the issue you're experiencing
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: shell

os: linux

.com.github.zencashofficial.zen_ci_testing.env-definitions:
.com.github.horizenofficial.zen.env-definitions:
- &docker_amd64_linux_ubuntu_xenial
env:
- DOCKER_ARCH=amd64
Expand Down Expand Up @@ -109,7 +109,7 @@ os: linux
- TEST_CMD="./qa/zcash/full_test_suite.py"
- TEST_ARGS="rpc --rpc-extended --rpc-exclude=rpcbind_test.py --rpc-split=3:3"

.com.github.zencashofficial.zen_ci_testing.job-definitions:
.com.github.horizenofficial.zen.job-definitions:
- &prepare_docker_amd64
os: linux
dist: bionic
Expand Down
18 changes: 5 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ A globally accessible and anonymous blockchain for censorship-resistant communic
Upgrading from 2.0.11 source
----------------

To upgrade from any version prior to 2.0.14, you will have to re-clone the repository, the [ZencashOfficial/zen](https://github.com/ZencashOfficial/zen) repository was replaced by a new repository based on Zcash upstream with a different commit history. Merging/pulling is not possible without issues.
To upgrade from any version prior to 2.0.14, you will have to re-clone the repository, the [HorizenOfficial/zen](https://github.com/HorizenOfficial/zen) repository was replaced by a new repository based on Zcash upstream with a different commit history. Merging/pulling is not possible without issues.
Assuming your current repository is stored at `~/zen`, do the following to upgrade:
```{r, engine='bash'}
# if you don't want to keep the old src around
rm -r ~/zen
# or if you do want to keep it
mv ~/zen ~/zen_archived
git clone https://github.com/ZencashOfficial/zen.git
git clone https://github.com/HorizenOfficial/zen.git
cd ~/zen
```
Now continue with building from source.
Expand Down Expand Up @@ -64,7 +64,7 @@ Building from source
* Install for Linux
```{r, engine='bash'}
git clone https://github.com/ZencashOfficial/zen.git
git clone https://github.com/HorizenOfficial/zen.git
cd zen
# Build
./zcutil/build.sh -j$(nproc)
Expand All @@ -77,10 +77,10 @@ cd zen
* Install for Mac OS (using clang)

```
Read and follow the README.md at https://github.com/ZencashOfficial/zencash-apple
Read and follow the README.md at https://github.com/HorizenOfficial/zencash-apple
```

https://github.com/ZencashOfficial/zencash-apple
https://github.com/HorizenOfficial/zencash-apple


* Install for Windows (Cross-Compiled, building on Windows is not supported yet)
Expand Down Expand Up @@ -176,14 +176,6 @@ Where do I begin?
Participation in the Horizen project is subject to a
[Code of Conduct](code_of_conduct.md).
Building
--------
Build Horizen along with most dependencies from source by running
./zcutil/build.sh for Linux.
./zcutil/build-win.sh for Windows
./zcutil/build-mac.sh for MacOS.
License
-------
Expand Down
2 changes: 1 addition & 1 deletion contrib/ci-horizen/scripts/common/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
export PIP_INSTALL=""
if [ "${TRAVIS_BUILD_STAGE_NAME}" = "Prepare" ]; then
export PIP_INSTALL="${PIP_INSTALL} b2"
export CLONE_REPO="https://github.com/ZencashOfficial/zencash-apple.git"
export CLONE_REPO="https://github.com/HorizenOfficial/zencash-apple.git"
export CLONE_TARGET="${HOME}/zencash-apple"
export B2_UL_COMPRESS_FOLDER="${CLONE_TARGET}"
export B2_UL_FILENAME="${TRAVIS_CPU_ARCH}-${TRAVIS_OS_NAME}-${TRAVIS_OSX_IMAGE}-${TRAVIS_BUILD_ID}-${TRAVIS_COMMIT}-zencash-apple.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Build-Depends: autoconf, automake, bsdmainutils, build-essential,
git, g++-multilib, libc6-dev, libtool,
m4, ncurses-dev, pkg-config, python,
unzip, wget, zlib1g-dev
Vcs-Git: https://github.com/ZencashOfficial/zen.git
Vcs-Browser: https://github.com/ZencashOfficial/zen
Vcs-Git: https://github.com/HorizenOfficial/zen.git
Vcs-Browser: https://github.com/HorizenOfficial/zen

Package: zen
Architecture: any
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
Upstream-Name: Horizen
Upstream-Contact: Horizen Team <[email protected]>
Source: https://github.com/ZenCashOfficial/zen
Source: https://github.com/HorizenOfficial/zen

Files: *
Copyright: 2016-2018, The Zen Blockchain Foundation
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ packages:
- "wget"
- "zlib1g-dev"
remotes:
- "url": "https://github.com/ZencashOfficial/zen.git"
- "url": "https://github.com/HorizenOfficial/zen.git"
"dir": "zen"
files: []
script: |
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/libgmp.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package=libgmp
$(package)_download_path=https://github.com/ZencashOfficial/$(package)/releases/download/v20170131/
$(package)_download_path=https://github.com/HorizenOfficial/$(package)/releases/download/v20170131/
$(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
$(package)_sha256_hash=59b2c2b5d58fdf5943bfde1fa709e9eb53e7e072c9699d28dc1c2cbb3c8cc32c
$(package)_git_commit=aece03c7b6967f91f3efdac8c673f55adff53ab1
Expand Down
2 changes: 1 addition & 1 deletion doc/payment-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ z_listoperationids <br>| [state] | Return a list of operationids for all operati

## Asynchronous RPC call Error Codes

Horizen error codes are defined in https://github.com/ZenCashOfficial/zen/blob/master/src/rpcprotocol.h
Horizen error codes are defined in https://github.com/HorizenOfficial/zen/blob/master/src/rpcprotocol.h

### z_sendmany error codes

Expand Down
4 changes: 2 additions & 2 deletions doc/release-notes/release-notes-2.0.18.md
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ Igor Mikheiko (1):
Added additional path check for default config file when app installed from .deb package #91

JOSEPH NICHOLAS R. ALCANTARA (1):
Merge pull request #135 from ZencashOfficial/TorDocumentation
Merge pull request #135 from HorizenOfficial/TorDocumentation

Jack Gavigan (2):
Removed markdown from COPYING
Expand Down Expand Up @@ -1218,7 +1218,7 @@ pierstab (29):
fix iscommunityfund
fix reward/miner/foundation
Revert "Merge branch 'master' into development"
fix https://github.com/ZencashOfficial/zencash/issues/46 and https://github.com/ZencashOfficial/zencash/issues/46
fix https://github.com/HorizenOfficial/zencash/issues/46 and https://github.com/HorizenOfficial/zencash/issues/46
minor fixes
refine CF,SN,XN addresses for testnet, reduce set for mainnet
change the getblocktemplate , add securenode, supernode in the coinbasetxn object, add the check in the related test
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/release-notes-2.0.21.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cronicc (8):
Set version to 2.0.21
Add release-notes
Regenerate man pages
Fixup: z_sendmany help message lines were misordered in https://github.com/ZencashOfficial/zen/pull/249
Fixup: z_sendmany help message lines were misordered in https://github.com/HorizenOfficial/zen/pull/249

root (7):
add timeblock check
Expand Down
4 changes: 2 additions & 2 deletions src/bitcoind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ bool AppInit(int argc, char* argv[])
" Windows (Vista and later): C:\\Users\\Username\\AppData\\Roaming\\Zen\n"
"\n"
" You can find the default configuration file at:\n"
" https://github.com/ZencashOfficial/zen/blob/master/contrib/debian/examples/zen.conf\n"
" https://github.com/HorizenOfficial/zen/blob/master/contrib/debian/examples/zen.conf\n"
"\n"
" WARNING:\n"
" Running the default configuration file without review is considered a potential risk, as zend\n"
Expand Down Expand Up @@ -184,7 +184,7 @@ bool AppInit(int argc, char* argv[])
" Windows (Vista and later): C:\\Users\\Username\\AppData\\Roaming\\Zen\n"
"\n"
" You can find the default configuration file at:\n"
" https://github.com/ZencashOfficial/zen/blob/master/contrib/debian/examples/zen.conf\n"
" https://github.com/HorizenOfficial/zen/blob/master/contrib/debian/examples/zen.conf\n"
"\n"
" WARNING:\n"
" Running the default configuration file without review is considered a potential risk, as zend\n"
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,7 @@ bool IsInitialBlockDownload()
{
const CChainParams& chainParams = Params();
LOCK(cs_main);
// from commit: https://github.com/ZencashOfficial/zen/commit/0c479520d29cae571dc531e54aa01813daacd1e1
// from commit: https://github.com/HorizenOfficial/zen/commit/0c479520d29cae571dc531e54aa01813daacd1e1
if (!ForkManager::getInstance().isAfterChainsplit(chainActive.Height()))
return false;
if (fImporting || fReindex)
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/mining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
if (vNodes.empty())
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Horizen is not connected!");

// from https://github.com/ZencashOfficial/zen/commit/e7a774e9a72fae1228ccbc764d520bd685860822
// from https://github.com/HorizenOfficial/zen/commit/e7a774e9a72fae1228ccbc764d520bd685860822
if (IsInitialBlockDownload() && ForkManager::getInstance().isAfterChainsplit(chainActive.Tip()->nHeight-(Params().GetConsensus().nMinerConfirmationWindow * 2)))
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Horizen is downloading blocks...");

Expand Down

0 comments on commit f81e416

Please sign in to comment.