Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev

fix merge conflict
2018-09-19 13:46:01 +08:00
parent 0c0befd6c4 119f1c1e0c
commit 876a6e0f9b
9 changed files with 35 additions and 18 deletions
--- a/src/notarisationdb.cpp
+++ b/src/notarisationdb.cpp
@@ -47,6 +47,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)
 {