Merge pull request monero-project#1041

011e42f fix nigglies, as pointed out by moneromooo-monero (Riccardo Spagni)
df63e07 fix remaining bitmonero and simplewallet bits (Riccardo Spagni)
04b120f fix blockchain utilities readme (Riccardo Spagni)
f1d4e4a readme fixes, small Docker fix (Riccardo Spagni)
9a525e0 rename systemd bits to monero (Riccardo Spagni)
011c94c change CMake project name (Riccardo Spagni)
50dc4fb update Dockerfile bitmonero refs (Riccardo Spagni)

CMakeLists.txt

@@ -30,7 +30,7 @@
 
 cmake_minimum_required(VERSION 2.8.7)
 
-project(bitmonero)
+project(monero)
 
 function (die msg)
   if (NOT WIN32)

Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER eiabea <developer@eiabea.com>
 RUN set -e && \
   apt-get update -q && \
   apt-get install -q -y --no-install-recommends ca-certificates git && \
-  git clone https://github.com/monero-project/bitmonero.git src && \
+  git clone https://github.com/monero-project/monero.git src && \
   apt-get purge -y git && \
   apt-get clean -q -y && \
   apt-get autoclean -q -y && \
@@ -23,18 +23,18 @@ RUN set -e && \
   apt-get clean -q -y && \
   apt-get autoclean -q -y && \
   apt-get autoremove -q -y && \
