From cf8fe2867654f0061a17ca4780e736a170a8f87b Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 11:37:25 -0400 Subject: [PATCH 1/3] Temporarily disable error relating to mangled tx_extra fields --- src/wallet/wallet2.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6a573c49e..47bf80e36 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -38,7 +38,10 @@ 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); + + // 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); 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 56bb9591a5e8ebb236a4f326720d9224c892be9a Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 12:03:30 -0400 Subject: [PATCH 2/3] return for unhandleable tx_extra --- src/wallet/wallet2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 47bf80e36..ca16025bf 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -41,7 +41,11 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ // 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; 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 9c70be0e77c3e0b9f4a06c962203d049851b6cc5 Mon Sep 17 00:00:00 2001 From: monero-project Date: Wed, 30 Apr 2014 13:07:00 -0400 Subject: [PATCH 3/3] prompt to delete build directory on 'make clean' --- 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: