From bbe085f6a426d1c6ca781ab10755897db699b80c Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 5 Aug 2018 17:13:06 +0200 Subject: [PATCH 1/8] Added MO specific build version --- src/App.cpp | 2 ++ src/common/config/CommonConfig.h | 1 + src/config.json | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index 1f6fc2fb..cbe6b1ef 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -64,6 +64,8 @@ App::App(int argc, char **argv) : return; } + if (!strstr(m_controller->config()->pools()[0]->host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); + if (!m_controller->config()->isBackground()) { m_console = new Console(this); } diff --git a/src/common/config/CommonConfig.h b/src/common/config/CommonConfig.h index b5539bbe..6de50857 100644 --- a/src/common/config/CommonConfig.h +++ b/src/common/config/CommonConfig.h @@ -59,6 +59,7 @@ public: inline const std::vector &pools() const { return m_activePools; } inline int apiPort() const { return m_apiPort; } inline int donateLevel() const { return m_donateLevel; } + inline void setDonateLevel(const int donate) { m_donateLevel = donate; } inline int printTime() const { return m_printTime; } inline int retries() const { return m_retries; } inline int retryPause() const { return m_retryPause; } diff --git a/src/config.json b/src/config.json index 155167b0..cd09dbee 100644 --- a/src/config.json +++ b/src/config.json @@ -19,7 +19,7 @@ "max-cpu-usage": 75, "pools": [ { - "url": "proxy.fee.xmrig.com:9999", + "url": "gulf.moneroocean.stream:10001", "user": "YOUR_WALLET", "pass": "x", "rig-id": null, @@ -35,7 +35,7 @@ "threads": null, "algo-perf": null, "calibrate-algo": false, - "calibrate-algo-time": 60, + "calibrate-algo-time": 10, "user-agent": null, "watch": false } \ No newline at end of file From 4d730a7a21873a7e05fcb4a7e316f96b316bfeb8 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 5 Aug 2018 17:15:40 +0200 Subject: [PATCH 2/8] Fixed -> to . --- src/App.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.cpp b/src/App.cpp index cbe6b1ef..c85ba5ff 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -64,7 +64,7 @@ App::App(int argc, char **argv) : return; } - if (!strstr(m_controller->config()->pools()[0]->host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); + if (!strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); if (!m_controller->config()->isBackground()) { m_console = new Console(this); From 850ca88c48d0747d891a98950a376704aab3b6bd Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 5 Aug 2018 17:19:40 +0200 Subject: [PATCH 3/8] Moved pool check --- src/App.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index c85ba5ff..36c6d5f4 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -64,8 +64,6 @@ App::App(int argc, char **argv) : return; } - if (!strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); - if (!m_controller->config()->isBackground()) { m_console = new Console(this); } @@ -105,6 +103,8 @@ int App::exec() Mem::init(m_controller->config()->isHugePages()); + if (!strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); + Summary::print(m_controller); if (m_controller->config()->isDryRun()) { From 9e231e322b41d809165328ec160b14fb7e92c0fd Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 5 Aug 2018 17:22:05 +0200 Subject: [PATCH 4/8] Fixed pool check --- src/App.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.cpp b/src/App.cpp index 36c6d5f4..2b0f8156 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -103,7 +103,7 @@ int App::exec() Mem::init(m_controller->config()->isHugePages()); - if (!strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); + if (strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); Summary::print(m_controller); From 9b796b4b8ac34b79388903958229c0a0148131dc Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 5 Aug 2018 17:50:11 +0200 Subject: [PATCH 5/8] Added CentOS 6 build script --- build_rh6.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 build_rh6.sh diff --git a/build_rh6.sh b/build_rh6.sh new file mode 100644 index 00000000..b1eb407c --- /dev/null +++ b/build_rh6.sh @@ -0,0 +1,10 @@ +#!/bin/bash +yum update -y +yum install -y cmake make git +rpm -i https://github.com/sipcapture/captagent/raw/master/dependency/centos/6/libuv-1.8.0-1.el6.x86_64.rpm +rpm -i https://github.com/sipcapture/captagent/raw/master/dependency/centos/6/libuv-devel-1.8.0-1.el6.x86_64.rpm +wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo +yum upgrade -y +yum install -y devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++ +scl enable devtoolset-2 bash +cmake . -DWITH_HTTPD=OFF From d9d720eed28e19b42f997d26f8954de614b17664 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Wed, 8 Aug 2018 21:42:52 +0200 Subject: [PATCH 6/8] Allow integer algo-perf values --- src/core/Config.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/Config.cpp b/src/core/Config.cpp index 0fc1bc5e..1b23aa7f 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -346,7 +346,9 @@ void xmrig::Config::parseJSON(const rapidjson::Document &doc) const xmrig::PerfAlgo pa = static_cast(a); const rapidjson::Value &key = algo_perf[xmrig::Algorithm::perfAlgoName(pa)]; if (key.IsDouble()) { - m_algo_perf[pa] = key.GetDouble(); + m_algo_perf[pa] = static_cast(key.GetDouble()); + } else if (key.IsInt()) { + m_algo_perf[pa] = static_cast(key.GetInt()); } } } From 377047e96e1003c9c2d0bb11ea761c2410795c90 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Tue, 14 Aug 2018 11:34:29 +0200 Subject: [PATCH 7/8] Fixed config modification --- src/App.cpp | 2 -- src/core/Controller.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index 76bc6a63..48ac379d 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -103,8 +103,6 @@ int App::exec() Mem::init(m_controller->config()->isHugePages()); - if (strstr(m_controller->config()->pools()[0].host(), "moneroocean.stream")) m_controller->config()->setDonateLevel(0); - Summary::print(m_controller); if (m_controller->config()->isDryRun()) { diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index a21c8ad9..90651d62 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -121,6 +121,8 @@ int xmrig::Controller::init(int argc, char **argv) } # endif + if (strstr(config()->pools()[0].host(), "moneroocean.stream")) config()->setDonateLevel(0); + d_ptr->network = new Network(this); return 0; } From a8bc3c7dc7e9bb4c73128a209d54fe32109cd053 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Mon, 20 Aug 2018 17:22:55 +0200 Subject: [PATCH 8/8] Fixed repo location --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6054b9f8..06b39843 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ # XMRig -:warning: **If you mine Monero, Aeon, Sumokoin, Turtlecoin, Stellite, GRAFT, Haven Protocol, IPBC, [PLEASE READ](https://github.com/xmrig/xmrig/issues/482)!** :warning: +:warning: **If you mine Monero, Aeon, Sumokoin, Turtlecoin, Stellite, GRAFT, Haven Protocol, IPBC, [PLEASE READ](https://github.com/MoneroOcean/xmrig/issues/482)!** :warning: -[![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases) -[![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases) -[![GitHub Release Date](https://img.shields.io/github/release-date-pre/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/releases) -[![GitHub license](https://img.shields.io/github/license/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/blob/master/LICENSE) -[![GitHub stars](https://img.shields.io/github/stars/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/stargazers) -[![GitHub forks](https://img.shields.io/github/forks/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/network) +[![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/MoneroOcean/xmrig/releases) +[![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/MoneroOcean/xmrig/releases) +[![GitHub Release Date](https://img.shields.io/github/release-date-pre/xmrig/xmrig.svg)](https://github.com/MoneroOcean/xmrig/releases) +[![GitHub license](https://img.shields.io/github/license/xmrig/xmrig.svg)](https://github.com/MoneroOcean/xmrig/blob/master/LICENSE) +[![GitHub stars](https://img.shields.io/github/stars/xmrig/xmrig.svg)](https://github.com/MoneroOcean/xmrig/stargazers) +[![GitHub forks](https://img.shields.io/github/forks/xmrig/xmrig.svg)](https://github.com/MoneroOcean/xmrig/network) XMRig is a high performance Monero (XMR) CPU miner, with official support for Windows. Originally based on cpuminer-multi with heavy optimizations/rewrites and removing a lot of legacy code, since version 1.0.0 completely rewritten from scratch on C++. -* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd). -* [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases. +* This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/MoneroOcean/xmrig-nvidia) and [AMD GPU version]( https://github.com/MoneroOcean/xmrig-amd). +* [Roadmap](https://github.com/MoneroOcean/xmrig/issues/106) for next releases. @@ -22,7 +22,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin * [Download](#download) * [Usage](#usage) * [Algorithm variations](#algorithm-variations) -* [Build](https://github.com/xmrig/xmrig/wiki/Build) +* [Build](https://github.com/MoneroOcean/xmrig/wiki/Build) * [Common Issues](#common-issues) * [Other information](#other-information) * [Donations](#donations) @@ -38,14 +38,14 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin * keepalived support. * Command line options compatible with cpuminer. * CryptoNight-Lite support for AEON. -* Smart automatic [CPU configuration](https://github.com/xmrig/xmrig/wiki/Threads). +* Smart automatic [CPU configuration](https://github.com/MoneroOcean/xmrig/wiki/Threads). * Nicehash support * It's open source software. ## Download -* Binary releases: https://github.com/xmrig/xmrig/releases -* Git tree: https://github.com/xmrig/xmrig.git - * Clone with `git clone https://github.com/xmrig/xmrig.git` :hammer: [Build instructions](https://github.com/xmrig/xmrig/wiki/Build). +* Binary releases: https://github.com/MoneroOcean/xmrig/releases +* Git tree: https://github.com/MoneroOcean/xmrig.git + * Clone with `git clone https://github.com/MoneroOcean/xmrig.git` :hammer: [Build instructions](https://github.com/MoneroOcean/xmrig/wiki/Build). ## Usage Use [config.xmrig.com](https://config.xmrig.com/xmrig) to generate, edit or share configurations.