First attempt to add support to BTC >= 0.16

SoraKohaku · Apr 17, 2018 · 26d2915 · 26d2915
1 parent 8fa8d6c
commit 26d2915
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/classes/bitcoin.class.php b/include/classes/bitcoin.class.php
@@ -284,13 +284,15 @@ public function __construct($scheme, $username, $password, $address = "localhost
    * The check is done by calling the server's getinfo() method and checking
    * for a fault.
    *
+   * To turn code compatible with BTC >= 0.16, getmininginfo() method used instead of getinfo()
+   *
    * @return mixed boolean TRUE if successful, or a fault string otherwise
    * @access public
    * @throws none
    */
   public function can_connect() {
     try {
-      $r = $this->getinfo();
+      $r = $this->getmininginfo();
     } catch (Exception $e) {
       return $e->getMessage();
     }

diff --git a/include/classes/bitcoinwrapper.class.php b/include/classes/bitcoinwrapper.class.php
@@ -24,13 +24,18 @@ public function __construct($type, $username, $password, $host, $debug_level, $d
   public function getinfo() {
     $this->oDebug->append("STA " . __METHOD__, 4);
     if ($data = $this->memcache->get(__FUNCTION__)) return $data;
-    return $this->memcache->setCache(__FUNCTION__, parent::getinfo(), 30);
+    if (!(parent::getwalletinfo()['walletname']))
+      return $this->memcache->setCache(__FUNCTION__, parent::getinfo(), 30);
+    else
+      return $this->memcache->setCache(__FUNCTION__, parent::getnetworkinfo()+parent::getmininginfo()+parent::getwalletinfo(), 30);
   }
+
   public function getmininginfo() {
     $this->oDebug->append("STA " . __METHOD__, 4);
     if ($data = $this->memcache->get(__FUNCTION__)) return $data;
     return $this->memcache->setCache(__FUNCTION__, parent::getmininginfo(), 30);
   }
+
   public function getblockcount() {
     $this->oDebug->append("STA " . __METHOD__, 4);
     if ($data = $this->memcache->get(__FUNCTION__)) return $data;