diff options
| author | mydesktop <dev.mc2@gmail.com> | 2014-04-30 16:29:45 -0400 |
|---|---|---|
| committer | mydesktop <dev.mc2@gmail.com> | 2014-04-30 16:29:45 -0400 |
| commit | 465bdc96291978bb5505b0c2a13dba50ad0bcfaf (patch) | |
| tree | bec716ebad81ae3eef4e6b70d5dd6473ccbea966 /src/wallet | |
| parent | Warn user on attempting to remove build directory for make clean (diff) | |
| parent | prompt to delete build directory on 'make clean' (diff) | |
| download | monero-465bdc96291978bb5505b0c2a13dba50ad0bcfaf.tar.xz | |
further fixes for mac osx
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 3c64c75c0..53facb43b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -38,7 +38,18 @@ 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()); |