getAddressInfo added

ArtemKo7v · ArtemKo7v · commit 9c09f3ba8907 · 2016-12-19T20:59:26.000+07:00
diff --git a/api/controller.php b/api/controller.php
@@ -19,7 +19,8 @@ class ethplorerController {
     protected $db;
     protected $command;
     protected $params = array();
-    protected $apiCommands = array('getTxInfo', 'getTokenHistory', 'getAddressInfo', 'getTokenInfo');
+    protected $apiCommands = array('getTxInfo', 'getTokenHistory', 'getAddressInfo', 'getTokenInfo', 'getAddressHistory');
+    protected $defaults;
 
     public function __construct($es){
         if(!($es instanceof Ethplorer)){
@@ -76,9 +77,11 @@ public function sendError($code, $message){
     public function run(){
         $command = $this->getCommand();
         if($command && in_array($command, $this->apiCommands) && method_exists($this, $command)){
-            if(!$this->db->checkAPIkey($this->getRequest('apiKey', FALSE))){
+            $key = $this->getRequest('apiKey', FALSE);
+            if(!$key || !$this->db->checkAPIkey($key)){
                 $this->sendError(1, 'Invalid API key');
             }
+            $this->defaults = $this->db->getAPIKeyDefaults($key, $this->getCommand());
             $result = call_user_func(array($this, $this->getCommand()));
             $this->sendResult($result);
         }
@@ -231,10 +234,11 @@ public function getTokenHistory(){
         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)), 10),
+            'limit'     => min(abs((int)$this->getRequest('limit', 10)), $maxLimit),
             'timestamp' => (int)$this->getRequest('tsAfter', 0)
         );
         $operations = $this->db->getLastTransfers($options);
@@ -261,6 +265,50 @@ public function getTokenHistory(){
         return $result;
     }
 
+    // @todo: remove copypaste
+    public function getAddressHistory(){
+        $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),
+            'history'   => TRUE
+        );
+        $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;
+    }
+
     protected function _bn2float($aNumber){
         $res = 0;
         if(isset($aNumber['c']) && !empty($aNumber['c'])){
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -489,9 +489,13 @@ public function getLastTransfers(array $options = array()){
                 $search['type'] = $options['type'];
             }
         }
-        if(isset($options['address'])){
+        if(isset($options['address']) && !isset($options['history'])){
             $search['contract'] = $options['address'];
         }
+        if(isset($options['address']) && isset($options['history'])){
+            $search['$or'] = array(array('from' => $options['address']), array('to' => $options['address']));
+        }
+
         $sort = array("timestamp" => -1);
 
         if(isset($options['timestamp']) && ($options['timestamp'] > 0)){
@@ -555,7 +559,21 @@ public function getAddressOperations($address, $limit = 10){
     }
 
     public function checkAPIKey($key){
-        return isset($this->aSettings['apiKeys']) && (FALSE !== array_search($key, $this->aSettings['apiKeys']));
+        return isset($this->aSettings['apiKeys']) && isset($this->aSettings['apiKeys'][$key]);
+    }
+
+    public function getAPIKeyDefaults($key, $option = FALSE){
+        $res = FALSE;
+        if($this->checkAPIKey($key)){
+            if(is_array($this->aSettings['apiKeys'][$key])){
+                if(FALSE === $option){
+                    $res = $this->aSettings['apiKeys'][$key];
+                }else if(isset($this->aSettings['apiKeys'][$key][$option])){
+                    $res = $this->aSettings['apiKeys'][$key][$option];
+                }
+            }
+        }
+        return $res;
     }
 
     /**
