enable all algos, now auto hidden + trading

c11: reduce fees

rc.local

@@ -17,8 +17,8 @@ screen -dmS blocks /var/web/blocks.sh
 
 screen -dmS c11 /var/stratum/run.sh c11
 screen -dmS x11 /var/stratum/run.sh x11
-#screen -dmS x13 /var/stratum/run.sh x13
-#screen -dmS x15 /var/stratum/run.sh x15
+screen -dmS x13 /var/stratum/run.sh x13
+screen -dmS x15 /var/stratum/run.sh x15
 screen -dmS sha /var/stratum/run.sh sha
 screen -dmS scrypt /var/stratum/run.sh scrypt
 #screen -dmS scrypt2 /var/stratum/run.sh scryptn

web/yaamp/core/backend/markets.php

@@ -229,8 +229,8 @@ function updateBittrexMarkets()
 
 function updateCryptsyMarkets()
 {
-	//	dborun("update markets set price=0 where name='cryptsy'");
-	//	return;
+//	dborun("update markets set price=0 where name='cryptsy'");
+//	return;
 
 	$markets = cryptsy_api_query('getmarkets');
 	if(!$markets || !isset($markets['return']))
@@ -254,6 +254,8 @@ function updateCryptsyMarkets()
 		$coin = getdbosql('db_coins', "symbol=:symbol", array(':symbol'=>$symbol));
 		if(!$coin || !$coin->installed) continue;
 
+//		debuglog("cryptsy:  $coin->name $symbol");
+
 		$market = getdbosql('db_markets', "coinid=$coin->id and name='cryptsy'");
 		if(!$market)
 		{
@@ -314,12 +316,12 @@ function updateCryptsyMarkets()
 		if(!$ticker) continue;
 		if(!isset($ticker->return->$symbol->buyorders[0]))
 		{
-			debuglog("error cryptsy $coin->name");
+			debuglog("error cryptsy $coin->name id {$market->marketid}");
 			debuglog($ticker, 5);
 			continue;
 		}
 
-		$price2 = ($ticker->return->$symbol->buyorders[0]->price+$ticker->return->$symbol->sellorders[0]->price)/2;
+		$price2 = ($ticker->return->$symbol->buyorders[0]->price + $ticker->return->$symbol->sellorders[0]->price)/2;
 		$market->price2 = AverageIncrement($market->price2, $price2);
 		$market->price = AverageIncrement($market->price, $ticker->return->$symbol->buyorders[0]->price);
 

web/yaamp/core/exchange/bleutrade.php

@@ -4,12 +4,14 @@
 
 function bleutrade_api_query($method, $params='')
 {
-	$apikey = ''; // your API-key
-	$apisecret = ''; // your Secret-key
+	require_once('/etc/yiimp/keys.php');
+
+	$apikey = YIIMP_BLEUTRADE_KEY; // your API-key
+	$apisecret = YIIMP_BLEUTRADE_SEC; // your Secret-key
 
 	$nonce = time();
 	$uri = "https://bleutrade.com/api/v2/$method?apikey=$apikey&nonce=$nonce$params";
-//	debuglog($uri);
+	debuglog("bleutrade $method:");
 
 	$sign = hash_hmac('sha512', $uri, $apisecret);
 	$ch = curl_init($uri);

web/yaamp/core/exchange/yobit.php

@@ -29,8 +29,10 @@ function yobit_api_query($method)
 
 function yobit_api_query2($method, $req = array())
 {
-	$api_key    = '';
-	$api_secret = '';
+	require_once('/etc/yiimp/keys.php');
+
+	$api_key    = YIIMP_YOBIT_KEY;
+	$api_secret = YIIMP_YOBIT_SEC;
 
 	$req['method'] = $method;
 	$req['nonce'] = time();
@@ -61,6 +63,8 @@ function yobit_api_query2($method, $req = array())
 		debuglog($e);
 		curl_close($ch);
 		return null;
+	} else if ($method != "getInfo") {
+		debuglog("yobit $method $post_data ok");
 	}
 
 	curl_close($ch);
@@ -70,8 +74,3 @@ function yobit_api_query2($method, $req = array())
 
 	return $result;
 }
-
-
-
-
-

web/yaamp/core/functions/yaamp.php

@@ -5,16 +5,19 @@ function yaamp_get_algos()
 	/* Toggle Site Algos Here */
 	return array(
 		'sha256',
-		'scrypt',// 'scryptn',
-		'neoscrypt','lyra2',
+		'scrypt',
+		'scryptn',
+		'neoscrypt',
+		'lyra2',
 		'quark',
 		'qubit',
 		'c11',
 		'x11',
-		//'x13','x15',
-		//'groestl', << dmd-gr -m 256
+		'x13',
+		'x15',
+		'groestl', // dmd-gr -m 256
 		'skein',
-		//'skein2',
+		'skein2',
 		'drop',
 		'zr5',
 	);
@@ -148,7 +151,6 @@ function yaamp_fee($algo)
 		$fee = 5.0;
 		break;
 	case 'drop':
-	case 'c11':
 		$fee *= 2.0;
 		break;
 	}

web/yaamp/modules/site/SiteController.php

@@ -711,7 +711,7 @@ class SiteController extends CommonController
 				break;
 
 			case 'bittrex':
-				//doBittrexTrading(true);
+				doBittrexTrading(true);
 				updateBittrexMarkets();
 				break;
 
@@ -721,12 +721,12 @@ class SiteController extends CommonController
 				break;
 
 			case 'yobit':
-				//doYobitTrading(true);
+				doYobitTrading(true);
 				updateYobitMarkets();
 				break;
 
 			case 'bleutrade':
-				//doBleutradeTrading(true);
+				doBleutradeTrading(true);
 				updateBleutradeMarkets();
 				break;
 

web/yaamp/modules/thread/CronjobController.php

@@ -127,10 +127,10 @@ class CronjobController extends CommonController
 				if(!YAAMP_PRODUCTION) break;
 
 				doBittrexTrading();
-				//doCryptsyTrading();
-				//doBleutradeTrading();
+				doCryptsyTrading();
+				doBleutradeTrading();
 				doPoloniexTrading();
-				//doYobitTrading();
+				doYobitTrading();
 				doCCexTrading();
 				//doAlcurexTrading();
 				//doCryptopiaTrading();