From 40547f3e6ff42d7c3ff5ba53b0f15e4d898be812 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 7 Jul 2018 20:29:12 -0700 Subject: [PATCH] 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());