nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2534

Browse Source 
4e115a3a core: remove out sorting from v7 rules (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-06 22:55:00 +04:00
commit 478b14b565
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cryptonote_core/blockchain.cpp
View File

@ -2383,26 +2383,6 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
}
}
// from v7, sorted outs
if (m_hardfork->get_current_version() >= 7) {
const crypto::public_key *last_key = NULL;
for (size_t n = 0; n < tx.vout.size(); ++n)
{
const tx_out &o = tx.vout[n];
if (o.target.type() == typeid(txout_to_key))
{
const txout_to_key& out_to_key = boost::get<txout_to_key>(o.target);
if (last_key && memcmp(&out_to_key.key, last_key, sizeof(*last_key)) >= 0)
{
MERROR_VER("transaction has unsorted outputs");
tvc.m_invalid_output = true;
return false;
}
last_key = &out_to_key.key;
}
}
}
return true;
}
//------------------------------------------------------------------

21
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

@ -264,6 +264,10 @@ namespace cryptonote
tx.vin.push_back(input_to_key);
}
// "Shuffle" outs
std::vector<tx_destination_entry> shuffled_dsts(destinations);
std::random_shuffle(shuffled_dsts.begin(), shuffled_dsts.end(), [](unsigned int i) { return crypto::rand<unsigned int>() % i; });
// sort ins by their key image
std::vector<size_t> ins_order(sources.size());
for (size_t n = 0; n < sources.size(); ++n)
@ -309,23 +313,6 @@ namespace cryptonote
summary_outs_money += dst_entr.amount;
}
#if 0
// sort outs by their public key
std::vector<size_t> outs_order(tx.vout.size());
for (size_t n = 0; n < tx.vout.size(); ++n)
outs_order[n] = n;
std::sort(outs_order.begin(), outs_order.end(), [&](size_t i0, size_t i1) {
const txout_to_key &tk0 = boost::get<txout_to_key>(tx.vout[i0].target);
const txout_to_key &tk1 = boost::get<txout_to_key>(tx.vout[i1].target);
return memcmp(&tk0.key, &tk1.key, sizeof(tk0.key)) < 0;
});
tools::apply_permutation(outs_order, [&] (size_t i0, size_t i1) {
std::swap(tx.vout[i0], tx.vout[i1]);
if (!amount_keys.empty())
std::swap(amount_keys[i0], amount_keys[i1]);
});
#endif
//check money
if(summary_outs_money > summary_inputs_money )
{