OSDN Git Service

bytom/bytom.git
5 years agoAdd mempool new tx subscription support (#1578)
yahtoo [Fri, 22 Feb 2019 06:05:08 +0000 (14:05 +0800)]
Add mempool new tx subscription support (#1578)

* Add mempool new tx subscription support

* Fix test file error

* Add test file

* Add test file

* Opz code format

* Del invalid test file

5 years agoadd status fail for websocket nofify new transaction (#1582)
muscle_boy [Thu, 21 Feb 2019 09:01:42 +0000 (17:01 +0800)]
add status fail for websocket nofify new transaction (#1582)

5 years agoinit push (#1581)
Paladz [Thu, 21 Feb 2019 08:48:49 +0000 (16:48 +0800)]
init push (#1581)

* init push

* delete unused function

5 years agosmall change (#1580)
Paladz [Thu, 21 Feb 2019 06:20:13 +0000 (14:20 +0800)]
small change (#1580)

5 years agoorphan block num limit (#1579)
muscle_boy [Thu, 21 Feb 2019 02:30:12 +0000 (10:30 +0800)]
orphan block num limit (#1579)

5 years agoP2P: fixed node startup id (#1573)
yahtoo [Wed, 20 Feb 2019 04:06:43 +0000 (12:06 +0800)]
P2P: fixed node startup id (#1573)

* P2P: fixed node startup id

* Add test file

* Fix test error

* Fix review bug

* Fix test error

* Add log info

5 years agoclean code (#1577)
Paladz [Tue, 19 Feb 2019 08:58:34 +0000 (16:58 +0800)]
clean code (#1577)

5 years agovalidate block unit test (#1576)
muscle_boy [Tue, 19 Feb 2019 08:11:20 +0000 (16:11 +0800)]
validate block unit test (#1576)

5 years agoValidate tx unit test (#1575)
muscle_boy [Tue, 19 Feb 2019 06:16:29 +0000 (14:16 +0800)]
Validate tx unit test (#1575)

* add setGasValid unit test

* add setGasValid unit test

* add validate tx unit test

* add mismatch reference unit test

* add validate tx testcase

* add same utxo testcase

5 years agoValidate tx unit test (#1574)
muscle_boy [Tue, 19 Feb 2019 04:57:52 +0000 (12:57 +0800)]
Validate tx unit test (#1574)

* add setGasValid unit test

* add setGasValid unit test

* add validate tx unit test

* add mismatch reference unit test

* add validate tx testcase

5 years agodelete the btcsuite (#1571)
Paladz [Tue, 19 Feb 2019 04:15:17 +0000 (12:15 +0800)]
delete the btcsuite (#1571)

5 years agoClean (#1569)
Paladz [Mon, 18 Feb 2019 11:08:54 +0000 (19:08 +0800)]
Clean (#1569)

* delete unused

* delete unused code

5 years agop2p: refactor switch code and add test (#1538)
yahtoo [Mon, 18 Feb 2019 07:44:03 +0000 (15:44 +0800)]
p2p: refactor switch code and add test (#1538)

* p2p: refactor switch code and add test

* Adjust parameter position

* Resolve merging conflicts

* Fix test fail

* Resolve merging conflicts

* Fix review bugs

* Fix review bugs

* Fix review bug

* Fix review bug

5 years agodelete the code (#1568)
Paladz [Mon, 18 Feb 2019 06:46:50 +0000 (14:46 +0800)]
delete the code (#1568)

* delete the code

* keeping delete the code

* delete from tendermint common

* keep deleteing

* keep deleteing

5 years agodelete the unused code (#1567)
Paladz [Mon, 18 Feb 2019 04:01:18 +0000 (12:01 +0800)]
delete the unused code (#1567)

5 years agodelete unused (#1566)
Paladz [Fri, 15 Feb 2019 10:27:35 +0000 (18:27 +0800)]
delete unused (#1566)

* delete unused

* edit the redirect

5 years agowallet: prevent restore duplicate key (#1561)
yahtoo [Thu, 14 Feb 2019 04:05:12 +0000 (12:05 +0800)]
wallet: prevent restore duplicate key (#1561)

* wallet: prevent restore duplicate key

* Fix review bug

5 years agoAdd seed address format check (#1563)
yahtoo [Thu, 14 Feb 2019 03:34:31 +0000 (11:34 +0800)]
Add seed address format check (#1563)

5 years agop2p: support dns seed (#1554)
yahtoo [Wed, 13 Feb 2019 09:41:01 +0000 (17:41 +0800)]
p2p: support dns seed (#1554)

* p2p: support dns seed

* Del unused code

* Add test file

* Add multiple dns server parallel support

* Fix review bugs

* Fix review bugs

5 years agoRecommit (#1547)
HAOYUatHZ [Mon, 7 Jan 2019 08:48:54 +0000 (16:48 +0800)]
Recommit (#1547)

* Fix nil pointer error

* Init commitMap

* Init blockSnapshot

* Combine recover block & submitWork

* Add commitMap cleaning

* Clean up

* Refine code

* Add recommitTicker

* Add comments

* Clean

* Add config

* Save recommitInterval as uint64 in miningpool

* Fix typo

* Refine code

* Remake a block freshly

* Refine code

* Refine code

* Clean up

* Fix deleteMap logic

* Refine code

* Update Readme

* Fix test

5 years agoadd checkpoint (#1550)
Chengcheng Zhang [Mon, 7 Jan 2019 08:22:05 +0000 (16:22 +0800)]
add checkpoint (#1550)

5 years agodiscover: fix TestNodeDBSeedQuery err (#1549)
yahtoo [Mon, 7 Jan 2019 08:07:27 +0000 (16:07 +0800)]
discover: fix TestNodeDBSeedQuery err (#1549)

5 years agonetsync: Fix crash when unsubscribe event on exit (#1543)
yahtoo [Fri, 4 Jan 2019 02:06:46 +0000 (10:06 +0800)]
netsync: Fix crash when unsubscribe event on exit (#1543)

* netsync: Fix crash when unsubscribe event on exit

* Revert "Fix crash when unsubscribe event on exit"

This reverts commit 7533c2f010081d3ffd90b91887d04c52f8429ea7.

* Fix review bug

* Fix review bug

* Fix review bug

5 years agoEdit api (#1544)
Paladz [Thu, 3 Jan 2019 09:19:17 +0000 (17:19 +0800)]
Edit api (#1544)

* p2p/discv5: fix idx can be negative after uint convert to int(can cause crash) (#1307)

* fix bug for concurrent map access

* get raw block return the tx status

5 years agoDiscover: add node persistent storage (#1539)
yahtoo [Wed, 2 Jan 2019 07:33:49 +0000 (15:33 +0800)]
Discover: add node persistent storage (#1539)

add database test file

5 years agoAdd event resource release when node stop (#1540)
yahtoo [Thu, 27 Dec 2018 08:46:32 +0000 (16:46 +0800)]
Add event resource release when node stop (#1540)

5 years agoevent: add new mined block subscribe func (#1537)
yahtoo [Thu, 27 Dec 2018 08:24:41 +0000 (16:24 +0800)]
event: add new mined block subscribe func (#1537)

* Add new mined block subscribe func

* Fix review bug

* Rename typeMux to dispatcher

* Fix test file error

* Fix review bug

* Fix review bug

* Fix review error

* Fix review error

* Fix review bug

5 years agofix issue (#1517)
Paladz [Tue, 11 Dec 2018 05:27:46 +0000 (13:27 +0800)]
fix issue (#1517)

* fix issue

* add unit test

* fix a coinbase issue

5 years agofix input display issue (#1514)
Paladz [Mon, 10 Dec 2018 11:27:45 +0000 (19:27 +0800)]
fix input display issue (#1514)

* fix input issue

* add unit test

5 years agofix bug for websocket (#1508)
wz [Thu, 6 Dec 2018 08:42:12 +0000 (16:42 +0800)]
fix bug for websocket (#1508)

5 years agoupdate equity front end. (#1505)
Zhiting Lin [Wed, 5 Dec 2018 11:00:35 +0000 (19:00 +0800)]
update equity front end. (#1505)

5 years agoupdate testnet checkpoint (#1501)
Chengcheng Zhang [Thu, 29 Nov 2018 16:11:51 +0000 (00:11 +0800)]
update testnet checkpoint (#1501)

5 years agoMerge pull request #1500 from Bytom/dev-message
Paladz [Thu, 29 Nov 2018 08:11:45 +0000 (16:11 +0800)]
Merge pull request #1500 from Bytom/dev-message

modify string into []byte for message

5 years agomodify string into []byte for message
oysheng [Tue, 27 Nov 2018 06:03:39 +0000 (14:03 +0800)]
modify string into []byte for message

5 years agoRemove vendor (#1496)
Paladz [Mon, 26 Nov 2018 15:51:56 +0000 (23:51 +0800)]
Remove vendor (#1496)

* remove golang.org/x/time

* remove github.com/go-logfmt

* delete btcsuite

* delete unused vendor

5 years agodelete the vendor (#1495)
Paladz [Mon, 26 Nov 2018 10:21:36 +0000 (18:21 +0800)]
delete the vendor (#1495)

5 years agoDelete vendor (#1494)
Paladz [Mon, 26 Nov 2018 10:01:47 +0000 (18:01 +0800)]
Delete vendor (#1494)

* remove the unused vendor

* remove vendor/github.com/tendermint/abci

5 years agoMerge pull request #1491 from Bytom/wallet-recovery
Paladz [Fri, 23 Nov 2018 02:54:34 +0000 (10:54 +0800)]
Merge pull request #1491 from Bytom/wallet-recovery

Add test case

5 years agoAdd test case
Yahtoo Ma [Fri, 16 Nov 2018 01:46:17 +0000 (09:46 +0800)]
Add test case

TestReportFound

5 years agoMerge pull request #1487 from Bytom/edit-utxo-number
Paladz [Mon, 19 Nov 2018 06:54:32 +0000 (14:54 +0800)]
Merge pull request #1487 from Bytom/edit-utxo-number

edit the chain utxo number config

5 years agoedit the chain utxo number config
paladz [Mon, 19 Nov 2018 06:49:37 +0000 (14:49 +0800)]
edit the chain utxo number config

5 years agoMerge pull request #1483 from Bytom/dev-fix
Paladz [Mon, 19 Nov 2018 06:27:16 +0000 (14:27 +0800)]
Merge pull request #1483 from Bytom/dev-fix

fix makefile

5 years agofix makefile
Chengcheng Zhang [Mon, 19 Nov 2018 06:25:47 +0000 (14:25 +0800)]
fix makefile

5 years agoadd release note, checkpoint and version (#1479)
Paladz [Mon, 19 Nov 2018 05:35:19 +0000 (13:35 +0800)]
add release note, checkpoint and version (#1479)

* add release note, checkpoint and version

* fix typo

* try to fix eletron issue

* Revert "try to fix eletron issue"

This reverts commit 654ed6f38df1f8be7058b4be7fdd55dec2abde03.

* try to fix eletron issue

* Revert "try to fix eletron issue"

This reverts commit e682229546cb431808862de1bdfebebd858a8c7f.

5 years agoMerge pull request #1478 from Bytom/dashboard
Paladz [Fri, 16 Nov 2018 16:51:21 +0000 (00:51 +0800)]
Merge pull request #1478 from Bytom/dashboard

fixed the wallet bug in dashboard.

5 years agofixed the wallet bug in dashboard.
Zhiting Lin [Fri, 16 Nov 2018 16:48:27 +0000 (00:48 +0800)]
fixed the wallet bug in dashboard.

5 years agoMerge pull request #1476 from Bytom/dashboard
Paladz [Fri, 16 Nov 2018 05:39:18 +0000 (13:39 +0800)]
Merge pull request #1476 from Bytom/dashboard

update the dashboard mnemonic words to 12.

5 years agoupdate the dashboard mnemonic words to 12.
Zhiting Lin [Fri, 16 Nov 2018 05:27:16 +0000 (13:27 +0800)]
update the dashboard mnemonic words to 12.

5 years agoMerge pull request #1474 from Bytom/wallet-bip44
Paladz [Fri, 16 Nov 2018 03:58:16 +0000 (11:58 +0800)]
Merge pull request #1474 from Bytom/wallet-bip44

Unified bip44 path filed length and endian

5 years agoUnified bip44 path filed length and endian
Yahtoo Ma [Fri, 16 Nov 2018 03:44:17 +0000 (11:44 +0800)]
Unified bip44 path filed length and endian

5 years agoMerge pull request #1472 from Bytom/mnemonic
Paladz [Fri, 16 Nov 2018 02:56:10 +0000 (10:56 +0800)]
Merge pull request #1472 from Bytom/mnemonic

Change mnemonic length to 12

5 years agoChange mnemonic length to 12
Yahtoo Ma [Fri, 16 Nov 2018 02:24:07 +0000 (10:24 +0800)]
Change mnemonic length to 12

5 years agoMerge pull request #1473 from Bytom/dev-readme
Paladz [Fri, 16 Nov 2018 02:46:07 +0000 (10:46 +0800)]
Merge pull request #1473 from Bytom/dev-readme

update readme

5 years agoupdate readme
Chengcheng Zhang [Fri, 16 Nov 2018 02:43:53 +0000 (10:43 +0800)]
update readme

5 years agoMerge pull request #1471 from Bytom/fix_time
Paladz [Fri, 16 Nov 2018 02:16:10 +0000 (10:16 +0800)]
Merge pull request #1471 from Bytom/fix_time

Fix time format in list-peers

5 years agoFix time format in list-peers
HAOYUatHZ [Fri, 16 Nov 2018 02:10:03 +0000 (10:10 +0800)]
Fix time format in list-peers

5 years agoFix wallet recovery test fail (#1469)
yahtoo [Thu, 15 Nov 2018 10:37:21 +0000 (18:37 +0800)]
Fix wallet recovery test fail (#1469)

5 years agoupdate dashboard. (#1468)
Zhiting Lin [Thu, 15 Nov 2018 09:35:53 +0000 (17:35 +0800)]
update dashboard. (#1468)

5 years agofix(api): delete transactions and rescan blocks after updating account alias (#1466)
John Chi [Thu, 15 Nov 2018 08:06:13 +0000 (16:06 +0800)]
fix(api): delete transactions and rescan blocks after updating account alias (#1466)

5 years agoDev fix control (#1462)
Chengcheng Zhang [Thu, 15 Nov 2018 07:05:25 +0000 (15:05 +0800)]
Dev fix control (#1462)

* fix deleteaccount

* delete utxo

* update

* delete tx

* add make install

* add some functions

* update

* add DeleteAccout in wallet

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

5 years agoupdate dashboard. (#1463)
Zhiting Lin [Wed, 14 Nov 2018 12:01:24 +0000 (20:01 +0800)]
update dashboard. (#1463)

5 years agoAdd wallet recovery from mnemonic function (#1439)
yahtoo [Wed, 14 Nov 2018 10:49:50 +0000 (18:49 +0800)]
Add wallet recovery from mnemonic function (#1439)

* Add wallet recovery from mnemonic function

* Fix test error

* Add getCurrentContractIndex func

* Fix review bug

* Add CreateBatchAddresses func

* Fix review bug

* Opz code logic

* Fix test error

* Fix review bug

* Fix review bug

* Opz code logic

* Fix code format err

* Fix code format err

* Fix code format err

* Fix format err

* Del unused parameter

* Opz code logic

* Fix bug

* Change paramter name

* Opz code logic

* Del unused code

* Add recovery mgr trylock/unlock

* Opz code logic

* Opz code format

* Opz code format

* Add test file

* Opz code logic

* Fix test file err

* Opz code logic

* Fix contract index not updated err

* Opz code logic

* Opz code logic

* Fix test error

* Opz code format

* Opz code logic

* Fix review bug

* Fix review bug

* Fix review bug

* Fix account nil bug

* Add test case

TestRecoveryFromXPubs
TestRecoveryByRescanAccount

5 years agoAdd Update Account Alias Api (#1461)
John Chi [Wed, 14 Nov 2018 10:19:39 +0000 (18:19 +0800)]
Add Update Account Alias Api (#1461)

* feat(api): add update account alias api

* feat(api): update account alias api add account_alias parameter

* fix(api): delete old alias from database when update account alias

5 years agoadd update-key-alias (#1460)
oysheng [Wed, 14 Nov 2018 03:07:22 +0000 (11:07 +0800)]
add update-key-alias (#1460)

* add update-key-alias

* optimise

* optimise test

* optmise

5 years agomodify dashboard directory (#1453)
oysheng [Tue, 13 Nov 2018 02:35:11 +0000 (10:35 +0800)]
modify dashboard directory (#1453)

5 years agoupdate mnemonic dashboard (#1458)
Zhiting Lin [Tue, 13 Nov 2018 02:32:40 +0000 (10:32 +0800)]
update mnemonic dashboard (#1458)

5 years agonew equity compiler (#1459)
oysheng [Tue, 13 Nov 2018 02:31:09 +0000 (10:31 +0800)]
new equity compiler  (#1459)

* new equity compiler

* equity compiler tool

* delete value

* update equity front end.

* optimise

* update equity front end.

* update equity dashboard.

* delete unrelated file

5 years agofix asset alias (#1456)
oysheng [Thu, 8 Nov 2018 10:29:50 +0000 (18:29 +0800)]
fix asset alias (#1456)

* fix asset alias

* optimise

5 years agoAdd SOCKS5 Protocol Support (#1455)
John Chi [Thu, 8 Nov 2018 08:27:10 +0000 (16:27 +0800)]
Add SOCKS5 Protocol Support (#1455)

* feat(p2p connection): add SOCKS5 protocol support

* refactor(p2p connection): code refactoring

5 years agoupdate (#1451)
Chengcheng Zhang [Tue, 6 Nov 2018 08:51:59 +0000 (16:51 +0800)]
update (#1451)

5 years ago AnnotatedInput add AssetDifinition for issue (#1450)
oysheng [Tue, 6 Nov 2018 03:05:10 +0000 (11:05 +0800)]
 AnnotatedInput add AssetDifinition for issue  (#1450)

* AnnotatedInput return AssetDifinition for issue

* add check

* optimise

5 years agoupdate checkpoint (#1448)
Chengcheng Zhang [Mon, 5 Nov 2018 07:40:00 +0000 (15:40 +0800)]
update checkpoint (#1448)

5 years agoDev ws notification (#1442)
wz [Mon, 5 Nov 2018 03:45:22 +0000 (11:45 +0800)]
Dev ws notification (#1442)

* add websocket

* Implementing block notifications

* Code adjustment structure

* Remove the dependency on protocol

* Add transaction notice

* modify Message notification type

* modify func name

* Roll back file content

* add error for websocket

* add the package to vendor

* Trimming code

* Adjust the code

5 years agoMerge pull request #1440 from Bytom/dev_websocket_package
Paladz [Thu, 1 Nov 2018 06:58:27 +0000 (14:58 +0800)]
Merge pull request #1440 from Bytom/dev_websocket_package

add websocket for vendor

5 years agoadd websocket for vendor
wz [Thu, 1 Nov 2018 06:02:26 +0000 (14:02 +0800)]
add websocket for vendor

5 years agoMerge pull request #1434 from Bytom/ping_type
Paladz [Tue, 30 Oct 2018 03:52:44 +0000 (11:52 +0800)]
Merge pull request #1434 from Bytom/ping_type

Fix typos

5 years agoFix typos
HAOYUatHZ [Tue, 30 Oct 2018 03:24:21 +0000 (11:24 +0800)]
Fix typos

5 years agoMerge pull request #1431 from Bytom/fix_bug
Paladz [Tue, 30 Oct 2018 02:38:50 +0000 (10:38 +0800)]
Merge pull request #1431 from Bytom/fix_bug

remove the unused space

5 years agoremove the unused space
paladz [Tue, 30 Oct 2018 02:35:46 +0000 (10:35 +0800)]
remove the unused space

5 years agoMerge pull request #1430 from Bytom/net_info
Paladz [Tue, 30 Oct 2018 02:25:03 +0000 (10:25 +0800)]
Merge pull request #1430 from Bytom/net_info

add net performance

5 years agoadd net performance
paladz [Mon, 29 Oct 2018 14:14:21 +0000 (22:14 +0800)]
add net performance

5 years agoMerge pull request #1427 from Bytom/add_performance_log
Paladz [Mon, 29 Oct 2018 04:03:43 +0000 (12:03 +0800)]
Merge pull request #1427 from Bytom/add_performance_log

add cpu log

5 years agoMerge pull request #1428 from Bytom/timestamp
Paladz [Mon, 29 Oct 2018 01:48:34 +0000 (09:48 +0800)]
Merge pull request #1428 from Bytom/timestamp

Refresh timestamp when get-work

5 years agoRefresh timestamp when get-work
HAOYUatHZ [Sun, 28 Oct 2018 12:38:21 +0000 (20:38 +0800)]
Refresh timestamp when get-work

5 years agoadd cpu log
paladz [Fri, 26 Oct 2018 09:55:03 +0000 (17:55 +0800)]
add cpu log

5 years ago fix error response for compile contract (#1424)
oysheng [Thu, 25 Oct 2018 08:45:18 +0000 (16:45 +0800)]
 fix error response for compile contract  (#1424)

* fix error response for compile contract

* optimise

* fix excepted contract check

* optimise

5 years agoadd the other type of contract arguments include string, integer, boolean (#1418)
oysheng [Thu, 25 Oct 2018 05:54:16 +0000 (13:54 +0800)]
add the other type of contract arguments include string, integer, boolean (#1418)

* support recursive contract

* add the other type of contract arguments include string, integer, boolean

* optimise

* modify test

5 years agoBip44 wallet (#1409)
yahtoo [Tue, 23 Oct 2018 12:41:10 +0000 (20:41 +0800)]
Bip44 wallet (#1409)

* Fix account index mixing problem

Fix account index mixing problem created by different XPubs,
discontinuous indexes affect the account recovery of XPubs.

* Modify the address derivation mode to bip44

* Fix test file error

* Fix key index coverage problem

* Fix test file error

* Optimize code format

* Optimize code format

* Optimize code format

* Add duplicate account index check

* Add test case

bip32 and bip44 utxo in a tx

* Fix logic error

* Fix test error

* Optimize code format

* Fix logic error

* Fix logic error

* Fix review problem

* Fix XPubs account index get/set logic

* Fix TestListAssets test bug

* Revert asset related modification

* Add account index key prefix

* Revert asset related modification

* Optimize code format

* Fix GetAccountIndexKey bug

* Fix signMessage error

* Fix review bug

* Add test case

TestGetAccountIndexKey

5 years agoadd go install (#1416)
Chengcheng Zhang [Fri, 19 Oct 2018 02:12:29 +0000 (10:12 +0800)]
add go install (#1416)

* add go install

* update

* update

5 years agoremove redundant code (#1400)
cancelloveyan [Tue, 16 Oct 2018 05:51:42 +0000 (13:51 +0800)]
remove redundant code (#1400)

* 删除重复定义的变量代码

* 优化抽出公共代码

5 years agoNet analysis (#1402)
Paladz [Mon, 15 Oct 2018 10:33:54 +0000 (18:33 +0800)]
Net analysis (#1402)

* clean the unused code

* add log moudle to netsync logs

* fix code format issue

* edit the log

5 years agobuild-transaction return gas (#1391)
Paladz [Wed, 10 Oct 2018 07:12:43 +0000 (15:12 +0800)]
build-transaction return gas (#1391)

* build-transaction return gas

* golint the code

5 years ago/restore-wallet, /backup-wallet only accept local access (#1388)
Paladz [Tue, 9 Oct 2018 10:43:44 +0000 (18:43 +0800)]
/restore-wallet, /backup-wallet only accept local access (#1388)

* /restore-wallet, /backup-wallet only accept local access

* fix error issue

5 years agoMerge pull request #1384 from Bytom/releae-log
Paladz [Mon, 8 Oct 2018 05:28:23 +0000 (13:28 +0800)]
Merge pull request #1384 from Bytom/releae-log

add 1.0.6 release log

5 years agoadd 1.0.6 release log
paladz [Mon, 8 Oct 2018 03:23:22 +0000 (11:23 +0800)]
add 1.0.6 release log

5 years agoMerge pull request #1383 from Bytom/add_check_point
Paladz [Mon, 8 Oct 2018 01:26:35 +0000 (09:26 +0800)]
Merge pull request #1383 from Bytom/add_check_point

add checkpoint and version

5 years agoadd checkpoint and version
paladz [Mon, 8 Oct 2018 01:23:09 +0000 (09:23 +0800)]
add checkpoint and version

5 years agoMerge pull request #1378 from Bytom/submit-block
Paladz [Fri, 5 Oct 2018 06:20:42 +0000 (14:20 +0800)]
Merge pull request #1378 from Bytom/submit-block

Add /submit-block

5 years agoMerge pull request #1379 from Bytom/fix_bug
Paladz [Fri, 5 Oct 2018 06:19:34 +0000 (14:19 +0800)]
Merge pull request #1379 from Bytom/fix_bug

fix dead lock bug

5 years agofix dead lock bug
paladz [Fri, 5 Oct 2018 06:15:05 +0000 (14:15 +0800)]
fix dead lock bug