Adding more actions for API page

* getblockcount
* getblocksfound (with limit support)
* getcurrentworkers
* getdifficulty
* getestimatedtime
* getpoolhashrate
* getpoolsharerate
* gettimesincelastblock

public/include/autoloader.inc.php

@@ -3,6 +3,7 @@
 require_once(CLASS_DIR . '/debug.class.php');
 require_once(CLASS_DIR . '/bitcoin.class.php');
 require_once(CLASS_DIR . '/statscache.class.php');
+require_once(CLASS_DIR . '/bitcoinwrapper.class.php');
 require_once(INCLUDE_DIR . '/database.inc.php');
 require_once(INCLUDE_DIR . '/smarty.inc.php');
 // Load classes that need the above as dependencies

public/include/classes/bitcoin.class.php

@@ -898,6 +898,3 @@ class BitcoinClient extends jsonrpc_client {
     return $this->query("getaddressesbyaccount", $account);
   }
 }
-
-// Auto-load this class
-$bitcoin = new BitcoinClient($config['wallet']['type'], $config['wallet']['username'], $config['wallet']['password'], $config['wallet']['host']);

public/include/classes/bitcoinwrapper.class.php

@@ -0,0 +1,37 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+  die('Hacking attempt');
+
+class BitcoinWrapper extends BitcoinClient {
+  var $type, $username, $password, $host, $memcache;
+  public function __construct($type, $username, $password, $host, $memcache) {
+    $this->type = $type;
+    $this->username = $username;
+    $this->password = $password;
+    $this->host = $host;
+    $this->memcache = $memcache;
+    return parent::__construct($this->type, $this->username, $this->password, $this->host);
+  }
+  /**
+   * Wrap variouns methods to add caching
+   **/
+  public function getblockcount() {
+    if ($data = $this->memcache->get(__FUNCTION__)) return $data;
+    return $this->memcache->setCache(__FUNCTION__, parent::getblockcount());
+  }
+  public function getdifficulty() {
+    if ($data = $this->memcache->get(__FUNCTION__)) return $data;
+    return $this->memcache->setCache(__FUNCTION__, parent::getdifficulty());
+  }
+  public function getestimatedtime($iCurrentPoolHashrate) {
+    if ($iCurrentPoolHashrate == 0) return 0;
+    if ($data = $this->memcache->get(__FUNCTION__)) return $data;
+    $dDifficulty = parent::getdifficulty();
+    return $this->memcache->setCache(__FUNCTION__, $dDifficulty * pow(2,32) / $iCurrentPoolHashrate);
+  }
+}
+
+// Load this wrapper
+$bitcoin = new BitcoinWrapper($config['wallet']['type'], $config['wallet']['username'], $config['wallet']['password'], $config['wallet']['host'], $memcache);

public/include/pages/api/getblockcount.inc.php

@@ -0,0 +1,24 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+if ($bitcoin->can_connect() === true){
+  if (!$iBlock = $memcache->get('iBlock')) {
+    $iBlock = $bitcoin->query('getblockcount');
+    $memcache->set('iBlock', $iBlock);
+  }
+} else {
+  $iBlock = 0;
+}
+
+// Output JSON format
+echo json_encode(array('getblockcount' => $iBlock));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getblocksfound.inc.php

@@ -0,0 +1,20 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Set a sane limit, overwrite with URL parameter
+$iLimit = 10;
+if (@$_REQUEST['limit'])
+  $iLimit = $_REQUEST['limit'];
+
+// Output JSON format
+echo json_encode(array('getblocksfound' => $statistics->getBlocksFound($iLimit)));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getcurrentworkers.inc.php

@@ -0,0 +1,15 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Output JSON format
+echo json_encode(array('getcurrentworkers' => $worker->getCountAllActiveWorkers()));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getdifficulty.inc.php

@@ -0,0 +1,25 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Fetch data from litecoind
+if ($bitcoin->can_connect() === true){
+  if (!$dDifficulty = $memcache->get('dDifficulty')) {
+    $memcache->set('dDifficulty', $dDifficulty);
+    $dDifficulty = $bitcoin->query('getdifficulty');
+  }
+} else {
+  $iDifficulty = 1;
+}
+
+// Output JSON format
+echo json_encode(array('getdifficulty' => $dDifficulty));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getestimatedtime.inc.php

@@ -0,0 +1,18 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Estimated time to find the next block
+$iCurrentPoolHashrate = $statistics->getCurrentHashrate() * 1000;
+
+// Output JSON format
+echo json_encode(array('getestimatedtime' => $bitcoin->getestimatedtime($iCurrentPoolHashrate)));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getpoolhashrate.inc.php

@@ -0,0 +1,15 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Output JSON format
+echo json_encode(array('getpoolhashrate' => $statistics->getCurrentHashrate()));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/getpoolsharerate.inc.php

@@ -0,0 +1,15 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Output JSON format
+echo json_encode(array('getpoolsharerate' => $statistics->getCurrentShareRate()));
+
+// Supress master template
+$supress_master = 1;
+?>

public/include/pages/api/gettimesincelastblock.inc.php

@@ -0,0 +1,26 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY'))
+die('Hacking attempt');
+
+// Check user token
+$user->checkApiKey($_REQUEST['api_key']);
+
+// Fetch our last block found
+$aBlocksFoundData = $statistics->getBlocksFound(1);
+
+// Time since last block
+$now = new DateTime( "now" );
+if (!empty($aBlocksFoundData)) {
+  $dTimeSinceLast = ($now->getTimestamp() - $aBlocksFoundData[0]['time']);
+} else {
+  $dTimeSinceLast = 0;
+}
+
+// Output JSON format
+echo json_encode(array('gettimesincelastblock' => $dTimeSinceLast));
+
+// Supress master template
+$supress_master = 1;
+?>