MSR-STAK 2.4.5

masari-project · Jul 2, 2018 · b436bba · b436bba
1 parent b3f79de
commit b436bba
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp
@@ -88,30 +88,30 @@ constexpr size_t iConfigCnt = (sizeof(oConfigValues)/sizeof(oConfigValues[0]));
 
 xmrstak::coin_selection coins[] = {
 	// name, userpool, devpool, default_pool_suggestion
-	{ "aeon7",               {cryptonight_aeon, cryptonight_lite, 7u},     {cryptonight_aeon, cryptonight_lite, 7u},     "mine.aeon-pool.com:5555" },
-	{ "bbscoin",             {cryptonight_monero, cryptonight, 3u},        {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "croat",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "cryptonight",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "cryptonight_masari",  {cryptonight_monero, cryptonight_masari, 255u}, {cryptonight_monero, cryptonight_monero, 0u},nullptr },
-	{ "cryptonight_haven",   {cryptonight_heavy, cryptonight_haven, 255u}, {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
-	{ "cryptonight_heavy",   {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
-	{ "cryptonight_lite",    {cryptonight_aeon, cryptonight_lite, 255u},   {cryptonight_aeon, cryptonight_lite, 7u},     nullptr },
-	{ "cryptonight_lite_v7", {cryptonight_lite, cryptonight_aeon, 255u},   {cryptonight_aeon, cryptonight_lite, 7u},     nullptr },
-	{ "cryptonight_lite_v7_xor", {cryptonight_aeon, cryptonight_ipbc, 255u}, {cryptonight_aeon, cryptonight_aeon, 255u}, nullptr },
-	{ "cryptonight_v7",      {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "cryptonight_v7_stellite", {cryptonight_monero, cryptonight_stellite, 255u}, {cryptonight_monero, cryptonight_monero, 255u}, nullptr },
-	{ "edollar",             {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "electroneum",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "graft",               {cryptonight_monero, cryptonight, 8u},        {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "haven",               {cryptonight_haven, cryptonight_heavy, 3u},   {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
+	{ "aeon7",               {cryptonight_aeon, cryptonight_lite, 7u},     {cryptonight_masari, cryptonight_monero, 7u},     "mine.aeon-pool.com:5555" },
+	{ "bbscoin",             {cryptonight_monero, cryptonight, 3u},        {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "croat",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "cryptonight",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "cryptonight_masari",  {cryptonight_monero, cryptonight_masari, 255u}, {cryptonight_masari, cryptonight_monero, 7u},nullptr },
+	{ "cryptonight_haven",   {cryptonight_heavy, cryptonight_haven, 255u}, {cryptonight_masari, cryptonight_monero, 7u},   nullptr },
+	{ "cryptonight_heavy",   {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_masari, cryptonight_monero, 7u},   nullptr },
+	{ "cryptonight_lite",    {cryptonight_aeon, cryptonight_lite, 255u},   {cryptonight_masari, cryptonight_monero, 7u},     nullptr },
+	{ "cryptonight_lite_v7", {cryptonight_lite, cryptonight_aeon, 255u},   {cryptonight_masari, cryptonight_monero, 7u},     nullptr },
+	{ "cryptonight_lite_v7_xor", {cryptonight_aeon, cryptonight_ipbc, 255u}, {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "cryptonight_v7",      {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "cryptonight_v7_stellite", {cryptonight_monero, cryptonight_stellite, 255u}, {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "edollar",             {cryptonight_monero, cryptonight, 255u},      {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "electroneum",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "graft",               {cryptonight_monero, cryptonight, 8u},        {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "haven",               {cryptonight_haven, cryptonight_heavy, 3u},   {cryptonight_masari, cryptonight_monero, 7u},   nullptr },
 	{ "intense",             {cryptonight_monero, cryptonight, 4u},        {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "ipbc",                {cryptonight_aeon, cryptonight_ipbc, 255u},   {cryptonight_aeon, cryptonight_aeon, 255u},     nullptr },
-	{ "karbo",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "masari",              {cryptonight_masari, cryptonight_monero, 7u},   {cryptonight_monero, cryptonight_monero, 0u},nullptr },
-	{ "monero7",             {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_monero, cryptonight_monero, 0u}, "pool.usxmrpool.com:3333" },
-	{ "stellite",            {cryptonight_stellite, cryptonight_monero, 4u}, {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
-	{ "sumokoin",            {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
-	{ "turtlecoin",          {cryptonight_lite, cryptonight_aeon, 255u},   {cryptonight_aeon, cryptonight_lite, 7u},     nullptr }
+	{ "ipbc",                {cryptonight_aeon, cryptonight_ipbc, 255u},   {cryptonight_masari, cryptonight_monero, 7u},     nullptr },
+	{ "karbo",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "masari",              {cryptonight_masari, cryptonight_monero, 7u},   {cryptonight_masari, cryptonight_monero, 7u},nullptr },
+	{ "monero7",             {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_masari, cryptonight_monero, 7u}, "pool.usxmrpool.com:3333" },
+	{ "stellite",            {cryptonight_stellite, cryptonight_monero, 4u}, {cryptonight_masari, cryptonight_monero, 7u}, nullptr },
+	{ "sumokoin",            {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_masari, cryptonight_monero, 7u},   nullptr },
+	{ "turtlecoin",          {cryptonight_lite, cryptonight_aeon, 255u},   {cryptonight_masari, cryptonight_monero, 7u},     nullptr }
 };
 
 constexpr size_t coin_algo_size = (sizeof(coins)/sizeof(coins[0]));

diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
@@ -107,7 +107,7 @@ bool executor::get_live_pools(std::vector<jpsock*>& eval_pools, bool is_dev)
 
 		// Only eval live pools
 		size_t num, dtime;
-		if(pool.get_disconnects(num, dtime))
+		if(pool.get_disconnects(num, dtime) && !pool.is_dev_pool())
 			set_timestamp();
 
 		if(dtime == 0 || (dtime >= wait && num <= limit))
@@ -576,6 +576,10 @@ void executor::ex_main()
 			pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", "", 0.0, true, false, "", true);
 		break;
 
+	case cryptonight_masari:
+		pools.emplace_front(0, "pool.masaricoin.com:3333", "5nYWvcvNThsLaMmrsfpRLBRou1RuGtLabUwYH7v6b88bem2J4aUwsoF33FbJuqMDgQjpDRTSpLCZu3dXpqXicE2uSWS4LUP", "xmrstak", "xmrstak", 0.0, true, false, "", false);
+		break;
+
 	case cryptonight:
 		if(dev_tls)
 			pools.emplace_front(0, "donate.xmr-stak.net:6666", "", "", "", 0.0, true, true, "", false);