From cc925bc5f127a96b6f5126c0ac16e7965242c0aa Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Fri, 3 Jul 2015 12:56:10 +0200 Subject: [PATCH] c11 stratum ok, link first exchanges --- rc.local | 1 + stratum/algos/zr5.c | 2 +- web/yaamp/core/backend/markets.php | 28 ++++++++++++------- web/yaamp/core/backend/system.php | 6 ---- web/yaamp/core/exchange/ccexapi.php | 6 ++-- web/yaamp/core/exchange/cryptsy.php | 7 +++-- web/yaamp/core/trading/cryptsy_trading.php | 6 +++- web/yaamp/modules/site/SiteController.php | 2 +- .../modules/thread/CronjobController.php | 3 -- 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/rc.local b/rc.local index ebfb5dc..c29142c 100644 --- a/rc.local +++ b/rc.local @@ -15,6 +15,7 @@ screen -dmS main /var/web/main.sh screen -dmS loop2 /var/web/loop2.sh 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 diff --git a/stratum/algos/zr5.c b/stratum/algos/zr5.c index 9906217..be196ba 100644 --- a/stratum/algos/zr5.c +++ b/stratum/algos/zr5.c @@ -56,7 +56,7 @@ void zr5_hash(const char* input, char* output, uint32_t len) sph_skein512_context ctx_skein; uint32_t hash[5][16]; - char *ph = (char *)hash; + char *ph = (char *)hash[0]; sph_keccak512_init(&ctx_keccak); sph_keccak512(&ctx_keccak, (const void*) input, len); diff --git a/web/yaamp/core/backend/markets.php b/web/yaamp/core/backend/markets.php index 7ed5928..a27e3c3 100644 --- a/web/yaamp/core/backend/markets.php +++ b/web/yaamp/core/backend/markets.php @@ -106,7 +106,7 @@ function AverageIncrement($value1, $value2) function updateBleutradeMarkets() { $list = bleutrade_api_query('public/getcurrencies'); - if(!$list) return; + if(!is_object($list)) return; foreach($list->result as $currency) { @@ -143,7 +143,7 @@ function updateBleutradeMarkets() { $address = bleutrade_api_query('account/getdepositaddress', "¤cy=$coin->symbol"); - if($address && isset($address->result)) + if(is_object($address) && is_object($address->result)) $market->deposit_address = $address->result->Address; } @@ -161,7 +161,7 @@ function updateBleutradeMarkets() function updateBittrexMarkets() { $list = bittrex_api_query('public/getcurrencies'); - if(!$list) return; + if(!is_object($list)) return; foreach($list->result as $currency) { @@ -207,7 +207,7 @@ function updateBittrexMarkets() { $address = bittrex_api_query('account/getdepositaddress', "¤cy=$coin->symbol"); - if($address && isset($address->result)) + if(is_object($address) && isset($address->result)) $market->deposit_address = $address->result->Address; } @@ -323,6 +323,8 @@ function updateCryptsyMarkets() } $list = cryptsy_api_query('getmydepositaddresses'); + if (empty($list)) return; + foreach($list['return'] as $symbol=>$item) { // debuglog($item); @@ -348,6 +350,8 @@ function updateCCexMarkets() $ccex = new CcexAPI; $list = $ccex->getPairs(); + if (!is_array($list)) return; + foreach($list as $item) { $e = explode('-', $item); @@ -387,7 +391,7 @@ function updatePoloniexMarkets() $poloniex = new poloniex; $tickers = $poloniex->get_ticker(); - if(!$tickers) return; + if(!is_array($tickers)) return; foreach($tickers as $symbol=>$ticker) { @@ -419,6 +423,8 @@ function updatePoloniexMarkets() } $list = $poloniex->get_deposit_addresses(); + if (!is_array($list)) return; + foreach($list as $symbol=>$item) { if($symbol == 'BTC') continue; @@ -439,7 +445,7 @@ function updatePoloniexMarkets() function updateYobitMarkets() { $res = yobit_api_query('info'); - if(!$res) return; + if(!is_object($res)) return; foreach($res->pairs as $i=>$item) { @@ -475,7 +481,7 @@ function updateYobitMarkets() function updateJubiMarkets() { $btc = jubi_api_query('ticker', "?coin=btc"); - if(!$btc) continue; + if(!is_object($btc)) continue; $list = getdbolist('db_markets', "name='jubi'"); foreach($list as $market) @@ -486,10 +492,12 @@ function updateJubiMarkets() $lowsymbol = strtolower($coin->symbol); $ticker = jubi_api_query('ticker', "?coin=$lowsymbol"); - if(!$ticker) continue; + if(!is_object($ticker)) continue; - $ticker->buy /= $btc->sell; - $ticker->sell /= $btc->buy; + if (isset($btc->sell) && $btc->sell != 0.) + $ticker->buy /= $btc->sell; + if (isset($btc->buy) && $btc->buy != 0.) + $ticker->sell /= $btc->buy; $price2 = ($ticker->buy+$ticker->sell)/2; $market->price2 = AverageIncrement($market->price2, $price2); diff --git a/web/yaamp/core/backend/system.php b/web/yaamp/core/backend/system.php index 7f1f845..9ef5c61 100644 --- a/web/yaamp/core/backend/system.php +++ b/web/yaamp/core/backend/system.php @@ -245,9 +245,3 @@ function BackendRunCoinActions() // system("echo \"$data\" | mail -s \"yiimp server\" ".YAAMP_ADMIN_EMAIL); } - - - - - - diff --git a/web/yaamp/core/exchange/ccexapi.php b/web/yaamp/core/exchange/ccexapi.php index d9424ea..a3ad822 100644 --- a/web/yaamp/core/exchange/ccexapi.php +++ b/web/yaamp/core/exchange/ccexapi.php @@ -9,9 +9,9 @@ class CcexAPI { - protected $api_url = 'https://c-cex.com/t/'; - protected $api_key = ''; - protected $api_secret = ''; // not used? + protected $api_url = 'https://c-cex.com/t/'; + protected $api_key = '9582CED05D859FA83E5E0E22F23E0A7E'; + protected $api_secret = ''; // not used? // public function __construct($api_key = '') { // $this->api_key = $api_key; diff --git a/web/yaamp/core/exchange/cryptsy.php b/web/yaamp/core/exchange/cryptsy.php index 7285444..26fa7d3 100644 --- a/web/yaamp/core/exchange/cryptsy.php +++ b/web/yaamp/core/exchange/cryptsy.php @@ -1,14 +1,15 @@