OSDN Git Service

bytom/bytom.git
6 years agoMerge pull request #89 from Bytom/dev v0.1.4
Guanghua Guo [Mon, 6 Nov 2017 09:04:15 +0000 (17:04 +0800)]
Merge pull request #89 from Bytom/dev

Dev

6 years agoAdd get-block-header-by-hash subcommand (#88)
Liu-Cheng Xu [Mon, 6 Nov 2017 08:59:57 +0000 (16:59 +0800)]
Add get-block-header-by-hash subcommand (#88)

* Add get-block-header-by-hash subcommand

* Catch err in hash.UnmarshalText

6 years agoTestnet (#86)
Guanghua Guo [Mon, 6 Nov 2017 06:54:51 +0000 (14:54 +0800)]
Testnet (#86)

* Delete tendermint log initialize

* Delete init function

* Add network initialize function

6 years agoMerge branch 'dev' of git://github.com/Bytom/bytom
Chengcheng Zhang [Mon, 6 Nov 2017 03:12:12 +0000 (11:12 +0800)]
Merge branch 'dev' of git://github.com/Bytom/bytom

6 years agoDelete tendermint log initialize (#85)
Guanghua Guo [Fri, 3 Nov 2017 07:03:33 +0000 (15:03 +0800)]
Delete tendermint log initialize (#85)

* Delete tendermint log initialize

* Delete init function

6 years agoFix chain's height is 0
gguoss [Fri, 3 Nov 2017 07:01:02 +0000 (15:01 +0800)]
Fix chain's height is 0

6 years agoRemove rpc updateAlias (#84)
Blockmeta-区块元 [Fri, 3 Nov 2017 06:17:51 +0000 (14:17 +0800)]
Remove rpc updateAlias (#84)

remove rpc updateAlias  for  alias should be unchangable

6 years agoMerge pull request #83 from Bytom/wallet
Blockmeta-区块元 [Fri, 3 Nov 2017 05:43:46 +0000 (13:43 +0800)]
Merge pull request #83 from Bytom/wallet

Add Wallet module

6 years agoFix duplicated alias bug and remove updateAlias rpc
Blockmeta-区块元 [Thu, 2 Nov 2017 15:01:50 +0000 (23:01 +0800)]
Fix duplicated alias bug and remove updateAlias rpc

fix bug for “duplicated alias happened at createKey“
remove updateAlias rpc for it‘s useless

6 years agoMerge remote-tracking branch 'origin/dev' into wallet
Blockmeta-区块元 [Thu, 2 Nov 2017 10:36:33 +0000 (18:36 +0800)]
Merge remote-tracking branch 'origin/dev' into wallet

6 years agoRemove vscode config
Blockmeta-区块元 [Thu, 2 Nov 2017 10:30:32 +0000 (18:30 +0800)]
Remove vscode config

Remove launch.json

6 years agochain.state using block.height instead of height (#82)
Paladz [Thu, 2 Nov 2017 09:41:42 +0000 (04:41 -0500)]
chain.state using block.height instead of height (#82)

6 years agoAdd rpc interface: get-current-block-hash (#80)
Guanghua Guo [Thu, 2 Nov 2017 08:51:36 +0000 (16:51 +0800)]
Add rpc interface: get-current-block-hash (#80)

* Add rpc interface: get-current-block-hash

* Update according review

6 years agodelete btmhash
Chengcheng Zhang [Thu, 2 Nov 2017 08:40:47 +0000 (16:40 +0800)]
delete btmhash

6 years agoAdd package cespare/cp
Blockmeta-区块元 [Thu, 2 Nov 2017 08:39:55 +0000 (16:39 +0800)]
Add package cespare/cp

Add package cespare/cp

6 years agoAdd thirdpart package and fix bugs of testcases
Blockmeta-区块元 [Thu, 2 Nov 2017 08:32:53 +0000 (16:32 +0800)]
Add thirdpart package and fix bugs of testcases

Add package cespare/cp
Fix pseudohsm testcases bugs  of "Keeping a clean workspace"

6 years agoMerge remote-tracking branch 'origin/dev' into wallet
Blockmeta-区块元 [Thu, 2 Nov 2017 06:11:40 +0000 (14:11 +0800)]
Merge remote-tracking branch 'origin/dev' into wallet

6 years agoFix difficulty_test error
gguoss [Thu, 2 Nov 2017 05:47:09 +0000 (13:47 +0800)]
Fix difficulty_test error

6 years agofix calDiff bug due to we set the genesis block height to 1 instead of 0
paladz [Thu, 2 Nov 2017 04:36:10 +0000 (12:36 +0800)]
fix calDiff bug due to we set the  genesis block height to 1 instead of 0

6 years agoMerge branch 'dev' into bvm
paladz [Thu, 2 Nov 2017 04:27:05 +0000 (12:27 +0800)]
Merge branch 'dev' into bvm

6 years agoupdate make file due to we are using vendor to control all the packages (#78)
Paladz [Thu, 2 Nov 2017 04:26:45 +0000 (23:26 -0500)]
update make file due to we are using vendor to control all the packages (#78)

* update make file due to we are using vendor to control all the packages

* update the makefile due to codereview

* delete grep -v '/rpc/' in makefile

6 years agodelete grep -v '/rpc/' in makefile
paladz [Thu, 2 Nov 2017 04:23:53 +0000 (12:23 +0800)]
delete grep -v '/rpc/' in makefile

6 years agoupdate the makefile due to codereview
paladz [Thu, 2 Nov 2017 04:05:53 +0000 (12:05 +0800)]
update the makefile due to codereview

6 years agoupdate make file due to we are using vendor to control all the packages
paladz [Thu, 2 Nov 2017 03:43:46 +0000 (11:43 +0800)]
update make file due to we are using vendor to control all the packages

6 years agoadd btmhash
Chengcheng Zhang [Thu, 2 Nov 2017 03:23:56 +0000 (11:23 +0800)]
add btmhash

6 years agodelete btmhash
Chengcheng Zhang [Thu, 2 Nov 2017 03:20:11 +0000 (11:20 +0800)]
delete btmhash

6 years agoadd btmhash
Chengcheng Zhang [Thu, 2 Nov 2017 03:15:25 +0000 (11:15 +0800)]
add btmhash

6 years agoMerge remote-tracking branch 'origin/dev' into wallet
Blockmeta-区块元 [Thu, 2 Nov 2017 03:02:02 +0000 (11:02 +0800)]
Merge remote-tracking branch 'origin/dev' into wallet

6 years agoadd stretchr/testify to vendor
paladz [Thu, 2 Nov 2017 02:58:04 +0000 (10:58 +0800)]
add stretchr/testify to vendor

6 years agoadd vendor support for make test
paladz [Thu, 2 Nov 2017 02:54:45 +0000 (10:54 +0800)]
add vendor support for make test

6 years agoMerge branch 'master' of https://github.com/Bytom/bytom-btmhash
Chengcheng Zhang [Thu, 2 Nov 2017 02:10:34 +0000 (10:10 +0800)]
Merge branch 'master' of https://github.com/Bytom/bytom-btmhash

6 years agoMerge remote-tracking branch 'origin/dev' into wallet
Blockmeta-区块元 [Wed, 1 Nov 2017 18:05:28 +0000 (02:05 +0800)]
Merge remote-tracking branch 'origin/dev' into wallet

6 years agoUpdate create-key rpc
Blockmeta-区块元 [Wed, 1 Nov 2017 15:39:23 +0000 (23:39 +0800)]
Update create-key rpc

Add error repsonse for duplicated alias

6 years agoDelete README.md
Chengcheng Zhang [Wed, 1 Nov 2017 14:40:29 +0000 (22:40 +0800)]
Delete README.md

6 years agoCreate README.md
Chengcheng Zhang [Wed, 1 Nov 2017 10:24:36 +0000 (18:24 +0800)]
Create README.md

6 years agoadd more package to our vendor
paladz [Wed, 1 Nov 2017 09:29:56 +0000 (17:29 +0800)]
add more package to our vendor

6 years agoMerge branch 'dev' into wallet
Blockmeta-区块元 [Wed, 1 Nov 2017 09:24:53 +0000 (17:24 +0800)]
Merge branch 'dev' into wallet

6 years agoadd golang.org/x package to our vendor
paladz [Wed, 1 Nov 2017 09:24:13 +0000 (17:24 +0800)]
add golang.org/x package to our vendor

6 years agoFix typo and delete coretest
Blockmeta-区块元 [Wed, 1 Nov 2017 09:24:01 +0000 (17:24 +0800)]
Fix typo and delete coretest

fix typo  "XKey“
delete coretest directory

6 years agoadd more package to our vendor
paladz [Wed, 1 Nov 2017 09:21:22 +0000 (17:21 +0800)]
add more package to our vendor

6 years agoFix bug for hsm test
Blockmeta-区块元 [Wed, 1 Nov 2017 09:11:55 +0000 (17:11 +0800)]
Fix bug for hsm test

fix bug
add comment

6 years agoadd magiconair/properties
paladz [Wed, 1 Nov 2017 09:11:20 +0000 (17:11 +0800)]
add magiconair/properties

6 years agoadd hashicorp/hcl
paladz [Wed, 1 Nov 2017 09:10:33 +0000 (17:10 +0800)]
add hashicorp/hcl

6 years agoadd fsnotify/fsnotify
paladz [Wed, 1 Nov 2017 09:09:48 +0000 (17:09 +0800)]
add fsnotify/fsnotify

6 years agoadd spf13/viper & spf13/cobra
paladz [Wed, 1 Nov 2017 09:08:41 +0000 (17:08 +0800)]
add spf13/viper & spf13/cobra

6 years agoadd rjeczalik/notify to vendor
paladz [Wed, 1 Nov 2017 09:00:17 +0000 (17:00 +0800)]
add rjeczalik/notify to vendor

6 years agoadd pkg/errors to vendor
paladz [Wed, 1 Nov 2017 08:59:19 +0000 (16:59 +0800)]
add pkg/errors to vendor

6 years agoadd uuid to vendor
paladz [Wed, 1 Nov 2017 08:58:16 +0000 (16:58 +0800)]
add uuid to vendor

6 years agoadd secureheader to vendor
paladz [Wed, 1 Nov 2017 08:57:10 +0000 (16:57 +0800)]
add secureheader to vendor

6 years agoadd protobuf to vendor
paladz [Wed, 1 Nov 2017 08:55:33 +0000 (16:55 +0800)]
add protobuf to vendor

6 years agoadd groupcache to vendor
paladz [Wed, 1 Nov 2017 08:51:55 +0000 (16:51 +0800)]
add groupcache to vendor

6 years agoadd hdrhistogram to vendor
paladz [Wed, 1 Nov 2017 08:47:48 +0000 (16:47 +0800)]
add hdrhistogram to vendor

6 years agoadd logrus to vendor
paladz [Wed, 1 Nov 2017 08:21:51 +0000 (16:21 +0800)]
add logrus to vendor

6 years agoMerge branch 'dev' into bvm
paladz [Wed, 1 Nov 2017 08:16:46 +0000 (16:16 +0800)]
Merge branch 'dev' into bvm

6 years agoremove submodule
paladz [Wed, 1 Nov 2017 08:15:16 +0000 (16:15 +0800)]
remove submodule

6 years agobuild: pass the right linker flags as version (#77)
detailyang [Wed, 1 Nov 2017 08:05:15 +0000 (03:05 -0500)]
build: pass the right linker flags as version (#77)

* build: pass the right linker flags as the version

* doc: change the installation of bytomd、 bytomcli

* style: pass golint

6 years agoinit the vender submodule
paladz [Wed, 1 Nov 2017 07:36:39 +0000 (15:36 +0800)]
init the vender submodule

6 years agoMerge branch 'dev' into wallet
Blockmeta-区块元 [Tue, 31 Oct 2017 12:34:00 +0000 (20:34 +0800)]
Merge branch 'dev' into wallet

6 years agoFix merge conflict
gguoss [Tue, 31 Oct 2017 09:06:43 +0000 (17:06 +0800)]
Fix merge conflict

6 years agoMerge branch 'dev' of https://github.com/Bytom/bytom into dev
gguoss [Tue, 31 Oct 2017 09:03:01 +0000 (17:03 +0800)]
Merge branch 'dev' of https://github.com/Bytom/bytom into dev

6 years agoset the init block bits
paladz [Tue, 31 Oct 2017 08:25:05 +0000 (16:25 +0800)]
set the init block bits

6 years agoMerge pull request #75 from Bytom/dev v0.1.3
Guanghua Guo [Tue, 31 Oct 2017 07:17:28 +0000 (15:17 +0800)]
Merge pull request #75 from Bytom/dev

Dev

6 years agoFix typo
Liu-Cheng Xu [Tue, 31 Oct 2017 06:15:46 +0000 (14:15 +0800)]
Fix typo

6 years agoupdate the init block bits
paladz [Tue, 31 Oct 2017 03:24:10 +0000 (11:24 +0800)]
update the init block bits

6 years agoMerge remote-tracking branch 'upstream/dev' into dev
Liu-Cheng Xu [Tue, 31 Oct 2017 03:07:24 +0000 (11:07 +0800)]
Merge remote-tracking branch 'upstream/dev' into dev

6 years agoAdd Dockerfile
Liu-Cheng Xu [Tue, 31 Oct 2017 03:04:55 +0000 (11:04 +0800)]
Add Dockerfile

6 years agomerge with dev
paladz [Tue, 31 Oct 2017 03:01:13 +0000 (11:01 +0800)]
merge with dev

6 years agoRemove copy in Makefile
Liu-Cheng Xu [Tue, 31 Oct 2017 00:54:56 +0000 (08:54 +0800)]
Remove copy in Makefile

6 years agofix bug for net level change
paladz [Sun, 29 Oct 2017 13:43:00 +0000 (21:43 +0800)]
fix bug for net level change

6 years agoUpdate README.md
Liu-Cheng Xu [Mon, 30 Oct 2017 09:26:24 +0000 (17:26 +0800)]
Update README.md

6 years agoMerge remote-tracking branch 'zjb/monday-zjb' into dev
Liu-Cheng Xu [Mon, 30 Oct 2017 09:24:28 +0000 (17:24 +0800)]
Merge remote-tracking branch 'zjb/monday-zjb' into dev

6 years agosubmitSpendTransaction
icodezjb [Mon, 30 Oct 2017 07:52:51 +0000 (15:52 +0800)]
submitSpendTransaction

6 years agoMerge branch 'master' into dev
gguoss [Mon, 30 Oct 2017 05:51:44 +0000 (13:51 +0800)]
Merge branch 'master' into dev

6 years agoDelete bytom log (#74)
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

6 years agoUpdate hsm unittest file
Blockmeta-区块元 [Sun, 29 Oct 2017 16:54:45 +0000 (00:54 +0800)]
Update hsm unittest file

Update unittest file
Pass goint checking procedure

6 years agomerge with the dev
paladz [Sun, 29 Oct 2017 12:20:58 +0000 (20:20 +0800)]
merge with the dev

6 years agodev version for modify net structure
paladz [Sun, 29 Oct 2017 09:36:42 +0000 (17:36 +0800)]
dev version for modify net structure

6 years agoFor monday
icodezjb [Sat, 28 Oct 2017 09:32:08 +0000 (17:32 +0800)]
For monday

6 years agoRemove useless code
Blockmeta-区块元 [Sat, 28 Oct 2017 09:30:47 +0000 (17:30 +0800)]
Remove useless code

Remove Address

6 years agoMerge branch 'dev' into wallet
Blockmeta-区块元 [Sat, 28 Oct 2017 07:05:36 +0000 (15:05 +0800)]
Merge branch 'dev' into wallet

6 years agoSupport spend transaction with account or utxo (#72)
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

6 years agoOptimize list-balances
icodezjb [Sat, 28 Oct 2017 06:31:38 +0000 (14:31 +0800)]
Optimize list-balances

6 years agoMerge branch 'dev' into wallet
Blockmeta-区块元 [Sat, 28 Oct 2017 05:53:17 +0000 (13:53 +0800)]
Merge branch 'dev' into wallet

6 years agoUse better iterator which tmlibs's IteratorPrefix
icodezjb [Sat, 28 Oct 2017 04:13:16 +0000 (12:13 +0800)]
Use better iterator which tmlibs's IteratorPrefix

6 years agoMerge remote-tracking branch 'origin/dev' into dev
icodezjb [Fri, 27 Oct 2017 08:58:23 +0000 (16:58 +0800)]
Merge remote-tracking branch 'origin/dev' into dev

6 years agoUpdate code style
icodezjb [Fri, 27 Oct 2017 08:57:48 +0000 (16:57 +0800)]
Update code style

6 years agoshit fix for the communicate level, we will rewrite the code in the future
paladz [Fri, 27 Oct 2017 06:02:35 +0000 (14:02 +0800)]
shit fix for the communicate level, we will rewrite the code in the future

6 years agoUpdate transact.go
icodezjb [Fri, 27 Oct 2017 06:01:53 +0000 (14:01 +0800)]
Update transact.go

6 years agoUpdate log package
icodezjb [Fri, 27 Oct 2017 04:30:24 +0000 (12:30 +0800)]
Update log package

6 years agoUse nil better to len for goleveldb.Get return
icodezjb [Fri, 27 Oct 2017 02:40:33 +0000 (10:40 +0800)]
Use nil better to len for goleveldb.Get return

6 years agofix typo about bytomd path (#73)
李永峰 [Fri, 27 Oct 2017 01:27:35 +0000 (20:27 -0500)]
fix typo about bytomd path (#73)

6 years agoMerge remote-tracking branch 'origin/dev' into dev
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

6 years agoSupport spend transaction with account or utxo
icodezjb [Thu, 26 Oct 2017 11:40:12 +0000 (19:40 +0800)]
Support spend transaction with account or utxo

6 years agoAdd coretest module
jianyixun [Thu, 26 Oct 2017 11:39:30 +0000 (19:39 +0800)]
Add coretest  module

Add coretest  fixture to construct tx

6 years agoMerge pull request #1 from Bytom/dev
icodezjb [Thu, 26 Oct 2017 11:19:09 +0000 (19:19 +0800)]
Merge pull request #1 from Bytom/dev

sync Dev

6 years agoAdd hsm_test template
jianyixun [Thu, 26 Oct 2017 03:02:14 +0000 (11:02 +0800)]
Add hsm_test template

add hsm unit test file

6 years agoRemove useless files
jianyixun [Wed, 25 Oct 2017 19:31:45 +0000 (03:31 +0800)]
Remove useless files

Remove useless files

6 years agoMerge branch 'dev' into wallet
jianyixun [Wed, 25 Oct 2017 19:28:49 +0000 (03:28 +0800)]
Merge branch 'dev' into wallet

Conflicts:
blockchain/pseudohsm/pseudohsm_test.go

6 years agoUpdate address format and mechanism of keystore
jianyixun [Wed, 25 Oct 2017 19:13:04 +0000 (03:13 +0800)]
Update address format and mechanism of keystore

Update address format using segwit address
Change new mechanism of keys' storage

6 years agoupdate log format
paladz [Wed, 25 Oct 2017 10:30:10 +0000 (18:30 +0800)]
update log format