OSDN Git Service
Paladz [Thu, 19 Apr 2018 03:34:35 +0000 (11:34 +0800)]
Merge pull request #708 from Bytom/test-fixtypo
fix "valid" typo
Paladz [Thu, 19 Apr 2018 03:33:11 +0000 (11:33 +0800)]
Merge pull request #713 from Bytom/p2p_test
Del useless log
Paladz [Thu, 19 Apr 2018 03:12:38 +0000 (11:12 +0800)]
Merge pull request #712 from Bytom/dev-pool
fix nil asset display
Yahtoo Ma [Thu, 19 Apr 2018 03:07:52 +0000 (11:07 +0800)]
Del useless log
oysheng [Thu, 19 Apr 2018 03:06:03 +0000 (11:06 +0800)]
fix nil asset display
Paladz [Thu, 19 Apr 2018 02:29:31 +0000 (10:29 +0800)]
Merge pull request #705 from Bytom/unit-test-validate-tx
validate tx unit tests
Blockmeta-区块元 [Thu, 19 Apr 2018 02:27:57 +0000 (10:27 +0800)]
fix "valid" typo
fix typo errro
Paladz [Thu, 19 Apr 2018 02:26:06 +0000 (10:26 +0800)]
Merge pull request #707 from Bytom/p2p_test
Add dial address filter function
Yahtoo Ma [Tue, 17 Apr 2018 13:21:58 +0000 (21:21 +0800)]
Add dial address filter function
Yongfeng LI [Thu, 19 Apr 2018 01:57:58 +0000 (09:57 +0800)]
update dashboard (#706)
Paladz [Wed, 18 Apr 2018 13:21:51 +0000 (21:21 +0800)]
Merge pull request #702 from Bytom/dev-pool
add get-asset and modify list-assets
oysheng [Wed, 18 Apr 2018 13:17:06 +0000 (21:17 +0800)]
fix test
oysheng [Wed, 18 Apr 2018 13:15:39 +0000 (21:15 +0800)]
fix
oysheng [Wed, 18 Apr 2018 12:56:57 +0000 (20:56 +0800)]
add btm asset
oysheng [Wed, 18 Apr 2018 12:50:47 +0000 (20:50 +0800)]
optimise
oysheng [Wed, 18 Apr 2018 12:32:31 +0000 (20:32 +0800)]
add api get-asset
modify list-assets by adding inquire extassetDB
Paladz [Wed, 18 Apr 2018 12:04:33 +0000 (20:04 +0800)]
Merge pull request #701 from Bytom/dev-pool
modify list-unconfirmed-transactions return
oysheng [Wed, 18 Apr 2018 11:53:50 +0000 (19:53 +0800)]
optimise list-unconfirmed-transactions
Paladz [Wed, 18 Apr 2018 11:34:54 +0000 (19:34 +0800)]
Merge pull request #694 from Bytom/dev_adapt_net
modify address prefix for diff network
lbqds [Wed, 18 Apr 2018 11:13:07 +0000 (19:13 +0800)]
Merge branch 'dev' into unit-test-validate-tx
lbqds [Wed, 18 Apr 2018 03:10:36 +0000 (11:10 +0800)]
validate tx unit tests
wz [Wed, 18 Apr 2018 06:43:35 +0000 (14:43 +0800)]
modify address prefix for diff network
Paladz [Wed, 18 Apr 2018 09:28:00 +0000 (17:28 +0800)]
Merge pull request #698 from Bytom/ci
add functional-test to ci
Paladz [Wed, 18 Apr 2018 09:26:54 +0000 (17:26 +0800)]
Merge pull request #697 from Bytom/dev-gas
modify log level
oysheng [Wed, 18 Apr 2018 09:23:41 +0000 (17:23 +0800)]
optimise
Yongfeng LI [Wed, 18 Apr 2018 09:20:47 +0000 (17:20 +0800)]
improve Makefile ci target syntax
Yongfeng LI [Wed, 18 Apr 2018 09:13:48 +0000 (17:13 +0800)]
add functional-test to ci
oysheng [Wed, 18 Apr 2018 09:00:32 +0000 (17:00 +0800)]
Merge branch 'dev' into dev-gas
Yongfeng LI [Wed, 18 Apr 2018 08:58:50 +0000 (16:58 +0800)]
remove uselss xpubs parameter for sign function (#695)
oysheng [Wed, 18 Apr 2018 08:53:36 +0000 (16:53 +0800)]
modify fmt.printf to log
modify log level
Yongfeng LI [Wed, 18 Apr 2018 06:12:25 +0000 (14:12 +0800)]
Remove /sign-submit-transaction api (#692)
* remove /sign-submit-transaction api
* update dashboard
Paladz [Wed, 18 Apr 2018 04:59:43 +0000 (12:59 +0800)]
Merge pull request #690 from Bytom/skip-solve-in-tests
skip solve in tests
lbqds [Wed, 18 Apr 2018 03:13:04 +0000 (11:13 +0800)]
Merge branch 'dev' into skip-solve-in-tests
Yongfeng LI [Wed, 18 Apr 2018 03:12:58 +0000 (11:12 +0800)]
Update asset alias api (#689)
* improve update-asset-alias api
* update dashboard
Paladz [Wed, 18 Apr 2018 02:34:53 +0000 (10:34 +0800)]
Merge pull request #686 from Bytom/dev-gas
remove redundancy code
Yongfeng LI [Wed, 18 Apr 2018 01:45:39 +0000 (09:45 +0800)]
add asset info when query transactions (#685)
* add asset info when query transactions
* correct array definition
oysheng [Wed, 18 Apr 2018 01:44:27 +0000 (09:44 +0800)]
remove redundancy code
Blockmeta-区块元 [Tue, 17 Apr 2018 13:43:18 +0000 (21:43 +0800)]
Merge pull request #683 from Bytom/dev-gas
modify get-block-hash
oysheng [Tue, 17 Apr 2018 12:21:45 +0000 (20:21 +0800)]
modify tags
oysheng [Tue, 17 Apr 2018 12:08:24 +0000 (20:08 +0800)]
modify get-block-hash
Paladz [Tue, 17 Apr 2018 11:44:21 +0000 (19:44 +0800)]
Merge pull request #682 from Bytom/remove-recovery
remove key import export
Yongfeng LI [Tue, 17 Apr 2018 11:38:00 +0000 (19:38 +0800)]
remove key import export
Paladz [Tue, 17 Apr 2018 09:36:28 +0000 (17:36 +0800)]
Merge pull request #681 from Bytom/fix-tx-feed
fix encoding/json can't marshal un-exported fields
Paladz [Tue, 17 Apr 2018 09:34:45 +0000 (17:34 +0800)]
Merge pull request #680 from Bytom/fix-print-json-invalid-type-assertion
fix print json invalid type assertion
Paladz [Tue, 17 Apr 2018 09:33:11 +0000 (17:33 +0800)]
Merge pull request #675 from Bytom/p2p_test
Adjust peer ban scoring strategy
Paladz [Tue, 17 Apr 2018 09:22:01 +0000 (17:22 +0800)]
Merge pull request #668 from Bytom/dev-gas
add api get-unconfirmed-transaction and list-unconfirmed-transactions
lbqds [Tue, 17 Apr 2018 09:20:57 +0000 (17:20 +0800)]
Merge branch 'dev' into fix-tx-feed
Yahtoo Ma [Tue, 17 Apr 2018 05:15:24 +0000 (13:15 +0800)]
Adjust peer ban scoring strategy
oysheng [Tue, 17 Apr 2018 09:09:10 +0000 (17:09 +0800)]
Merge branch 'dev' into dev-gas
oysheng [Tue, 17 Apr 2018 09:07:09 +0000 (17:07 +0800)]
fix tags
oysheng [Tue, 17 Apr 2018 09:05:38 +0000 (17:05 +0800)]
optimse api
oysheng [Tue, 17 Apr 2018 08:08:44 +0000 (16:08 +0800)]
optimise
oysheng [Tue, 17 Apr 2018 07:49:46 +0000 (15:49 +0800)]
add api get-unconfirmed-transaction
add list-unconfirmed-transactions
Yongfeng LI [Tue, 17 Apr 2018 07:17:54 +0000 (15:17 +0800)]
Merge pull request #676 from Bytom/keys
delete unused address after import private key
Yongfeng LI [Tue, 17 Apr 2018 07:10:17 +0000 (15:10 +0800)]
remove Xpubs in CtrlProgram
lbqds [Tue, 17 Apr 2018 07:06:50 +0000 (15:06 +0800)]
fix encoding/json can't marshal un-exported fields
Paladz [Tue, 17 Apr 2018 06:44:52 +0000 (14:44 +0800)]
Merge pull request #677 from Bytom/remove
delete the 2node-test submodule file
Yongfeng LI [Tue, 17 Apr 2018 06:43:34 +0000 (14:43 +0800)]
delete the 2node-test submodule file
Yongfeng LI [Tue, 17 Apr 2018 06:31:36 +0000 (14:31 +0800)]
take place CompareTwoXpubs with chainkd.IsXpubsEqual
Paladz [Tue, 17 Apr 2018 06:09:10 +0000 (14:09 +0800)]
Merge pull request #674 from Bytom/dev_addr_pre_for_net
Main network and test network distinguish address prefix
Yongfeng LI [Tue, 17 Apr 2018 03:17:55 +0000 (11:17 +0800)]
fix address set marshal bug
Yongfeng LI [Mon, 16 Apr 2018 13:37:00 +0000 (21:37 +0800)]
delete unused addresses for imported key and account
Yongfeng LI [Mon, 16 Apr 2018 07:22:39 +0000 (15:22 +0800)]
improve importing key progress calculation
Yongfeng LI [Mon, 16 Apr 2018 07:02:11 +0000 (15:02 +0800)]
improve naming
Yongfeng LI [Mon, 16 Apr 2018 06:13:49 +0000 (14:13 +0800)]
improve account manager DeleteAccount parameter
Paladz [Tue, 17 Apr 2018 05:33:09 +0000 (13:33 +0800)]
Merge pull request #660 from Bytom/p2p_test
Fix dial peers error
Yahtoo Ma [Tue, 17 Apr 2018 05:27:38 +0000 (13:27 +0800)]
Optimized code format
wz [Tue, 17 Apr 2018 05:18:22 +0000 (13:18 +0800)]
Main network and test network distinguish address prefix
yahtoo [Tue, 17 Apr 2018 04:44:41 +0000 (12:44 +0800)]
Merge branch 'dev' into p2p_test
wz [Tue, 17 Apr 2018 03:31:10 +0000 (11:31 +0800)]
update data dir for linux (#672)
Yongfeng LI [Tue, 17 Apr 2018 03:21:24 +0000 (11:21 +0800)]
Merge pull request #670 from Bytom/version
update version to 0.4.7
Yongfeng LI [Tue, 17 Apr 2018 03:19:15 +0000 (11:19 +0800)]
update version to 0.4.7
lbqds [Tue, 17 Apr 2018 02:44:35 +0000 (10:44 +0800)]
fix print json invalid type assertion
Paladz [Tue, 17 Apr 2018 02:47:31 +0000 (10:47 +0800)]
Merge pull request #657 from Bytom/coinbase-tx-test
add coinbase tx tests
Paladz [Tue, 17 Apr 2018 02:43:48 +0000 (10:43 +0800)]
Merge pull request #635 from Bytom/unit_test
add cache for tensority
oysheng [Tue, 17 Apr 2018 02:37:44 +0000 (10:37 +0800)]
add lock for func GetTxPool
paladz [Tue, 17 Apr 2018 01:52:53 +0000 (09:52 +0800)]
fix for code review
Yongfeng LI [Tue, 17 Apr 2018 01:45:10 +0000 (09:45 +0800)]
Merge pull request #669 from freewind/dev
[外部测试] use built-in string operator replace strings.Compare for better readability and performance
freewind [Mon, 16 Apr 2018 13:43:14 +0000 (21:43 +0800)]
use built-in string operator replace strings.Compare for better readability and performance
oysheng [Mon, 16 Apr 2018 13:22:26 +0000 (21:22 +0800)]
add api get-txpool
lbqds [Mon, 16 Apr 2018 12:23:32 +0000 (20:23 +0800)]
move subsidy tests to consensus
Paladz [Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)]
Merge pull request #636 from Bytom/fix-bytomcli-bugs
Fix bytomcli bugs
Paladz [Mon, 16 Apr 2018 11:41:44 +0000 (19:41 +0800)]
Merge pull request #664 from Bytom/dev_modify_datadir
modify data dir
wz [Mon, 16 Apr 2018 07:35:02 +0000 (15:35 +0800)]
modify data dir
Paladz [Mon, 16 Apr 2018 11:21:01 +0000 (19:21 +0800)]
Merge pull request #665 from Bytom/dev-gas
add api estimate-transaction-gas
Paladz [Mon, 16 Apr 2018 11:13:36 +0000 (19:13 +0800)]
Merge pull request #651 from Bytom/crazy-miner
Crazy miner
lbqds [Mon, 16 Apr 2018 11:09:21 +0000 (19:09 +0800)]
fix unit tests
Yongfeng LI [Mon, 16 Apr 2018 09:27:00 +0000 (17:27 +0800)]
Merge pull request #644 from Bytom/wallet_optimise
fix create-asset definition is nil, issue asset transaction display wrong
oysheng [Mon, 16 Apr 2018 09:19:35 +0000 (17:19 +0800)]
optimise
oysheng [Mon, 16 Apr 2018 09:10:01 +0000 (17:10 +0800)]
modify api name
oysheng [Mon, 16 Apr 2018 08:43:07 +0000 (16:43 +0800)]
Merge branch 'dev' into dev-gas
oysheng [Mon, 16 Apr 2018 08:40:55 +0000 (16:40 +0800)]
add api calculate-transaction-gas
Yongfeng LI [Mon, 16 Apr 2018 07:46:34 +0000 (15:46 +0800)]
Merge pull request #662 from Bytom/network_info
Add NetWorkID to GetNodeInfo api
Yahtoo Ma [Mon, 16 Apr 2018 07:39:58 +0000 (15:39 +0800)]
Merge remote-tracking branch 'origin/dev' into network_info
Yongfeng LI [Mon, 16 Apr 2018 07:39:22 +0000 (15:39 +0800)]
Merge pull request #663 from Bytom/remove-modules
remove .gitmodules
Yongfeng LI [Mon, 16 Apr 2018 07:35:39 +0000 (15:35 +0800)]
remove .gitmodules
Yahtoo Ma [Mon, 16 Apr 2018 06:55:43 +0000 (14:55 +0800)]
Add NetWorkID to GetNodeInfo api
Yongfeng LI [Mon, 16 Apr 2018 05:20:52 +0000 (13:20 +0800)]
Merge pull request #659 from Bytom/dev_parse_env
add parse env for url
wz [Mon, 16 Apr 2018 01:48:27 +0000 (09:48 +0800)]
add parse env for url
lbqds [Sat, 14 Apr 2018 09:55:42 +0000 (17:55 +0800)]
add coinbase tx tests