merging ombre-ryo-libre into ombre-master

.travis.yml

@@ -189,7 +189,7 @@ script:
     if [ "$COMPILE" == "main" ] ; then
         mkdir linux-x64-build
         cd linux-x64-build
-        cmake -DCMAKE_INSTALL_PREFIX=$HOME/ryo-linux-x64-release -DARCH="x86-64" -DBUILD_64=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_TAG="linux-x64-release" $TRAVIS_BUILD_DIR
+        cmake -DCMAKE_INSTALL_PREFIX=$HOME/ombre-linux-x64-release -DARCH="x86-64" -DBUILD_64=ON -DCMAKE_BUILD_TYPE=Debug -DBUILD_TAG="linux-x64-release" $TRAVIS_BUILD_DIR
         make -j "$NUMBER_OF_CPUS"
         make install
         cd bin

CMakeLists.txt

@@ -56,7 +56,7 @@ endif()
 
 cmake_minimum_required(VERSION 3.1.0)
 
-project(ryo)
+project(ombre)
 
 function (die msg)
   if (NOT WIN32)

Dockerfile

@@ -88,7 +88,7 @@ RUN git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} \
 
 # ncurses 
 # Needed for readline find module in cmake. Why is it not documented?
-# WARNING: ncurses 6.1 is not working correctly with RYO so we stay with the common 5.X
+# WARNING: ncurses 6.1 is not working correctly with Ombre so we stay with the common 5.X
 ARG NCURSES_VERSION=5.9
 ARG NCURSES_HASH=9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
 RUN curl -s -O ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-${NCURSES_VERSION}.tar.gz \
