OSDN Git Service

bytom/bytom.git
6 years agoMerge branch 'dev' into dev-pool
oysheng [Fri, 20 Apr 2018 01:41:10 +0000 (09:41 +0800)]
Merge branch 'dev' into dev-pool

6 years agooptimise
oysheng [Fri, 20 Apr 2018 01:40:36 +0000 (09:40 +0800)]
optimise

6 years agoremove the weird function (#730)
Paladz [Fri, 20 Apr 2018 01:30:56 +0000 (09:30 +0800)]
remove the weird function (#730)

6 years agoMerge pull request #726 from Bytom/dev-pool
Paladz [Thu, 19 Apr 2018 14:10:05 +0000 (22:10 +0800)]
Merge pull request #726 from Bytom/dev-pool

modify estimate-transaction-gas

6 years agoMerge pull request #725 from Bytom/dev_fix_bigint
Paladz [Thu, 19 Apr 2018 13:24:16 +0000 (21:24 +0800)]
Merge pull request #725 from Bytom/dev_fix_bigint

fix bigint

6 years agomodify estimate-transaction-gas
oysheng [Thu, 19 Apr 2018 13:20:07 +0000 (21:20 +0800)]
modify estimate-transaction-gas

6 years agofix bigint
wz [Thu, 19 Apr 2018 13:18:29 +0000 (21:18 +0800)]
fix bigint

6 years agoRemove init account (#724)
Yongfeng LI [Thu, 19 Apr 2018 13:04:22 +0000 (21:04 +0800)]
Remove init account (#724)

* remove init account

* update dashboard

6 years agoMerge pull request #693 from Bytom/backup
Paladz [Thu, 19 Apr 2018 12:59:48 +0000 (20:59 +0800)]
Merge pull request #693 from Bytom/backup

init push for backup wallet

6 years agofix for code review
paladz [Thu, 19 Apr 2018 12:55:37 +0000 (20:55 +0800)]
fix for code review

6 years agofix conflix
paladz [Thu, 19 Apr 2018 12:52:15 +0000 (20:52 +0800)]
fix conflix

6 years agoMerge branch 'dev' into backup
paladz [Thu, 19 Apr 2018 12:30:44 +0000 (20:30 +0800)]
Merge branch 'dev' into backup

6 years agoedit for test fix bug
paladz [Thu, 19 Apr 2018 12:17:43 +0000 (20:17 +0800)]
edit for test fix bug

6 years agoMerge pull request #723 from Bytom/fix-create-account-asset-concurrently
Blockmeta-区块元 [Thu, 19 Apr 2018 12:12:58 +0000 (20:12 +0800)]
Merge pull request #723 from Bytom/fix-create-account-asset-concurrently

fix create same alias assets/accounts concurrently

6 years agofix create same alias assets/accounts concurrently
lbqds [Thu, 19 Apr 2018 12:07:53 +0000 (20:07 +0800)]
fix create same alias assets/accounts concurrently

6 years agoMerge pull request #716 from Bytom/dev-pool
Paladz [Thu, 19 Apr 2018 12:05:44 +0000 (20:05 +0800)]
Merge pull request #716 from Bytom/dev-pool

add bench_mark test

6 years agoMerge pull request #720 from Bytom/blockindex-unit-tests
Paladz [Thu, 19 Apr 2018 12:05:09 +0000 (20:05 +0800)]
Merge pull request #720 from Bytom/blockindex-unit-tests

blockindex unit tests

6 years agoMerge pull request #721 from Bytom/balances
Paladz [Thu, 19 Apr 2018 12:01:23 +0000 (20:01 +0800)]
Merge pull request #721 from Bytom/balances

return asset definition when get balances

6 years agoMerge pull request #722 from Bytom/dev-psedo
Paladz [Thu, 19 Apr 2018 11:59:07 +0000 (19:59 +0800)]
Merge pull request #722 from Bytom/dev-psedo

fix bug for "duplicated alias"

6 years agofix bug for "duplicated alias"
Blockmeta-区块元 [Thu, 19 Apr 2018 11:53:24 +0000 (19:53 +0800)]
fix bug for "duplicated alias"

fix bug “duplicated alias problem” while creating keys concurrently

6 years agoreturn asset definition when get balances
Yongfeng LI [Thu, 19 Apr 2018 11:51:40 +0000 (19:51 +0800)]
return asset definition when get balances

6 years agoskip process existed account and assets
paladz [Thu, 19 Apr 2018 11:12:07 +0000 (19:12 +0800)]
skip process existed account and assets

6 years agooptimise
oysheng [Thu, 19 Apr 2018 09:30:23 +0000 (17:30 +0800)]
optimise

6 years agoadd bench_mark test
oysheng [Thu, 19 Apr 2018 08:46:42 +0000 (16:46 +0800)]
add bench_mark test

6 years agoMerge branch 'dev' into dev-pool
oysheng [Thu, 19 Apr 2018 08:43:19 +0000 (16:43 +0800)]
Merge branch 'dev' into dev-pool

6 years agoblockindex unit tests
lbqds [Thu, 19 Apr 2018 07:29:12 +0000 (15:29 +0800)]
blockindex unit tests

6 years agoMerge pull request #715 from Bytom/p2p_test
Paladz [Thu, 19 Apr 2018 06:43:45 +0000 (14:43 +0800)]
Merge pull request #715 from Bytom/p2p_test

Add bytomd init command info prompt

6 years agoAdd bytomd init command info prompt
Yahtoo Ma [Thu, 19 Apr 2018 06:14:18 +0000 (14:14 +0800)]
Add bytomd init command info prompt

6 years agofix create-asset success when alias is space, but update-asset-alias will generate...
oysheng [Thu, 19 Apr 2018 06:15:51 +0000 (14:15 +0800)]
fix create-asset success when alias is space, but update-asset-alias will generate execption (#714)

* fix create-asset success when alias is space, but update-asset-alias will generate execption
modify bytomcli for update-asset-alias

* fix unit test

* optimise

6 years agooptimise
oysheng [Thu, 19 Apr 2018 06:11:22 +0000 (14:11 +0800)]
optimise

6 years agofix unit test
oysheng [Thu, 19 Apr 2018 06:03:25 +0000 (14:03 +0800)]
fix unit test

6 years agoedit for code review
paladz [Thu, 19 Apr 2018 05:55:45 +0000 (13:55 +0800)]
edit for code review

6 years agoMerge branch 'dev' into dev-pool
oysheng [Thu, 19 Apr 2018 05:50:27 +0000 (13:50 +0800)]
Merge branch 'dev' into dev-pool

6 years agofix create-asset success when alias is space, but update-asset-alias will generate...
oysheng [Thu, 19 Apr 2018 05:47:17 +0000 (13:47 +0800)]
fix create-asset success when alias is space, but update-asset-alias will generate execption
modify bytomcli for update-asset-alias

6 years agoMerge branch 'dev' into backup
paladz [Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)]
Merge branch 'dev' into backup

6 years agoMerge pull request #708 from Bytom/test-fixtypo
Paladz [Thu, 19 Apr 2018 03:34:35 +0000 (11:34 +0800)]
Merge pull request #708 from Bytom/test-fixtypo

fix "valid" typo

6 years agoMerge pull request #713 from Bytom/p2p_test
Paladz [Thu, 19 Apr 2018 03:33:11 +0000 (11:33 +0800)]
Merge pull request #713 from Bytom/p2p_test

Del useless log

6 years agofix for code review
paladz [Thu, 19 Apr 2018 03:32:30 +0000 (11:32 +0800)]
fix for code review

6 years agoMerge pull request #712 from Bytom/dev-pool
Paladz [Thu, 19 Apr 2018 03:12:38 +0000 (11:12 +0800)]
Merge pull request #712 from Bytom/dev-pool

fix nil asset display

6 years agoDel useless log
Yahtoo Ma [Thu, 19 Apr 2018 03:07:52 +0000 (11:07 +0800)]
Del useless log

6 years agofix nil asset display
oysheng [Thu, 19 Apr 2018 03:06:03 +0000 (11:06 +0800)]
fix nil asset display

6 years agoMerge pull request #705 from Bytom/unit-test-validate-tx
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

6 years agofix "valid" typo
Blockmeta-区块元 [Thu, 19 Apr 2018 02:27:57 +0000 (10:27 +0800)]
fix "valid" typo

fix typo errro

6 years agoMerge pull request #707 from Bytom/p2p_test
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

6 years agoAdd dial address filter function
Yahtoo Ma [Tue, 17 Apr 2018 13:21:58 +0000 (21:21 +0800)]
Add dial address filter function

6 years agoupdate dashboard (#706)
Yongfeng LI [Thu, 19 Apr 2018 01:57:58 +0000 (09:57 +0800)]
update dashboard (#706)

6 years agofix for golint
paladz [Wed, 18 Apr 2018 16:28:52 +0000 (00:28 +0800)]
fix for golint

6 years agofix bug
paladz [Wed, 18 Apr 2018 15:32:01 +0000 (23:32 +0800)]
fix bug

6 years agomerge with dev
paladz [Wed, 18 Apr 2018 15:16:35 +0000 (23:16 +0800)]
merge with dev

6 years agoedit the code
paladz [Wed, 18 Apr 2018 15:15:22 +0000 (23:15 +0800)]
edit the code

6 years agoMerge pull request #702 from Bytom/dev-pool
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

6 years agofix test
oysheng [Wed, 18 Apr 2018 13:17:06 +0000 (21:17 +0800)]
fix test

6 years agofix
oysheng [Wed, 18 Apr 2018 13:15:39 +0000 (21:15 +0800)]
fix

6 years agoadd btm asset
oysheng [Wed, 18 Apr 2018 12:56:57 +0000 (20:56 +0800)]
add btm asset

6 years agooptimise
oysheng [Wed, 18 Apr 2018 12:50:47 +0000 (20:50 +0800)]
optimise

6 years agoadd api get-asset
oysheng [Wed, 18 Apr 2018 12:32:31 +0000 (20:32 +0800)]
add api get-asset
modify list-assets by adding inquire extassetDB

6 years agoMerge pull request #701 from Bytom/dev-pool
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

6 years agooptimise list-unconfirmed-transactions
oysheng [Wed, 18 Apr 2018 11:53:50 +0000 (19:53 +0800)]
optimise list-unconfirmed-transactions

6 years agoMerge pull request #694 from Bytom/dev_adapt_net
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

6 years agoMerge branch 'dev' into unit-test-validate-tx
lbqds [Wed, 18 Apr 2018 11:13:07 +0000 (19:13 +0800)]
Merge branch 'dev' into unit-test-validate-tx

6 years agovalidate tx unit tests
lbqds [Wed, 18 Apr 2018 03:10:36 +0000 (11:10 +0800)]
validate tx unit tests

6 years agomodify address prefix for diff network
wz [Wed, 18 Apr 2018 06:43:35 +0000 (14:43 +0800)]
modify address prefix for diff network

6 years agoMerge pull request #698 from Bytom/ci
Paladz [Wed, 18 Apr 2018 09:28:00 +0000 (17:28 +0800)]
Merge pull request #698 from Bytom/ci

add functional-test to ci

6 years agoMerge pull request #697 from Bytom/dev-gas
Paladz [Wed, 18 Apr 2018 09:26:54 +0000 (17:26 +0800)]
Merge pull request #697 from Bytom/dev-gas

modify log level

6 years agooptimise
oysheng [Wed, 18 Apr 2018 09:23:41 +0000 (17:23 +0800)]
optimise

6 years agoimprove Makefile ci target syntax
Yongfeng LI [Wed, 18 Apr 2018 09:20:47 +0000 (17:20 +0800)]
improve Makefile ci target syntax

6 years agoadd functional-test to ci
Yongfeng LI [Wed, 18 Apr 2018 09:13:48 +0000 (17:13 +0800)]
add functional-test to ci

6 years agoMerge branch 'dev' into dev-gas
oysheng [Wed, 18 Apr 2018 09:00:32 +0000 (17:00 +0800)]
Merge branch 'dev' into dev-gas

6 years agoMerge branch 'dev' into backup
paladz [Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)]
Merge branch 'dev' into backup

6 years agofix for debug
paladz [Wed, 18 Apr 2018 09:00:03 +0000 (17:00 +0800)]
fix for debug

6 years agoremove uselss xpubs parameter for sign function (#695)
Yongfeng LI [Wed, 18 Apr 2018 08:58:50 +0000 (16:58 +0800)]
remove uselss xpubs parameter for sign function (#695)

6 years agomodify fmt.printf to log
oysheng [Wed, 18 Apr 2018 08:53:36 +0000 (16:53 +0800)]
modify fmt.printf to log
modify log level

6 years agoinit push for backup wallet
paladz [Wed, 18 Apr 2018 06:20:48 +0000 (14:20 +0800)]
init push for backup wallet

6 years agoRemove /sign-submit-transaction api (#692)
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

6 years agoMerge pull request #690 from Bytom/skip-solve-in-tests
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

6 years agoMerge branch 'dev' into skip-solve-in-tests
lbqds [Wed, 18 Apr 2018 03:13:04 +0000 (11:13 +0800)]
Merge branch 'dev' into skip-solve-in-tests

6 years agoUpdate asset alias api (#689)
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

6 years agoMerge pull request #686 from Bytom/dev-gas
Paladz [Wed, 18 Apr 2018 02:34:53 +0000 (10:34 +0800)]
Merge pull request #686 from Bytom/dev-gas

remove redundancy code

6 years agoadd asset info when query transactions (#685)
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

6 years agoremove redundancy code
oysheng [Wed, 18 Apr 2018 01:44:27 +0000 (09:44 +0800)]
remove redundancy code

6 years agoMerge pull request #683 from Bytom/dev-gas
Blockmeta-区块元 [Tue, 17 Apr 2018 13:43:18 +0000 (21:43 +0800)]
Merge pull request #683 from Bytom/dev-gas

modify get-block-hash

6 years agomodify tags
oysheng [Tue, 17 Apr 2018 12:21:45 +0000 (20:21 +0800)]
modify tags

6 years agomodify get-block-hash
oysheng [Tue, 17 Apr 2018 12:08:24 +0000 (20:08 +0800)]
modify get-block-hash

6 years agoMerge pull request #682 from Bytom/remove-recovery
Paladz [Tue, 17 Apr 2018 11:44:21 +0000 (19:44 +0800)]
Merge pull request #682 from Bytom/remove-recovery

remove key import export

6 years agoremove key import export
Yongfeng LI [Tue, 17 Apr 2018 11:38:00 +0000 (19:38 +0800)]
remove key import export

6 years agoMerge pull request #681 from Bytom/fix-tx-feed
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

6 years agoMerge pull request #680 from Bytom/fix-print-json-invalid-type-assertion
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

6 years agoMerge pull request #675 from Bytom/p2p_test
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

6 years agoMerge pull request #668 from Bytom/dev-gas
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

6 years agoMerge branch 'dev' into fix-tx-feed
lbqds [Tue, 17 Apr 2018 09:20:57 +0000 (17:20 +0800)]
Merge branch 'dev' into fix-tx-feed

6 years agoAdjust peer ban scoring strategy
Yahtoo Ma [Tue, 17 Apr 2018 05:15:24 +0000 (13:15 +0800)]
Adjust peer ban scoring strategy

6 years agoMerge branch 'dev' into dev-gas
oysheng [Tue, 17 Apr 2018 09:09:10 +0000 (17:09 +0800)]
Merge branch 'dev' into dev-gas

6 years agofix tags
oysheng [Tue, 17 Apr 2018 09:07:09 +0000 (17:07 +0800)]
fix tags

6 years agooptimse api
oysheng [Tue, 17 Apr 2018 09:05:38 +0000 (17:05 +0800)]
optimse api

6 years agooptimise
oysheng [Tue, 17 Apr 2018 08:08:44 +0000 (16:08 +0800)]
optimise

6 years agoadd api get-unconfirmed-transaction
oysheng [Tue, 17 Apr 2018 07:49:46 +0000 (15:49 +0800)]
add api get-unconfirmed-transaction
add list-unconfirmed-transactions

6 years agoMerge pull request #676 from Bytom/keys
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

6 years agoremove Xpubs in CtrlProgram
Yongfeng LI [Tue, 17 Apr 2018 07:10:17 +0000 (15:10 +0800)]
remove Xpubs in CtrlProgram

6 years agofix encoding/json can't marshal un-exported fields
lbqds [Tue, 17 Apr 2018 07:06:50 +0000 (15:06 +0800)]
fix encoding/json can't marshal un-exported fields

6 years agoMerge pull request #677 from Bytom/remove
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