OSDN Git Service
Guanghua Guo [Tue, 31 Oct 2017 07:17:28 +0000 (15:17 +0800)]
Merge pull request #75 from Bytom/dev
Dev
Liu-Cheng Xu [Tue, 31 Oct 2017 06:15:46 +0000 (14:15 +0800)]
Fix typo
paladz [Tue, 31 Oct 2017 03:24:10 +0000 (11:24 +0800)]
update the init block bits
Liu-Cheng Xu [Tue, 31 Oct 2017 03:07:24 +0000 (11:07 +0800)]
Merge remote-tracking branch 'upstream/dev' into dev
Liu-Cheng Xu [Tue, 31 Oct 2017 03:04:55 +0000 (11:04 +0800)]
Add Dockerfile
Liu-Cheng Xu [Tue, 31 Oct 2017 00:54:56 +0000 (08:54 +0800)]
Remove copy in Makefile
Liu-Cheng Xu [Mon, 30 Oct 2017 09:26:24 +0000 (17:26 +0800)]
Update README.md
Liu-Cheng Xu [Mon, 30 Oct 2017 09:24:28 +0000 (17:24 +0800)]
Merge remote-tracking branch 'zjb/monday-zjb' into dev
icodezjb [Mon, 30 Oct 2017 07:52:51 +0000 (15:52 +0800)]
submitSpendTransaction
Guanghua Guo [Mon, 30 Oct 2017 05:39:36 +0000 (13:39 +0800)]
Delete bytom log (#74)
* Delete bytom/log
* Fix bytom log test error
* Delete reqid handle
icodezjb [Sat, 28 Oct 2017 09:32:08 +0000 (17:32 +0800)]
For monday
icodezjb [Sat, 28 Oct 2017 06:37:20 +0000 (14:37 +0800)]
Support spend transaction with account or utxo (#72)
* Fix the restore issue parallel insert and delete accountutxos
* Add filter for wallet mode to index accountutxos
* Support spend transaction with account or utxo
* Use nil better to len for goleveldb.Get return
* Update log package
* Update transact.go
* Update code style
* Use better iterator which tmlibs's IteratorPrefix
* Optimize list-balances
icodezjb [Sat, 28 Oct 2017 06:31:38 +0000 (14:31 +0800)]
Optimize list-balances
icodezjb [Sat, 28 Oct 2017 04:13:16 +0000 (12:13 +0800)]
Use better iterator which tmlibs's IteratorPrefix
icodezjb [Fri, 27 Oct 2017 08:58:23 +0000 (16:58 +0800)]
Merge remote-tracking branch 'origin/dev' into dev
icodezjb [Fri, 27 Oct 2017 08:57:48 +0000 (16:57 +0800)]
Update code style
icodezjb [Fri, 27 Oct 2017 06:01:53 +0000 (14:01 +0800)]
Update transact.go
icodezjb [Fri, 27 Oct 2017 04:30:24 +0000 (12:30 +0800)]
Update log package
icodezjb [Fri, 27 Oct 2017 02:40:33 +0000 (10:40 +0800)]
Use nil better to len for goleveldb.Get return
李永峰 [Fri, 27 Oct 2017 01:27:35 +0000 (20:27 -0500)]
fix typo about bytomd path (#73)
icodezjb [Thu, 26 Oct 2017 11:42:58 +0000 (19:42 +0800)]
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blockchain/account/accounts.go
# blockchain/account/indexer.go
icodezjb [Thu, 26 Oct 2017 11:40:12 +0000 (19:40 +0800)]
Support spend transaction with account or utxo
icodezjb [Thu, 26 Oct 2017 11:19:09 +0000 (19:19 +0800)]
Merge pull request #1 from Bytom/dev
sync Dev
Liu-Cheng Xu [Wed, 25 Oct 2017 07:23:51 +0000 (15:23 +0800)]
Fix legacy log
Liu-Cheng Xu [Wed, 25 Oct 2017 06:44:53 +0000 (14:44 +0800)]
Purify normal log output (#70)
* Purify normal log output
The current log output at default INFO level has been unified already.
* Resolve conflicts
* Delete useless comments
* Resolve conflicts
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
Liu-Cheng Xu [Mon, 23 Oct 2017 06:12:06 +0000 (14:12 +0800)]
Eliminate tendermint log in pool.go (#68)
Guanghua Guo [Sat, 21 Oct 2017 09:45:26 +0000 (17:45 +0800)]
Merge pull request #67 from Bytom/dev
Dev
gguoss [Sat, 21 Oct 2017 09:32:42 +0000 (17:32 +0800)]
Merge branch 'dev' of https://github.com/Bytom/bytom into dev
gguoss [Sat, 21 Oct 2017 09:32:04 +0000 (17:32 +0800)]
Resolve conflicts
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)
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
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.
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
icodezjb [Fri, 20 Oct 2017 06:00:00 +0000 (14:00 +0800)]
Add filter for wallet mode to index accountutxos
icodezjb [Fri, 20 Oct 2017 05:25:42 +0000 (13:25 +0800)]
Fix the restore issue parallel insert and delete accountutxos
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
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
Liu-Cheng Xu [Fri, 20 Oct 2017 01:34:21 +0000 (09:34 +0800)]
Replace the basic log in p2p (#60)
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
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
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
Liu-Cheng Xu [Wed, 18 Oct 2017 01:52:27 +0000 (09:52 +0800)]
Finish the basic log replacement
Guanghua Guo [Tue, 17 Oct 2017 01:48:52 +0000 (09:48 +0800)]
Merge pull request #54 from Bytom/p2p
Close(#41)
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
Liu-Cheng Xu [Mon, 16 Oct 2017 08:13:21 +0000 (16:13 +0800)]
Replace the basic log statement with logrus
gguoss [Mon, 16 Oct 2017 07:05:38 +0000 (15:05 +0800)]
Close(#41)
Guanghua Guo [Fri, 13 Oct 2017 06:23:13 +0000 (14:23 +0800)]
Merge pull request #51 from Bytom/p2p
Close(#46)
gguoss [Fri, 13 Oct 2017 05:49:26 +0000 (13:49 +0800)]
Fix a bug(#46)
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
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.
Guanghua Guo [Fri, 13 Oct 2017 01:47:26 +0000 (09:47 +0800)]
Merge pull request #49 from Bytom/dev
Merge dev branch
gguoss [Thu, 12 Oct 2017 05:34:19 +0000 (13:34 +0800)]
Update submodule(2node-test)
Guanghua Guo [Thu, 12 Oct 2017 02:31:30 +0000 (10:31 +0800)]
Merge pull request #47 from liuchengxu/ci
Add travis ci
Guanghua Guo [Thu, 12 Oct 2017 02:31:03 +0000 (10:31 +0800)]
Merge pull request #48 from Bytom/wallet
wallet.enable flag
gguoss [Thu, 12 Oct 2017 02:19:20 +0000 (10:19 +0800)]
wallet.enable control account and asset
Liu-Cheng Xu [Thu, 12 Oct 2017 00:45:50 +0000 (08:45 +0800)]
Add travis ci
gguoss [Wed, 11 Oct 2017 09:56:15 +0000 (17:56 +0800)]
add node's command flag --wallet.enable
gguoss [Tue, 10 Oct 2017 07:38:06 +0000 (15:38 +0800)]
Merge branch 'dev' of github.com:Bytom/bytom into dev
gguoss [Tue, 10 Oct 2017 07:35:28 +0000 (15:35 +0800)]
Remove dashboard && Make test OK.
paladz [Tue, 10 Oct 2017 04:12:39 +0000 (12:12 +0800)]
Merge branch 'dev' into bvm
paladz [Tue, 10 Oct 2017 02:04:05 +0000 (10:04 +0800)]
init version for enable mining diff calculate func
gguoss [Tue, 10 Oct 2017 01:38:21 +0000 (09:38 +0800)]
Merge branch 'zhouyasong-patch-1' into dev
gguoss [Tue, 10 Oct 2017 01:33:44 +0000 (09:33 +0800)]
Merge branch 'dev' into zhouyasong-patch-1
zhouyasong [Tue, 10 Oct 2017 01:24:22 +0000 (09:24 +0800)]
change 2node-test path and remove bytom
icodezjb [Mon, 9 Oct 2017 01:19:26 +0000 (09:19 +0800)]
Merge pull request #43 from liuchengxu/fmt
Reformat 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.
Guanghua Guo [Sat, 30 Sep 2017 08:44:42 +0000 (16:44 +0800)]
Merge pull request #40 from Zeroman/dev
Add Dockerfile
Zeroman [Sat, 30 Sep 2017 08:20:43 +0000 (16:20 +0800)]
Add Dockerfile
zhouyasong [Fri, 29 Sep 2017 09:45:09 +0000 (17:45 +0800)]
change bytom to bytomd
Liu-Cheng Xu [Fri, 29 Sep 2017 08:12:14 +0000 (16:12 +0800)]
Update README.md
Guanghua Guo [Fri, 29 Sep 2017 01:55:22 +0000 (09:55 +0800)]
Update README.md
Guanghua Guo [Fri, 29 Sep 2017 01:51:12 +0000 (09:51 +0800)]
Update README.md
gguoss [Fri, 29 Sep 2017 01:40:45 +0000 (09:40 +0800)]
Merge branch 'master' into demo
icodezjb [Thu, 28 Sep 2017 14:58:09 +0000 (22:58 +0800)]
Merge pull request #37 from icodezjb/demo
support list-balances
icodezjb [Thu, 28 Sep 2017 14:51:30 +0000 (22:51 +0800)]
support list-balances
icodezjb [Thu, 28 Sep 2017 14:47:53 +0000 (22:47 +0800)]
Merge pull request #9 from Bytom/demo
sync Demo
gguoss [Thu, 28 Sep 2017 13:30:03 +0000 (21:30 +0800)]
Merge branch 'demo'
Liu-Cheng Xu [Thu, 28 Sep 2017 10:04:52 +0000 (18:04 +0800)]
Fix typo
Liu-Cheng Xu [Thu, 28 Sep 2017 10:00:28 +0000 (18:00 +0800)]
Update README.md
paladz [Thu, 28 Sep 2017 09:13:32 +0000 (17:13 +0800)]
add spend btm into the issue test
Guanghua Guo [Thu, 28 Sep 2017 08:49:07 +0000 (16:49 +0800)]
Update README.md
gguoss [Thu, 28 Sep 2017 08:38:39 +0000 (16:38 +0800)]
add btm descriptor in log & Add issue amout as a argment
gguoss [Thu, 28 Sep 2017 08:16:18 +0000 (16:16 +0800)]
Add sub-create-issue-tx
paladz [Thu, 28 Sep 2017 08:05:49 +0000 (16:05 +0800)]
fix logic bug on broadcast tx
icodezjb [Thu, 28 Sep 2017 05:02:00 +0000 (13:02 +0800)]
Merge pull request #8 from Bytom/demo
sync Demo
gguoss [Thu, 28 Sep 2017 04:19:26 +0000 (12:19 +0800)]
Merge branch 'demo'
paladz [Thu, 28 Sep 2017 03:00:52 +0000 (11:00 +0800)]
remove tx from pool after success commit block
paladz [Wed, 27 Sep 2017 11:56:50 +0000 (19:56 +0800)]
Merge branch 'demo' into bvm
paladz [Wed, 27 Sep 2017 11:52:11 +0000 (19:52 +0800)]
we got the first issue transaction in the block
Liu-Cheng Xu [Wed, 27 Sep 2017 07:09:47 +0000 (15:09 +0800)]
Update Makefile
- dump useless parts in Makefile
- minor README update
jianyixun [Tue, 26 Sep 2017 18:09:57 +0000 (02:09 +0800)]
mistake remove & recover
recover ctx
jianyixun [Tue, 26 Sep 2017 18:07:06 +0000 (02:07 +0800)]
fix bug action & remove ctx
fix bug and remove useless codes
Liu-Cheng Xu [Tue, 26 Sep 2017 12:03:01 +0000 (20:03 +0800)]
Update README.md
paladz [Tue, 26 Sep 2017 11:31:40 +0000 (19:31 +0800)]
fix the validation part error
paladz [Tue, 26 Sep 2017 08:50:17 +0000 (16:50 +0800)]
Merge branch 'demo' into bvm
paladz [Tue, 26 Sep 2017 08:46:52 +0000 (16:46 +0800)]
log error when sync tx fail
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
icodezjb [Tue, 26 Sep 2017 08:28:20 +0000 (16:28 +0800)]
support list-accounts and list-assets
icodezjb [Tue, 26 Sep 2017 08:25:26 +0000 (16:25 +0800)]
Merge pull request #7 from Bytom/demo
sync Demo