further fixes for mac osx
This commit is contained in:
commit
465bdc9629
|
@ -38,7 +38,18 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_
|
||||||
uint64_t tx_money_got_in_outs = 0;
|
uint64_t tx_money_got_in_outs = 0;
|
||||||
crypto::public_key tx_pub_key = null_pkey;
|
crypto::public_key tx_pub_key = null_pkey;
|
||||||
bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
|
bool r = parse_and_validate_tx_extra(tx, tx_pub_key);
|
||||||
|
<<<<<<< HEAD
|
||||||
// THROW_WALLET_EXCEPTION_IF(!r, error::tx_extra_parse_error, tx);
|
// 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);
|
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());
|
THROW_WALLET_EXCEPTION_IF(!r, error::acc_outs_lookup_error, tx, tx_pub_key, m_account.get_keys());
|
||||||
|
|
Loading…
Reference in New Issue