Merge pull request #1890 from mxaddict/master

Pull request for findblock cron fix, related to orphaned blocks.

Author: TheSerapher

cronjobs/findblock.php

@@ -26,7 +26,7 @@
 require_once('shared.inc.php');
 
 // Fetch our last block found from the DB as a starting point
-$aLastBlock = @$block->getLast();
+$aLastBlock = @$block->getLastValid();
 $strLastBlockHash = $aLastBlock['blockhash'];
 if (!$strLastBlockHash) $strLastBlockHash = '';
 

public/include/classes/block.class.php

@@ -15,6 +15,18 @@ public function getLast() {
       return $result->fetch_assoc();
     return $this->sqlError();
   }
+  
+  /**
+   * Specific method to fetch the latest block found that is VALID
+   * @param none
+   * @return data array Array with database fields as keys
+   **/
+  public function getLastValid() {
+    $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE confirmations > -1 ORDER BY height DESC LIMIT 1");
+    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
+      return $result->fetch_assoc();
+    return $this->sqlError();
+  }
 
   /**
    * Get a specific block, by block height