From 2d8d0537060039e8bebb9b772909e7760a417554 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 6 Jul 2018 17:47:57 -0700 Subject: [PATCH 1/7] Adding Brewfile for MacOS build dependencies --- Brewfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Brewfile diff --git a/Brewfile b/Brewfile new file mode 100644 index 000000000..8ed641c56 --- /dev/null +++ b/Brewfile @@ -0,0 +1,17 @@ +tap "discoteq/discoteq" +tap "homebrew/bundle" +tap "homebrew/cask" +tap "homebrew/cask-versions" +tap "homebrew/core" +brew "autoconf" +brew "autogen" +brew "automake" +brew "binutils" +brew "cmake" +brew "coreutils" +brew "gcc@5" +brew "leveldb" +brew "nanomsg" +brew "protobuf" +brew "wget" +brew "discoteq/discoteq/flock" From 66e6ec96c2779e92698a00edf64c5a463fe2182e Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 00:29:03 -0700 Subject: [PATCH 2/7] Updating version, annotating Mac fetch-params.sh for debugging --- .gitlab-ci.yml | 6 +++--- README.md | 2 +- contrib/devtools/fix-copyright-headers.py | 4 +++- kmd/linux/verus-cli/README.txt | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67ad7d43c..bef05408f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - deploy variables: - VERSION: 0.3.9 + VERSION: 0.3.10 AGAMA_ARTIFACTS_LINUX: linux64.tar.gz AGAMA_ARTIFACTS_MACOS: osx.tar.gz AGAMA_ARTIFACTS_WINDOWS: win64.zip @@ -190,7 +190,7 @@ ubuntu:bionic: - build:linux -osx:sierra: +.osx:sierra: # fetch-params.sh needs to be fixed for MacOS stage: test tags: ["Sierra"] script: @@ -204,7 +204,7 @@ osx:sierra: - build:mac -osx:high-sierra: +.osx:high-sierra: # fetch-params.sh needs to be fixed for MacOS stage: test tags: ["High Sierra"] script: diff --git a/README.md b/README.md index bed92e9f2..285d6459d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## VerusCoin version 0.3.9-beta +## VerusCoin version 0.3.10-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/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py index 5e8495254..fc57ae64e 100755 --- a/contrib/devtools/fix-copyright-headers.py +++ b/contrib/devtools/fix-copyright-headers.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +from __future__ import print_function + ''' Run this script inside of src/ and it will look for all the files that were changed this year that still have the last year in the @@ -46,7 +48,7 @@ for extension in extensions: filePath = os.getcwd() + filePath modifiedTime = getLastGitModifiedDate(filePath) if len(modifiedTime) > 0 and str(year) in modifiedTime: - print n,"Last Git Modified: ", modifiedTime, " - ", filePath + print(n, "Last Git Modified: ", modifiedTime, " - ", filePath) os.popen(command % (last_year,year,filePath)) n = n + 1 diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index 691ba4ff0..9cdfd2768 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.9-beta +VerusCoin Command Line Tools v0.3.10-beta Contents: komodod - VerusCoin's enhanced Komodo daemon komodo-cli - VerusCoin's Komodo command line utility From 2194e2af5ebbfa8435acf356377ae066f71a7fdc Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 16:57:16 -0700 Subject: [PATCH 3/7] updating from master (#91) * Asher dev (#89) * Adding Brewfile for fetching MacOS build dependencies with the brew bundle command. * Updating version, annotating Mac fetch-params.sh for debugging * Modify version to 0.3.10. (#90) --- 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 40547f3e6ff42d7c3ff5ba53b0f15e4d898be812 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 20:29:12 -0700 Subject: [PATCH 4/7] Debugging Windows komodod crash on legacy hardware that does not support AES or AVX instructions. Removing deploy steps in Travis-CI to use as a sanity check on Github --- .travis.yml | 24 ++++-------------------- src/txdb.cpp | 3 +++ 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 107a3827f..6be8ad007 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -sudo: required +sudo: false os: linux -dist: xenial +dist: trusty language: cpp compiler: - gcc @@ -41,27 +41,11 @@ matrix: exclude: - compiler: gcc install: -- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list -- travis_retry sudo apt-get -y update && travis_retry sudo apt-get -y install -qq $PACKAGES +- rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list +- travis_retry apt-get -y update && travis_retry apt-get -y install -qq $PACKAGES - if [ -n "$RUST_TARGET" ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH && rustup target add $RUST_TARGET; fi before_script: - unset CC; unset CXX script: -- "./zcutil/fetch-params.sh" - "./zcutil/$BUILD_SCRIPT -j2" -after_script: -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then eval "${PACKAGING_MATRIX}" && - gsutil cp $PACKAGE_NAME $STORAGE_DEST; fi -notifications: - slack: - secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= -before_install: -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d; fi -- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi -- source /home/travis/google-cloud-sdk/path.bash.inc -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then rm AUTH_KEY.json; fi -- rm AUTH_KEY.json.enc diff --git a/src/txdb.cpp b/src/txdb.cpp index 0651b920c..d3c87654d 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -489,6 +489,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pcursor->Seek(ssKeySet.str()); // Load mapBlockIndex + LogPrint("Debug", "Past the pcursor->Seek\n"); while (pcursor->Valid()) { boost::this_thread::interruption_point(); try { @@ -524,7 +525,9 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pindexNew->nSproutValue = diskindex.nSproutValue; // Consistency checks + LogPrint("Debug", "Before the auto header\n"); auto header = pindexNew->GetBlockHeader(); + LogPrint("Debug", "Past the auto header\n"); if (header.GetHash() != pindexNew->GetBlockHash()) return error("LoadBlockIndex(): block header inconsistency detected: on-disk = %s, in-memory = %s", diskindex.ToString(), pindexNew->ToString()); From d65488bf983c2e5d8b9a35efce0e7e0dc6b86e6f Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 21:23:53 -0700 Subject: [PATCH 5/7] troubleshooting komodod on legacy hardware running Windows --- src/txdb.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/txdb.cpp b/src/txdb.cpp index d3c87654d..b5def4474 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -489,7 +489,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pcursor->Seek(ssKeySet.str()); // Load mapBlockIndex - LogPrint("Debug", "Past the pcursor->Seek\n"); + LogPrintf("Past the pcursor->Seek\n"); while (pcursor->Valid()) { boost::this_thread::interruption_point(); try { @@ -525,9 +525,9 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pindexNew->nSproutValue = diskindex.nSproutValue; // Consistency checks - LogPrint("Debug", "Before the auto header\n"); + LogPrintf("Debug Before the auto header\n"); auto header = pindexNew->GetBlockHeader(); - LogPrint("Debug", "Past the auto header\n"); + LogPrintf("Debug Past the auto header\n"); if (header.GetHash() != pindexNew->GetBlockHash()) return error("LoadBlockIndex(): block header inconsistency detected: on-disk = %s, in-memory = %s", diskindex.ToString(), pindexNew->ToString()); From 2d98bcf949f6f04190559d9312128fc2299b0d44 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 21:44:59 -0700 Subject: [PATCH 6/7] debugging --- src/txdb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/txdb.cpp b/src/txdb.cpp index b5def4474..ae6870f8c 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -491,8 +491,10 @@ bool CBlockTreeDB::LoadBlockIndexGuts() // Load mapBlockIndex LogPrintf("Past the pcursor->Seek\n"); while (pcursor->Valid()) { + LogPrintf("Before interruption_point\n") boost::this_thread::interruption_point(); try { + LogPrintf("Before pcursor->key\n") leveldb::Slice slKey = pcursor->key(); CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION); char chType; From b1a8ac9db089e9553849a90f71fee9e150d446e7 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 23:04:07 -0700 Subject: [PATCH 7/7] Correcting syntax errors on debug saving progress on verus-cli windows InstallBuilder configuration xml --- src/txdb.cpp | 4 +- zcutil/VerusCoin.xml | 195 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 zcutil/VerusCoin.xml diff --git a/src/txdb.cpp b/src/txdb.cpp index ae6870f8c..ccca54ec7 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -491,10 +491,10 @@ bool CBlockTreeDB::LoadBlockIndexGuts() // Load mapBlockIndex LogPrintf("Past the pcursor->Seek\n"); while (pcursor->Valid()) { - LogPrintf("Before interruption_point\n") + LogPrintf("Before interruption_point\n"); boost::this_thread::interruption_point(); try { - LogPrintf("Before pcursor->key\n") + LogPrintf("Before pcursor->key\n"); leveldb::Slice slKey = pcursor->key(); CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION); char chType; diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml new file mode 100644 index 000000000..964f3bc77 --- /dev/null +++ b/zcutil/VerusCoin.xml @@ -0,0 +1,195 @@ + + VerusCoin + VerusCoin + 0.3.10 + ../COPYING + ../assets/imgs/VRSC_256x256.png + ../assets/imgs/VRSC_256x256.png + ../assets/imgs/VRSC_256x256.png + 1 + + + VerusCoin + VerusCoin CLI + 1 + 1 + 1 + 1 + + + Agama + Verus-Enhanced Agama Wallet + 1 + 1 + 1 + 1 + + + Start Agama App + + ../assets/icons/agama_icons/256x256.png + Agama App + + all + 0 + 0 + ${installdir}/Agama/Agama-win32-x64/Agama.exe + + + ${windows_folder_common_programs}/ + + + + + Verus-Enhanced Agama Wallet + ${installdir}/Agama + Agama + all + + + ../Agama-win32-x64 + + + + + + + + + Program Files + ${installdir} + programfiles + all + + + Uninstall + ${installdir}/${uninstallerName} + + Uninstall ${product_fullname} + ${installdir} + all + 0 + 0 + ${installdir}/${uninstallerName}.exe + + + ${installdir} + + + + + VerusCoin + ${installdir}/ + VerusCoin + all + + + ../kmd/windows/verus-cli + + + + + + + + + HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} + uninstaller_path + uninstaller_path + + + previous_installation_exists + 1 + + + + + + + + VERUS_HOME + ${installdir} + + + 1 + 1 + 1 + 1 + 1 + ../builds + 1 + ${windows_folder_appdata} + 1 + 1 + VerusCoin + 1 + + + installdira + Installer.Parameter.installdir.description + Installer.Parameter.installdir.explanation + + ${platform_install_prefix}/${product_shortname} + 0 + prefix + 1 + 0 + 30 + + + You don't have enough disk space to install the application, + please select another installation directory + + + less + ${installdir} + ${required_diskspace} + + + + + + + installation_type + Instalation type + Existing instalation is detected + Existing instalation is detected + uninstall + uninstall + + + uninstall + Uninstall + Uninstall + + + + + + 0 + 0 + + + + 0 + 0 + + + + + Upgrade + + + + + + + equals + ${previous_installation_exists} + 1 + + + + + +