OSDN Git Service

bytom/bytom.git
6 years agoReplace grpc to jsonrpc (#69)
Guanghua Guo [Wed, 25 Oct 2017 05:57:50 +0000 (13:57 +0800)]
Replace grpc to jsonrpc (#69)

* Add rpc about network status

* Bind p2p.Switch and jsonrpc

* Delete grpc && Add net info call in rpcclient

* Format code

6 years agoEliminate tendermint log in pool.go (#68)
Liu-Cheng Xu [Mon, 23 Oct 2017 06:12:06 +0000 (14:12 +0800)]
Eliminate tendermint log in pool.go (#68)

6 years agoMerge branch 'dev' of https://github.com/Bytom/bytom into dev
gguoss [Sat, 21 Oct 2017 09:32:42 +0000 (17:32 +0800)]
Merge branch 'dev' of https://github.com/Bytom/bytom into dev

6 years agoResolve conflicts
gguoss [Sat, 21 Oct 2017 09:32:04 +0000 (17:32 +0800)]
Resolve conflicts

6 years agoKey wallet (#66)
Guanghua Guo [Sat, 21 Oct 2017 09:06:22 +0000 (17:06 +0800)]
Key wallet (#66)

* Fix a bug about unmarshal json (#63)

* Fix a bug about parameter error in signTransaction
Close(#63)

6 years agoSplit logrus config out (#65)
Liu-Cheng Xu [Sat, 21 Oct 2017 07:16:42 +0000 (15:16 +0800)]
Split logrus config out (#65)

- Keep main.go as simple as possiable

- Add `BYTOM_DEBUG` environment variable to set the log level to DEBUG

6 years agoRemove old inessential logger injection (#64)
Liu-Cheng Xu [Sat, 21 Oct 2017 05:56:10 +0000 (13:56 +0800)]
Remove old inessential logger injection (#64)

Remove `log.logger` in function arguments.

6 years agoFix the restore issue parallel insert and delete accountutxos (#62)
icodezjb [Sat, 21 Oct 2017 01:48:50 +0000 (09:48 +0800)]
Fix the restore issue parallel insert and delete accountutxos (#62)

* Fix the restore issue parallel insert and delete accountutxos

* Add filter for wallet mode to index accountutxos

6 years agoDev (#61)
Guanghua Guo [Fri, 20 Oct 2017 02:04:04 +0000 (10:04 +0800)]
Dev (#61)

* Specifiy the branches of CI

It's enough to test on master and dev branch. Furthermore, no need to
clone dev branch particularly in script part

* Fix a bug(#46)

* Close(#41)

* Replace the basic log statement with logrus

* Finish the basic log replacement

* Add block process to build accountutxos db  (#53)

* Add block process to build accountutxos db

* Update 544bf9be2752abaa5f1ff58f392ba41fc4126a72

* Update init pin.Store

* Rename some variables

* Update gofmt

* Modify io_test to not support bytom/log && Add logrus in glide.lock

* Replace the basic log in p2p (#60)

* Account bind key && Asset bind key (#59)

* Add bindAccount && bindAsset function in bytomcli

* Add signTransactions in bytomcli

6 years agoAccount bind key && Asset bind key (#59)
Guanghua Guo [Fri, 20 Oct 2017 01:35:23 +0000 (09:35 +0800)]
Account bind key && Asset bind key (#59)

* Add bindAccount && bindAsset function in bytomcli

* Add signTransactions in bytomcli

6 years agoReplace the basic log in p2p (#60)
Liu-Cheng Xu [Fri, 20 Oct 2017 01:34:21 +0000 (09:34 +0800)]
Replace the basic log in p2p (#60)

6 years agoModify io_test to not support bytom/log && Add logrus in glid.lock
gguoss [Wed, 18 Oct 2017 07:01:55 +0000 (15:01 +0800)]
Modify io_test to not support bytom/log && Add logrus in glid.lock

6 years agoAdd block process to build accountutxos db (#53)
icodezjb [Wed, 18 Oct 2017 05:19:14 +0000 (13:19 +0800)]
Add block process to build accountutxos db  (#53)

* Add block process to build accountutxos db

* Update 544bf9be2752abaa5f1ff58f392ba41fc4126a72

* Update init pin.Store

* Rename some variables

* Update gofmt

6 years agoMerge pull request #57 from liuchengxu/log
Guanghua Guo [Wed, 18 Oct 2017 02:41:39 +0000 (10:41 +0800)]
Merge pull request #57 from liuchengxu/log

Finish the basic log replacement

6 years agoFinish the basic log replacement
Liu-Cheng Xu [Wed, 18 Oct 2017 01:52:27 +0000 (09:52 +0800)]
Finish the basic log replacement

6 years agoMerge pull request #54 from Bytom/p2p
Guanghua Guo [Tue, 17 Oct 2017 01:48:52 +0000 (09:48 +0800)]
Merge pull request #54 from Bytom/p2p

Close(#41)

6 years agoMerge pull request #56 from liuchengxu/log
Guanghua Guo [Mon, 16 Oct 2017 10:59:56 +0000 (18:59 +0800)]
Merge pull request #56 from liuchengxu/log

Replace the basic log statement with logrus

6 years agoReplace the basic log statement with logrus
Liu-Cheng Xu [Mon, 16 Oct 2017 08:13:21 +0000 (16:13 +0800)]
Replace the basic log statement with logrus

6 years agoClose(#41)
gguoss [Mon, 16 Oct 2017 07:05:38 +0000 (15:05 +0800)]
Close(#41)

6 years agoMerge pull request #51 from Bytom/p2p
Guanghua Guo [Fri, 13 Oct 2017 06:23:13 +0000 (14:23 +0800)]
Merge pull request #51 from Bytom/p2p

Close(#46)

6 years agoFix a bug(#46)
gguoss [Fri, 13 Oct 2017 05:49:26 +0000 (13:49 +0800)]
Fix a bug(#46)

6 years agoMerge pull request #50 from liuchengxu/ci-branch
Guanghua Guo [Fri, 13 Oct 2017 02:21:26 +0000 (10:21 +0800)]
Merge pull request #50 from liuchengxu/ci-branch

Specify the branches of CI

6 years agoSpecifiy the branches of CI
Liu-Cheng Xu [Fri, 13 Oct 2017 02:12:31 +0000 (10:12 +0800)]
Specifiy the branches of CI

It's enough to test on master and dev branch. Furthermore, no need to
clone dev branch particularly in script part.

6 years agoMerge pull request #49 from Bytom/dev v0.1.1
Guanghua Guo [Fri, 13 Oct 2017 01:47:26 +0000 (09:47 +0800)]
Merge pull request #49 from Bytom/dev

Merge dev branch

6 years agoUpdate submodule(2node-test)
gguoss [Thu, 12 Oct 2017 05:34:19 +0000 (13:34 +0800)]
Update submodule(2node-test)

6 years agoMerge pull request #47 from liuchengxu/ci
Guanghua Guo [Thu, 12 Oct 2017 02:31:30 +0000 (10:31 +0800)]
Merge pull request #47 from liuchengxu/ci

Add travis ci

6 years agoMerge pull request #48 from Bytom/wallet
Guanghua Guo [Thu, 12 Oct 2017 02:31:03 +0000 (10:31 +0800)]
Merge pull request #48 from Bytom/wallet

wallet.enable flag

6 years agowallet.enable control account and asset
gguoss [Thu, 12 Oct 2017 02:19:20 +0000 (10:19 +0800)]
wallet.enable control account and asset

6 years agoAdd travis ci
Liu-Cheng Xu [Thu, 12 Oct 2017 00:45:50 +0000 (08:45 +0800)]
Add travis ci

6 years agoadd node's command flag --wallet.enable
gguoss [Wed, 11 Oct 2017 09:56:15 +0000 (17:56 +0800)]
add node's command flag --wallet.enable

6 years agoMerge branch 'dev' of github.com:Bytom/bytom into dev
gguoss [Tue, 10 Oct 2017 07:38:06 +0000 (15:38 +0800)]
Merge branch 'dev' of github.com:Bytom/bytom into dev

6 years agoRemove dashboard && Make test OK.
gguoss [Tue, 10 Oct 2017 07:35:28 +0000 (15:35 +0800)]
Remove dashboard && Make test OK.

6 years agoMerge branch 'dev' into bvm
paladz [Tue, 10 Oct 2017 04:12:39 +0000 (12:12 +0800)]
Merge branch 'dev' into bvm

6 years agoinit version for enable mining diff calculate func
paladz [Tue, 10 Oct 2017 02:04:05 +0000 (10:04 +0800)]
init version for enable mining diff calculate func

6 years agoMerge branch 'zhouyasong-patch-1' into dev
gguoss [Tue, 10 Oct 2017 01:38:21 +0000 (09:38 +0800)]
Merge branch 'zhouyasong-patch-1' into dev

6 years agoMerge branch 'dev' into zhouyasong-patch-1
gguoss [Tue, 10 Oct 2017 01:33:44 +0000 (09:33 +0800)]
Merge branch 'dev' into zhouyasong-patch-1

6 years agochange 2node-test path and remove bytom
zhouyasong [Tue, 10 Oct 2017 01:24:22 +0000 (09:24 +0800)]
change 2node-test path and remove bytom

6 years agoMerge pull request #43 from liuchengxu/fmt
icodezjb [Mon, 9 Oct 2017 01:19:26 +0000 (09:19 +0800)]
Merge pull request #43 from liuchengxu/fmt

Reformat the whole project

6 years agoReformat the whole project
Liu-Cheng Xu [Mon, 9 Oct 2017 00:56:44 +0000 (08:56 +0800)]
Reformat the whole project

Format the project via `go fmt ./...` under the bytom directory.

6 years agoMerge pull request #40 from Zeroman/dev
Guanghua Guo [Sat, 30 Sep 2017 08:44:42 +0000 (16:44 +0800)]
Merge pull request #40 from Zeroman/dev

Add Dockerfile

6 years agoAdd Dockerfile
Zeroman [Sat, 30 Sep 2017 08:20:43 +0000 (16:20 +0800)]
Add Dockerfile

6 years agochange bytom to bytomd
zhouyasong [Fri, 29 Sep 2017 09:45:09 +0000 (17:45 +0800)]
change bytom to bytomd

6 years agoUpdate README.md
Liu-Cheng Xu [Fri, 29 Sep 2017 08:12:14 +0000 (16:12 +0800)]
Update README.md

6 years agoUpdate README.md v0.1.0
Guanghua Guo [Fri, 29 Sep 2017 01:55:22 +0000 (09:55 +0800)]
Update README.md

6 years agoUpdate README.md
Guanghua Guo [Fri, 29 Sep 2017 01:51:12 +0000 (09:51 +0800)]
Update README.md

6 years agoMerge branch 'master' into demo
gguoss [Fri, 29 Sep 2017 01:40:45 +0000 (09:40 +0800)]
Merge branch 'master' into demo

6 years agoMerge pull request #37 from icodezjb/demo
icodezjb [Thu, 28 Sep 2017 14:58:09 +0000 (22:58 +0800)]
Merge pull request #37 from icodezjb/demo

support list-balances

6 years agosupport list-balances
icodezjb [Thu, 28 Sep 2017 14:51:30 +0000 (22:51 +0800)]
support list-balances

6 years agoMerge pull request #9 from Bytom/demo
icodezjb [Thu, 28 Sep 2017 14:47:53 +0000 (22:47 +0800)]
Merge pull request #9 from Bytom/demo

sync Demo

6 years agoMerge branch 'demo'
gguoss [Thu, 28 Sep 2017 13:30:03 +0000 (21:30 +0800)]
Merge branch 'demo'

6 years agoFix typo
Liu-Cheng Xu [Thu, 28 Sep 2017 10:04:52 +0000 (18:04 +0800)]
Fix typo

6 years agoUpdate README.md
Liu-Cheng Xu [Thu, 28 Sep 2017 10:00:28 +0000 (18:00 +0800)]
Update README.md

6 years agoadd spend btm into the issue test
paladz [Thu, 28 Sep 2017 09:13:32 +0000 (17:13 +0800)]
add spend btm into the issue test

6 years agoUpdate README.md
Guanghua Guo [Thu, 28 Sep 2017 08:49:07 +0000 (16:49 +0800)]
Update README.md

6 years agoadd btm descriptor in log & Add issue amout as a argment
gguoss [Thu, 28 Sep 2017 08:38:39 +0000 (16:38 +0800)]
add btm descriptor in log & Add issue amout as a argment

6 years agoAdd sub-create-issue-tx
gguoss [Thu, 28 Sep 2017 08:16:18 +0000 (16:16 +0800)]
Add sub-create-issue-tx

6 years agofix logic bug on broadcast tx
paladz [Thu, 28 Sep 2017 08:05:49 +0000 (16:05 +0800)]
fix logic bug on broadcast tx

6 years agoMerge pull request #8 from Bytom/demo
icodezjb [Thu, 28 Sep 2017 05:02:00 +0000 (13:02 +0800)]
Merge pull request #8 from Bytom/demo

sync Demo

6 years agoMerge branch 'demo'
gguoss [Thu, 28 Sep 2017 04:19:26 +0000 (12:19 +0800)]
Merge branch 'demo'

6 years agoremove tx from pool after success commit block
paladz [Thu, 28 Sep 2017 03:00:52 +0000 (11:00 +0800)]
remove tx from pool after success commit block

6 years agoMerge branch 'demo' into bvm
paladz [Wed, 27 Sep 2017 11:56:50 +0000 (19:56 +0800)]
Merge branch 'demo' into bvm

6 years agowe got the first issue transaction in the block
paladz [Wed, 27 Sep 2017 11:52:11 +0000 (19:52 +0800)]
we got the first issue transaction in the block

6 years agoUpdate Makefile
Liu-Cheng Xu [Wed, 27 Sep 2017 07:09:47 +0000 (15:09 +0800)]
Update Makefile

- dump useless parts in Makefile
- minor README update

6 years agomistake remove & recover
jianyixun [Tue, 26 Sep 2017 18:09:57 +0000 (02:09 +0800)]
mistake remove & recover

recover ctx

6 years agofix bug action & remove ctx
jianyixun [Tue, 26 Sep 2017 18:07:06 +0000 (02:07 +0800)]
fix bug  action & remove ctx

fix bug and remove useless codes

6 years agoUpdate README.md
Liu-Cheng Xu [Tue, 26 Sep 2017 12:03:01 +0000 (20:03 +0800)]
Update README.md

6 years agofix the validation part error
paladz [Tue, 26 Sep 2017 11:31:40 +0000 (19:31 +0800)]
fix the validation part error

6 years agoMerge branch 'demo' into bvm
paladz [Tue, 26 Sep 2017 08:50:17 +0000 (16:50 +0800)]
Merge branch 'demo' into bvm

6 years agolog error when sync tx fail
paladz [Tue, 26 Sep 2017 08:46:52 +0000 (16:46 +0800)]
log error when sync tx fail

6 years agoMerge pull request #34 from icodezjb/demo
Guanghua Guo [Tue, 26 Sep 2017 08:45:56 +0000 (16:45 +0800)]
Merge pull request #34 from icodezjb/demo

support list-accounts and list-assets

6 years agosupport list-accounts and list-assets
icodezjb [Tue, 26 Sep 2017 08:28:20 +0000 (16:28 +0800)]
support list-accounts and list-assets

6 years agoMerge pull request #7 from Bytom/demo
icodezjb [Tue, 26 Sep 2017 08:25:26 +0000 (16:25 +0800)]
Merge pull request #7 from Bytom/demo

sync Demo

6 years agomiss }
jianyixun [Tue, 26 Sep 2017 08:19:41 +0000 (16:19 +0800)]
miss }

fix bug

6 years agoMerge branch 'demo' of https://github.com/Bytom/bytom into demo
jianyixun [Tue, 26 Sep 2017 08:17:55 +0000 (16:17 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo

6 years agofix address marshal format
jianyixun [Tue, 26 Sep 2017 08:17:50 +0000 (16:17 +0800)]
fix address marshal format

fix address marshal format
optimize bytomcli output format

6 years agoAdd ISSUE_TEMPLATE
Liu-Cheng Xu [Tue, 26 Sep 2017 08:03:13 +0000 (16:03 +0800)]
Add ISSUE_TEMPLATE

6 years agofix the merge bug
paladz [Tue, 26 Sep 2017 07:51:43 +0000 (15:51 +0800)]
fix the merge bug

6 years agoMerge branch 'master' of https://github.com/Bytom/bytom
gguoss [Tue, 26 Sep 2017 07:46:06 +0000 (15:46 +0800)]
Merge branch 'master' of https://github.com/Bytom/bytom

6 years agoMerge branch 'demo'
gguoss [Tue, 26 Sep 2017 07:44:29 +0000 (15:44 +0800)]
Merge branch 'demo'

6 years agocode need to be little better elegant
paladz [Tue, 26 Sep 2017 07:38:43 +0000 (15:38 +0800)]
code need to be little better elegant

6 years agoMerge branch 'demo' of https://github.com/Bytom/bytom into demo
gguoss [Tue, 26 Sep 2017 07:38:26 +0000 (15:38 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo

6 years agofix bug about spawn block issue:33
gguoss [Tue, 26 Sep 2017 07:37:54 +0000 (15:37 +0800)]
fix bug about spawn block issue:33

6 years agoAdd license badge
Liu-Cheng Xu [Tue, 26 Sep 2017 06:48:26 +0000 (14:48 +0800)]
Add license badge

6 years agoUpdate README.md
Liu-Cheng Xu [Tue, 26 Sep 2017 06:29:40 +0000 (14:29 +0800)]
Update README.md

- Ignore cmd/bytom/.bytom

6 years agoMerge branch 'demo' of https://github.com/Bytom/bytom into demo
jianyixun [Tue, 26 Sep 2017 06:18:58 +0000 (14:18 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo

6 years agoadd command wallet-test
jianyixun [Tue, 26 Sep 2017 06:18:43 +0000 (14:18 +0800)]
add command wallet-test

add command wallet-test

6 years agoMerge branch 'demo' of https://github.com/Bytom/bytom into demo
gguoss [Tue, 26 Sep 2017 06:13:37 +0000 (14:13 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo

6 years agoDescribe block chain info in info.go
gguoss [Tue, 26 Sep 2017 06:13:08 +0000 (14:13 +0800)]
Describe block chain info in info.go

6 years agoadd new wallet test
jianyixun [Tue, 26 Sep 2017 06:10:43 +0000 (14:10 +0800)]
add new wallet test

add new WalletTest func

6 years agoAdd a rpc: getBlockHeight
gguoss [Tue, 26 Sep 2017 06:10:08 +0000 (14:10 +0800)]
Add a rpc: getBlockHeight

6 years agofix mistake
jianyixun [Tue, 26 Sep 2017 06:07:44 +0000 (14:07 +0800)]
fix mistake

auth

6 years agoadd auth on txbuilder.sign
jianyixun [Tue, 26 Sep 2017 05:55:13 +0000 (13:55 +0800)]
add auth on txbuilder.sign

fix typo
add auth on txbuilder.sign

6 years agofix build error:import the extra branch
gguoss [Tue, 26 Sep 2017 05:15:25 +0000 (13:15 +0800)]
fix build error:import the extra branch

6 years agoMove cmd/bytom/test to 2node-test submodule
gguoss [Tue, 26 Sep 2017 05:10:22 +0000 (13:10 +0800)]
Move cmd/bytom/test to 2node-test submodule

6 years agofix conflicts
gguoss [Tue, 26 Sep 2017 04:52:44 +0000 (12:52 +0800)]
fix conflicts

6 years agoMerge branch 'demo'
gguoss [Tue, 26 Sep 2017 04:05:32 +0000 (12:05 +0800)]
Merge branch 'demo'

6 years agoModify createAccount & createAsset not use hard code.
gguoss [Tue, 26 Sep 2017 04:04:35 +0000 (12:04 +0800)]
Modify createAccount & createAsset not use hard code.

6 years agoModify bytom descriptor.
gguoss [Tue, 26 Sep 2017 03:20:35 +0000 (11:20 +0800)]
Modify bytom descriptor.

6 years agoMerge pull request #6 from Bytom/demo
icodezjb [Tue, 26 Sep 2017 01:35:57 +0000 (09:35 +0800)]
Merge pull request #6 from Bytom/demo

sync Demo

6 years agodelete submit due to txPoold already included that
paladz [Mon, 25 Sep 2017 12:16:46 +0000 (20:16 +0800)]
delete submit due to txPoold already included that