OSDN Git Service
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
jianyixun [Tue, 26 Sep 2017 08:19:41 +0000 (16:19 +0800)]
miss }
fix bug
jianyixun [Tue, 26 Sep 2017 08:17:55 +0000 (16:17 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
jianyixun [Tue, 26 Sep 2017 08:17:50 +0000 (16:17 +0800)]
fix address marshal format
fix address marshal format
optimize bytomcli output format
Liu-Cheng Xu [Tue, 26 Sep 2017 08:03:13 +0000 (16:03 +0800)]
Add ISSUE_TEMPLATE
paladz [Tue, 26 Sep 2017 07:51:43 +0000 (15:51 +0800)]
fix the merge bug
gguoss [Tue, 26 Sep 2017 07:46:06 +0000 (15:46 +0800)]
Merge branch 'master' of https://github.com/Bytom/bytom
gguoss [Tue, 26 Sep 2017 07:44:29 +0000 (15:44 +0800)]
Merge branch 'demo'
paladz [Tue, 26 Sep 2017 07:38:43 +0000 (15:38 +0800)]
code need to be little better elegant
gguoss [Tue, 26 Sep 2017 07:38:26 +0000 (15:38 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
gguoss [Tue, 26 Sep 2017 07:37:54 +0000 (15:37 +0800)]
fix bug about spawn block issue:33
Liu-Cheng Xu [Tue, 26 Sep 2017 06:48:26 +0000 (14:48 +0800)]
Add license badge
Liu-Cheng Xu [Tue, 26 Sep 2017 06:29:40 +0000 (14:29 +0800)]
Update README.md
- Ignore cmd/bytom/.bytom
jianyixun [Tue, 26 Sep 2017 06:18:58 +0000 (14:18 +0800)]
Merge branch 'demo' of https://github.com/Bytom/bytom into demo
jianyixun [Tue, 26 Sep 2017 06:18:43 +0000 (14:18 +0800)]
add command wallet-test
add command wallet-test
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 05:15:25 +0000 (13:15 +0800)]
fix build error:import the extra branch
gguoss [Tue, 26 Sep 2017 05:10:22 +0000 (13:10 +0800)]
Move cmd/bytom/test to 2node-test submodule
gguoss [Tue, 26 Sep 2017 04:52:44 +0000 (12:52 +0800)]
fix conflicts
gguoss [Tue, 26 Sep 2017 04:05:32 +0000 (12:05 +0800)]
Merge branch 'demo'
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.
icodezjb [Tue, 26 Sep 2017 01:35:57 +0000 (09:35 +0800)]
Merge pull request #6 from Bytom/demo
sync Demo
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
icodezjb [Mon, 25 Sep 2017 03:00:04 +0000 (11:00 +0800)]
Merge pull request #5 from Bytom/demo
sync Demo
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
Liu-Cheng Xu [Mon, 25 Sep 2017 02:23:34 +0000 (10:23 +0800)]
Update .gitignore
Ignore the executable program in cmd.
Guanghua Guo [Mon, 25 Sep 2017 02:00:18 +0000 (10:00 +0800)]
Merge pull request #32 from liuchengxu/master
Add .gitignore
icodezjb [Mon, 25 Sep 2017 01:49:03 +0000 (09:49 +0800)]
Merge pull request #4 from Bytom/demo
fix typo & change seed
jianyixun [Mon, 25 Sep 2017 01:43:58 +0000 (09:43 +0800)]
fix typo & change seed
fix typo
change seed "bytom seed"
Liu-Cheng Xu [Mon, 25 Sep 2017 01:43:56 +0000 (09:43 +0800)]
Add .gitignore
icodezjb [Mon, 25 Sep 2017 01:25:37 +0000 (09:25 +0800)]
Merge pull request #3 from Bytom/demo
sync Demo
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
gguoss [Sat, 23 Sep 2017 07:09:34 +0000 (15:09 +0800)]
Added LICENSE.
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