@@ -116,14 +116,14 @@ RUN apt-get update && \
 COPY --from=builder /src/build/release/bin/* /usr/local/bin/
 
 # Contains the blockchain
-VOLUME /root/.ryo
+VOLUME /root/.ombre
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet
-# ryo-wallet-cli
+# ombre-wallet-cli
 VOLUME /wallet
 
 EXPOSE 18080
 EXPOSE 18081
 
-ENTRYPOINT ["ryod", "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=18081", "--non-interactive", "--confirm-external-bind"] 
+ENTRYPOINT ["ombred", "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=18081", "--non-interactive", "--confirm-external-bind"] 

README.md

@@ -1,5 +1,5 @@
 # Ombre
-Copyright (c) 2018, The Ombre Cryptocurrency Project
+Copyright (c) 2019, The Ombre Cryptocurrency Project
 
 Copyright (c) 2018, Ryo Currency Project
 
@@ -36,9 +36,9 @@ The development fee will be used to pay for development, exchanges and marketing
 - **Total supply**: **500,000,000** coins in first 20 years which is followed by a tail emission each year for inflation.
 - **Coin symbol**: **OMB**
 - **Coin Units**:
-  + 1 Nano-Ombre &nbsp;= 0.000000001 **OMB** (10<sup>-9</sup> - _the smallest coin unit_)
-  + 1 Micro-Ombre = 0.000001 **OMB** (10<sup>-6</sup>)
-  + 1 Milli-Ombre = 0.001 **OMB** (10<sup>-3</sup>)
+  + 1 NanoOmbre &nbsp;= 0.000000001 **OMB** (10<sup>-9</sup> - _the smallest coin unit_)
+  + 1 MicroOmbre = 0.000001 **OMB** (10<sup>-6</sup>)
+  + 1 MilliOmbre = 0.001 **OMB** (10<sup>-3</sup>)
 - **Hash algorithm**: CryptoNight (Proof-Of-Work)
 - **Emission scheme**: Ombre's block reward changes _every 6-months_ as the following "Camel" distribution* (inspired by _real-world mining production_ like of crude oil, coal etc. that is often slow at first,
 accelerated in the next few years before declined and depleted). This great emission scheme was first introduced in Sumokoin.

src/address_validator/CMakeLists.txt

@@ -1,5 +1,4 @@
-# Copyright (c) 2018, Ombre Cryptocurrency Project
-# Copyright (c) 2018, Ryo Currency Project
+# Copyright (c) 2018, ryo-currency
 #
 # Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 # All rights reserved.
@@ -63,5 +62,5 @@ target_link_libraries(address_validator
     fmt::fmt-header-only)
 set_property(TARGET address_validator
   PROPERTY
-    OUTPUT_NAME "ryo-address-validator")
+    OUTPUT_NAME "ombre-address-validator")
 install(TARGETS address_validator DESTINATION bin)

src/address_validator/address_validator.cpp

@@ -1,10 +1,9 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
-// Copyright (c) 2018, Ryo Currency Project
+// Copyright (c) 2018, ryo-currency
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -175,7 +174,7 @@ int main(int argc, char *argv[])
 
 	namespace po = boost::program_options;
 
-	po::options_description desc("Validate OMBRE addresses and show properties\n\n"
+	po::options_description desc("Validate OMB/SUMOKOIN addresses and show properties\n\n"
 								 "ombre-address-validator [OPTIONS] WALLET_ADDRESS [WALLET_ADDRESS...]\n\n"
 								 "OPTIONS");
 	po::positional_options_description pos_option;

src/address_validator/address_validator.h

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -33,10 +32,10 @@
  */
 namespace cryptonote
 {
-/*! validate ombre addresses
+/*! validate ombre/sumokoin addresses
    *
-   * The validator is backward compatible to ombre addresses.
-   * A ombre address will be shown as OMBRE representation.
+   * The validator is backward compatible to sumokoin addresses.
+   * A sumokoin address will be shown as OMB representation.
    */
 class address_validator
 {

src/address_validator/writer.cpp

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/address_validator/writer.h

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/CMakeLists.txt

@@ -1,4 +1,3 @@
-# Copyright (c) 2018, Ombre Cryptocurrency Project
 # Copyright (c) 2018, Ryo Currency Project
 # Portions copyright (c) 2014-2018, The Monero Project
 #

src/blockchain_db/berkeleydb/db_bdb.cpp

@@ -1,10 +1,9 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/berkeleydb/db_bdb.h

@@ -1,10 +1,9 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/blockchain_db.cpp

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/blockchain_db.h

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/db_types.h

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/lmdb/db_lmdb.cpp

@@ -1,10 +1,9 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_db/lmdb/db_lmdb.h

@@ -1,10 +1,9 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

src/blockchain_utilities/CMakeLists.txt

@@ -1,4 +1,3 @@
-# Copyright (c) 2018, Ombre Cryptocurrency Project
 # Copyright (c) 2018, Ryo Currency Project
 # Portions copyright (c) 2014-2018, The Monero Project
 #
@@ -134,7 +133,7 @@ endif()
 
 set_property(TARGET blockchain_import
 	PROPERTY
-	OUTPUT_NAME "ryo-blockchain-import")
+	OUTPUT_NAME "ombre-blockchain-import")
 install(TARGETS blockchain_import DESTINATION bin)
 
 monero_add_executable(blockchain_export
@@ -157,7 +156,7 @@ target_link_libraries(blockchain_export
 
 set_property(TARGET blockchain_export
 	PROPERTY
-	OUTPUT_NAME "ryo-blockchain-export")
+	OUTPUT_NAME "ombre-blockchain-export")
 install(TARGETS blockchain_export DESTINATION bin)
 
 monero_add_executable(blockchain_blackball
@@ -182,7 +181,7 @@ target_link_libraries(blockchain_blackball
 
 set_property(TARGET blockchain_blackball
 	PROPERTY
-	OUTPUT_NAME "ryo-blockchain-blackball")
+	OUTPUT_NAME "ombre-blockchain-blackball")
 install(TARGETS blockchain_blackball DESTINATION bin)
 
 
@@ -206,6 +205,6 @@ target_link_libraries(blockchain_usage
 
 set_property(TARGET blockchain_usage
 	PROPERTY
-	OUTPUT_NAME "ryo-blockchain-usage")
+	OUTPUT_NAME "ombre-blockchain-usage")
 install(TARGETS blockchain_usage DESTINATION bin)
 

src/blockchain_utilities/README.md

@@ -1,4 +1,4 @@
-# Ombre Blockchain Utilities
+# ombre Blockchain Utilities
 
 Copyright (c) 2014-2018, The Monero Project
 
@@ -14,13 +14,13 @@ See also each utility's "--help" option.
 
 `$ ombre-blockchain-export`
 
-This loads the existing blockchain and exports it to `$OMBRE_DATA_DIR/export/blockchain.raw`
+This loads the existing blockchain and exports it to `$ombre_DATA_DIR/export/blockchain.raw`
 
 ### Import the exported file
 
 `$ ombre-blockchain-import`
 
-This imports blocks from `$OMBRE_DATA_DIR/export/blockchain.raw` (exported using the
+This imports blocks from `$ombre_DATA_DIR/export/blockchain.raw` (exported using the
 `ombre-blockchain-export` tool as described above) into the current database.
 
 Defaults: `--batch on`, `--batch size 20000`, `--verify on`

src/blockchain_utilities/blockchain_blackball.cpp

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -61,7 +60,7 @@ struct hash<output_data>
 static std::string get_default_db_path()
 {
 	boost::filesystem::path dir = tools::get_default_data_dir();
-	// remove .ryo, replace with .shared-ringdb
+	// remove .ombre, replace with .shared-ringdb
 	dir = dir.remove_filename();
 	dir /= ".shared-ringdb";
 	return dir.string();
@@ -180,7 +179,7 @@ int main(int argc, char *argv[])
 	const command_line::arg_descriptor<std::string> arg_database = {
 		"database", available_dbs.c_str(), default_db_type};
 	const command_line::arg_descriptor<bool> arg_rct_only = {"rct-only", "Only work on ringCT outputs", false};
-	const command_line::arg_descriptor<std::vector<std::string>> arg_inputs = {"inputs", "Path to Ombre DB, and path to any fork DBs"};
+	const command_line::arg_descriptor<std::vector<std::string>> arg_inputs = {"inputs", "Path to ombre DB, and path to any fork DBs"};
 
 	command_line::add_arg(desc_cmd_sett, arg_blackball_db_dir);
 	command_line::add_arg(desc_cmd_sett, cryptonote::arg_testnet_on);
@@ -209,12 +208,12 @@ int main(int argc, char *argv[])
 
 	if(command_line::get_arg(vm, command_line::arg_help))
 	{
-		std::cout << "Ombre '" << RYO_RELEASE_NAME << "' (" << RYO_VERSION_FULL << ")" << ENDL << ENDL;
+		std::cout << "ombre '" << RYO_RELEASE_NAME << "' (" << RYO_VERSION_FULL << ")" << ENDL << ENDL;
 		std::cout << desc_options << std::endl;
 		return 0;
 	}
 
-	mlog_configure(mlog_get_default_log_path("ryo-blockchain-blackball.log"), true);
+	mlog_configure(mlog_get_default_log_path("ombre-blockchain-blackball.log"), true);
 	if(!command_line::is_arg_defaulted(vm, arg_log_level))
 		mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
 	else

src/blockchain_utilities/blockchain_export.cpp

@@ -1,11 +1,10 @@
-// Copyright (c) 2018, Ombre Cryptocurrency Project
 // Copyright (c) 2018, Ryo Currency Project
 // Portions copyright (c) 2014-2018, The Monero Project
 //
 // Portions of this file are available under BSD-3 license. Please see ORIGINAL-LICENSE for details
 // All rights reserved.
 //
-// Ombre changes to this code are in public domain. Please note, other licences may apply to the file.
+// ombre changes to this code are in public domain. Please note, other licences may apply to the file.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -95,12 +94,12 @@ int main(int argc, char *argv[])
 
 	if(command_line::get_arg(vm, command_line::arg_help))
 	{
-		std::cout << "Ombre '" << RYO_RELEASE_NAME << "' (" << RYO_VERSION_FULL << ")" << ENDL << ENDL;
+		std::cout << "ombre '" << RYO_RELEASE_NAME << "' (" << RYO_VERSION_FULL << ")" << ENDL << ENDL;
 		std::cout << desc_options << std::endl;
 		return 0;
 	}
 
-	mlog_configure(mlog_get_default_log_path("ryo-blockchain-export.log"), true);
+	mlog_configure(mlog_get_default_log_path("ombre-blockchain-export.log"), true);
 	if(!command_line::is_arg_defaulted(vm, arg_log_level))
 		mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
 	else