OSDN Git Service
gguoss [Tue, 26 Sep 2017 06:13:37 +0000 (14:13 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
gguoss [Tue, 26 Sep 2017 06:13:08 +0000 (14:13 +0800)]
Describe block chain info in info.go
jianyixun [Tue, 26 Sep 2017 06:10:43 +0000 (14:10 +0800)]
add new wallet test
add new WalletTest func
gguoss [Tue, 26 Sep 2017 06:10:08 +0000 (14:10 +0800)]
Add a rpc: getBlockHeight
jianyixun [Tue, 26 Sep 2017 06:07:44 +0000 (14:07 +0800)]
fix mistake
auth
jianyixun [Tue, 26 Sep 2017 05:55:13 +0000 (13:55 +0800)]
add auth on txbuilder.sign
fix typo
add auth on txbuilder.sign
gguoss [Tue, 26 Sep 2017 04:04:35 +0000 (12:04 +0800)]
Modify createAccount & createAsset not use hard code.
gguoss [Tue, 26 Sep 2017 03:20:35 +0000 (11:20 +0800)]
Modify bytom descriptor.
paladz [Mon, 25 Sep 2017 12:16:46 +0000 (20:16 +0800)]
delete submit due to txPoold already included that
paladz [Mon, 25 Sep 2017 09:01:39 +0000 (17:01 +0800)]
Merge branch 'demo' into bvm
paladz [Mon, 25 Sep 2017 08:36:04 +0000 (16:36 +0800)]
connect bcR with txPool newTx chanel, auto boardcast
paladz [Mon, 25 Sep 2017 07:45:30 +0000 (15:45 +0800)]
tx validation call the chain function
paladz [Mon, 25 Sep 2017 07:34:00 +0000 (15:34 +0800)]
add our txpool to chain.validationTx
jianyixun [Mon, 25 Sep 2017 07:15:28 +0000 (15:15 +0800)]
add bytomcli update-alias
new feature: bytomcli update-alias
jianyixun [Mon, 25 Sep 2017 06:19:18 +0000 (14:19 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
jianyixun [Mon, 25 Sep 2017 06:19:07 +0000 (14:19 +0800)]
add bytomcli reset-password
new feature reset-password
paladz [Mon, 25 Sep 2017 05:59:39 +0000 (13:59 +0800)]
Merge branch 'demo' into bvm
paladz [Mon, 25 Sep 2017 05:59:15 +0000 (13:59 +0800)]
Merge branch 'calDiff' into bvm
paladz [Mon, 25 Sep 2017 05:59:04 +0000 (13:59 +0800)]
finish but untest calDiff, due to need work on other parts ASAP
paladz [Mon, 25 Sep 2017 02:56:50 +0000 (10:56 +0800)]
Merge branch 'bvm' into demo
paladz [Mon, 25 Sep 2017 02:56:03 +0000 (10:56 +0800)]
quick fix for make the chain.validationTx work, but this part need better structure
paladz [Mon, 25 Sep 2017 02:54:42 +0000 (10:54 +0800)]
tmp save for developing
jianyixun [Mon, 25 Sep 2017 01:43:58 +0000 (09:43 +0800)]
fix typo & change seed
fix typo
change seed "bytom seed"
jianyixun [Sun, 24 Sep 2017 14:38:10 +0000 (22:38 +0800)]
add bytomcli listkey deletekey
fix typo
add bytomcli listkey deletekey
Guanghua Guo [Sun, 24 Sep 2017 09:16:14 +0000 (17:16 +0800)]
Merge pull request #31 from icodezjb/demo
store RawDefinition1 instead of rawDefinition in struct Asset to leveldb
Guanghua Guo [Sun, 24 Sep 2017 09:16:01 +0000 (17:16 +0800)]
Merge branch 'demo' into demo
icodezjb [Sat, 23 Sep 2017 10:01:46 +0000 (18:01 +0800)]
store RawDefinition1 instead of rawDefinition in struct Asset to leveldb
jianyixun [Sat, 23 Sep 2017 07:53:28 +0000 (15:53 +0800)]
add hsm funcs
add listKeys , deleteKey, signTransaction
jianyixun [Sat, 23 Sep 2017 07:28:23 +0000 (15:28 +0800)]
add comma
fix bug
jianyixun [Sat, 23 Sep 2017 07:25:12 +0000 (15:25 +0800)]
add bytomcli create-key
add new client rpc : create-key
paladz [Sat, 23 Sep 2017 06:22:05 +0000 (14:22 +0800)]
delete the unused code
paladz [Sat, 23 Sep 2017 05:58:10 +0000 (13:58 +0800)]
fix wrong import issue
paladz [Sat, 23 Sep 2017 05:34:30 +0000 (13:34 +0800)]
Merge branch 'bvm' into demo
paladz [Sat, 23 Sep 2017 05:33:03 +0000 (13:33 +0800)]
add custom init block
icodezjb [Sat, 23 Sep 2017 02:01:36 +0000 (10:01 +0800)]
Merge pull request #1 from Bytom/demo
sync Demo
jianyixun [Fri, 22 Sep 2017 18:41:17 +0000 (02:41 +0800)]
fix bug: hsm
fix "https too many args error"
Blockmeta-区块元 [Fri, 22 Sep 2017 17:57:32 +0000 (01:57 +0800)]
Merge branch 'master' into demo
root [Fri, 22 Sep 2017 13:21:24 +0000 (21:21 +0800)]
pseudohsm bugfix
paladz [Fri, 22 Sep 2017 08:56:57 +0000 (16:56 +0800)]
change the hash check time
jianyixun [Fri, 22 Sep 2017 08:50:09 +0000 (16:50 +0800)]
fix bug
gguoss [Fri, 22 Sep 2017 08:35:26 +0000 (16:35 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
gguoss [Fri, 22 Sep 2017 08:34:46 +0000 (16:34 +0800)]
Merge branch 'master' into demo
Guanghua Guo [Fri, 22 Sep 2017 08:32:53 +0000 (16:32 +0800)]
Update README.md
Blockmeta-区块元 [Fri, 22 Sep 2017 08:06:41 +0000 (16:06 +0800)]
Merge pull request #27 from Blockmeta/master
bytom add
jianyixun [Fri, 22 Sep 2017 08:01:29 +0000 (16:01 +0800)]
reflash
清除hsm
jianyixun [Fri, 22 Sep 2017 07:56:48 +0000 (15:56 +0800)]
Merge branch 'master' of https://github.com/Blockmeta/bytom
jianyixun [Fri, 22 Sep 2017 07:53:02 +0000 (15:53 +0800)]
delete remote
remote hsm remove
paladz [Fri, 22 Sep 2017 07:51:57 +0000 (15:51 +0800)]
Merge branch 'demo' of https://github.com/Bytom/blockchain into demo
paladz [Fri, 22 Sep 2017 07:50:01 +0000 (15:50 +0800)]
Merge branch 'bvm' into demo
Blockmeta-区块元 [Fri, 22 Sep 2017 07:49:00 +0000 (15:49 +0800)]
Merge pull request #26 from Blockmeta/master
Merge pull request #3 from Bytom/demo
Blockmeta-区块元 [Fri, 22 Sep 2017 07:46:17 +0000 (15:46 +0800)]
Merge pull request #3 from Bytom/demo
Demo
Blockmeta-区块元 [Fri, 22 Sep 2017 07:46:08 +0000 (15:46 +0800)]
Merge branch 'master' into demo
paladz [Fri, 22 Sep 2017 07:38:19 +0000 (15:38 +0800)]
fix log issue
paladz [Fri, 22 Sep 2017 07:32:59 +0000 (15:32 +0800)]
delete the debug code
Guanghua Guo [Fri, 22 Sep 2017 07:27:56 +0000 (15:27 +0800)]
Merge pull request #25 from icodezjb/demo
annotate Alias checks when create accout for bytomcli issue-test
paladz [Fri, 22 Sep 2017 07:07:06 +0000 (15:07 +0800)]
format the check proof of work enter point
jianyixun [Fri, 22 Sep 2017 06:26:30 +0000 (14:26 +0800)]
ADD hsm handler
add hsm into BlockchainReasctor
add nodekey dir
paladz [Fri, 22 Sep 2017 06:05:45 +0000 (14:05 +0800)]
move difficulty part code to a file
paladz [Fri, 22 Sep 2017 05:54:46 +0000 (13:54 +0800)]
BTM asset id should be define in the consensus folder
paladz [Fri, 22 Sep 2017 05:46:23 +0000 (13:46 +0800)]
move the max tx size and block size to the consensus package
paladz [Fri, 22 Sep 2017 05:31:22 +0000 (13:31 +0800)]
remove generate block function due to we are pow crypto
paladz [Fri, 22 Sep 2017 05:27:09 +0000 (13:27 +0800)]
validation should handle the int/uint type convert
paladz [Fri, 22 Sep 2017 05:24:19 +0000 (13:24 +0800)]
tx weight should read from tx directly
icodezjb [Fri, 22 Sep 2017 04:32:14 +0000 (12:32 +0800)]
annotate Alias checks when create accout for bytomcli issue-test
gguoss [Fri, 22 Sep 2017 02:55:06 +0000 (10:55 +0800)]
recovery BlockchainReactor.
paladz [Fri, 22 Sep 2017 02:37:43 +0000 (10:37 +0800)]
fix one unit test bug
gguoss [Fri, 22 Sep 2017 02:30:26 +0000 (10:30 +0800)]
ignore hsm.go.
gguoss [Fri, 22 Sep 2017 02:18:38 +0000 (10:18 +0800)]
Fixed import from github.com.
gguoss [Fri, 22 Sep 2017 02:13:58 +0000 (10:13 +0800)]
Fixed code file abs path.
zhouyasong [Thu, 21 Sep 2017 14:08:06 +0000 (22:08 +0800)]
manage package
Blockmeta-区块元 [Thu, 21 Sep 2017 08:26:32 +0000 (16:26 +0800)]
Merge pull request #2 from Bytom/demo
Demo update
Blockmeta-区块元 [Thu, 21 Sep 2017 08:11:03 +0000 (16:11 +0800)]
Merge pull request #24 from Blockmeta/master
add hsm
zhouyasong [Thu, 21 Sep 2017 08:05:13 +0000 (16:05 +0800)]
modified reactor.go
zhouyasong [Thu, 21 Sep 2017 07:27:09 +0000 (15:27 +0800)]
mmerge zhouyasong-patch-1 to demo
jianyixun [Thu, 21 Sep 2017 07:22:14 +0000 (15:22 +0800)]
修复
remove sturct
paladz [Thu, 21 Sep 2017 06:59:02 +0000 (14:59 +0800)]
merge with master baby
paladz [Thu, 21 Sep 2017 06:38:20 +0000 (14:38 +0800)]
add txpool and tx boardcast after received tx
paladz [Wed, 20 Sep 2017 06:59:23 +0000 (14:59 +0800)]
mining, block sync, success
zhouyasong [Tue, 19 Sep 2017 10:16:46 +0000 (18:16 +0800)]
add accesstoken
zhouyasong [Tue, 19 Sep 2017 06:06:02 +0000 (14:06 +0800)]
add spendAction to issue.go
jianyixun [Mon, 18 Sep 2017 18:00:09 +0000 (02:00 +0800)]
add wallet
hsm and remote hsm added
Blockmeta-区块元 [Mon, 18 Sep 2017 17:48:42 +0000 (01:48 +0800)]
Merge pull request #1 from Bytom/master
new merge
paladz [Sun, 17 Sep 2017 17:56:13 +0000 (01:56 +0800)]
init version of merger all thr things together
Guanghua Guo [Fri, 15 Sep 2017 09:35:44 +0000 (17:35 +0800)]
Merge pull request #21 from Bytom/zhouyasong-patch-1
Zhouyasong patch 1
gguoss [Fri, 15 Sep 2017 09:30:34 +0000 (17:30 +0800)]
Merge branch 'master' into zhouyasong-patch-1
Guanghua Guo [Fri, 15 Sep 2017 08:47:05 +0000 (16:47 +0800)]
Merge pull request #20 from icodezjb/master
support update-account tags
icodezjb [Fri, 15 Sep 2017 08:37:40 +0000 (16:37 +0800)]
support update-account tags
Guanghua Guo [Sat, 9 Sep 2017 09:03:28 +0000 (17:03 +0800)]
Merge pull request #18 from Bytom/develop
Develop
gguoss [Sat, 9 Sep 2017 09:02:09 +0000 (17:02 +0800)]
Added a example about submit-transaction call.
gguoss [Sat, 9 Sep 2017 08:14:14 +0000 (16:14 +0800)]
Added log to print SigningInstructions's SignatureWitnesses.
Guanghua Guo [Sat, 9 Sep 2017 07:35:01 +0000 (15:35 +0800)]
Merge pull request #17 from icodezjb/master
change <asset.Signer.ID, Asset> to <asset.AssetID.String(),Asset>
Guanghua Guo [Sat, 9 Sep 2017 07:33:48 +0000 (15:33 +0800)]
Merge branch 'master' into master
icodezjb [Sat, 9 Sep 2017 07:18:58 +0000 (15:18 +0800)]
change <asset.Signer.ID, Asset> to <asset.AssetID.String(),Asset> for Asset struct storing in leveldb
Guanghua Guo [Sat, 9 Sep 2017 06:57:43 +0000 (14:57 +0800)]
Merge pull request #16 from Bytom/develop
Develop
gguoss [Sat, 9 Sep 2017 06:52:26 +0000 (14:52 +0800)]
Fixed a bug about store AssetId.
gguoss [Sat, 9 Sep 2017 06:03:47 +0000 (14:03 +0800)]
Added Sign transaction in example.
icodezjb [Sat, 9 Sep 2017 02:47:03 +0000 (10:47 +0800)]
Merge pull request #2 from Bytom/master
sync bytom from master
Guanghua Guo [Fri, 8 Sep 2017 09:48:50 +0000 (17:48 +0800)]
Merge pull request #14 from Bytom/develop
Develop
gguoss [Fri, 8 Sep 2017 08:28:38 +0000 (16:28 +0800)]
Fixed a bug about asset's findByID.
gguoss [Fri, 8 Sep 2017 07:45:12 +0000 (15:45 +0800)]
Merge branch 'master' into develop