From 01a22b48b64ba77cace67508e532b1e05af86f41 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Sat, 13 Jan 2018 18:12:32 +0100 Subject: [PATCH] Update strings --- Dockerfile | 16 +- Doxyfile | 2 +- README.i18n.md | 8 +- README.md | 501 +++--------------- src/blockchain_utilities/CMakeLists.txt | 4 +- src/blockchain_utilities/README.md | 24 +- .../blockchain_export.cpp | 2 +- .../blockchain_import.cpp | 2 +- src/cryptonote_core/cryptonote_core.cpp | 6 +- .../cryptonote_protocol_handler.inl | 2 +- src/daemon/CMakeLists.txt | 2 +- src/daemon/rpc_command_executor.cpp | 4 +- src/simplewallet/CMakeLists.txt | 2 +- src/simplewallet/simplewallet.cpp | 6 +- src/wallet/CMakeLists.txt | 2 +- src/wallet/wallet_rpc_server.cpp | 8 +- translations/monero.ts | 2 +- translations/monero_fr.ts | 4 +- translations/monero_it.ts | 4 +- 19 files changed, 113 insertions(+), 488 deletions(-) diff --git a/Dockerfile b/Dockerfile index 297789a8..e74a60c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN set -x \ && apt-get -qq update \ && apt-get -qq --no-install-recommends install $buildDeps -RUN git clone https://github.com/monero-project/monero.git $SRC_DIR +RUN git clone https://kumig.it/kumitterer/danicoin $SRC_DIR WORKDIR $SRC_DIR RUN make -j$(nproc) release-static @@ -26,20 +26,20 @@ RUN cp build/release/bin/* /usr/local/bin/ \ && apt-get -qq --auto-remove purge $buildDeps # Contains the blockchain -VOLUME /root/.bitmonero +VOLUME /root/.danicoin # Generate your wallet via accessing the container and run: # cd /wallet -# monero-wallet-cli +# daniwallet VOLUME /wallet ENV LOG_LEVEL 0 ENV P2P_BIND_IP 0.0.0.0 -ENV P2P_BIND_PORT 18080 +ENV P2P_BIND_PORT 14086 ENV RPC_BIND_IP 127.0.0.1 -ENV RPC_BIND_PORT 18081 +ENV RPC_BIND_PORT 25096 -EXPOSE 18080 -EXPOSE 18081 +EXPOSE 14086 +EXPOSE 25096 -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 +CMD danicoind --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 diff --git a/Doxyfile b/Doxyfile index f622c618..58b7a38f 100644 --- 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 = "Danicoin" # 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/README.i18n.md b/README.i18n.md index 65f87cda..f8d78c45 100644 --- a/README.i18n.md +++ b/README.i18n.md @@ -1,9 +1,7 @@ -Monero daemon internationalization -================================== +Danicoin daemon internationalization +==================================== -The Monero command line tools can be translated in various languages. - -In order to use the same translation workflow as the [Monero Core GUI](https://github.com/monero-project/monero-core), they use Qt Linguist translation files. However, to avoid the dependencies on Qt this normally implies, they use a custom loader to read those files at runtime. +The Danicoin command line tools can be translated in various languages. ### Tools for translators diff --git a/README.md b/README.md index bda0ab5a..c4edbbd1 100644 --- a/README.md +++ b/README.md @@ -1,465 +1,92 @@ -# Monero +nicoin -Copyright (c) 2014-2017, The Monero Project, The Danicoin Project -Portions Copyright (c) 2012-2013, The Cryptonote developers +This is Danicoin, the best cryptocurrency out there. -## Development Resources +## Building -- 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/monero](https://github.com/monero-project/monero) -- IRC: [#monero-dev on Freenode](http://webchat.freenode.net/?randomnick=1&channels=%23monero-dev&prompt=1&uio=d4) - -## Build - -| Operating System | Processor | Status | -| --------------------- | -------- |--------| -| Ubuntu 16.04 | i686 | [![Ubuntu 16.04 i686](https://build.getmonero.org/png?builder=monero-static-ubuntu-i686)](https://build.getmonero.org/builders/monero-static-ubuntu-i686) -| Ubuntu 16.04 | amd64 | [![Ubuntu 16.04 amd64](https://build.getmonero.org/png?builder=monero-static-ubuntu-amd64)](https://build.getmonero.org/builders/monero-static-ubuntu-amd64) -| Ubuntu 16.04 | armv7 | [![Ubuntu 16.04 armv7](https://build.getmonero.org/png?builder=monero-static-ubuntu-arm7)](https://build.getmonero.org/builders/monero-static-ubuntu-arm7) -| Debian Stable | armv8 | [![Debian armv8](https://build.getmonero.org/png?builder=monero-static-debian-armv8)](https://build.getmonero.org/builders/monero-static-debian-armv8) -| OSX 10.10 | amd64 | [![OSX 10.10 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.10)](https://build.getmonero.org/builders/monero-static-osx-10.10) -| OSX 10.11 | amd64 | [![OSX 10.11 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.11)](https://build.getmonero.org/builders/monero-static-osx-10.11) -| OSX 10.12 | amd64 | [![OSX 10.12 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.12)](https://build.getmonero.org/builders/monero-static-osx-10.12) -| FreeBSD 11 | amd64 | [![FreeBSD 11 amd64](https://build.getmonero.org/png?builder=monero-static-freebsd64)](https://build.getmonero.org/builders/monero-static-freebsd64) -| DragonFly BSD 4.6 | amd64 | [![DragonFly BSD amd64](https://build.getmonero.org/png?builder=monero-static-dragonflybsd-amd64)](https://build.getmonero.org/builders/monero-static-dragonflybsd-amd64) -| Windows (MSYS2/MinGW) | i686 | [![Windows (MSYS2/MinGW) i686](https://build.getmonero.org/png?builder=monero-static-win32)](https://build.getmonero.org/builders/monero-static-win32) -| Windows (MSYS2/MinGW) | amd64 | [![Windows (MSYS2/MinGW) amd64](https://build.getmonero.org/png?builder=monero-static-win64)](https://build.getmonero.org/builders/monero-static-win64) - -## Coverage - -| Type | Status | -|-----------|--------| -| Coverity | [![Coverity Status](https://scan.coverity.com/projects/9657/badge.svg)](https://scan.coverity.com/projects/9657/) -| Coveralls | [![Coveralls Status](https://coveralls.io/repos/github/monero-project/monero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/monero?branch=master) -| License | [![License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) - -## Introduction - -Monero is a private, secure, untraceable, decentralised digital currency. You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so. - -**Privacy:** Monero uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain absolutely private by default. - -**Security:** Using the power of a distributed peer-to-peer consensus network, every transaction on the network is cryptographically secured. Individual wallets have a 25 word mnemonic seed that is only displayed once, and can be written down to backup the wallet. Wallet files are encrypted with a passphrase to ensure they are useless if stolen. - -**Untraceability:** By taking advantage of ring signatures, a special property of a certain type of cryptography, Monero is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer. - -## About this Project - -This is the core implementation of Monero. It is open source and completely free to use without restrictions, except for those specified in the license agreement below. There are no restrictions on anyone creating an alternative implementation of Monero that uses the protocol and network in a compatible manner. - -As with many development projects, the repository on Github is considered to be the "staging" area for the latest changes. Before changes are merged into that branch on the main repository, they are tested by individual developers in their own branches, submitted as a pull request, and then subsequently tested by contributors who focus on testing and code reviews. That having been said, the repository should be carefully considered before using it in a production environment, unless there is a patch in the repository for a particular show-stopping issue you are experiencing. It is generally a better idea to use a tagged release for stability. - -**Anyone is welcome to contribute to Monero's codebase!** If you have a fix or code change, feel free to submit it as a pull request directly to the "master" branch. In cases where the change is relatively small or does not affect other parts of the codebase it may be merged in immediately by any one of the collaborators. On the other hand, if the change is particularly large or complex, it is expected that it will be discussed at length either well in advance of the pull request being submitted, or even directly on the pull request. - -## Supporting the Project - -Monero development can be supported directly through donations. - -Both Monero and Bitcoin donations can be made to donate.getmonero.org if using a client that supports the [OpenAlias](https://openalias.org) standard - -The Monero donation address is: `44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A` (viewkey: `f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`) - -The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H` - -*Note: you can easily donate XMR to the Monero donation address by using the `donate` command. Type `help` in the command-line wallet for details.* - -Core development funding and/or some supporting services are also graciously provided by sponsors: - -[](https://mymonero.com) -[](http://kitware.com) -[](http://dome9.com) -[](http://araxis.com) -[](http://www.jetbrains.com/) -[](http://www.navicat.com/) -[](http://www.symas.com/) - -There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0). - -## License - -See [LICENSE](LICENSE). - -# Contributing - -If you want to help out, see [CONTRIBUTING](CONTRIBUTING.md) for a set of guidelines. - -## Vulnerability Response Process - -See [Vulnerability Response Process](VULNERABILITY_RESPONSE_PROCESS.md). - -## Monero software updates and consensus protocol changes (hard fork schedule) - -Monero uses a fixed-schedule hard fork mechanism to implement new features. This means that users of Monero (end users and service providers) need to run current versions and update their software on a regular schedule. Here is the current schedule, versions, and compatibility. -Dates are provided in the format YYYY-MM-DD. - - -| Fork Date | Consensus version | Minimum Monero Version | Recommended Monero Version | Details | -| ----------------- | ----------------- | ---------------------- | -------------------------- | ------------------ | -| 2016-09-21 | v3 | v0.9.4 | v0.10.0 | Splits coinbase into denominations | -| 2017-01-05 | v4 | v0.10.1 | v0.10.2.1 | Allow normal and RingCT transactions | -| 2017-04-15 | v5 | v0.10.3.0 | v0.10.3.1 | Adjusted minimum blocksize and fee algorithm | -| 2017-09-21 | v6 | Not determined as of 2017-03-27 | Not determined as of 2017-03-27 | Allow only RingCT transactions | - -## Installing Monero from a Package - -Packages are available for - -* Ubuntu and [snap supported](https://snapcraft.io/docs/core/install) systems, via a community contributed build. - - snap install monero --beta - -Installing a snap is very quick. Snaps are secure. They are isolated with all of their dependencies. Snaps also auto update when a new version is released. - -* Arch Linux (via [AUR](https://aur.archlinux.org/)): - - Stable release: [`monero`](https://aur.archlinux.org/packages/monero) - - Bleeding edge: [`bitmonero-git`](https://aur.archlinux.org/packages/bitmonero-git) - -* OS X via [Homebrew](http://brew.sh) - - brew tap sammy007/cryptonight - brew install monero --build-from-source - -* Docker - - docker build -t monero . - - # either run in foreground - docker run -it -v /monero/chain:/root/.bitmonero -v /monero/wallet:/wallet -p 18080:18080 monero - - # or in background - 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! - -## Compiling Monero from Source - -### Dependencies - -The following table summarizes the tools and libraries required to build. A -few of the libraries are also included in this repository (marked as -"Vendored"). By default, the build uses the library installed on the system, -and ignores the vendored sources. However, if no library is found installed on -the system, then the vendored source will be built and used. The vendored -sources are also used for statically-linked builds because distribution -packages often include only shared library binaries (`.so`) but not static -library archives (`.a`). - -| Dep | Min. Version | Vendored | Debian/Ubuntu Pkg | Arch Pkg | Optional | Purpose | -| -------------- | ------------- | ---------| ------------------ | -------------- | -------- | -------------- | -| GCC | 4.7.3 | NO | `build-essential` | `base-devel` | NO | | -| CMake | 3.0.0 | NO | `cmake` | `cmake` | NO | | -| pkg-config | any | NO | `pkg-config` | `base-devel` | NO | | -| Boost | 1.58 | NO | `libboost-all-dev` | `boost` | NO | C++ libraries | -| OpenSSL | basically any | NO | `libssl-dev` | `openssl` | NO | sha256 sum | -| libunbound | 1.4.16 | YES | `libunbound-dev` | `unbound` | NO | DNS resolver | -| libminiupnpc | 2.0 | YES | `libminiupnpc-dev` | `miniupnpc` | YES | NAT punching | -| libunwind | any | NO | `libunwind8-dev` | `libunwind` | YES | Stack traces | -| liblzma | any | NO | `liblzma-dev` | `xz` | YES | For libunwind | -| ldns | 1.6.17 | NO | `libldns-dev` | `ldns` | YES | SSL toolkit | -| expat | 1.1 | NO | `libexpat1-dev` | `expat` | YES | XML parsing | -| GTest | 1.5 | YES | `libgtest-dev`^ | `gtest` | YES | Test suite | -| Doxygen | any | NO | `doxygen` | `doxygen` | YES | Documentation | -| Graphviz | any | NO | `graphviz` | `graphviz` | YES | Documentation | - -[^] On Debian/Ubuntu `libgtest-dev` only includes sources and headers. You must -build the library binary manually. This can be done with the following command ```sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv libg* /usr/lib/ ``` - -### Build instructions - -Monero uses the CMake build system and a top-level [Makefile](Makefile) that -invokes cmake commands as needed. - -#### On Linux and OS X - -* Install the dependencies -* Change to the root of the source code directory and build: - - cd monero - make - - *Optional*: If your machine has several cores and enough memory, enable - parallel build by running `make -j` instead of `make`. For - this to be worthwhile, the machine should have one core and about 2GB of RAM - available per thread. - -* The resulting executables can be found in `build/release/bin` - -* Add `PATH="$PATH:$HOME/monero/build/release/bin"` to `.profile` - -* Run Monero with `monerod --detach` - -* **Optional**: build and run the test suite to verify the binaries: - - make release-test - - *NOTE*: `coretests` test may take a few hours to complete. - -* **Optional**: to build binaries suitable for debugging: - - make debug - -* **Optional**: to build statically-linked binaries: - - make release-static - -* **Optional**: build documentation in `doc/html` (omit `HAVE_DOT=YES` if `graphviz` is not installed): - - HAVE_DOT=YES doxygen Doxyfile - -#### On the Raspberry Pi 2 - -Tested on a Raspberry Pi 2 with a clean install of minimal Debian Jessie from https://www.raspberrypi.org/downloads/raspbian/ - -* `apt-get update && apt-get upgrade` to install all of the latest software - -* Install the dependencies for Monero except libunwind and libboost-all-dev - -* Increase the system swap size: -``` - sudo /etc/init.d/dphys-swapfile stop - sudo nano /etc/dphys-swapfile - CONF_SWAPSIZE=1024 - sudo /etc/init.d/dphys-swapfile start -``` -* Install the latest version of boost (this may first require invoking `apt-get remove --purge libboost*` to remove a previous version if you're not using a clean install): -``` - cd - wget https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2 - tar xvfo boost_1_64_0.tar.bz2 - cd boost_1_64_0 - ./bootstrap.sh - sudo ./b2 -``` -* Wait ~8 hours -``` - sudo ./bjam install -``` -* Wait ~4 hours - -* Change to the root of the source code directory and build: -``` - cd monero - make release -``` -* Wait ~4 hours - -* The resulting executables can be found in `build/release/bin` - -* Add `PATH="$PATH:$HOME/monero/build/release/bin"` to `.profile` - -* Run Monero with `monerod --detach` - -* You may wish to reduce the size of the swap file after the build has finished, and delete the boost directory from your home directory - -#### On Windows: - -Binaries for Windows are built on Windows using the MinGW toolchain within -[MSYS2 environment](http://msys2.github.io). The MSYS2 environment emulates a -POSIX system. The toolchain runs within the environment and *cross-compiles* -binaries that can run outside of the environment as a regular Windows -application. - -**Preparing the Build Environment** - -* Download and install the [MSYS2 installer](http://msys2.github.io), either the 64-bit or the 32-bit package, depending on your system. -* Open the MSYS shell via the `MSYS2 Shell` shortcut -* Update packages using pacman: - - pacman -Syuu - -* Exit the MSYS shell using Alt+F4 -* Edit the properties for the `MSYS2 Shell` shortcut changing "msys2_shell.bat" to "msys2_shell.cmd -mingw64" for 64-bit builds or "msys2_shell.cmd -mingw32" for 32-bit builds -* Restart MSYS shell via modified shortcut and update packages again using pacman: - - pacman -Syuu - - -* Install dependencies: - - To build for 64-bit Windows: - - pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost - - To build for 32-bit Windows: - - pacman -S mingw-w64-i686-toolchain make mingw-w64-i686-cmake mingw-w64-i686-boost - -* Open the MingW shell via `MinGW-w64-Win64 Shell` shortcut on 64-bit Windows - or `MinGW-w64-Win64 Shell` shortcut on 32-bit Windows. Note that if you are - running 64-bit Windows, you will have both 64-bit and 32-bit MinGW shells. - -**Building** - -* If you are on a 64-bit system, run: - - make release-static-win64 - -* If you are on a 32-bit system, run: - - make release-static-win32 - -* The resulting executables can be found in `build/release/bin` - -### On FreeBSD: - -The project can be built from scratch by following instructions for Linux above. If you are running monero in a jail you need to add the flag: `allow.sysvipc=1` to your jail configuration, otherwise lmdb will throw the error message: `Failed to open lmdb environment: Function not implemented`. - -We expect to add Monero into the ports tree in the near future, which will aid in managing installations using ports or packages. - -### On OpenBSD: - -This has been tested on OpenBSD 5.8. - -You will need to add a few packages to your system. `pkg_add db cmake gcc gcc-libs g++ miniupnpc gtest`. - -The doxygen and graphviz packages are optional and require the xbase set. - -The Boost package has a bug that will prevent librpc.a from building correctly. In order to fix this, you will have to Build boost yourself from scratch. Follow the directions here (under "Building Boost"): -https://github.com/bitcoin/bitcoin/blob/master/doc/build-openbsd.md - -You will have to add the serialization, date_time, and regex modules to Boost when building as they are needed by Monero. - -To build: `env CC=egcc CXX=eg++ CPP=ecpp DEVELOPER_LOCAL_TOOLS=1 BOOST_ROOT=/path/to/the/boost/you/built make release-static-64` - -### On Linux for Android (using docker): - - # Build image (select android64.Dockerfile for aarch64) - cd utils/build_scripts/ && docker build -f android32.Dockerfile -t monero-android . - # Create container - docker create -it --name monero-android monero-android bash - # Get binaries - docker cp monero-android:/opt/android/monero/build/release/bin . - -### Building Portable Statically Linked Binaries - -By default, in either dynamically or statically linked builds, binaries target the specific host processor on which the build happens and are not portable to other processors. Portable binaries can be built using the following targets: - -* ```make release-static-64``` builds binaries on Linux on x86_64 portable across POSIX systems on x86_64 processors -* ```make release-static-32``` builds binaries on Linux on x86_64 or i686 portable across POSIX systems on i686 processors -* ```make release-static-armv8``` builds binaries on Linux portable across POSIX systems on armv8 processors -* ```make release-static-armv7``` builds binaries on Linux portable across POSIX systems on armv7 processors -* ```make release-static-armv6``` builds binaries on Linux portable across POSIX systems on armv6 processors -* ```make release-static-win64``` builds binaries on 64-bit Windows portable across 64-bit Windows systems -* ```make release-static-win32``` builds binaries on 64-bit or 32-bit Windows portable across 32-bit Windows systems - -## 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/monerod - -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/monerod --log-file monerod.log --detach - -To run as a systemd service, copy -[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/monerod.conf). - -If you're on Mac, you may need to add the `--max-concurrency 1` option to -monero-wallet-cli, and possibly monerod, if you get crashes refreshing. - -## Internationalization - -See [README.i18n.md](README.i18n.md). - -## 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 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, you might have to add TORSOCKS_ALLOW_INBOUND=1, some OSes need it and some don't. Example: - -`DNS_PUBLIC=tcp torsocks monerod --p2p-bind-ip 127.0.0.1 --no-igd` - -or: - -`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 ./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` - -`./monero-wallet-cli` - -## Using readline - -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/monero-wallet-cli --wallet-file /path/to/wallet` - -Note: rlwrap will save things like your seed and private keys, if you supply them on prompt. You may want to not use rlwrap when you use simplewallet to restore from seed, etc. - -# Debugging - -This section contains general instructions for debugging failed installs or problems encountered with Monero. First ensure you are running the latest version built from the github repo. - -## Obtaining Stack Traces and Core Dumps on Unix Systems - -We generally use the tool `gdb` (GNU debugger) to provide stack trace functionality, and `ulimit` to provide core dumps in builds which crash or segfault. - -* To use gdb in order to obtain a stack trace for a build that has stalled: - -Run the build. - -Once it stalls, enter the following command: +There are currently no pre-built binaries available. To build Danicoin on an +Ubuntu machine, you first need to install some dependencies: ``` -gdb /path/to/monerod `pidof monerod` +sudo apt install git build-essential cmake libboost-all-dev ``` -Type `thread apply all bt` within gdb in order to obtain the stack trace +You can then fetch the code and compile it like this: -* If however the core dumps or segfaults: +``` +git clone https://kumig.it/kumitterer/danicoin.git +cd danicoin +make +``` -Enter `ulimit -c unlimited` on the command line to enable unlimited filesizes for core dumps +The binaries (you will primarily want to use danicoind and daniwallet) will be +placed into the "build/release/src" subdirectory of the danicoin source +directory. You may want to move them to /usr/bin like this: -Run the build. +``` +sudo install build/release/src/dani{coind,wallet} /usr/bin +``` -When it terminates with an output along the lines of "Segmentation fault (core dumped)", there should be a core dump file in the same directory as monerod. +## Usage -You can now analyse this core dump with `gdb` as follows: +### danicoind -`gdb /path/to/monerod /path/to/dumpfile` +Danicoin's core component is the daemon, danicoind. It is responsible for +keeping your copy of the blockchain in sync. Assuming you have installed it to +/usr/bin as seen above, you can just fire it up like this: -Print the stack trace with `bt` +``` +danicoind +``` -* To run monero within gdb: +Please note that running it for the first time might take a while as the entire +blockchain will have to be downloaded. -Type `gdb /path/to/monerod` +danicoind should not require any configuration as such. By default, it will +store its data, including a full copy of the blockchain, in the ".danicoin" +subdirectory of your user directory. -Pass command-line options with `--args` followed by the relevant arguments +If you need to change any settings, you may pass them as arguments to danicoind +or write them to a configuration file. If a "danicoin.conf" file exists in the +data directory (~/.danicoin), its settings will be used by default. -Type `run` to run monerod +You can find the arguments accepted by danicoind by executing: -## Analysing Memory Corruption +``` +danicoind --help +``` -We use the tool `valgrind` for this. +A sample configuration file can be found [in this repository](/danicoin.conf). -Run with `valgrind /path/to/monerod`. It will be slow. +### daniwallet -## LMDB +The easiest way to create and manage Danicoin wallets is using daniwallet. To +create your first wallet, named "mywallet" in this example, execute: -Instructions for debugging suspected blockchain corruption as per @HYC +``` +daniwallet --generate-new-wallet mywallet +``` -There is an `mdb_stat` command in the LMDB source that can print statistics about the database but it's not routinely built. This can be built with the following command: +daniwallet will then ask you for a password and generate your new wallet. Two +files will be stored in your current working directory - mywallet.wallet and +mywallet.address. mywallet.wallet contains the actual wallet, mywallet.address +contains the wallet address you use to receive payments. -`cd ~/monero/external/db_drivers/liblmdb && make` +In order to use daniwallet with an existing wallet, navigate to the directory +containing your mywallet.wallet, then execute: -The output of `mdb_stat -ea ` will indicate inconsistencies in the blocks, block_heights and block_info table. +``` +daniwallet --wallet-file mywallet +``` -The output of `mdb_dump -s blocks ` and `mdb_dump -s block_info ` is useful for indicating whether blocks and block_info contain the same keys. +Once daniwallet is running, you can, for instance, type in "balance" and press +Enter to see your current balance. To transfer money to another wallet, you may +use the following command (replacing "recipient_address" with the actual address +of the receiving wallet and "amount" with the amount of Danicoin to send): + +``` +transfer 3 recipient_address amount +``` + +You can find out about the other commands using "help". -These records are dumped as hex data, where the first line is the key and the second line is the data. diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index b4c02d57..6fbc5089 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -93,7 +93,7 @@ add_dependencies(blockchain_import version) set_property(TARGET blockchain_import PROPERTY - OUTPUT_NAME "monero-blockchain-import") + OUTPUT_NAME "danicoin-blockchain-import") monero_add_executable(blockchain_export ${blockchain_export_sources} @@ -115,5 +115,5 @@ add_dependencies(blockchain_export version) set_property(TARGET blockchain_export PROPERTY - OUTPUT_NAME "monero-blockchain-export") + OUTPUT_NAME "danicoin-blockchain-export") diff --git a/src/blockchain_utilities/README.md b/src/blockchain_utilities/README.md index 634d1da3..00c2e4f4 100644 --- a/src/blockchain_utilities/README.md +++ b/src/blockchain_utilities/README.md @@ -1,4 +1,4 @@ -# Monero Blockchain Utilities +# Danicoin Blockchain Utilities Copyright (c) 2014-2017, The Monero Project, The Danicoin Project @@ -12,16 +12,16 @@ See also each utility's "--help" option. ### Export an existing blockchain database -`$ monero-blockchain-export` +`$ danicoin-blockchain-export` -This loads the existing blockchain and exports it to `$MONERO_DATA_DIR/export/blockchain.raw` +This loads the existing blockchain and exports it to `$DANICOIN_DATA_DIR/export/blockchain.raw` ### Import the exported file -`$ monero-blockchain-import` +`$ danicoin-blockchain-import` -This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the -`monero-blockchain-export` tool as described above) into the current database. +This imports blocks from `$DANICOIN_DATA_DIR/export/blockchain.raw` (exported using the +`danicoin-blockchain-export` tool as described above) into the current database. Defaults: `--batch on`, `--batch size 20000`, `--verify on` @@ -30,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 `monero-blockchain-import` command again, and it will restart from where it left off. +the `danicoin-blockchain-import` command again, and it will restart from where it left off. ```bash ## use default settings to import blockchain.raw into database -$ monero-blockchain-import +$ danicoin-blockchain-import ## fast import with large batch size, database mode "fastest", verification off -$ monero-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off +$ danicoin-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off ``` @@ -80,9 +80,9 @@ LMDB flags (more than one may be specified): ## Examples: ``` -$ monero-blockchain-import --database lmdb#fastest +$ danicoin-blockchain-import --database lmdb#fastest -$ monero-blockchain-import --database lmdb#nosync +$ danicoin-blockchain-import --database lmdb#nosync -$ monero-blockchain-import --database lmdb#nosync,nometasync +$ danicoin-blockchain-import --database lmdb#nosync,nometasync ``` diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp index 7598fb0f..34cb9584 100644 --- a/src/blockchain_utilities/blockchain_export.cpp +++ b/src/blockchain_utilities/blockchain_export.cpp @@ -108,7 +108,7 @@ int main(int argc, char* argv[]) return 1; } - mlog_configure(mlog_get_default_log_path("monero-blockchain-export.log"), true); + mlog_configure(mlog_get_default_log_path("danicoin-blockchain-export.log"), true); if (!vm["log-level"].defaulted()) mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); else diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp index 4d698a25..be0c1ad9 100644 --- a/src/blockchain_utilities/blockchain_import.cpp +++ b/src/blockchain_utilities/blockchain_import.cpp @@ -637,7 +637,7 @@ int main(int argc, char* argv[]) m_config_folder = command_line::get_arg(vm, data_dir_arg); db_arg_str = command_line::get_arg(vm, arg_database); - mlog_configure(mlog_get_default_log_path("monero-blockchain-import.log"), true); + mlog_configure(mlog_get_default_log_path("danicoin-blockchain-import.log"), true); if (!vm["log-level"].defaulted()) mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); else diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 708e7479..4591ea34 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -303,8 +303,8 @@ namespace cryptonote if (boost::filesystem::exists(old_files / "blockchain.bin")) { MWARNING("Found old-style blockchain.bin in " << old_files.string()); - MWARNING("Monero now uses a new format. You can either remove blockchain.bin to start syncing"); - MWARNING("the blockchain anew, or use monero-blockchain-export and monero-blockchain-import to"); + MWARNING("Danicoin now uses a new format. You can either remove blockchain.bin to start syncing"); + MWARNING("the blockchain anew, or use danicoin-blockchain-export and danicoin-blockchain-import to"); MWARNING("convert your existing blockchain.bin to the new format. See README.md for instructions."); return false; } @@ -1301,7 +1301,7 @@ namespace cryptonote //----------------------------------------------------------------------------------------------- bool core::check_updates() { - static const char software[] = "monero"; + static const char software[] = "danicoin"; #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char subdir[] = "cli"; // because it can never be simple diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 92e81e4a..cb1dea87 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -1537,7 +1537,7 @@ skip: if(m_synchronized.compare_exchange_strong(val_expected, true)) { MGINFO_YELLOW(ENDL << "**********************************************************************" << ENDL - << "You are now synchronized with the network. You may now start monero-wallet-cli." << ENDL + << "You are now synchronized with the network. You may now start daniwallet." << ENDL << ENDL << "Use the \"help\" command to see the list of available commands." << ENDL << "**********************************************************************"); diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index cb76a827..14cfb645 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -102,5 +102,5 @@ target_link_libraries(daemon add_dependencies(daemon version) set_property(TARGET daemon PROPERTY - OUTPUT_NAME "monerod") + OUTPUT_NAME "danicoind") install(TARGETS daemon DESTINATION bin) diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 91e4370a..21778abd 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1118,10 +1118,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() << "monerod is running"; + tools::success_msg_writer() << "danicoind is running"; } else { - tools::fail_msg_writer() << "monerod is NOT running"; + tools::fail_msg_writer() << "danicoind is NOT running"; } return true; diff --git a/src/simplewallet/CMakeLists.txt b/src/simplewallet/CMakeLists.txt index f1c09a8b..e2aa78e6 100644 --- a/src/simplewallet/CMakeLists.txt +++ b/src/simplewallet/CMakeLists.txt @@ -59,5 +59,5 @@ add_dependencies(simplewallet version) set_property(TARGET simplewallet PROPERTY - OUTPUT_NAME "monero-wallet-cli") + OUTPUT_NAME "daniwallet") install(TARGETS simplewallet DESTINATION bin) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 65cd72ea..6d8b0c89 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1597,7 +1597,7 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map& vm, 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 monero-wallet-cli to save your\n" + "Always use \"exit\" command when closing daniwallet 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") ; @@ -4965,10 +4965,10 @@ int main(int argc, char* argv[]) const auto vm = wallet_args::main( argc, argv, - "monero-wallet-cli [--wallet-file=|--generate-new-wallet=] []", + "daniwallet [--wallet-file=|--generate-new-wallet=] []", desc_params, positional_options, - "monero-wallet-cli.log" + "daniwallet.log" ); if (!vm) diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index 8cf3dd73..1d54a418 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -119,7 +119,7 @@ if (NOT BUILD_GUI_DEPS) add_dependencies(wallet_rpc_server version) set_property(TARGET wallet_rpc_server PROPERTY - OUTPUT_NAME "monero-wallet-rpc") + OUTPUT_NAME "daniwallet-rpc") install(TARGETS wallet_rpc_server DESTINATION bin) endif() diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 9149c10a..a690e4ae 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -59,7 +59,7 @@ namespace const command_line::arg_descriptor arg_trusted_daemon = {"trusted-daemon", "Enable commands which rely on a trusted daemon", false}; const command_line::arg_descriptor arg_wallet_dir = {"wallet-dir", "Directory for newly created wallets"}; - constexpr const char default_rpc_username[] = "monero"; + constexpr const char default_rpc_username[] = "danicoin"; } namespace tools @@ -191,7 +191,7 @@ namespace tools } assert(bool(http_login)); - std::string temp = "monero-wallet-rpc." + bind_port + ".login"; + std::string temp = "daniwallet-rpc." + bind_port + ".login"; const auto cookie = tools::create_private_file(temp); if (!cookie) { @@ -1814,10 +1814,10 @@ int main(int argc, char** argv) { const auto vm = wallet_args::main( argc, argv, - "monero-wallet-rpc [--wallet-file=|--generate-from-json=|--wallet-dir=] [--rpc-bind-port=]", + "daniwallet-rpc [--wallet-file=|--generate-from-json=|--wallet-dir=] [--rpc-bind-port=]", desc_params, po::positional_options_description(), - "monero-wallet-rpc.log", + "daniwallet-rpc.log", true ); if (!vm) diff --git a/translations/monero.ts b/translations/monero.ts index c65013f1..363a33a3 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -1626,7 +1626,7 @@ Warning: Some input keys being spent are from Your wallet has been generated! To start synchronizing with the daemon, use "refresh" command. Use "help" command to see the list of available commands. -Always use "exit" command when closing monero-wallet-cli to save your +Always use "exit" command when closing daniwallet to save your current session's state. Otherwise, you might need to synchronize your wallet again (your wallet keys are NOT at risk in any case). diff --git a/translations/monero_fr.ts b/translations/monero_fr.ts index 58fcc17e..2a87a07d 100644 --- a/translations/monero_fr.ts +++ b/translations/monero_fr.ts @@ -1658,14 +1658,14 @@ Attention : Certaines clés d'entrées étant dépensées sont issues de < Your wallet has been generated! To start synchronizing with the daemon, use "refresh" command. Use "help" command to see the list of available commands. -Always use "exit" command when closing monero-wallet-cli to save your +Always use "exit" command when closing daniwallet to save your current session's state. Otherwise, you might need to synchronize your wallet again (your wallet keys are NOT at risk in any case). Votre portefeuille a été généré ! Pour commencer la synchronisation avec le démon, utilisez la commande "refresh". Utilisez la commande "help" pour voir la liste des commandes disponibles. -Utilisez toujours la commande "exit" pour fermer monero-wallet-cli afin de sauvegarder +Utilisez toujours la commande "exit" pour fermer daniwallet afin de sauvegarder l'état actuel de votre session. Sinon vous pourriez avoir besoin de synchroniser votre portefeuille à nouveau (mais les clés de votre portefeuille ne risquent rien). diff --git a/translations/monero_it.ts b/translations/monero_it.ts index c3041321..a30d631f 100644 --- a/translations/monero_it.ts +++ b/translations/monero_it.ts @@ -1618,14 +1618,14 @@ Warning: Some input keys being spent are from Your wallet has been generated! To start synchronizing with the daemon, use "refresh" command. Use "help" command to see the list of available commands. -Always use "exit" command when closing monero-wallet-cli to save your +Always use "exit" command when closing daniwallet to save your current session's state. Otherwise, you might need to synchronize your wallet again (your wallet keys are NOT at risk in any case). Il tuo portafoglio è stato generato! Per iniziare a sincronizzarlo con il daemon, usa il comando "refresh". Usa il comando "help" per vedere la lista dei comandi disponibili. -Usa sempre il comando "exit" quando chiudi monero-wallet-cli per salvare +Usa sempre il comando "exit" quando chiudi daniwallet per salvare lo stato della tua sessione 's corrente. Altrimenti potresti dover sincronizzare di nuovo il tuo portafoglio (le chiavi del tuo portafoglio NON sono a rischio in sessun caso).