From 8cd7b03ff53d7937c38fd1b384b2233a336b4843 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 4 Jun 2019 14:41:56 +0300 Subject: [PATCH 1/2] build: configuration script for win64 msvc testnet --- utils/configure_win64_msvs2017_gui_testnet.cmd | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 utils/configure_win64_msvs2017_gui_testnet.cmd diff --git a/utils/configure_win64_msvs2017_gui_testnet.cmd b/utils/configure_win64_msvs2017_gui_testnet.cmd new file mode 100644 index 00000000..892a199a --- /dev/null +++ b/utils/configure_win64_msvs2017_gui_testnet.cmd @@ -0,0 +1,7 @@ +call configure_local_paths.cmd + +cd .. +@mkdir build_msvc2017_64_tn +cd build_msvc2017_64_tn + +cmake -D TESTNET=TRUE -D USE_PCH=TRUE -D BUILD_TESTS=TRUE -D CMAKE_PREFIX_PATH="%QT_PREFIX_PATH%"\msvc2017_64 -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -T host=x64 ".." \ No newline at end of file From 41cc980023d9f6c6eb779806f6275eb65f8a999c Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Tue, 4 Jun 2019 21:46:56 +0300 Subject: [PATCH 2/2] fixed critical bug in altchain validation code --- src/currency_core/blockchain_storage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index f88d60c6..a6f7daf3 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -5210,7 +5210,10 @@ bool blockchain_storage::validate_alt_block_input(const transaction& input_tx, s // TODO: consider checking p->tx for unlock time validity as it's checked in get_output_keys_for_input_with_checks() // make sure it was actually found - CHECK_AND_ASSERT_MES(pk != null_pkey, false, "Can't determine output public key for offset " << pk_n); + + // let's disable this check due to missing equal check in main chain validation code + //TODO: implement more strict validation with next hard fork + //CHECK_AND_ASSERT_MES(pk != null_pkey, false, "Can't determine output public key for offset " << pk_n << " in related tx: " << tx_id << ", out_n = " << out_n); pub_key_pointers.push_back(&pk); }