Merge pull request #4308

9907ea06 cryptonote: sort tx_extra fields (moneromooo-monero)
2018-10-26 22:18:28 +02:00
parent affab99b8a 9907ea0694
commit 1c91963dcd
5 changed files with 177 additions and 1 deletions
@@ -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 )
    {