From 121459dd573a3cd249937de233c669fe9717b945 Mon Sep 17 00:00:00 2001
From: Dusan Klinec <dusan.klinec@gmail.com>
Date: Thu, 1 Nov 2018 10:30:19 +0100
Subject: [PATCH] xmr: sort extra fields

---
 src/apps/monero/signing/state.py              |  2 +
 .../signing/step_01_init_transaction.py       |  2 +-
 .../monero/signing/step_07_all_outputs_set.py | 75 ++++++++++---------
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/apps/monero/signing/state.py b/src/apps/monero/signing/state.py
index 1586f2c3e..cb5f7355b 100644
--- a/src/apps/monero/signing/state.py
+++ b/src/apps/monero/signing/state.py
@@ -109,6 +109,8 @@ class State:
 
         # simple stub containing items hashed into tx prefix
         self.tx = TprefixStub(vin=[], vout=[], extra=b"")
+        # TX_EXTRA_NONCE extra field for tx.extra, due to sort_tx_extra()
+        self.extra_nonce = None
 
         # contains an array where each item denotes the input's position
         # (inputs are sorted by key images)
diff --git a/src/apps/monero/signing/step_01_init_transaction.py b/src/apps/monero/signing/step_01_init_transaction.py
index 962aaec70..2797c0c91 100644
--- a/src/apps/monero/signing/step_01_init_transaction.py
+++ b/src/apps/monero/signing/step_01_init_transaction.py
@@ -324,7 +324,7 @@ def _process_payment_id(state: State, tsx_data: MoneroTransactionData):
     extra_buff[1] = lextra + 1
     extra_buff[2] = extra_prefix
     extra_buff[3:] = extra_nonce
-    state.tx.extra = extra_buff
+    state.extra_nonce = extra_buff
 
 
 def _get_key_for_payment_id_encryption(destinations: list, change_addr=None):
diff --git a/src/apps/monero/signing/step_07_all_outputs_set.py b/src/apps/monero/signing/step_07_all_outputs_set.py
index 61213dd2e..a886e5459 100644
--- a/src/apps/monero/signing/step_07_all_outputs_set.py
+++ b/src/apps/monero/signing/step_07_all_outputs_set.py
@@ -101,13 +101,47 @@ def _validate(state: State):
 def _set_tx_extra(state: State):
     """
     Sets tx public keys into transaction's extra.
+    Extra field is supposed to be sorted (by sort_tx_extra() in the Monero)
+    Tag ordering: TX_EXTRA_TAG_PUBKEY, TX_EXTRA_TAG_ADDITIONAL_PUBKEYS, TX_EXTRA_NONCE
     """
-    state.tx.extra = _add_tx_pub_key_to_extra(state.tx.extra, state.tx_pub)
+    from apps.monero.xmr.serialize import int_serialize
+
+    # Extra buffer length computation
+    # TX_EXTRA_TAG_PUBKEY (1B) | tx_pub_key (32B)
+    extra_size = 33
+    offset = 0
+    num_keys = 0
+    len_size = 0
 
     if state.need_additional_txkeys:
-        state.tx.extra = _add_additional_tx_pub_keys_to_extra(
-            state.tx.extra, state.additional_tx_public_keys
-        )
+        num_keys = len(state.additional_tx_public_keys)
+        len_size = int_serialize.uvarint_size(num_keys)
+
+        # TX_EXTRA_TAG_ADDITIONAL_PUBKEYS (1B) | varint | keys
+        extra_size += 1 + len_size + 32 * num_keys
+
+    if state.extra_nonce:
+        extra_size += len(state.extra_nonce)
+
+    extra = bytearray(extra_size)
+    extra[0] = 1  # TX_EXTRA_TAG_PUBKEY
+    crypto.encodepoint_into(memoryview(extra)[1:], state.tx_pub)
+    offset += 33
+
+    if state.need_additional_txkeys:
+        extra[offset] = 0x4  # TX_EXTRA_TAG_ADDITIONAL_PUBKEYS
+        int_serialize.dump_uvarint_b_into(num_keys, extra, offset + 1)
+        offset += 1 + len_size
+
+        for idx in range(num_keys):
+            extra[offset : offset + 32] = state.additional_tx_public_keys[idx]
+            offset += 32
+
+    if state.extra_nonce:
+        utils.memcpy(extra, offset, state.extra_nonce, 0, len(state.extra_nonce))
+        state.extra_nonce = None
+
+    state.tx.extra = extra
 
 
 def _set_tx_prefix(state: State):
@@ -127,39 +161,6 @@ def _set_tx_prefix(state: State):
     state.full_message_hasher.set_message(state.tx_prefix_hash)
 
 
-def _add_tx_pub_key_to_extra(tx_extra, pub_key):
-    """
-    Adds public key to the extra
-    """
-    to_add = bytearray(33)
-    to_add[0] = 1  # TX_EXTRA_TAG_PUBKEY
-    crypto.encodepoint_into(memoryview(to_add)[1:], pub_key)
-    return tx_extra + to_add
-
-
-def _add_additional_tx_pub_keys_to_extra(tx_extra, pub_keys):
-    """
-    Adds all additional tx public keys to the extra buffer
-    """
-    from apps.monero.xmr.serialize import int_serialize
-
-    # format: variant_tag (0x4) | array len varint | 32B | 32B | ...
-    num_keys = len(pub_keys)
-    len_size = int_serialize.uvarint_size(num_keys)
-    buffer = bytearray(1 + len_size + 32 * num_keys)
-
-    buffer[0] = 0x4  # TX_EXTRA_TAG_ADDITIONAL_PUBKEYS
-    int_serialize.dump_uvarint_b_into(num_keys, buffer, 1)  # uvarint(num_keys)
-    offset = 1 + len_size
-
-    for idx in range(num_keys):
-        buffer[offset : offset + 32] = pub_keys[idx]
-        offset += 32
-
-    tx_extra += buffer
-    return tx_extra
-
-
 def _out_pk(state: State):
     """
     Hashes out_pk into the full message.