From cbb14226569d8815137524c672fde8250b3327c4 Mon Sep 17 00:00:00 2001
From: Scott Sadler <scott@alphanode.co>
Date: Tue, 4 Sep 2018 17:12:04 -0300
Subject: [PATCH] fix for TXSCL data leak

---
 src/crosschain.cpp     | 7 +++++--
 src/notarisationdb.cpp | 7 ++++++-
 src/notarisationdb.h   | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/crosschain.cpp b/src/crosschain.cpp
index 197390e59..831c7bcae 100644
--- a/src/crosschain.cpp
+++ b/src/crosschain.cpp
@@ -50,6 +50,8 @@ uint256 CalculateProofRoot(const char* symbol, uint32_t targetCCid, int kmdHeigh
 
     int seenOwnNotarisations = 0;
 
+    bool txscl = IsTXSCL(symbol);
+
     for (int i=0; i<NOTARISATION_SCAN_LIMIT_BLOCKS; i++) {
         if (i > kmdHeight) break;
         NotarisationsInBlock notarisations;
@@ -72,8 +74,9 @@ uint256 CalculateProofRoot(const char* symbol, uint32_t targetCCid, int kmdHeigh
 
         if (seenOwnNotarisations == 1) {
             BOOST_FOREACH(Notarisation& nota, notarisations) {
-                if (nota.second.ccId == targetCCid)
-                    moms.push_back(nota.second.MoM);
+                if (IsTXSCL(nota.second.symbol) == txscl)
+                    if (nota.second.ccId == targetCCid)
+                        moms.push_back(nota.second.MoM);
             }
         }
     }
diff --git a/src/notarisationdb.cpp b/src/notarisationdb.cpp
index cdfbb82c1..de3dd75f2 100644
--- a/src/notarisationdb.cpp
+++ b/src/notarisationdb.cpp
@@ -26,7 +26,7 @@ NotarisationsInBlock ScanBlockNotarisations(const CBlock &block, int nHeight)
         {
             NotarisationData data;
             if (ParseNotarisationOpReturn(tx, data))
-                if (strlen(data.symbol) >= 5 && strncmp(data.symbol, "TXSCL", 5) == 0)
+                if (IsTXSCL(data.symbol))
                     isTxscl = 1;
         }
 
@@ -46,6 +46,11 @@ NotarisationsInBlock ScanBlockNotarisations(const CBlock &block, int nHeight)
     return vNotarisations;
 }
 
+bool IsTXSCL(const char* symbol)
+{
+    return strlen(symbol) >= 5 && strncmp(symbol, "TXSCL", 5) == 0;
+}
+
 
 bool GetBlockNotarisations(uint256 blockHash, NotarisationsInBlock &nibs)
 {
diff --git a/src/notarisationdb.h b/src/notarisationdb.h
index b8cd93691..f01a5a587 100644
--- a/src/notarisationdb.h
+++ b/src/notarisationdb.h
@@ -24,5 +24,6 @@ bool GetBackNotarisation(uint256 notarisationHash, Notarisation &n);
 void WriteBackNotarisations(const NotarisationsInBlock notarisations, CLevelDBBatch &batch);
 void EraseBackNotarisations(const NotarisationsInBlock notarisations, CLevelDBBatch &batch);
 int ScanNotarisationsDB(int height, std::string symbol, int scanLimitBlocks, Notarisation& out);
+bool IsTXSCL(const char* symbol);
 
 #endif  /* NOTARISATIONDB_H */