From c50a71a1ce516440fbf4fbda67ff28e7694962a1 Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Jul 2020 16:36:45 +0000 Subject: [PATCH 1/2] Rename org to HorizenOfficial --- .github/ISSUE_TEMPLATE.md | 2 +- .travis.yml | 4 ++-- README.md | 10 +++++----- contrib/ci-horizen/scripts/common/setup_environment.sh | 2 +- contrib/debian/control | 4 ++-- contrib/debian/copyright | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- depends/packages/libgmp.mk | 2 +- doc/payment-api.md | 2 +- doc/release-notes/release-notes-2.0.18.md | 4 ++-- doc/release-notes/release-notes-2.0.21.md | 2 +- src/bitcoind.cpp | 4 ++-- src/main.cpp | 2 +- src/rpc/mining.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ad8db0c0c7..4b21cbe2b9 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -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 security@horizen.global 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 security@horizen.global 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 diff --git a/.travis.yml b/.travis.yml index 80996b7d11..6f687a702e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/README.md b/README.md index 8fc466fca9..204788fedc 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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) @@ -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) diff --git a/contrib/ci-horizen/scripts/common/setup_environment.sh b/contrib/ci-horizen/scripts/common/setup_environment.sh index 5c9b72b434..7f84ccb8e3 100755 --- a/contrib/ci-horizen/scripts/common/setup_environment.sh +++ b/contrib/ci-horizen/scripts/common/setup_environment.sh @@ -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" diff --git a/contrib/debian/control b/contrib/debian/control index 138cf89dfd..337da31d83 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -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 diff --git a/contrib/debian/copyright b/contrib/debian/copyright index 0856139658..a85e8bfcfb 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -1,7 +1,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174 Upstream-Name: Horizen Upstream-Contact: Horizen Team -Source: https://github.com/ZenCashOfficial/zen +Source: https://github.com/HorizenOfficial/zen Files: * Copyright: 2016-2018, The Zen Blockchain Foundation diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 57edb8209a..1697c4f57e 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -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: | diff --git a/depends/packages/libgmp.mk b/depends/packages/libgmp.mk index 0855e7979e..f7bd485a8f 100644 --- a/depends/packages/libgmp.mk +++ b/depends/packages/libgmp.mk @@ -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 diff --git a/doc/payment-api.md b/doc/payment-api.md index f8f252634e..72bcc88d39 100644 --- a/doc/payment-api.md +++ b/doc/payment-api.md @@ -107,7 +107,7 @@ z_listoperationids
| [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 diff --git a/doc/release-notes/release-notes-2.0.18.md b/doc/release-notes/release-notes-2.0.18.md index c612787efe..d4d0e561ab 100644 --- a/doc/release-notes/release-notes-2.0.18.md +++ b/doc/release-notes/release-notes-2.0.18.md @@ -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 @@ -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 diff --git a/doc/release-notes/release-notes-2.0.21.md b/doc/release-notes/release-notes-2.0.21.md index 4bdb7ef176..3bb1748901 100644 --- a/doc/release-notes/release-notes-2.0.21.md +++ b/doc/release-notes/release-notes-2.0.21.md @@ -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 diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 75ccd025ea..862d3a199e 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -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" @@ -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" diff --git a/src/main.cpp b/src/main.cpp index 8d10838c27..990ebaa1aa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1590,7 +1590,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) diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 5841a6638f..3d68560998 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -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..."); From 20ced394994a789c2ea0e621f14fead199325c7c Mon Sep 17 00:00:00 2001 From: cronicc Date: Fri, 24 Jul 2020 17:58:42 +0000 Subject: [PATCH 2/2] Remove redundant Building section from README --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 204788fedc..8955bfbb38 100644 --- a/README.md +++ b/README.md @@ -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 -------