From 884d068274e959d95401b884639d5ca1dce6bb32 Mon Sep 17 00:00:00 2001
From: sowle <crypto.sowle@gmail.com>
Date: Tue, 19 May 2020 20:21:31 +0300
Subject: [PATCH] tx_payer / tx_receiver will not be added to extra for an
 auditable address before HF2

---
 src/currency_core/currency_format_utils.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/currency_core/currency_format_utils.h b/src/currency_core/currency_format_utils.h
index 26f6554d..c4edefeb 100644
--- a/src/currency_core/currency_format_utils.h
+++ b/src/currency_core/currency_format_utils.h
@@ -602,10 +602,13 @@ namespace currency
     }
     else
     {
-      // before hardfork 2
-      tx_payer_old result = AUTO_VAL_INIT(result);
-      result.acc_addr = addr.to_old();
-      container.push_back(result);
+      // before hardfork 2 -- add only if addr is not auditable
+      if (!addr.is_auditable())
+      {
+        tx_payer_old result = AUTO_VAL_INIT(result);
+        result.acc_addr = addr.to_old();
+        container.push_back(result);
+      }
     }
   }
   //---------------------------------------------------------------
@@ -621,10 +624,13 @@ namespace currency
     }
     else
     {
-      // before hardfork 2
-      tx_receiver_old result = AUTO_VAL_INIT(result);
-      result.acc_addr = addr.to_old();
-      container.push_back(result);
+      // before hardfork 2 -- add only if addr is not auditable
+      if (!addr.is_auditable())
+      {
+        tx_receiver_old result = AUTO_VAL_INIT(result);
+        result.acc_addr = addr.to_old();
+        container.push_back(result);
+      }
     }
   }
   //---------------------------------------------------------------