From 1be399925e56d52f3724f27e016a252df1326300 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 11 Aug 2018 15:47:54 -0700 Subject: [PATCH] Revert "Merge branch 'Asher-Dev' into dev" This reverts commit 825f31148362141d13fe990bf509c49b5ec07161, reversing changes made to ecbd54c3b46149b957bb95f2a619e49f01dd10f5. --- .travis.yml | 24 +++- README.md | 1 - kmd/linux/verus-cli/README.txt | 1 - src/txdb.cpp | 5 - zcutil/VerusCoin.xml | 195 --------------------------------- 5 files changed, 20 insertions(+), 206 deletions(-) delete mode 100644 zcutil/VerusCoin.xml diff --git a/.travis.yml b/.travis.yml index 6be8ad007..107a3827f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -sudo: false +sudo: required os: linux -dist: trusty +dist: xenial language: cpp compiler: - gcc @@ -41,11 +41,27 @@ matrix: exclude: - compiler: gcc install: -- 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 +- 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 - 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/README.md b/README.md index 89c3f306e..1a25809bc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ ## 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/) diff --git a/kmd/linux/verus-cli/README.txt b/kmd/linux/verus-cli/README.txt index 6f345ed2f..233670c5f 100644 --- a/kmd/linux/verus-cli/README.txt +++ b/kmd/linux/verus-cli/README.txt @@ -1,5 +1,4 @@ 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/src/txdb.cpp b/src/txdb.cpp index 26e1c0788..3fd660c10 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -628,12 +628,9 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pcursor->Seek(ssKeySet.str()); // 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; @@ -666,9 +663,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pindexNew->nSproutValue = diskindex.nSproutValue; // Consistency checks - LogPrintf("Debug Before the auto header\n"); auto header = pindexNew->GetBlockHeader(); - 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()); diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml deleted file mode 100644 index 964f3bc77..000000000 --- a/zcutil/VerusCoin.xml +++ /dev/null @@ -1,195 +0,0 @@ - - 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 - - - - - -