From 8e92162d2c522d6dfa34cd7729c96231967e21c8 Mon Sep 17 00:00:00 2001 From: mydesktop Date: Wed, 30 Apr 2014 13:01:32 -0400 Subject: [PATCH 1/4] Warn user on attempting to remove build directory for make clean --- Makefile | 3 +++ src/wallet/wallet2.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 451319b08..65b72d4e1 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,9 @@ test-release: build-release all-release: build-release clean: + @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ + read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \ + [ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;) rm -rf build tags: diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6a573c49e..3c64c75c0 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -38,7 +38,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ uint64_t tx_money_got_in_outs = 0; crypto::public_key tx_pub_key = null_pkey; bool r = parse_and_validate_tx_extra(tx, tx_pub_key); - THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); + // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs); THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys()); From d165b74910e3f5b7cab5d6f04d7e0892bb2a0944 Mon Sep 17 00:00:00 2001 From: mydesktop Date: Wed, 30 Apr 2014 16:39:11 -0400 Subject: [PATCH 2/4] Revert "prompt to delete build directory on 'make clean'" This reverts commit 9c70be0e77c3e0b9f4a06c962203d049851b6cc5. --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 65b72d4e1..451319b08 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,6 @@ test-release: build-release all-release: build-release clean: - @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ - read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \ - [ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;) rm -rf build tags: From 8658f202325f61ec5351a5b0a7dd190e8b7b0fdc Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 16:41:03 -0400 Subject: [PATCH 3/4] how does github lol --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 451319b08..65b72d4e1 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,9 @@ test-release: build-release all-release: build-release clean: + @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ + read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; \ + [ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;) rm -rf build tags: From 504bdddcb55059e56c4e77c6cd9ad5e2f13ad39c Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 16:42:00 -0400 Subject: [PATCH 4/4] Reverting wallet2.cpp to proper bugfix --- src/wallet/wallet2.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 53facb43b..9bd487997 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -38,18 +38,13 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ uint64_t tx_money_got_in_outs = 0; crypto::public_key tx_pub_key = null_pkey; bool r = parse_and_validate_tx_extra(tx, tx_pub_key); -<<<<<<< HEAD - // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); -======= // Temporarily disabled due to messed up tx_extra from someone // screwing around with MMing. 2014-04-30 - // THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx); // We don't know how to handle this weird tx, so return if (!r) return; ->>>>>>> 9c70be0e77c3e0b9f4a06c962203d049851b6cc5 r = lookup_acc_outs(m_account.get_keys(), tx, tx_pub_key, outs, tx_money_got_in_outs); THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());