Merge branch 'feature/cross_chain' into 'master'

api/controllers/CrossChainController.php

@@ -52,6 +52,7 @@ class CrossChainController extends BaseController
             $data['txhex'] = $val['tx'];
             $data['transfer_url'] = $val['url'];
             $data['step'] = $val['step'];
+            $data['amount'] = isset($val['amount']) ? $val['amount'] : 0;
             $model->load($data, '');
             $model->save();
         }
@@ -123,7 +124,7 @@ class CrossChainController extends BaseController
         $code = -1;
         $msg = 'fail';
         $data = null;
-        $step = 0;
+        $step = $amount = 0;
         $request = Yii::$app->request;
         if (!$request->isGet) {
             $msg = '请求错误!';
@@ -146,6 +147,7 @@ class CrossChainController extends BaseController
         sort($model);
 
         foreach ($model as $key => $val) {
+            $amount = $val['amount'];
             //未交易
             if ('0' == $val['send_result'] && '0' == $val['query_result'] && '0' == $val['msg']) {
                 $step = $key + 1;
@@ -189,7 +191,8 @@ class CrossChainController extends BaseController
 
         doEnd :
         $data = [
-            'step' => $step
+            'step' => $step,
+            'amount' => (int)$amount
         ];
         return ['code' => $code, 'msg' => $msg, 'data' => $data];
     }

common/models/psources/CoinCrossChain.php

@@ -10,6 +10,9 @@ class CoinCrossChain extends BaseActiveRecord
     const WITHDRAW = 0;
     const RECHARGE = 1;
 
+    const CROSS_CHAIN_TRANSFERING = 'cross_chain_transfering';
+    const CROSS_CHAIN_CACHE_FAIL =  'cross_chain_fail';
+
     public static function getDb()
     {
         return Yii::$app->get('p_sources');
@@ -28,14 +31,14 @@ class CoinCrossChain extends BaseActiveRecord
     {
         return [
             [['is_with_draw', 'address', 'txhex', 'transfer_url'], 'required'],
-            [['transfer_number', 'step', 'send_result', 'query_result', 'msg'], 'safe']
+            [['transfer_number', 'amount', 'step', 'send_result', 'query_result', 'msg'], 'safe']
         ];
     }
 
     public function scenarios()
     {
         $scenarios = [
-            self:: SCENARIOS_CREATE => ['is_with_draw', 'address', 'txhex', 'transfer_url', 'transfer_number', 'step', 'send_result', 'query_result', 'msg'],
+            self:: SCENARIOS_CREATE => ['is_with_draw', 'address', 'txhex', 'transfer_url', 'transfer_number', 'amount', 'step', 'send_result', 'query_result', 'msg'],
         ];
         return array_merge(parent:: scenarios(), $scenarios);
     }

common/service/chain33/Chain33Service.php

@@ -20,7 +20,7 @@ class Chain33Service
 
     public function __construct($parameter = [])
     {
-        if(empty($parameter)){
+        if (empty($parameter)) {
             $this->node_params = Yii::$app->params['chain33'];
         } else {
             $this->node_params = $parameter;
@@ -31,8 +31,8 @@ class Chain33Service
     {
         $config = $this->node_params;
         $scheme = $config['scheme'] ?? 'http';
-        $host   = $config['host'] ?? '127.0.0.1';
-        $port   = (string)$config['port'] ?? '';
+        $host = $config['host'] ?? '127.0.0.1';
+        $port = (string)$config['port'] ?? '';
         if ($port) {
             return $scheme . '://' . $host . ':' . $port;
         } else {
@@ -44,9 +44,9 @@ class Chain33Service
     {
         $data = [
             'jsonrpc' => '2.0',
-            'id'      => 0,
-            'method'  => $method,
-            'params'  => [],
+            'id' => 0,
+            'method' => $method,
+            'params' => [],
         ];
         if (!empty($params)) {
             $data['params'][] = $params;
@@ -56,7 +56,11 @@ class Chain33Service
 
     public function send($params = [], $method = 'Chain33.Query')
     {
-        $ch      = new Curl();
+        $timeout = [
+            'connect_timeout' => 50000,
+            'timeout_ms' => 40000
+        ];
+        $ch = new Curl($timeout);
         $jsonrpc = self::jsonRpcBuild($params, $method);
         $ch->setHeader('Content-Type', 'application/json');
         $ch->setRawPostData($jsonrpc);
@@ -124,7 +128,7 @@ class Chain33Service
      * 获取地址下的所有token资产
      *
      * @param  string|array $address
-     * @param  string       $symbol
+     * @param  string $symbol
      * @return array
      */
     public function getAccountTokenAssets($address, $symbol)
@@ -133,8 +137,8 @@ class Chain33Service
             $address = [$address];
         }
         $params = [
-            "addresses"   => $address,
-            "execer"      => "user.p.guodun.token",
+            "addresses" => $address,
+            "execer" => "user.p.guodun.token",
             "tokenSymbol" => $symbol
         ];
         return $this->send($params, 'token.GetTokenBalance');
@@ -147,18 +151,18 @@ class Chain33Service
      * @param        $to
      * @param        $amount
      * @param string $note
-     * @param bool   $isToken
+     * @param bool $isToken
      * @param string $tokenSymbol
      * @return array
      */
     public function extractToken($from, $to, $amount, $note = '', $isToken = true, $tokenSymbol = '')
     {
         $params = [
-            "from"        => $to,
-            "to"          => $from,
-            "amount"      => -$amount,
-            "note"        => $note,
-            "isToken"     => $isToken ? true : false,
+            "from" => $to,
+            "to" => $from,
+            "amount" => -$amount,
+            "note" => $note,
+            "isToken" => $isToken ? true : false,
             "tokenSymbol" => strtoupper($tokenSymbol)
         ];
         return $this->send($params, 'Chain33.SendToAddress');
@@ -171,18 +175,18 @@ class Chain33Service
      * @param        $to
      * @param        $amount
      * @param string $note
-     * @param bool   $isToken
+     * @param bool $isToken
      * @param string $tokenSymbol
      * @return array
      */
     public function transToken($from, $to, $amount, $note = '', $isToken = true, $tokenSymbol = '')
     {
         $params = [
-            "from"        => $from,
-            "to"          => $to,
-            "amount"      => $amount,
-            "note"        => $note,
-            "isToken"     => $isToken ? true : false,
+            "from" => $from,
+            "to" => $to,
+            "amount" => $amount,
+            "note" => $note,
+            "isToken" => $isToken ? true : false,
             "tokenSymbol" => strtoupper($tokenSymbol)
         ];
         return $this->send($params, 'Chain33.SendToAddress');
@@ -191,25 +195,25 @@ class Chain33Service
     public function createTokenRawTransaction($to, $amount, $isToken, $tokenSymbol, $fee, $note, $execer)
     {
         $params = [
-            "to"   => $to,
+            "to" => $to,
             "amount" => $amount,
             "isToken" => $isToken,
             "tokenSymbol" => $tokenSymbol,
             "fee" => $fee,
-            "note"  => $note,
+            "note" => $note,
             "execer" => $execer,
 
         ];
         return $this->send($params, 'Chain33.CreateRawTransaction');
     }
 
-    public function createRawTransaction($to, $amount, $fee, $note,$execer)
+    public function createRawTransaction($to, $amount, $fee, $note, $execer)
     {
         $params = [
-            "to"   => $to,
+            "to" => $to,
             "amount" => $amount,
             "fee" => $fee,
-            "note"  => $note,
+            "note" => $note,
             "execer" => $execer,
 
         ];
@@ -274,11 +278,11 @@ class Chain33Service
     public function structureTrade($amount, $execName, $fee, $isToken = True, $to, $tokenSymbol = '')
     {
         $params = [
-            "amount"   => $amount,
+            "amount" => $amount,
             "execName" => $execName,
-            "fee"      => $fee,
-            "isToken"  => $isToken ? true : false,
-            "to"        => $to,
+            "fee" => $fee,
+            "isToken" => $isToken ? true : false,
+            "to" => $to,
             "tokenSymbol" => strtoupper($tokenSymbol)
         ];
         return $this->send($params, 'Chain33.CreateRawTransaction');
@@ -287,9 +291,9 @@ class Chain33Service
     public function signTrade($addr, $expire = '2h', $txHex)
     {
         $params = [
-            "addr"   => $addr,
+            "addr" => $addr,
             "expire" => $expire,
-            "txHex"  => $txHex
+            "txHex" => $txHex
         ];
         return $this->send($params, 'Chain33.SignRawTx');
     }
@@ -297,11 +301,19 @@ class Chain33Service
     public function sendTrade($data)
     {
         $params = [
-            "data"   => $data,
+            "data" => $data,
         ];
         return $this->send($params, 'Chain33.SendTransaction');
     }
 
+    public function getHeight($params = [])
+    {
+        $params = [
+            "data" => 'user.p.game.',
+        ];
+        return $this->send($params, 'paracross.GetHeight');
+    }
+
     /**
      * 获取最新的区块
      */
@@ -329,12 +341,12 @@ class Chain33Service
     public function getTxByAddr($addr, $flag, $count, $direction, $height, $index)
     {
         $params = [
-            'addr'      => $addr,
-            'flag'      => $flag,
-            'count'     => $count,
+            'addr' => $addr,
+            'flag' => $flag,
+            'count' => $count,
             'direction' => $direction,
-            'height'    => $height,
-            'index'     => $index
+            'height' => $height,
+            'index' => $index
         ];
         return $this->send($params, 'Chain33.GetTxByAddr');
     }
@@ -359,9 +371,9 @@ class Chain33Service
     public function unLockWallet($password)
     {
         $params = [
-            'passwd'         => $password,
+            'passwd' => $password,
             'walletorticket' => false,
-            'timeout'        => 30
+            'timeout' => 30
         ];
         return $this->send($params, 'Chain33.UnLock');
     }

console/controllers/CrossChainController.php

@@ -14,71 +14,88 @@ class CrossChainController extends Controller
      *
      * @return array
      */
-    public function actionAutoTransfer()
+    public function actionAutoTransfer($step, $is_with_draw)
     {
-        $model = CoinCrossChain::find()->where(['send_result' => "0"])->limit(20)->groupBy('transfer_number')->orderBy('id')->asArray()->all();
+        $redis = Yii::$app->redis;
+        $model = CoinCrossChain::find()->where(['send_result' => "0", 'step' => (int)$step, 'is_with_draw' => (int)$is_with_draw])->asArray()->all();
         if (empty($model)) {
-            echo date('Y-m-d H:i:s') . '暂无跨链交易计划' . PHP_EOL;
+            echo date('Y-m-d H:i:s') . ' STEP: ' . $step . '暂无跨链交易计划' . PHP_EOL;
             return 0;
         }
+        $current_time = time();
         foreach ($model as $val) {
-            $isExist = CoinCrossChain::find()
-                ->where(['transfer_number' => $val['transfer_number']])
-                ->andWhere(['<', 'id', (int)$val['id']])
-                ->orderBy('id desc')
-                ->asArray()
-                ->one();
-            //上一步发送成功，未查询
-            if ('success' != $isExist['query_result'] && !empty($isExist)) {
+            if ($step > 1) {
+                $isExist = CoinCrossChain::find()
+                    ->where(['transfer_number' => $val['transfer_number']])
+                    ->andWhere(['<', 'id', (int)$val['id']])
+                    ->orderBy('id desc')
+                    ->asArray()
+                    ->one();
+                //上一步发送成功，未查询
+                if ('success' != $isExist['query_result'] && !empty($isExist)) {
+                    continue;
+                }
+            }
+            $cache_transfering_time = $redis->hget(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
+            if (true == $cache_transfering_time) {
                 continue;
             }
+            $redis->hmset(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id'], $current_time);
 
-            //go(function () use ($val) {
-            //    \Co::sleep(0.5);
+            go(function () use ($val, $redis) {
+                \Co::sleep(0.5);
                 $transfer_url = $val['transfer_url'];
                 $transfer_url = explode(':', $transfer_url);
 
                 $node_params = [
                     'scheme' => $transfer_url[0],
                     'host' => str_replace('//', '', $transfer_url[1]),
-                    'port' => isset($transfer_url[2]) ? $transfer_url[2] : ''
+                    'port' => isset($transfer_url[2]) ? $transfer_url[2] : '',
                 ];
 
                 $service = new Chain33Service($node_params);
                 $sign_str = $val['txhex'];
                 $result = $service->sendTransaction($sign_str);
 
-                if (0 != $result['code']) {
-                    $msg = $result['msg'];
-                    goto doEnd;
-                }
-                $send_result = $result['result'];
-
-                doEnd :
-                $currentModel = CoinCrossChain::findOne($val['id']);
-                if (isset($msg)) {
-                    $currentModel->msg = $msg;
-                }
-                if (isset($send_result)) {
+                if (0 == $result['code']) {
+                    $send_result = $result['result'];
+                    $currentModel = CoinCrossChain::findOne($val['id']);
                     $currentModel->send_result = $send_result;
+                    $currentModel->msg = 0;
+                    $currentModel->save();
+                    $redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
                 }
-                $currentModel->save();
 
-            //});
+                if (0 != $result['code'] && (false == strstr($result['msg'], 'ErrDupTx'))) {
+                    $redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
+                }
+            });
         }
-        echo date('Y-m-d H:i:s') . '跨链交易成功' . PHP_EOL;
+        echo date('Y-m-d H:i:s') . ' STEP: ' . $step . '跨链交易成功' . PHP_EOL;
         return 0;
     }
 
     public function actionQueryTransaction()
     {
-        $model = CoinCrossChain::find()->where(['<>', 'send_result', '0'])->andWhere(['msg' => '0'])->limit(20)->asArray()->all();
+        $redis = Yii::$app->redis;
+        $model = CoinCrossChain::find()->where(['<>', 'send_result', '0'])->andWhere(['msg' => '0'])->asArray()->all();
 
         if (empty($model)) {
             echo date('Y-m-d H:i:s') . '暂无跨链交易计划' . PHP_EOL;
             return 0;
         }
 
+        //查询共识高度
+        $node_params = [
+            'scheme' => 'https',
+            'host' => 'jiedian1.bityuan.com',
+            'port' => 8801
+        ];
+        $service = new Chain33Service($node_params);
+        $result = $service->getHeight();
+        $consensHeight = $result['result']['consensHeight'];
+
+        $current_time = time();
         foreach ($model as $val) {
             $node_params = $val['transfer_url'];
             $node_params = explode(':', $node_params);
@@ -90,30 +107,53 @@ class CrossChainController extends Controller
             $service = new Chain33Service($node_params);
             $send_result = $val['send_result'];
             $result = $service->QueryTransaction($send_result);
-            if (-1 == $result['code']) {
-                if('tx not exist' == $result['msg']) continue;
-                $msg = $result['msg'];
-                $query_result = $result['code'];
-                goto doEnd;
-//                echo date('Y-m-d H:i:s') . 'ID:' . $val['id'] . '查询错误' . PHP_EOL;
-//                continue;
-            }
-
+            $switch = true;
             if (isset($result['result']['actionName']) && 'unknown' == $result['result']['actionName']) {
+                $redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
                 $query_result = 'success';
                 $msg = 'success';
+                $height = isset($result['result']['height']) ? $result['result']['height'] : 0;
+                goto doEnd;
             } else if (isset($result['result']['receipt']['ty']) && 2 == $result['result']['receipt']['ty']) {
+                $redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
                 $query_result = 'success';
                 $msg = 'success';
+                $height = isset($result['result']['height']) ? $result['result']['height'] : 0;
+                goto doEnd;
             } else {
-                $query_result = 'fail';
-                foreach ($result['result']['receipt']['logs'] as $log) {
-                    if (is_array($log['log'])) continue;
-                    $msg = isset($log['log']) ? $log['log'] : '查询错误';
+                $cache_error_time = $redis->hget(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
+                if (false == $cache_error_time) {
+                    $redis->hmset(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw'], $current_time);
+                    continue;
+                }
+
+                if (($current_time - $cache_error_time) < 60) {
+                    continue;
+                }
+
+                $redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
+                if (-1 == $result['code']) {
+                    $msg = $result['msg'];
+                    $query_result = $result['code'];
+                    $switch = false;
+                    goto doEnd;
+                } else {
+                    $query_result = 'fail';
+                    foreach ($result['result']['receipt']['logs'] as $log) {
+                        if (is_array($log['log'])) continue;
+                        $msg = isset($log['log']) ? $log['log'] : '查询错误';
+                    }
+                    $switch = false;
+                    goto doEnd;
                 }
             }
 
             doEnd :
+
+            if (CoinCrossChain::RECHARGE == $val['is_with_draw'] && $val['step'] == 2 && $switch && isset($height) && ($consensHeight < $height)) {
+                continue;
+            }
+
             $currentModel = CoinCrossChain::findOne($val['id']);
             $currentModel->query_result = $query_result;
             $currentModel->msg = $msg;
@@ -121,7 +161,6 @@ class CrossChainController extends Controller
 
             $count = CoinCrossChain::find()->where(['transfer_number' => $val['transfer_number']])->andWhere(['query_result' => 'success'])->count();
             if (3 == $count) {
-                $redis = Yii::$app->redis;
                 $key = $val['address'] . '_' . $val['is_with_draw'];
                 if ($redis->exists($key)) {
                     $redis->del($key);

shell/AutoTransfer.sh

-#!/bin/bash
-while true; do php /var/www/html/token_pwallet/yii cross-chain/auto-transfer >> /var/www/html/auto-transfer.log 2>&1; sleep 15; done &
\ No newline at end of file

shell/BetUpdate.sh

-#!/bin/bash
-while true; do php /var/www/html/token_pwallet/yii game-bet/bet-update >> /var/log/bet-update.log 2>&1; sleep 2; done &
\ No newline at end of file

shell/GameStatus.sh

-#!/bin/bash
-while true; do php /var/www/html/token_pwallet/yii game-bet/game-status >> /var/log/game-status.log 2>&1; sleep 5; done &
\ No newline at end of file

shell/QueryTransaction.sh

-#!/bin/bash
-while true; do php /var/www/html/token_pwallet/yii cross-chain/query-transaction >> /var/www/html/query-transaction.log 2>&1; sleep 5; done &
\ No newline at end of file