Merge pull request monero-project#200 from DeanCole/rebrand

Full re-brand to Electroneum
lxop · Apr 9, 2018 · 2c24bf2 · 2c24bf2
2 parents a7fb737 + f12d53a
commit 2c24bf2
Show file tree

Hide file tree

Showing 448 changed files with 1,491 additions and 1,172 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 #
 # All rights reserved.
@@ -237,7 +238,7 @@ if(STATIC)
 endif()
 
 # Set default blockchain storage location:
-# memory was the default in Cryptonote before Monero implimented LMDB, it still works but is unneccessary.
+# memory was the default in Cryptonote before Electroneum implimented LMDB, it still works but is unneccessary.
 # set(DATABASE memory)
 set(DATABASE lmdb)
 

diff --git a/CMakeLists_IOS.txt b/CMakeLists_IOS.txt
@@ -1,6 +1,7 @@
+# Portions Copyright (c) 2017-2018, The Electroneum Project
 # Portions Copyright (c) 2017, The Monero Project
 # This file is based off of the https://code.google.com/archive/p/ios-cmake/
-# It has been altered for Monero iOS development
+# It has been altered for Electroneum iOS development
 #
 #
 # Options:

diff --git a/Doxyfile b/Doxyfile
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Monero"
+PROJECT_NAME           = "Electroneum"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 #
 # All rights reserved.

