OSDN Git Service

bytom/bytom.git
5 years agoMerge pull request #1190 from Bytom/prod v1.0.4 v1.0.4-simd
Paladz [Thu, 26 Jul 2018 03:28:30 +0000 (11:28 +0800)]
Merge pull request #1190 from Bytom/prod

Prod

5 years agoMerge pull request #1189 from Bytom/dev
Paladz [Thu, 26 Jul 2018 03:25:48 +0000 (11:25 +0800)]
Merge pull request #1189 from Bytom/dev

Dev

5 years agoMerge pull request #1188 from Bytom/edit-release
Paladz [Thu, 26 Jul 2018 03:23:57 +0000 (11:23 +0800)]
Merge pull request #1188 from Bytom/edit-release

fix the format

5 years agofix the format
paladz [Thu, 26 Jul 2018 03:21:58 +0000 (11:21 +0800)]
fix the format

5 years agoMerge pull request #1187 from Bytom/dev
Paladz [Thu, 26 Jul 2018 03:19:59 +0000 (11:19 +0800)]
Merge pull request #1187 from Bytom/dev

Dev

5 years agoadd release note (#1185)
Paladz [Thu, 26 Jul 2018 03:17:22 +0000 (11:17 +0800)]
add release note (#1185)

* add release note

* elegant the release note

* fix the grammar

* elegant the release note (#1186)

* elegant the release note

* elegant the release note

5 years agoAdd simd section in README (#1184)
successli [Thu, 26 Jul 2018 02:40:53 +0000 (10:40 +0800)]
Add simd section in README (#1184)

5 years agoupdate dashboard (#1183)
Zhiting Lin [Wed, 25 Jul 2018 11:46:57 +0000 (19:46 +0800)]
update dashboard (#1183)

5 years agoDev readme (#1182)
successli [Wed, 25 Jul 2018 11:06:55 +0000 (19:06 +0800)]
Dev readme (#1182)

* fix the coinbase generate bug (#1136)

* update README.md file

* update README.md file delete --mining param

* Add simd section in README

5 years agoMerge pull request #1180 from Bytom/dev
Paladz [Wed, 25 Jul 2018 08:27:48 +0000 (16:27 +0800)]
Merge pull request #1180 from Bytom/dev

Dev

5 years agoupdated equity frontend. (#1177)
Zhiting Lin [Wed, 25 Jul 2018 07:46:59 +0000 (15:46 +0800)]
updated equity frontend. (#1177)

5 years agoedit sync logic, make it fast (#1176)
Paladz [Wed, 25 Jul 2018 07:42:56 +0000 (15:42 +0800)]
edit sync logic, make it fast (#1176)

* edit sync logic, make it fast

* fix ci error

5 years agoMerge pull request #1175 from Bytom/dev
Paladz [Wed, 25 Jul 2018 05:35:43 +0000 (13:35 +0800)]
Merge pull request #1175 from Bytom/dev

Dev

5 years agoedit the config for prod (#1174)
Paladz [Wed, 25 Jul 2018 05:32:30 +0000 (13:32 +0800)]
edit the config for prod (#1174)

5 years agoadd unit test for netsync (#1162)
Paladz [Wed, 25 Jul 2018 03:20:30 +0000 (11:20 +0800)]
add unit test for netsync (#1162)

* add unit test for block_keeper

* fix unit test error

* add unit test for locateHeaders

* add unit test for locateBlocks

* add unit test for TestNextCheckpoint

* add unit test for TestRequireBlock

* add unit test for regular block sync

* add unit test for TestFastBlockSync

* fix golint

5 years agoupdate equity frontend part (#1171)
Zhiting Lin [Tue, 24 Jul 2018 12:10:28 +0000 (20:10 +0800)]
update equity frontend part (#1171)

5 years agofix typo (#1168)
broadroad [Tue, 24 Jul 2018 11:25:53 +0000 (19:25 +0800)]
fix typo (#1168)

5 years agoTry (#1165)
HAOYUatHZ [Tue, 24 Jul 2018 11:24:51 +0000 (19:24 +0800)]
Try (#1165)

* Add simd tag

* Clean up Makefile

* Request CI again

* Fix link option for Darwin

* Update readme

5 years agomodify list-pubkeys response order (#1170)
oysheng [Tue, 24 Jul 2018 07:24:32 +0000 (15:24 +0800)]
modify list-pubkeys response order (#1170)

5 years agoFrontend (#1169)
Zhiting Lin [Tue, 24 Jul 2018 02:56:41 +0000 (10:56 +0800)]
Frontend (#1169)

* updated dashboard

* update the equity frontend.

* update dashboard nav.

5 years agoadd filter field pubkey for list-pubkeys (#1161)
oysheng [Mon, 23 Jul 2018 07:03:41 +0000 (15:03 +0800)]
add filter field pubkey for list-pubkeys (#1161)

* add filter pubkey for list-pubkeys

* optimise

* optimise import

5 years agoAdd simd tag (#1160)
HAOYUatHZ [Mon, 23 Jul 2018 06:30:54 +0000 (14:30 +0800)]
Add simd tag (#1160)

* Add simd tag

* Clean up Makefile

* Request CI again

5 years agoMerge pull request #1158 from Bytom/dev
Paladz [Mon, 23 Jul 2018 02:32:33 +0000 (10:32 +0800)]
Merge pull request #1158 from Bytom/dev

Dev

5 years agoMerge pull request #1155 from Bytom/dev
Paladz [Mon, 23 Jul 2018 02:00:22 +0000 (10:00 +0800)]
Merge pull request #1155 from Bytom/dev

Dev

5 years agofix unit test for sm op (#1156)
Paladz [Mon, 23 Jul 2018 01:55:18 +0000 (09:55 +0800)]
fix unit test for sm op (#1156)

5 years agoedit go version (#1153)
Paladz [Fri, 20 Jul 2018 10:38:56 +0000 (18:38 +0800)]
edit go version (#1153)

5 years agofix comment (#1152)
Chengcheng Zhang [Fri, 20 Jul 2018 09:42:42 +0000 (17:42 +0800)]
fix comment (#1152)

* fix comment

* delete pem

5 years agoAdd netsync node error handler (#1151)
yahtoo [Fri, 20 Jul 2018 08:34:32 +0000 (16:34 +0800)]
Add netsync node error handler (#1151)

5 years agoFix txSyncLoop null pointer error (#1150)
yahtoo [Fri, 20 Jul 2018 05:27:04 +0000 (13:27 +0800)]
Fix txSyncLoop null pointer error (#1150)

5 years agoadd utxo_opt algorithm (#1149)
Paladz [Fri, 20 Jul 2018 02:13:29 +0000 (10:13 +0800)]
add utxo_opt algorithm (#1149)

* add utxo_opt algorithm

* edit the unit test

* edit the comment

5 years agoDev simd (#1146)
HAOYUatHZ [Thu, 19 Jul 2018 14:05:24 +0000 (22:05 +0800)]
Dev simd (#1146)

* Adapt.

* re-arrange package

* Update Makefile

5 years agoFix node discovery table delete entry bug (#1139)
yahtoo [Thu, 19 Jul 2018 12:16:39 +0000 (20:16 +0800)]
Fix node discovery table delete entry bug (#1139)

5 years agoequity compiler (#1144)
oysheng [Thu, 19 Jul 2018 11:30:16 +0000 (19:30 +0800)]
equity compiler (#1144)

* add equity compiler API

* modify name declared_type to type

* optimise equity compile API

* optimise

* modify compile API

* optimise

* optimise params

* optimise params

* add equity index

* add equity Authenticate

* add the equity.go to the production

* add print log while validate transaction fail

* add test for VM

* add the equity dashboard

* delete test log

* fixed the equity corss-origin error and remove escrow contract template

5 years agoAdd block fast sync function (#1104)
yahtoo [Thu, 19 Jul 2018 11:09:05 +0000 (19:09 +0800)]
Add block fast sync function (#1104)

* Add block headers handler for fast sync

* Add testnet checkpoint

* Add debug info

* Fix GetHeadersMessage bug

* Add debug info

* Fix HeadersMessage bug

* Add HeadersMessage handler

* Fast sync call BlockRequestWorker download block

* Add debug info for measure time

* Add getBlocks for fast sync

* Fix code logic errors

* Del unused variable headersFirstMode

* Fix hash string compare error

* Fix code logic errors

* Fix blocksSend logic error

* Optimize log printing

* Add max blocksMsg package size limit

* Modify fast sync node selection logic

* Fix multi checkpoint fast sync error

* Del unused code prevGetHdrsMtx

* Add fast sync txs merkle root check

* Add fast sync complete new status broadcast

* Change variable hash format

* edit the code format

* delete the unused checkpoint

* edit netsync message byte

* Fix Duplicate Byte BlockRequestMessage

* Add testnet checkpoint

* tmp save

* edit the handle logic

* edit the fast sync

* move tx process out of blockKeeper

* elegant the message

* elegant the peer.go

* elegant block_keeper

* elegant the block_fetcher

* fix api node info bug

* delete unused data

* edit the tx_keeper

* edit ban method

* make sure both size sync tx

* add response bool on every send

* handle all the peer dc

* merge with dev

* fix bug on merge with dev

* add max block peer msg limit

* limit the max send block size

* fix the web wallet display bug

* fix hand shake timepout error

* fix logic if statement

* edit the services flag bug

* add error message log

* edit blocks/headers, marshal/unmarshal

* edit the message field name

* fix sync logic bug

* fix sync bug

* fix a code logic error

5 years agoreorganize error code (#1133)
oysheng [Thu, 19 Jul 2018 11:06:41 +0000 (19:06 +0800)]
reorganize error code (#1133)

* modify errors for build-transaction

* submit transaction error

* modify onlyHaveSpendActions to onlyHaveInputActions
add build-transaction error code

* modify validation error

* add vm error

* add hsm error

* modify run VM error

* modify rum VM wrapErr function

5 years agoupdate dashboard (#1143)
Zhiting Lin [Thu, 19 Jul 2018 03:01:35 +0000 (11:01 +0800)]
update dashboard (#1143)

5 years agoAdd timeout did not confirm txs del function (#1141)
yahtoo [Wed, 18 Jul 2018 07:52:10 +0000 (15:52 +0800)]
Add timeout did not confirm txs del function (#1141)

* Add timeout did not confirm txs del function

* Fix code review problem

5 years agoMerge pull request #1137 from Bytom/v1.0.3_fix
yahtoo [Sat, 14 Jul 2018 10:42:15 +0000 (18:42 +0800)]
Merge pull request #1137 from Bytom/v1.0.3_fix

V1.0.3 fix

5 years agofix the coinbase generate bug (#1136) v1.0.3-hotfix-f53cde9
yahtoo [Sat, 14 Jul 2018 10:30:45 +0000 (18:30 +0800)]
fix the coinbase generate bug (#1136)

5 years agofix the coinbase generate bug
paladz [Sat, 14 Jul 2018 09:24:03 +0000 (17:24 +0800)]
fix the coinbase generate bug

5 years agofix unit test for ispushdata (#1132)
oysheng [Thu, 12 Jul 2018 06:35:13 +0000 (14:35 +0800)]
fix unit test for ispushdata (#1132)

5 years agodecode-raw-transaction API add tx_id and txinput add input_id (#1130)
oysheng [Wed, 11 Jul 2018 02:31:37 +0000 (10:31 +0800)]
decode-raw-transaction API add tx_id and txinput add input_id (#1130)

5 years agoestimate gas support multi-sign (#1126)
muscle_boy [Tue, 10 Jul 2018 06:17:34 +0000 (14:17 +0800)]
estimate gas support multi-sign (#1126)

* the transaction output amout prohibit set zero

* add network access control api

* format import code style

* refactor

* code refactor

* bug fix

* the struct node_info add json field

* estimate gas support multi-sign

* add testcase of estimate gas

* add testcase

* bug fix

* add test case

* test case refactor

5 years agoinit version for list-unspend-output support 0 confirmed utxo (#1129)
Paladz [Tue, 10 Jul 2018 03:16:19 +0000 (11:16 +0800)]
init version for list-unspend-output support 0 confirmed utxo (#1129)

* init version for list-unspend-output support 0 confirmed utxo

* add unit test for list 0 confirmed utxo

5 years agoMerge pull request #1128 from Bytom/dev
Paladz [Mon, 9 Jul 2018 09:31:30 +0000 (17:31 +0800)]
Merge pull request #1128 from Bytom/dev

Dev

5 years agomodify equity to available (#1127)
oysheng [Mon, 9 Jul 2018 08:36:16 +0000 (16:36 +0800)]
modify equity to available  (#1127)

* modify function name from greater/less to below/above

* modify CHECKOUTPUT instruction

* modify path

* modify ivy to equity

* add func IsPushdata

5 years agoadd contract template LoanCollateral (#1125)
oysheng [Fri, 6 Jul 2018 08:07:30 +0000 (16:07 +0800)]
add contract template LoanCollateral (#1125)

add contract template CallOption

5 years agofix the file path bug (#1124)
Paladz [Thu, 5 Jul 2018 14:45:33 +0000 (22:45 +0800)]
fix the file path bug (#1124)

5 years agoinit push for spend 0 confirm utxo (#1112)
Paladz [Thu, 5 Jul 2018 13:02:37 +0000 (21:02 +0800)]
init push for spend 0 confirm utxo (#1112)

* init push for spend 0 confirm utxo

* elegant the code

* add unit test for utxo_keeper

* add unit test for wallet/utxo.go

* fix a unit test bug

* delete the unused control_receiver

5 years agothe struct of node_info add json field (#1120)
muscle_boy [Wed, 4 Jul 2018 08:55:09 +0000 (16:55 +0800)]
the struct of node_info add json field (#1120)

* the transaction output amout prohibit set zero

* add network access control api

* format import code style

* refactor

* code refactor

* bug fix

* the struct node_info add json field

5 years agoadd network access control api (#1118)
muscle_boy [Wed, 4 Jul 2018 08:05:40 +0000 (16:05 +0800)]
add network access control api (#1118)

* the transaction output amout prohibit set zero

* add network access control api

* format import code style

* refactor

* code refactor

* bug fix

5 years agodelete equity time type (#1119)
oysheng [Wed, 4 Jul 2018 07:30:50 +0000 (15:30 +0800)]
delete equity time type (#1119)

* delete equity time type
add blockHeight field and add internal function greater and less

* delete time related

5 years agoadd contract template escrow (#1117)
oysheng [Tue, 3 Jul 2018 07:48:23 +0000 (15:48 +0800)]
add contract template escrow (#1117)

5 years agoAdd bytomd command line param about setting log level (#1115)
successli [Tue, 3 Jul 2018 06:47:17 +0000 (14:47 +0800)]
Add bytomd command line param about setting log level (#1115)

* add bytomd command line param about log level

* default set to info and rm pre-setting for log level

5 years agoadd contract TradeOffer template (#1116)
oysheng [Tue, 3 Jul 2018 06:14:12 +0000 (14:14 +0800)]
add contract TradeOffer template (#1116)

* add contract TradeOffer template

* refactor template contract

* fix error result

5 years agoMerge pull request #1113 from Bytom/dev
Paladz [Mon, 2 Jul 2018 13:34:58 +0000 (21:34 +0800)]
Merge pull request #1113 from Bytom/dev

Dev

5 years agodelete time waiter (#1111)
oysheng [Mon, 2 Jul 2018 09:04:04 +0000 (17:04 +0800)]
delete time waiter (#1111)

5 years agothe transaction output amout prohibit set zero (#1109)
muscle_boy [Mon, 2 Jul 2018 08:49:16 +0000 (16:49 +0800)]
the transaction output amout prohibit set zero (#1109)

5 years agofix rescan wallet (#1108)
oysheng [Mon, 2 Jul 2018 08:45:16 +0000 (16:45 +0800)]
fix rescan wallet (#1108)

* fix rescan wallet

* optimise

5 years agomiss return when error (#1100)
broadroad [Fri, 29 Jun 2018 03:07:31 +0000 (11:07 +0800)]
miss return when error (#1100)

5 years agoelegant the code for utxo reserver (#1105)
Paladz [Fri, 29 Jun 2018 02:47:52 +0000 (10:47 +0800)]
elegant the code for utxo reserver (#1105)

* elegant the code for utxo reserver

* fix bug

5 years agoadd contract template LockWithPublicKeyHash and RevealPreimage (#1101)
oysheng [Thu, 28 Jun 2018 08:23:20 +0000 (16:23 +0800)]
add contract template LockWithPublicKeyHash and RevealPreimage (#1101)

adjust contract template structure

5 years agorescan-wallet capture rescan signal (#1102)
oysheng [Thu, 28 Jun 2018 08:13:48 +0000 (16:13 +0800)]
rescan-wallet capture rescan signal (#1102)

* rescan-wallet capture rescan signal

* optimise

5 years agoadd multisig contract template (#1095)
oysheng [Wed, 27 Jun 2018 06:41:45 +0000 (14:41 +0800)]
add multisig contract template (#1095)

5 years agoadd getWalletInfo API to acquire rescan wallet schedule (#1098)
oysheng [Wed, 27 Jun 2018 06:30:04 +0000 (14:30 +0800)]
add getWalletInfo API to acquire rescan wallet schedule (#1098)

5 years agoadd checkpoint into the block keeper (#1093)
Paladz [Tue, 26 Jun 2018 07:52:55 +0000 (15:52 +0800)]
add checkpoint into the block keeper (#1093)

* add checkpoint into the block keeper

* edit for code review

5 years agorefactor spend_account_unspent_output struct for add contract arguments (#1089)
oysheng [Mon, 25 Jun 2018 12:05:05 +0000 (20:05 +0800)]
refactor spend_account_unspent_output struct for add contract arguments (#1089)

* refactor spend_account_unspent_output struct for add contract arguments
add the contract template LockWithPublicKey for build-transaction

* optimise arguments
add unit test

* optimise unit test

* optimise struct

5 years agoMerge pull request #1090 from Bytom/add_fastsync_flag
yahtoo [Mon, 25 Jun 2018 12:03:11 +0000 (20:03 +0800)]
Merge pull request #1090 from Bytom/add_fastsync_flag

enable the fast sync server flag

5 years agoenable the fast sync server flag
paladz [Mon, 25 Jun 2018 11:37:06 +0000 (19:37 +0800)]
enable the fast sync server flag

5 years agoGm (#1085)
Chengcheng Zhang [Fri, 22 Jun 2018 01:48:43 +0000 (09:48 +0800)]
Gm (#1085)

* update .gitignore

* add OP_SM3

* add OP_SM3 test

5 years agoadd list-pubkeys API (#1086)
oysheng [Thu, 21 Jun 2018 13:43:06 +0000 (21:43 +0800)]
add list-pubkeys API (#1086)

* add list-pubkeys API

* modify response of list-pubkeys

5 years agoUpdate release-notes-1.0.3.md (#1079)
RockerFlower [Thu, 21 Jun 2018 05:36:15 +0000 (13:36 +0800)]
Update release-notes-1.0.3.md (#1079)

Fix the link of Bytom User Manual.

5 years agomodify MergeSpendAction order by origin action list (#1048)
oysheng [Thu, 21 Jun 2018 02:38:28 +0000 (10:38 +0800)]
modify MergeSpendAction order by origin action list (#1048)

* modify MergeSpendAction order by origin action list

* optimise

5 years agoAPI list-unspent-outputs add filter for contract (#1076)
oysheng [Wed, 20 Jun 2018 13:40:27 +0000 (21:40 +0800)]
API list-unspent-outputs add filter for contract (#1076)

5 years agoadd arbitrary for retire (#1065)
Derek [Wed, 20 Jun 2018 10:15:57 +0000 (18:15 +0800)]
add arbitrary for retire (#1065)

* add rescan-blocks api

* rename rescan-blocks to rescan-wallet

* rename rescanWallet to rescanWallet

* add arbitrary for retire

* retireAction needs a program

* retireAction used address

* add RetireProgram for script

* update RetireProgram for script

5 years agoMerge pull request #1081 from Bytom/equity-origin
Paladz [Wed, 20 Jun 2018 08:15:29 +0000 (16:15 +0800)]
Merge pull request #1081 from Bytom/equity-origin

equity origin compiler

5 years agoequity origin compiler
oysheng [Wed, 20 Jun 2018 06:17:30 +0000 (14:17 +0800)]
equity origin compiler

5 years agoMerge pull request #1077 from Bytom/dev-discv-temp
Paladz [Tue, 19 Jun 2018 06:29:15 +0000 (14:29 +0800)]
Merge pull request #1077 from Bytom/dev-discv-temp

gofmt

5 years agogofmt
HAOYUatHZ [Tue, 19 Jun 2018 06:21:19 +0000 (14:21 +0800)]
gofmt

5 years agoMerge pull request #1075 from Bytom/prod v1.0.3
Paladz [Tue, 19 Jun 2018 03:15:10 +0000 (11:15 +0800)]
Merge pull request #1075 from Bytom/prod

Prod

5 years agoMerge pull request #1074 from Bytom/dev
Paladz [Tue, 19 Jun 2018 03:13:50 +0000 (11:13 +0800)]
Merge pull request #1074 from Bytom/dev

Dev

5 years agoMerge pull request #1073 from Bytom/p2p_disv
Paladz [Tue, 19 Jun 2018 03:11:27 +0000 (11:11 +0800)]
Merge pull request #1073 from Bytom/p2p_disv

Change peer discv resp timeout

5 years agoChange peer discv resp timeout
Yahtoo Ma [Tue, 19 Jun 2018 02:29:51 +0000 (10:29 +0800)]
Change peer discv resp timeout

5 years agoMerge pull request #1072 from Bytom/prod
Paladz [Tue, 19 Jun 2018 02:20:49 +0000 (10:20 +0800)]
Merge pull request #1072 from Bytom/prod

prod - master

5 years agoMerge pull request #1071 from Bytom/dev
Paladz [Tue, 19 Jun 2018 02:17:33 +0000 (10:17 +0800)]
Merge pull request #1071 from Bytom/dev

Dev

5 years agoMerge pull request #1062 from Bytom/release_note
Paladz [Tue, 19 Jun 2018 02:07:51 +0000 (10:07 +0800)]
Merge pull request #1062 from Bytom/release_note

add unit release note for v1.0.3

5 years agoMerge pull request #1070 from Bytom/dev-filter
Paladz [Tue, 19 Jun 2018 02:03:39 +0000 (10:03 +0800)]
Merge pull request #1070 from Bytom/dev-filter

add filter related unconfirmed transaction

5 years agomodify func name
oysheng [Tue, 19 Jun 2018 01:59:10 +0000 (09:59 +0800)]
modify func name

5 years agoadd filter related unconfirmed transaction
oysheng [Tue, 19 Jun 2018 01:52:00 +0000 (09:52 +0800)]
add filter related unconfirmed transaction

5 years agoMerge pull request #1064 from Bytom/dev
Paladz [Fri, 15 Jun 2018 07:28:46 +0000 (15:28 +0800)]
Merge pull request #1064 from Bytom/dev

Dev

5 years agoedit the config (#1063)
Paladz [Fri, 15 Jun 2018 07:25:30 +0000 (15:25 +0800)]
edit the config (#1063)

5 years agoadd unit release note for v1.0.3
paladz [Thu, 14 Jun 2018 13:12:21 +0000 (21:12 +0800)]
add unit release note for v1.0.3

5 years agoadd rescan-blocks api (#1055)
Derek [Thu, 14 Jun 2018 11:52:14 +0000 (19:52 +0800)]
add rescan-blocks api (#1055)

* add rescan-blocks api

* rename rescan-blocks to rescan-wallet

* rename rescanWallet to rescanWallet

5 years ago Add udp upnp port mapping (#1060)
yahtoo [Thu, 14 Jun 2018 09:58:20 +0000 (17:58 +0800)]
 Add udp upnp port mapping (#1060)

* Fix nodeID encode bug

* Add udp upnp port mapping

5 years agoMerge pull request #1058 from Bytom/edit_chain_id
Paladz [Thu, 14 Jun 2018 05:03:23 +0000 (13:03 +0800)]
Merge pull request #1058 from Bytom/edit_chain_id

edit testnet chain_id

5 years agoedit testnet chain_id
paladz [Thu, 14 Jun 2018 05:01:42 +0000 (13:01 +0800)]
edit testnet chain_id

5 years agoedit the config (#1057)
Paladz [Thu, 14 Jun 2018 03:04:46 +0000 (11:04 +0800)]
edit the config (#1057)

5 years agodon't dial self (#1056)
Paladz [Thu, 14 Jun 2018 02:03:36 +0000 (10:03 +0800)]
don't dial self (#1056)

* don't dial self

* edit the dial code

5 years agoMerge pull request #1053 from Bytom/dev-error
Paladz [Wed, 13 Jun 2018 10:04:32 +0000 (18:04 +0800)]
Merge pull request #1053 from Bytom/dev-error

fix default error response struct

5 years agoMerge pull request #1052 from Bytom/fix_bug
Paladz [Wed, 13 Jun 2018 07:03:11 +0000 (15:03 +0800)]
Merge pull request #1052 from Bytom/fix_bug

handle node is nil bug