From e143cf038c19ddd3572bb47a0dfe7493477a8a6c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 7 Jul 2018 01:32:19 -0700 Subject: [PATCH 1/7] Modify version to 0.3.10. --- zcutil/build-debian-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index 5207716ca..9c621d15b 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -20,7 +20,7 @@ fi ## PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v) ## Need version setting from environment -PACKAGE_VERSION=0.3.9-beta +PACKAGE_VERSION=0.3.10-beta ## ## Also, what does the sed end up doing? From 303c5303920b591b89e844456b456aea30182550 Mon Sep 17 00:00:00 2001 From: David Dawes Date: Mon, 16 Jul 2018 23:02:22 -0700 Subject: [PATCH 2/7] Remove undef __cpuid --- src/script/serverchecker.cpp | 2 +- src/support/pagelocker.h | 2 +- src/sync.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/script/serverchecker.cpp b/src/script/serverchecker.cpp index acff88450..52cfcc57b 100644 --- a/src/script/serverchecker.cpp +++ b/src/script/serverchecker.cpp @@ -12,7 +12,7 @@ #include "uint256.h" #include "util.h" -#undef __cpuid +//#undef __cpuid #include #include diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h index 7385bc444..677ee347c 100644 --- a/src/support/pagelocker.h +++ b/src/support/pagelocker.h @@ -10,7 +10,7 @@ #include -#undef __cpuid +//#undef __cpuid #include #include diff --git a/src/sync.h b/src/sync.h index c9ba7f8b0..5fa49947b 100644 --- a/src/sync.h +++ b/src/sync.h @@ -8,7 +8,7 @@ #include "threadsafety.h" -#undef __cpuid +//#undef __cpuid #include #include #include From 573ad4183f127ac1a59619ccacd0fc1ec8b82835 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 21 Jul 2018 19:52:12 -0700 Subject: [PATCH 3/7] updating versions --- README-mac.md | 4 ++-- README.md | 2 +- kmd/linux/verus-cli/README.txt | 2 +- kmd/mac/verus-cli/README.txt | 2 +- kmd/windows/verus-cli/README.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README-mac.md b/README-mac.md index 1e55bff5a..2ae4253d8 100644 --- a/README-mac.md +++ b/README-mac.md @@ -1,4 +1,4 @@ -First off you need Apple's Xcode (at least version 7, preferably 8.x) and the Xcode Command Line Tools: +You will need Apple's Xcode (at least version 7, preferably 8.x) and the Xcode Command Line Tools: https://itunes.apple.com/us/app/xcode/id497799835?mt=12 @@ -6,7 +6,7 @@ And Homebrew: http://brew.sh/ -then use the brewfile to install the necessary packages: +Use the brewfile to install the necessary packages: ```shell brew bundle diff --git a/README.md b/README.md index 285d6459d..ac12b15d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## VerusCoin version 0.3.10-beta +## VerusCoin version 0.3.11-beta VerusCoin is a new, mineable and stakeable cryptocurrency. It is a live fork of Komodo that retains its Zcash lineage and improves it. VerusCoin will leverage the Komodo platform and dPoW notarization for enhanced security and cross-chain interoperability. We have added a variation of a zawy12, lwma difficulty algorithm, a new CPU-optimized hash algorithm and a new algorithm for fair proof of stake. We describe these changes and vision going forward in a [our Phase I white paper](http://185.25.51.16/papers/VerusPhaseI.pdf) and [our Vision](http://185.25.51.16/papers/VerusVision.pdf). - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/) - [VerusCoin Explorer](https://explorer.veruscoin.io/) diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index 9cdfd2768..e24e33e0e 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.10-beta +VerusCoin Command Line Tools v0.3.11-beta Contents: komodod - VerusCoin's enhanced Komodo daemon komodo-cli - VerusCoin's Komodo command line utility diff --git a/kmd/mac/verus-cli/README.txt b/kmd/mac/verus-cli/README.txt index ddc238d80..8ebc2c0e6 100644 --- a/kmd/mac/verus-cli/README.txt +++ b/kmd/mac/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.9-beta +VerusCoin Command Line Tools v0.3.11-beta Contents: komodod - VerusCoin's enhanced Komodo daemon. komodo-cli - VerusCoin's enhanced Komodo command line utility. diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt index a77f950f6..3cdd96f0e 100644 --- a/kmd/windows/verus-cli/README.txt +++ b/kmd/windows/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.9-beta +VerusCoin Command Line Tools v0.3.11-beta Contents: komodod.exe - VerusCoin's enhanced Komodo daemon komodo-cli.exe - VerusCoin's Komodo command line utility From 88e39c853732c5263269a3616e68b1e5d544767c Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sun, 22 Jul 2018 20:02:09 -0700 Subject: [PATCH 4/7] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bef05408f..800d1792d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - deploy variables: - VERSION: 0.3.10 + VERSION: 0.3.11 AGAMA_ARTIFACTS_LINUX: linux64.tar.gz AGAMA_ARTIFACTS_MACOS: osx.tar.gz AGAMA_ARTIFACTS_WINDOWS: win64.zip From d6e6917177626bcd604e90d7c22e95895cb91f72 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 4 Aug 2018 16:42:23 -0700 Subject: [PATCH 5/7] Version to 0.3.12-beta. --- README.md | 4 +++- kmd/linux/verus-cli/README.txt | 2 +- kmd/mac/verus-cli/README.txt | 2 +- kmd/windows/verus-cli/README.txt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ac12b15d1..5c21ea514 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ -## VerusCoin version 0.3.11-beta +## VerusCoin version 0.3.12-beta VerusCoin is a new, mineable and stakeable cryptocurrency. It is a live fork of Komodo that retains its Zcash lineage and improves it. VerusCoin will leverage the Komodo platform and dPoW notarization for enhanced security and cross-chain interoperability. We have added a variation of a zawy12, lwma difficulty algorithm, a new CPU-optimized hash algorithm and a new algorithm for fair proof of stake. We describe these changes and vision going forward in a [our Phase I white paper](http://185.25.51.16/papers/VerusPhaseI.pdf) and [our Vision](http://185.25.51.16/papers/VerusVision.pdf). - [VerusCoin web site https://veruscoin.io/ Wallets and CLI tools](https://veruscoin.io/) - [VerusCoin Explorer](https://explorer.veruscoin.io/) +Version 0.3.12-beta has portable mining working. + ## Komodo with Bitcore This version of Komodo contains Bitcore support for komodo and all its assetchains. diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index e24e33e0e..233670c5f 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.11-beta +VerusCoin Command Line Tools v0.3.12-beta Contents: komodod - VerusCoin's enhanced Komodo daemon komodo-cli - VerusCoin's Komodo command line utility diff --git a/kmd/mac/verus-cli/README.txt b/kmd/mac/verus-cli/README.txt index 8ebc2c0e6..18007f72a 100644 --- a/kmd/mac/verus-cli/README.txt +++ b/kmd/mac/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.11-beta +VerusCoin Command Line Tools v0.3.12-beta Contents: komodod - VerusCoin's enhanced Komodo daemon. komodo-cli - VerusCoin's enhanced Komodo command line utility. diff --git a/kmd/windows/verus-cli/README.txt b/kmd/windows/verus-cli/README.txt index 3cdd96f0e..59cf3c4f6 100644 --- a/kmd/windows/verus-cli/README.txt +++ b/kmd/windows/verus-cli/README.txt @@ -1,4 +1,4 @@ -VerusCoin Command Line Tools v0.3.11-beta +VerusCoin Command Line Tools v0.3.12-beta Contents: komodod.exe - VerusCoin's enhanced Komodo daemon komodo-cli.exe - VerusCoin's Komodo command line utility From 5ddb85b2971d28d8a58eb2c49c7ff34fe6be0bc7 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 4 Aug 2018 16:48:11 -0700 Subject: [PATCH 6/7] Change version to 0.3.12 for gilab CI. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 800d1792d..e0c71a676 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - deploy variables: - VERSION: 0.3.11 + VERSION: 0.3.12 AGAMA_ARTIFACTS_LINUX: linux64.tar.gz AGAMA_ARTIFACTS_MACOS: osx.tar.gz AGAMA_ARTIFACTS_WINDOWS: win64.zip From 3ccaf5de85a24b73659c2558d4f10a5f5bca678b Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 4 Aug 2018 17:15:27 -0700 Subject: [PATCH 7/7] Put undefines for _cpuid back. --- src/script/serverchecker.cpp | 2 +- src/support/pagelocker.h | 2 +- src/sync.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/script/serverchecker.cpp b/src/script/serverchecker.cpp index 52cfcc57b..acff88450 100644 --- a/src/script/serverchecker.cpp +++ b/src/script/serverchecker.cpp @@ -12,7 +12,7 @@ #include "uint256.h" #include "util.h" -//#undef __cpuid +#undef __cpuid #include #include diff --git a/src/support/pagelocker.h b/src/support/pagelocker.h index 677ee347c..7385bc444 100644 --- a/src/support/pagelocker.h +++ b/src/support/pagelocker.h @@ -10,7 +10,7 @@ #include -//#undef __cpuid +#undef __cpuid #include #include diff --git a/src/sync.h b/src/sync.h index 5fa49947b..c9ba7f8b0 100644 --- a/src/sync.h +++ b/src/sync.h @@ -8,7 +8,7 @@ #include "threadsafety.h" -//#undef __cpuid +#undef __cpuid #include #include #include