diff --git a/README.md b/README.md
@@ -7,8 +7,6 @@ Portions Copyright (c) 2012-2013, The Cryptonote developers
 ## Development Resources
 
 - Web: [electroneum.com](https://electroneum.com)
-- Forum: [electroneumtalk.proboards.com](https://electroneumtalk.proboards.com)
-- Mail: [support@electroneum.com](mailto:support@electroneum.com)
 - GitHub: [https://github.com/electroneum/electroneum](https://github.com/electroneum/electroneum)
 
 ## Introduction
@@ -39,7 +37,7 @@ If you want to help out, see [CONTRIBUTING](CONTRIBUTING.md) for a set of guidel
 
 ## Vulnerability Response Process
 
-See [Vulnerability Response Process](VULNERABILITY_RESPONSE_PROCESS.md).
+See [HackerOne](https://hackerone.com/electroneum).
 
 ## Installing Electroneum from a Package
 

diff --git a/VULNERABILITY_RESPONSE_PROCESS.md b/VULNERABILITY_RESPONSE_PROCESS.md
diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 # 
 # All rights reserved.

diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 # 
 # All rights reserved.

diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in
@@ -26,7 +26,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need 
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = Monero
+PROJECT_NAME           = Electroneum
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 

diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 # All rights reserved.
 # 

diff --git a/cmake/test-static-assert.c b/cmake/test-static-assert.c
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2017, The Monero Project
+// Copyrights(c) 2017-2018, The Electroneum Project
+// Copyrights(c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 

diff --git a/cmake/test-static-assert.cpp b/cmake/test-static-assert.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2017, The Monero Project
+// Copyrights(c) 2017-2018, The Electroneum Project
+// Copyrights(c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 # 
 # All rights reserved.

diff --git a/contrib/epee/CMakeLists.txt b/contrib/epee/CMakeLists.txt
@@ -1,3 +1,4 @@
+# Copyright (c) 2017-2018, The Electroneum Project
 # Copyright (c) 2014-2017, The Monero Project
 # 
 # All rights reserved.

diff --git a/contrib/epee/include/hex.h b/contrib/epee/include/hex.h
@@ -1,3 +1,4 @@
+// Copyright (c) 2017-2018, The Electroneum Project
 // Copyright (c) 2017, The Monero Project
 //
 // All rights reserved.

diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
@@ -51,7 +51,7 @@
 
 #include "easylogging++.h"
 
-#define MONERO_DEFAULT_LOG_CATEGORY "default"
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "default"
 
 #define MCFATAL(cat,x) CLOG(FATAL,cat) << x
 #define MCERROR(cat,x) CLOG(ERROR,cat) << x
@@ -70,20 +70,20 @@
 #define MCLOG_MAGENTA(level,cat,x) MCLOG_COLOR(level,cat,"35",x)
 #define MCLOG_CYAN(level,cat,x) MCLOG_COLOR(level,cat,"36",x)
 
-#define MLOG_RED(level,x) MCLOG_RED(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG_GREEN(level,x) MCLOG_GREEN(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG_YELLOW(level,x) MCLOG_YELLOW(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG_BLUE(level,x) MCLOG_BLUE(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG_MAGENTA(level,x) MCLOG_MAGENTA(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG_CYAN(level,x) MCLOG_CYAN(level,MONERO_DEFAULT_LOG_CATEGORY,x)
-
-#define MFATAL(x) MCFATAL(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MERROR(x) MCERROR(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MWARNING(x) MCWARNING(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MINFO(x) MCINFO(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MDEBUG(x) MCDEBUG(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MTRACE(x) MCTRACE(MONERO_DEFAULT_LOG_CATEGORY,x)
-#define MLOG(level,x) MCLOG(level,MONERO_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_RED(level,x) MCLOG_RED(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_GREEN(level,x) MCLOG_GREEN(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_YELLOW(level,x) MCLOG_YELLOW(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_BLUE(level,x) MCLOG_BLUE(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_MAGENTA(level,x) MCLOG_MAGENTA(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG_CYAN(level,x) MCLOG_CYAN(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+
+#define MFATAL(x) MCFATAL(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MERROR(x) MCERROR(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MWARNING(x) MCWARNING(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MINFO(x) MCINFO(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MDEBUG(x) MCDEBUG(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MTRACE(x) MCTRACE(ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
+#define MLOG(level,x) MCLOG(level,ELECTRONEUM_DEFAULT_LOG_CATEGORY,x)
 
 #define MGINFO(x) MCINFO("global",x)
 #define MGINFO_RED(x) MCLOG_RED(el::Level::Info, "global",x)

diff --git a/contrib/epee/include/net/abstract_tcp_server.h b/contrib/epee/include/net/abstract_tcp_server.h
@@ -38,8 +38,8 @@
 
 #pragma comment(lib, "Ws2_32.lib")
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net"
 
 namespace epee 
 {

diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h
@@ -1,7 +1,7 @@
 /**
 @file
 @author from CrypoNote (see copyright below; Andrey N. Sabelnikov)
-@monero rfree
+@electroneum rfree
 @brief the connection templated-class for one peer connection
 */
 // Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
@@ -57,8 +57,8 @@
 #include "../../../../src/p2p/connection_basic.hpp"
 #include "../../../../src/p2p/network_throttle-detail.hpp"
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net"
 
 #define ABSTRACT_SERVER_SEND_QUE_MAX_COUNT 1000
 

diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -1,7 +1,7 @@
 /**
 @file
 @author from CrypoNote (see copyright below; Andrey N. Sabelnikov)
-@monero rfree
+@electroneum rfree
 @brief the connection templated-class for one peer connection
 */
 // Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
@@ -51,8 +51,8 @@
 
 #include "../../../../src/cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net"
 
 #define CONNECTION_CLEANUP_TIME 30 // seconds
 
@@ -438,7 +438,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
 					if (!all_ok) {
 						MDEBUG("do_send() DONE ***FAILED*** from packet="<<cb<<" B for ptr="<<ptr);
 						MDEBUG("do_send() SEND was aborted in middle of big package - this is mostly harmless "
-							<< " (e.g. peer closed connection) but if it causes trouble tell us at #monero-dev. " << cb);
+							<< " (e.g. peer closed connection) but if it causes trouble tell us at #electroneum-dev. " << cb);
 						return false; // partial failure in sending
 					}
 					pos = pos+len;

diff --git a/contrib/epee/include/net/abstract_tcp_server_cp.h b/contrib/epee/include/net/abstract_tcp_server_cp.h
@@ -42,8 +42,8 @@
 #include "net_utils_base.h"
 #include "pragma_comp_defs.h"
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net"
 
 #define LEVIN_DEFAULT_DATA_BUFF_SIZE       2000  
 

diff --git a/contrib/epee/include/net/abstract_tcp_server_cp.inl b/contrib/epee/include/net/abstract_tcp_server_cp.inl
@@ -27,8 +27,8 @@
 
 #pragma comment(lib, "Ws2_32.lib")
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net"
 
 namespace epee
 {

diff --git a/contrib/epee/include/net/http_auth.h b/contrib/epee/include/net/http_auth.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2017, The Monero Project
+// Copyrights(c) 2017-2018, The Electroneum Project
+// Copyrights(c) 2014-2017, The Monero Project
 //
 // All rights reserved.
 //
@@ -36,8 +37,8 @@
 
 #include "http_base.h"
 
-#undef MONERO_DEFAULT_LOG_CATEGORY
-#define MONERO_DEFAULT_LOG_CATEGORY "net.http"
+#undef ELECTRONEUM_DEFAULT_LOG_CATEGORY
+#define ELECTRONEUM_DEFAULT_LOG_CATEGORY "net.http"
 
 namespace epee
 {