Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-13 18:05:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4308

Browse source 
9907ea06 cryptonote: sort tx_extra fields (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-26 22:18:28 +02:00
commit 1c91963dcd
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
5 changed files with 177 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cryptonote_core/cryptonote_tx_utils.cpp
View file

@ -38,6 +38,7 @@ using namespace epee;
#include "cryptonote_tx_utils.h"
#include "cryptonote_config.h"
#include "cryptonote_basic/miner.h"
#include "cryptonote_basic/tx_extra.h"
#include "crypto/crypto.h"
#include "crypto/hash.h"
#include "ringct/rctSigs.h"
@ -84,6 +85,8 @@ namespace cryptonote
if(!extra_nonce.empty())
if(!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce))
return false;
if (!sort_tx_extra(tx.extra, tx.extra))
return false;
txin_gen in;
in.height = height;
@ -434,6 +437,9 @@ namespace cryptonote
add_additional_tx_pub_keys_to_extra(tx.extra, additional_tx_public_keys);
}
if (!sort_tx_extra(tx.extra, tx.extra))
return false;
//check money
if(summary_outs_money > summary_inputs_money )
{