From 32fda4260278c84a70813f7921ac351feea6431d Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Sun, 6 Dec 2020 22:57:07 -0500
Subject: [PATCH] Notarization

---
 src/Makefile.am                                | 2 +-
 src/crosschain.cpp                             | 2 +-
 src/crosschain_authority.cpp                   | 2 +-
 src/init.cpp                                   | 2 +-
 src/komodo_nSPV_fullnode.h                     | 2 +-
 src/main.cpp                                   | 2 +-
 src/{notarisationdb.cpp => notarizationdb.cpp} | 2 +-
 src/{notarisationdb.h => notarizationdb.h}     | 0
 src/rpc/crosschain.cpp                         | 2 +-
 src/test-hush/testutils.cpp                    | 2 +-
 src/torcontrol.cpp                             | 3 ---
 11 files changed, 9 insertions(+), 12 deletions(-)
 rename src/{notarisationdb.cpp => notarizationdb.cpp} (99%)
 rename src/{notarisationdb.h => notarizationdb.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index dbae00399..7cde25d52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -302,7 +302,7 @@ libbitcoin_server_a_SOURCES = \
   miner.cpp \
   net.cpp \
   noui.cpp \
-  notarisationdb.cpp \
+  notarizationdb.cpp \
   policy/fees.cpp \
   pow.cpp \
   rest.cpp \
diff --git a/src/crosschain.cpp b/src/crosschain.cpp
index a1c5463ef..1e782d6fb 100644
--- a/src/crosschain.cpp
+++ b/src/crosschain.cpp
@@ -17,7 +17,7 @@
 #include "crosschain.h"
 #include "importcoin.h"
 #include "main.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "merkleblock.h"
 
 #include "cc/CCinclude.h"
diff --git a/src/crosschain_authority.cpp b/src/crosschain_authority.cpp
index 339a5178c..f8c335be6 100644
--- a/src/crosschain_authority.cpp
+++ b/src/crosschain_authority.cpp
@@ -3,7 +3,7 @@
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #include "cc/eval.h"
 #include "crosschain.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 
 int GetSymbolAuthority(const char* symbol)
 {
diff --git a/src/init.cpp b/src/init.cpp
index 483f1495f..14bdaf09f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -33,7 +33,7 @@
 #include "httpserver.h"
 #include "httprpc.h"
 #include "key.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 
 #ifdef ENABLE_MINING
 #include "key_io.h"
diff --git a/src/komodo_nSPV_fullnode.h b/src/komodo_nSPV_fullnode.h
index 226cfe370..e1a274171 100644
--- a/src/komodo_nSPV_fullnode.h
+++ b/src/komodo_nSPV_fullnode.h
@@ -19,7 +19,7 @@
 
 // NSPV_get... functions need to return the exact serialized length, which is the size of the structure minus size of pointers, plus size of allocated data
 
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "rpc/server.h"
 
 static std::map<std::string,bool> nspv_remote_commands =  {{"channelsopen", true},{"channelspayment", true},{"channelsclose", true},{"channelsrefund", true},
diff --git a/src/main.cpp b/src/main.cpp
index 918845357..cff2f0d53 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,7 @@
 #include "init.h"
 #include "merkleblock.h"
 #include "metrics.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "net.h"
 #include "pow.h"
 #include "script/interpreter.h"
diff --git a/src/notarisationdb.cpp b/src/notarizationdb.cpp
similarity index 99%
rename from src/notarisationdb.cpp
rename to src/notarizationdb.cpp
index f11eefe02..44b20efb6 100644
--- a/src/notarisationdb.cpp
+++ b/src/notarizationdb.cpp
@@ -2,7 +2,7 @@
 // Distributed under the GPLv3 software license, see the accompanying
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 #include "dbwrapper.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "uint256.h"
 #include "cc/eval.h"
 #include "crosschain.h"
diff --git a/src/notarisationdb.h b/src/notarizationdb.h
similarity index 100%
rename from src/notarisationdb.h
rename to src/notarizationdb.h
diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp
index ddd57f1b8..318d9fa10 100644
--- a/src/rpc/crosschain.cpp
+++ b/src/rpc/crosschain.cpp
@@ -21,7 +21,7 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "crosschain.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "importcoin.h"
 #include "base58.h"
 #include "consensus/validation.h"
diff --git a/src/test-hush/testutils.cpp b/src/test-hush/testutils.cpp
index 1efb54c21..327e7fd93 100644
--- a/src/test-hush/testutils.cpp
+++ b/src/test-hush/testutils.cpp
@@ -8,7 +8,7 @@
 #include "key.h"
 #include "main.h"
 #include "miner.h"
-#include "notarisationdb.h"
+#include "notarizationdb.h"
 #include "random.h"
 #include "rpc/server.h"
 #include "rpc/protocol.h"
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 239fb062a..218fb903b 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -9,12 +9,10 @@
 #include "net.h"
 #include "util.h"
 #include "crypto/hmac_sha256.h"
-
 #include <vector>
 #include <deque>
 #include <set>
 #include <stdlib.h>
-
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <boost/signals2/signal.hpp>
@@ -23,7 +21,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
-
 #include <event2/bufferevent.h>
 #include <event2/buffer.h>
 #include <event2/util.h>