get xpub is working

assafY · assafY · commit 5ea46fced372 · 2017-04-28T16:41:28.000+01:00
diff --git a/src/Blockchain.php b/src/Blockchain.php
@@ -101,7 +101,7 @@ public function post($resource, $data=null) {
         curl_setopt($this->ch, CURLOPT_URL, $url.$resource);
         curl_setopt($this->ch, CURLOPT_POST, true);
 
-        curl_setopt($this->ch, CURLOPT_HTTPHEADER, 
+        curl_setopt($this->ch, CURLOPT_HTTPHEADER,
             array("Content-Type: application/x-www-form-urlencoded"));
 
         if(!is_null($this->api_code)) {
@@ -120,7 +120,7 @@ public function post($resource, $data=null) {
         return $json;
     }
 
-    public function get($resource, $params=null) {
+    public function get($resource, $params=array()) {
         $url = Blockchain::URL;
 
         if (($resource == "api/v2/create") || (substr($resource, 0, 8) === "merchant")) {
diff --git a/src/Explorer/Explorer.php b/src/Explorer/Explorer.php
@@ -72,9 +72,20 @@ public function getXpub($xpub, $limit=100, $offset=0, $filter=FilterType::Remove
             'format'=>'json',
             'limit'=>intval($limit),
             'offset'=>intval($offset),
-            'filter'=>intval($filter)
+            'filter'=>intval($filter),
+            'active'=>$xpub
         );
-        return new Xpub($this->blockchain->get('multiaddr?' . $params));
+        $resp = $this->blockchain->get('multiaddr?', $params);
+        if(array_key_exists('addresses', $resp)) {
+            $xpub = new Xpub($resp['addresses'][0]);
+            if(array_key_exists('txs', $resp)) {
+                foreach ($resp['txs'] as $txn) {
+                    $xpub->transactions[] = new Transaction($txn);
+                }
+            }
+        }
+        return $xpub;
+
     }
 
     public function getMultiAddress($addresses, $limit=100, $offset=0, $filter=FilterType::RemoveUnspendable) {
@@ -88,7 +99,7 @@ public function getMultiAddress($addresses, $limit=100, $offset=0, $filter=Filte
             'filter'=>intval($filter),
             'active'=>implode('|', $addresses)
         );
-        return new MultiAddress($this->blockchain->get('multiaddr?' . $params));
+        return new MultiAddress($this->blockchain->get('multiaddr?', $params));
     }
 
     /* Get a list of unspent outputs for an array of addresses
diff --git a/src/Explorer/Xpub.php b/src/Explorer/Xpub.php
@@ -22,5 +22,6 @@ public function __construct($json) {
             $this->change_index = $json['account_index'];
         if (array_key_exists('gap_limit', $json))
             $this->change_index = $json['gap_limit'];
+        Address::__construct($json);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@ public function __construct($json) {`
`22`	`22`	`$this->change_index = $json['account_index'];`
`23`	`23`	`if (array_key_exists('gap_limit', $json))`
`24`	`24`	`$this->change_index = $json['gap_limit'];`
	`25`	`+ Address::__construct($json);`
`25`	`26`	`}`
`26`	`27`	`}`