Browse Source

Revert "Merge branch 'Asher-Dev' into dev"

This reverts commit 825f311483, reversing
changes made to ecbd54c3b4.
pull/4/head
Asher Dawes 6 years ago
parent
commit
1be399925e
  1. 24
      .travis.yml
  2. 1
      README.md
  3. 1
      kmd/linux/verus-cli/README.txt
  4. 5
      src/txdb.cpp
  5. 195
      zcutil/VerusCoin.xml

24
.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

1
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/)

1
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

5
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());

195
zcutil/VerusCoin.xml

@ -1,195 +0,0 @@
<project>
<shortName>VerusCoin</shortName>
<fullName>VerusCoin</fullName>
<version>0.3.10</version>
<licenseFile>../COPYING</licenseFile>
<leftImage>../assets/imgs/VRSC_256x256.png</leftImage>
<logoImage>../assets/imgs/VRSC_256x256.png</logoImage>
<splashImage>../assets/imgs/VRSC_256x256.png</splashImage>
<allowLanguageSelection>1</allowLanguageSelection>
<componentList>
<componentGroup>
<name>VerusCoin</name>
<description>VerusCoin CLI</description>
<canBeEdited>1</canBeEdited>
<downloadable>1</downloadable>
<selected>1</selected>
<show>1</show>
<componentList>
<component>
<name>Agama</name>
<description>Verus-Enhanced Agama Wallet</description>
<canBeEdited>1</canBeEdited>
<downloadable>1</downloadable>
<selected>1</selected>
<show>1</show>
<desktopShortcutList>
<shortcut>
<comment>Start Agama App</comment>
<exec></exec>
<icon>../assets/icons/agama_icons/256x256.png</icon>
<name>Agama App</name>
<path></path>
<platforms>all</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/Agama/Agama-win32-x64/Agama.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath>${windows_folder_common_programs}/</windowsPath>
</shortcut>
</desktopShortcutList>
<folderList>
<folder>
<description>Verus-Enhanced Agama Wallet</description>
<destination>${installdir}/Agama</destination>
<name>Agama</name>
<platforms>all</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../Agama-win32-x64</origin>
</distributionDirectory>
</distributionFileList>
</folder>
</folderList>
</component>
</componentList>
<folderList>
<folder>
<description>Program Files</description>
<destination>${installdir}</destination>
<name>programfiles</name>
<platforms>all</platforms>
<shortcutList>
<shortcut>
<comment>Uninstall</comment>
<exec>${installdir}/${uninstallerName}</exec>
<icon></icon>
<name>Uninstall ${product_fullname}</name>
<path>${installdir}</path>
<platforms>all</platforms>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath>${installdir}</windowsPath>
</shortcut>
</shortcutList>
</folder>
<folder>
<description>VerusCoin</description>
<destination>${installdir}/</destination>
<name>VerusCoin</name>
<platforms>all</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../kmd/windows/verus-cli</origin>
</distributionDirectory>
</distributionFileList>
</folder>
</folderList>
</componentGroup>
</componentList>
<preInstallationActionList>
<registryGetMatch>
<key>HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname}</key>
<name>uninstaller_path</name>
<variable>uninstaller_path</variable>
</registryGetMatch>
<setInstallerVariable>
<name>previous_installation_exists</name>
<value>1</value>
<ruleList>
<fileTest condition="exists" path="${uninstaller_path}"/>
</ruleList>
</setInstallerVariable>
</preInstallationActionList>
<postInstallationActionList>
<addEnvironmentVariable>
<name>VERUS_HOME</name>
<value>${installdir}</value>
</addEnvironmentVariable>
</postInstallationActionList>
<allowAddRemoveComponents>1</allowAddRemoveComponents>
<allowComponentSelection>1</allowComponentSelection>
<enableDebugger>1</enableDebugger>
<enableRollback>1</enableRollback>
<enableTimestamp>1</enableTimestamp>
<outputDirectory>../builds</outputDirectory>
<replaceLockedFilesOnReboot>1</replaceLockedFilesOnReboot>
<rollbackBackupDirectory>${windows_folder_appdata}</rollbackBackupDirectory>
<saveRelativePaths>1</saveRelativePaths>
<singleInstanceCheck>1</singleInstanceCheck>
<vendor>VerusCoin</vendor>
<windows64bitMode>1</windows64bitMode>
<parameterList>
<directoryParameter>
<name>installdir</name>a
<description>Installer.Parameter.installdir.description</description>
<explanation>Installer.Parameter.installdir.explanation</explanation>
<value></value>
<default>${platform_install_prefix}/${product_shortname}</default>
<allowEmptyValue>0</allowEmptyValue>
<cliOptionName>prefix</cliOptionName>
<mustBeWritable>1</mustBeWritable>
<mustExist>0</mustExist>
<width>30</width>
<validationActionList>
<throwError>
<text>You don't have enough disk space to install the application,
please select another installation directory</text>
<ruleList>
<checkFreeDiskSpace>
<logic>less</logic>
<path>${installdir}</path>
<size>${required_diskspace}</size>
</checkFreeDiskSpace>
</ruleList>
</throwError>
</validationActionList>
</directoryParameter>
<choiceParameterGroup>
<name>installation_type</name>
<title>Instalation type</title>
<description>Existing instalation is detected</description>
<explanation>Existing instalation is detected</explanation>
<value>uninstall</value>
<default>uninstall</default>
<parameterList>
<parameterGroup>
<name>uninstall</name>
<title>Uninstall</title>
<explanation>Uninstall</explanation>
<value></value>
<default></default>
<parameterList>
<booleanParameter name="delete_user_data" description="Delete user data" displayStyle="checkbox-left">
<explanation></explanation>
<value>0</value>
<default>0</default>
</booleanParameter>
<booleanParameter name="delete_zcash_params" description="Delete Zcash params" displayStyle="checkbox-left">
<explanation></explanation>
<value>0</value>
<default>0</default>
</booleanParameter>
</parameterList>
</parameterGroup>
<labelParameter name="Upgrade" description="Upgrade to current version">
<title>Upgrade</title>
<explanation></explanation>
<image></image>
</labelParameter>
</parameterList>
<ruleList>
<compareValues>
<logic>equals</logic>
<value1>${previous_installation_exists}</value1>
<value2>1</value2>
</compareValues>
</ruleList>
</choiceParameterGroup>
</parameterList>
</project>
Loading…
Cancel
Save