-  mkdir /bitmonero && \
-  mv /src/build/release/bin/* /bitmonero && \
+  mkdir /monero && \
+  mv /src/build/release/bin/* /monero && \
   rm -rf /src
 
-WORKDIR /bitmonero
+WORKDIR /monero
 
 # Contains the blockchain
 VOLUME /root/.bitmonero
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet
-# /./bitmonero/simplewallet
+# /./bitmonero/monero-wallet-cli
 VOLUME /wallet
 
 ENV LOG_LEVEL 0
@@ -46,4 +46,4 @@ ENV RPC_BIND_PORT 18081
 EXPOSE 18080
 EXPOSE 18081
 
-CMD ./bitmonerod --log-level=$LOG_LEVEL --p2p-bind-ip=$P2P_BIND_IP --p2p-bind-port=$P2P_BIND_PORT --rpc-bind-ip=$RPC_BIND_IP --rpc-bind-port=$RPC_BIND_PORT
+CMD ./monerod --log-level=$LOG_LEVEL --p2p-bind-ip=$P2P_BIND_IP --p2p-bind-port=$P2P_BIND_PORT --rpc-bind-ip=$RPC_BIND_IP --rpc-bind-port=$RPC_BIND_PORT

README.i18n

@@ -25,7 +25,7 @@ To build translations after modiying them:
 
 To test a translation:
 
-  LANG=es ./build/release/bin/simplewallet
+  LANG=es ./build/release/bin/monero-wallet-cli
 
 To add new translatable sources in the source:
 

README.md

@@ -2,15 +2,15 @@
 
 Copyright (c) 2014-2016, The Monero Project
 
-[![Build Status](https://travis-ci.org/monero-project/bitmonero.svg?branch=master)](https://travis-ci.org/monero-project/bitmonero)
-[![Coverage Status](https://coveralls.io/repos/github/monero-project/bitmonero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/bitmonero?branch=master)
+[![Build Status](https://travis-ci.org/monero-project/monero.svg?branch=master)](https://travis-ci.org/monero-project/monero)
+[![Coverage Status](https://coveralls.io/repos/github/monero-project/monero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/monero?branch=master)
 
 ## Development Resources
 
 - Web: [getmonero.org](https://getmonero.org)
 - Forum: [forum.getmonero.org](https://forum.getmonero.org)
 - Mail: [dev@getmonero.org](mailto:dev@getmonero.org)
-- GitHub: [https://github.com/monero-project/bitmonero](https://github.com/monero-project/bitmonero)
+- GitHub: [https://github.com/monero-project/monero](https://github.com/monero-project/monero)
 - IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
 
 ## Introduction
@@ -73,10 +73,10 @@ Packages are available for
         docker build -t monero .
      
         # either run in foreground
-        docker run -it -v /bitmonero/chain:/root/.bitmonero -v /bitmonero/wallet:/wallet -p 18080:18080 monero
+        docker run -it -v /monero/chain:/root/.bitmonero -v /monero/wallet:/wallet -p 18080:18080 monero
 
         # or in background
-        docker run -it -d -v /bitmonero/chain:/root/.bitmonero -v /bitmonero/wallet:/wallet -p 18080:18080 monero
+        docker run -it -d -v /monero/chain:/root/.bitmonero -v /monero/wallet:/wallet -p 18080:18080 monero
 
 Packaging for your favorite distribution would be a welcome contribution!
 
@@ -123,7 +123,7 @@ invokes cmake commands as needed.
 * Install the dependencies
 * Change to the root of the source code directory and build:
 
-        cd bitmonero
+        cd monero
         make
 
     *Optional*: If your machine has several cores and enough memory, enable
@@ -243,51 +243,51 @@ Dependencies: Doxygen `>=1.8.0`, Graphviz `>=2.28` (optional).
 
 * The output will be built in doc/html/
 
-## Running bitmonerod
+## Running monerod
 
 The build places the binary in `bin/` sub-directory within the build directory
 from which cmake was invoked (repository root by default). To run in
 foreground:
 
-    ./bin/bitmonerod
+    ./bin/monerod
 
-To list all available options, run `./bin/bitmonerod --help`.  Options can be
+To list all available options, run `./bin/monerod --help`.  Options can be
 specified either on the command line or in a configuration file passed by the
 `--config-file` argument.  To specify an option in the configuration file, add
 a line with the syntax `argumentname=value`, where `argumentname` is the name
 of the argument without the leading dashes, for example `log-level=1`.
 
 To run in background:
 
-    ./bin/bitmonerod --log-file bitmonerod.log --detach
+    ./bin/monerod --log-file monerod.log --detach
 
 To run as a systemd service, copy
-[bitmonerod.service](utils/systemd/bitmonerod.service) to `/etc/systemd/system/` and
-[bitmonerod.conf](utils/conf/bitmonerod.conf) to `/etc/`. The [example
-service](utils/systemd/bitmonerod.service) assumes that the user `bitmonero` exists
+[monerod.service](utils/systemd/monerod.service) to `/etc/systemd/system/` and
+[monerod.conf](utils/conf/monerod.conf) to `/etc/`. The [example
+service](utils/systemd/monerod.service) assumes that the user `monero` exists
 and its home is the data directory specified in the [example
-config](utils/conf/bitmonerod.conf).
+config](utils/conf/monerod.conf).
 
 ## Internationalization
 
 See README.i18n
 
 ## Using Tor
 
-While Monero isn't made to integrate with Tor, it can be used wrapped with torsocks, if you add --p2p-bind-ip 127.0.0.1 to the bitmonerod command line. You also want to set DNS requests to go over TCP, so they'll be routed through Tor, by setting DNS_PUBLIC=tcp. You may also disable IGD (UPnP port forwarding negotiation), which is pointless with Tor. To allow local connections from the wallet, add TORSOCKS_ALLOW_INBOUND=1. Example:
+While Monero isn't made to integrate with Tor, it can be used wrapped with torsocks, if you add --p2p-bind-ip 127.0.0.1 to the monerod command line. You also want to set DNS requests to go over TCP, so they'll be routed through Tor, by setting DNS_PUBLIC=tcp. You may also disable IGD (UPnP port forwarding negotiation), which is pointless with Tor. To allow local connections from the wallet, add TORSOCKS_ALLOW_INBOUND=1. Example:
 
-`DNS_PUBLIC=tcp TORSOCKS_ALLOW_INBOUND=1 torsocks bitmonerod --p2p-bind-ip 127.0.0.1 --no-igd`
+`DNS_PUBLIC=tcp TORSOCKS_ALLOW_INBOUND=1 torsocks monerod --p2p-bind-ip 127.0.0.1 --no-igd`
 
 TAILS ships with a very restrictive set of firewall rules. Therefore, you need to add a rule to allow this connection too, in addition to telling torsocks to allow inbound connections. Full example:
 
 `sudo iptables -I OUTPUT 2 -p tcp -d 127.0.0.1 -m tcp --dport 18081 -j ACCEPT`
 
-`DNS_PUBLIC=tcp TORSOCKS_ALLOW_INBOUND=1 torsocks ./bitmonerod --p2p-bind-ip 127.0.0.1 --no-igd --rpc-bind-ip 127.0.0.1 --data-dir /home/amnesia/Persistent/your/directory/to/the/blockchain`
+`DNS_PUBLIC=tcp TORSOCKS_ALLOW_INBOUND=1 torsocks ./monerod --p2p-bind-ip 127.0.0.1 --no-igd --rpc-bind-ip 127.0.0.1 --data-dir /home/amnesia/Persistent/your/directory/to/the/blockchain`
 
-`./simplewallet`
+`./monero-wallet-cli`
 
 ## Using readline
 
-While bitmonerod and simplewallet do not use readline directly, most of the functionality can be obtained by running them via rlwrap. This allows command recall, edit capabilities, etc. It does not give autocompletion without an extra completion file, however. To use rlwrap, simply prepend `rlwrap` to the command line, eg:
+While monerod and monero-wallet-cli do not use readline directly, most of the functionality can be obtained by running them via rlwrap. This allows command recall, edit capabilities, etc. It does not give autocompletion without an extra completion file, however. To use rlwrap, simply prepend `rlwrap` to the command line, eg:
 
-`rlwrap bin/simplewallet --wallet-file /path/to/wallet`
+`rlwrap bin/monero-wallet-cli --wallet-file /path/to/wallet`

src/blockchain_utilities/README.md

@@ -4,41 +4,24 @@ Copyright (c) 2014-2016, The Monero Project
 
 ## Introduction
 
-The blockchain utilities allow one to convert an old style blockchain.bin file
-to a new style database. There are two ways to upgrade an old style blockchain:
-The recommended way is to run a `blockchain_export`, then `blockchain_import`.
-The other way is to run `blockchain_converter`. In both cases, you will be left
-with a new style blockchain.
-
-For importing into the LMDB database, compile with `DATABASE=lmdb`
-
-e.g.
-
-`DATABASE=lmdb make release`
-
-This is also the default compile setting on the master branch.
-
-The exporter will use the LMDB database as its source.
-If you are still using an old style in-memory database (blockchain.bin), you will
-have to either resync from scratch, or use an older version of the tools to export
-it and import it.
+The blockchain utilities allow one to import and export the blockchain.
 
 ## Usage:
 
 See also each utility's "--help" option.
 
-### Export an existing in-memory database
+### Export an existing blockchain database
 
-`$ blockchain_export`
+`$ monero-blockchain-export`
 
-This loads the existing blockchain, for whichever database type it was compiled for, and exports it to `$MONERO_DATA_DIR/export/blockchain.raw`
+This loads the existing blockchain and exports it to `$MONERO_DATA_DIR/export/blockchain.raw`
 
 ### Import the exported file
 
-`$ blockchain_import`
+`$ monero-blockchain-import`
 
-This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the `blockchain_export` tool as described above)
-into the current database.
+This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the
+`monero-blockchain-export` tool as described above) into the current database.
 
 Defaults: `--batch on`, `--batch size 20000`, `--verify on`
 
@@ -47,14 +30,14 @@ Batch size refers to number of blocks and can be adjusted for performance based
 Verification should only be turned off if importing from a trusted blockchain.
 
 If you encounter an error like "resizing not supported in batch mode", you can just re-run
-the `blockchain_import` command again, and it will restart from where it left off.
+the `monero-blockchain-import` command again, and it will restart from where it left off.
 
 ```bash
 ## use default settings to import blockchain.raw into database
-$ blockchain_import
+$ monero-blockchain-import
 
 ## fast import with large batch size, database mode "fastest", verification off
-$ blockchain_import --batch-size 20000 --database lmdb#fastest --verify off
+$ monero-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off
 
 ```
 
@@ -77,7 +60,7 @@ stop at block number
 
 `--database <database type>#<flag(s)>`
 
-database type: `lmdb, berkeley, memory`
+database type: `lmdb, memory`
 
 flags:
 
@@ -94,27 +77,12 @@ LMDB flags (more than one may be specified):
 
 `nosync, nometasync, writemap, mapasync, nordahead`
 
-BerkeleyDB flags (takes one):
-
-`txn_write_nosync, txn_nosync, txn_sync`
-
-```
 ## Examples:
-$ blockchain_import --database lmdb#fastest
-$ blockchain_import --database berkeley#fastest
-
-$ blockchain_import --database lmdb#nosync
-$ blockchain_import --database lmdb#nosync,nometasync
 
-$ blockchain_import --database berkeley#txn_nosync
 ```
+$ monero-blockchain-import --database lmdb#fastest
 
+$ monero-blockchain-import --database lmdb#nosync
 
-### Blockchain converter with batching
-`blockchain_converter` has also been updated and includes batching for faster writes. However, on lower RAM systems, this will be slower than using the exporter and importer utilities. The converter needs to keep the blockchain in memory for the duration of the conversion, like the original bitmonerod, thus leaving less memory available to the destination database to operate.
-
-Due to higher resource use, it is recommended to use the importer with an exported file instead of the converter.
-
-```bash
-$ blockchain_converter --batch on --batch-size 20000
+$ monero-blockchain-import --database lmdb#nosync,nometasync
 ```

src/cryptonote_core/cryptonote_core.cpp

@@ -280,8 +280,8 @@ namespace cryptonote
       {
         LOG_PRINT_RED_L0("Found old-style blockchain.bin in " << old_files.string());
         LOG_PRINT_RED_L0("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
-        LOG_PRINT_RED_L0("the blockchain anew, or use blockchain_export and blockchain_import to convert your");
-        LOG_PRINT_RED_L0("existing blockchain.bin to the new format. See README.md for instructions.");
+        LOG_PRINT_RED_L0("the blockchain anew, or use monero-blockchain-export and monero-blockchain-import to");
+        LOG_PRINT_RED_L0("convert your existing blockchain.bin to the new format. See README.md for instructions.");
         return false;
       }
     }

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -706,7 +706,7 @@ namespace cryptonote
     if(m_synchronized.compare_exchange_strong(val_expected, true))
     {
       LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL
-        << "You are now synchronized with the network. You may now start simplewallet." << ENDL
+        << "You are now synchronized with the network. You may now start monero-wallet-cli." << ENDL
         << ENDL
         << "Please note, that the blockchain will be saved only after you quit the daemon with \"exit\" command or if you use \"save\" command." << ENDL
         << "Otherwise, you will possibly need to synchronize the blockchain again." << ENDL

src/daemon/rpc_command_executor.cpp

@@ -923,10 +923,10 @@ bool t_rpc_command_executor::print_status()
   bool daemon_is_alive = m_rpc_client->check_connection();
 
   if(daemon_is_alive) {
-    tools::success_msg_writer() << "bitmonerod is running";
+    tools::success_msg_writer() << "monerod is running";
   }
   else {
-    tools::fail_msg_writer() << "bitmonerod is NOT running";
+    tools::fail_msg_writer() << "monerod is NOT running";
   }
 
   return true;

src/simplewallet/simplewallet.cpp

@@ -1598,7 +1598,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
     tr("Your wallet has been generated!\n"
     "To start synchronizing with the daemon, use \"refresh\" command.\n"
     "Use \"help\" command to see the list of available commands.\n"
-    "Always use \"exit\" command when closing simplewallet to save your\n"
+    "Always use \"exit\" command when closing monero-wallet-cli to save your\n"
     "current session's state. Otherwise, you might need to synchronize \n"
     "your wallet again (your wallet keys are NOT at risk in any case).\n")
   ;
@@ -3746,7 +3746,7 @@ int main(int argc, char* argv[])
       return false;
     }
     // epee didn't find path to executable from argv[0], so use this default file name.
-    log_file_name = "simplewallet.log";
+    log_file_name = "monero-wallet-cli.log";
     // The full path will use cwd because epee also returned an empty default log folder.
   }
   default_log /= log_file_name;
@@ -3779,7 +3779,7 @@ int main(int argc, char* argv[])
     if (command_line::get_arg(vm, command_line::arg_help))
     {
       success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
-      success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
+      success_msg_writer() << sw::tr("Usage:") << " monero-wallet-cli [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
       success_msg_writer() << desc_all;
       return false;
     }
@@ -3798,8 +3798,8 @@ int main(int argc, char* argv[])
     return 0;
 
   // log_file_path
-  //   default: < argv[0] directory >/simplewallet.log
-  //     so if ran as "simplewallet" (no path), log file will be in cwd
+  //   default: < argv[0] directory >/monero-wallet-cli.log
+  //     so if ran as "monero-wallet-cli" (no path), log file will be in cwd
   //
   //   if log-file argument given:
   //     absolute path

tests/libwallet_api_tests/scripts/create_wallets.sh

@@ -2,7 +2,7 @@
 
 function create_wallet {
     wallet_name=$1
-    echo 0 | simplewallet  --testnet --trusted-daemon --daemon-address localhost:38081 --generate-new-wallet $wallet_name --password "" --restore-height=1
+    echo 0 | monero-wallet-cli  --testnet --trusted-daemon --daemon-address localhost:38081 --generate-new-wallet $wallet_name --password "" --restore-height=1
 }
 
 

tests/libwallet_api_tests/scripts/mining_start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rlwrap simplewallet --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_m.log start_mining
+rlwrap monero-wallet-cli --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_m.log start_mining
 

tests/libwallet_api_tests/scripts/mining_stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rlwrap simplewallet --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_miner.log stop_mining
+rlwrap monero-wallet-cli --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_miner.log stop_mining
 

tests/libwallet_api_tests/scripts/open_wallet_1.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 
-rlwrap simplewallet --wallet-file wallet_01.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_01.log
+rlwrap monero-wallet-cli --wallet-file wallet_01.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_01.log
 

tests/libwallet_api_tests/scripts/open_wallet_2.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 
-rlwrap simplewallet --wallet-file wallet_02.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_01.log
+rlwrap monero-wallet-cli --wallet-file wallet_02.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_01.log
 

tests/libwallet_api_tests/scripts/open_wallet_3.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rlwrap simplewallet --wallet-file wallet_03.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_03.log
+rlwrap monero-wallet-cli --wallet-file wallet_03.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_03.log
 

tests/libwallet_api_tests/scripts/open_wallet_4.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rlwrap simplewallet --wallet-file wallet_04.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_04.log
+rlwrap monero-wallet-cli --wallet-file wallet_04.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_04.log
 

tests/libwallet_api_tests/scripts/open_wallet_5.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rlwrap simplewallet --wallet-file wallet_05.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_05.log
+rlwrap monero-wallet-cli --wallet-file wallet_05.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081  --log-file wallet_05.log