Merge branch 'feature/optimize' into 'master'

console/controllers/GameBetController.php

@@ -85,7 +85,7 @@ class GameBetController extends Controller
         ];
         $result = $service->getLastHeader($node_params);
         $main_height = isset($result['result']['height']) ? $result['result']['height'] : 0;
-        $safe_main_height = $main_height - 14;
+        $safe_main_height = $main_height - 36;
         $nodes = \Yii::$app->params['chain_parallel']['wasm'];
         if (empty($nodes)) {
             echo date('Y-m-d H:i:s') . '无节点' . PHP_EOL;
@@ -95,7 +95,7 @@ class GameBetController extends Controller
             $service = new Chain33Service($node);
             $result = $service->getLastHeader();
             $height = $result['result']['height'];
-            $main_info = $service->getBlock2MainInfo($height - 14, $height);
+            $main_info = $service->getBlock2MainInfo($height - 36, $height);
             if (!isset($main_info['result']['items'])) continue;
             $items = $main_info['result']['items'];
             $items = $this->arraySort($items, 'mainHeight');