API work in progress

ArtemKo7v · ArtemKo7v · commit aee2694a3763 · 2016-12-21T22:01:44.000+07:00
diff --git a/api/controller.php b/api/controller.php
@@ -19,7 +19,7 @@ class ethplorerController {
     protected $db;
     protected $command;
     protected $params = array();
-    protected $apiCommands = array('getTxInfo', 'getTokenHistory', 'getAddressInfo', 'getTokenInfo', /*'getAddressHistory'*/);
+    protected $apiCommands = array('getTxInfo', 'getTokenHistory', 'getAddressInfo', 'getTokenInfo', 'getAddressHistory');
     protected $defaults;
 
     public function __construct($es){
@@ -224,67 +224,42 @@ public function getTxInfo(){
     }
 
     public function getTokenHistory(){
-        $result = array(
-            'operations' => array()
-        );
-        $address = $this->getParam(0, FALSE);
-        if($address){
-            $address = strtolower($address);
-        }
-        if((FALSE !== $address) && (!$this->db->isValidAddress($address))){
-            $this->sendError(104, 'Invalid address format');
-        }
-        $maxLimit = is_array($this->defaults) && isset($this->defaults['limit']) ? $this->defaults['limit'] : 10;
-        $options = array(
-            'address'   => $this->getParam(0, FALSE),
-            'type'      => $this->getRequest('type', FALSE),
-            'limit'     => min(abs((int)$this->getRequest('limit', 10)), $maxLimit),
-            'timestamp' => (int)$this->getRequest('tsAfter', 0)
-        );
-        $operations = $this->db->getLastTransfers($options);
-        if(is_array($operations) && count($operations)){
-            for($i = 0; $i < count($operations); $i++){
-                $operation = $operations[$i];
-                $res = array(
-                    'timestamp'         => $operation['timestamp'],
-                    'transactionHash'   => $operation['transactionHash'],
-                    'tokenInfo'         => $operation['token'],
-                    'type'              => $operation['type'],
-                    'value'             => $operation['value'],
-                );
-                if(isset($operation['address'])){
-                    $res['address'] = $operation['address'];
-                }
-                if(isset($operation['from'])){
-                    $res['from'] = $operation['from'];
-                    $res['to'] = $operation['to'];
-                }
-                $result['operations'][] = $res;
-            }
-        }
-        return $result;
+        return $this->_getHistory();
     }
 
     // @todo: remove copypaste
     public function getAddressHistory(){
+        return $this->_getHistory(TRUE);
+    }
+
+    protected function _getHistory($addressHistoryMode = FALSE){
         $result = array(
             'operations' => array()
         );
         $address = $this->getParam(0, FALSE);
         if($address){
             $address = strtolower($address);
         }
-        if((FALSE !== $address) && (!$this->db->isValidAddress($address))){
+        if((!$address && $addressHistoryMode) || ((FALSE !== $address) && (!$this->db->isValidAddress($address)))){
             $this->sendError(104, 'Invalid address format');
         }
         $maxLimit = is_array($this->defaults) && isset($this->defaults['limit']) ? $this->defaults['limit'] : 10;
         $options = array(
-            'address'   => $this->getParam(0, FALSE),
+            'address'   => $address,
             'type'      => $this->getRequest('type', FALSE),
             'limit'     => min(abs((int)$this->getRequest('limit', 10)), $maxLimit),
-            'timestamp' => (int)$this->getRequest('tsAfter', 0),
-            'history'   => TRUE
         );
+        if($addressHistoryMode){
+            $token = $this->getRequest('token', FALSE);
+            if(FALSE !== $token){
+                $token = strtolower($token);
+                if(!$this->db->isValidAddress($token)){
+                    $this->sendError(104, 'Invalid token address format');
+                }
+                $options['token'] = $token;
+            }
+            $options['history'] = TRUE;
+        }
         $operations = $this->db->getLastTransfers($options);
         if(is_array($operations) && count($operations)){
             for($i = 0; $i < count($operations); $i++){
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -496,6 +496,10 @@ public function getLastTransfers(array $options = array()){
             $search['$or'] = array(array('from' => $options['address']), array('to' => $options['address']));
         }
 
+        if(isset($options['token']) && isset($options['history'])){
+            $search['contract'] = $options['token'];
+        }
+
         $sort = array("timestamp" => -1);
 
         if(isset($options['timestamp']) && ($options['timestamp'] > 0)){

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,10 @@ public function getLastTransfers(array $options = array()){`
`496`	`496`	`$search['$or'] = array(array('from' => $options['address']), array('to' => $options['address']));`
`497`	`497`	`}`
`498`	`498`
	`499`	`+ if(isset($options['token']) && isset($options['history'])){`
	`500`	`+ $search['contract'] = $options['token'];`
	`501`	`+ }`
	`502`	`+`
`499`	`503`	`$sort = array("timestamp" => -1);`
`500`	`504`
`501`	`505`	`if(isset($options['timestamp']) && ($options['timestamp'] > 0)){`