OSDN Git Service

bytom/bytom.git
6 years agoBTM asset id should be define in the consensus folder
paladz [Fri, 22 Sep 2017 05:54:46 +0000 (13:54 +0800)]
BTM asset id should be define in the consensus folder

6 years agomove the max tx size and block size to the consensus package
paladz [Fri, 22 Sep 2017 05:46:23 +0000 (13:46 +0800)]
move the max tx size and block size to the consensus package

6 years agoremove generate block function due to we are pow crypto
paladz [Fri, 22 Sep 2017 05:31:22 +0000 (13:31 +0800)]
remove generate block function due to we are pow crypto

6 years agovalidation should handle the int/uint type convert
paladz [Fri, 22 Sep 2017 05:27:09 +0000 (13:27 +0800)]
validation should handle the int/uint type convert

6 years agotx weight should read from tx directly
paladz [Fri, 22 Sep 2017 05:24:19 +0000 (13:24 +0800)]
tx weight should read from tx directly

6 years ago annotate Alias checks when create accout for bytomcli issue-test
icodezjb [Fri, 22 Sep 2017 04:32:14 +0000 (12:32 +0800)]
 annotate Alias checks when create accout for bytomcli issue-test

6 years agorecovery BlockchainReactor.
gguoss [Fri, 22 Sep 2017 02:55:06 +0000 (10:55 +0800)]
recovery BlockchainReactor.

6 years agofix one unit test bug
paladz [Fri, 22 Sep 2017 02:37:43 +0000 (10:37 +0800)]
fix one unit test bug

6 years agoignore hsm.go.
gguoss [Fri, 22 Sep 2017 02:30:26 +0000 (10:30 +0800)]
ignore hsm.go.

6 years agoFixed import from github.com.
gguoss [Fri, 22 Sep 2017 02:18:38 +0000 (10:18 +0800)]
Fixed import from github.com.

6 years agoFixed code file abs path.
gguoss [Fri, 22 Sep 2017 02:13:58 +0000 (10:13 +0800)]
Fixed code file abs path.

6 years agomanage package
zhouyasong [Thu, 21 Sep 2017 14:08:06 +0000 (22:08 +0800)]
manage package

6 years agoMerge pull request #2 from Bytom/demo
Blockmeta-区块元 [Thu, 21 Sep 2017 08:26:32 +0000 (16:26 +0800)]
Merge pull request #2 from Bytom/demo

Demo update

6 years agoMerge pull request #24 from Blockmeta/master
Blockmeta-区块元 [Thu, 21 Sep 2017 08:11:03 +0000 (16:11 +0800)]
Merge pull request #24 from Blockmeta/master

add hsm

6 years agomodified reactor.go
zhouyasong [Thu, 21 Sep 2017 08:05:13 +0000 (16:05 +0800)]
modified reactor.go

6 years agommerge zhouyasong-patch-1 to demo
zhouyasong [Thu, 21 Sep 2017 07:27:09 +0000 (15:27 +0800)]
mmerge zhouyasong-patch-1 to demo

6 years ago修复
jianyixun [Thu, 21 Sep 2017 07:22:14 +0000 (15:22 +0800)]
修复

remove sturct

6 years agomerge with master baby
paladz [Thu, 21 Sep 2017 06:59:02 +0000 (14:59 +0800)]
merge with master baby

6 years agoadd txpool and tx boardcast after received tx
paladz [Thu, 21 Sep 2017 06:38:20 +0000 (14:38 +0800)]
add txpool and tx boardcast after received tx

6 years agomining, block sync, success
paladz [Wed, 20 Sep 2017 06:59:23 +0000 (14:59 +0800)]
mining, block sync, success

6 years agoadd accesstoken
zhouyasong [Tue, 19 Sep 2017 10:16:46 +0000 (18:16 +0800)]
add accesstoken

6 years agoadd spendAction to issue.go
zhouyasong [Tue, 19 Sep 2017 06:06:02 +0000 (14:06 +0800)]
add spendAction to issue.go

6 years agoadd wallet
jianyixun [Mon, 18 Sep 2017 18:00:09 +0000 (02:00 +0800)]
add wallet

hsm and remote hsm added

6 years agoMerge pull request #1 from Bytom/master
Blockmeta-区块元 [Mon, 18 Sep 2017 17:48:42 +0000 (01:48 +0800)]
Merge pull request #1 from Bytom/master

new merge

6 years agoinit version of merger all thr things together
paladz [Sun, 17 Sep 2017 17:56:13 +0000 (01:56 +0800)]
init version of merger all thr things together

6 years agoMerge pull request #21 from Bytom/zhouyasong-patch-1
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

6 years agoMerge branch 'master' into zhouyasong-patch-1
gguoss [Fri, 15 Sep 2017 09:30:34 +0000 (17:30 +0800)]
Merge branch 'master' into zhouyasong-patch-1

6 years agoRemoved something not important.
gguoss [Fri, 15 Sep 2017 09:18:59 +0000 (17:18 +0800)]
Removed something not important.

6 years agoMerge pull request #20 from icodezjb/master
Guanghua Guo [Fri, 15 Sep 2017 08:47:05 +0000 (16:47 +0800)]
Merge pull request #20 from icodezjb/master

support update-account tags

6 years agosupport update-account tags
icodezjb [Fri, 15 Sep 2017 08:37:40 +0000 (16:37 +0800)]
support update-account tags

6 years agoMerge pull request #18 from Bytom/develop
Guanghua Guo [Sat, 9 Sep 2017 09:03:28 +0000 (17:03 +0800)]
Merge pull request #18 from Bytom/develop

Develop

6 years agoAdded a example about submit-transaction call.
gguoss [Sat, 9 Sep 2017 09:02:09 +0000 (17:02 +0800)]
Added a example about submit-transaction call.

6 years agoAdded log to print SigningInstructions's SignatureWitnesses.
gguoss [Sat, 9 Sep 2017 08:14:14 +0000 (16:14 +0800)]
Added log to print SigningInstructions's SignatureWitnesses.

6 years agoMerge pull request #17 from icodezjb/master
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>

6 years agoMerge branch 'master' into master
Guanghua Guo [Sat, 9 Sep 2017 07:33:48 +0000 (15:33 +0800)]
Merge branch 'master' into master

6 years agochange <asset.Signer.ID, Asset> to <asset.AssetID.String(),Asset> for Asset struct...
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

6 years agoMerge pull request #16 from Bytom/develop
Guanghua Guo [Sat, 9 Sep 2017 06:57:43 +0000 (14:57 +0800)]
Merge pull request #16 from Bytom/develop

Develop

6 years agoFixed a bug about store AssetId.
gguoss [Sat, 9 Sep 2017 06:52:26 +0000 (14:52 +0800)]
Fixed a bug about store AssetId.

6 years agoAdded Sign transaction in example.
gguoss [Sat, 9 Sep 2017 06:03:47 +0000 (14:03 +0800)]
Added Sign transaction in example.

6 years agoMerge pull request #2 from Bytom/master
icodezjb [Sat, 9 Sep 2017 02:47:03 +0000 (10:47 +0800)]
Merge pull request #2 from Bytom/master

sync bytom from master

6 years agoMerge pull request #14 from Bytom/develop
Guanghua Guo [Fri, 8 Sep 2017 09:48:50 +0000 (17:48 +0800)]
Merge pull request #14 from Bytom/develop

Develop

6 years agoFixed a bug about asset's findByID.
gguoss [Fri, 8 Sep 2017 08:28:38 +0000 (16:28 +0800)]
Fixed a bug about asset's findByID.

6 years agoMerge branch 'master' into develop
gguoss [Fri, 8 Sep 2017 07:45:12 +0000 (15:45 +0800)]
Merge branch 'master' into develop

6 years agoMerge pull request #13 from icodezjb/master
Guanghua Guo [Fri, 8 Sep 2017 07:35:45 +0000 (15:35 +0800)]
Merge pull request #13 from icodezjb/master

signer id的生成

6 years agoAdded example about build-transaction.
gguoss [Fri, 8 Sep 2017 06:17:03 +0000 (14:17 +0800)]
Added example about build-transaction.

6 years agoadd one id generation which account and asset use by signer
icodezjb [Fri, 8 Sep 2017 05:33:09 +0000 (13:33 +0800)]
add one id generation which account and asset use by signer

6 years agoMerge branch 'master' of https://github.com/icodezjb/bytom
icodezjb [Fri, 8 Sep 2017 05:09:44 +0000 (13:09 +0800)]
Merge branch 'master' of https://github.com/icodezjb/bytom

6 years agoadd one id generation which account and asset use by signer
icodezjb [Fri, 8 Sep 2017 04:59:45 +0000 (12:59 +0800)]
add one id generation which account and asset use by signer

6 years agoFixed a bug about createAccount & createAsset function result type.
gguoss [Fri, 8 Sep 2017 03:11:28 +0000 (11:11 +0800)]
Fixed a bug about createAccount & createAsset function result type.

6 years agoMerge pull request #1 from Bytom/master
icodezjb [Fri, 8 Sep 2017 03:08:29 +0000 (11:08 +0800)]
Merge pull request #1 from Bytom/master

sync the bytom master

6 years agoadd query API
root [Thu, 7 Sep 2017 07:34:26 +0000 (07:34 +0000)]
add query API

6 years agoadd query
root [Thu, 7 Sep 2017 07:10:32 +0000 (07:10 +0000)]
add query

6 years agoFixed a bug about assets memory not be alloc.
gguoss [Thu, 7 Sep 2017 06:48:45 +0000 (14:48 +0800)]
Fixed a bug about assets memory not be alloc.

6 years agoMerge branch 'consensus' into bvm
Colt [Thu, 7 Sep 2017 06:03:50 +0000 (14:03 +0800)]
Merge branch 'consensus' into bvm

6 years agoMerge branch 'master' into develop
gguoss [Thu, 7 Sep 2017 03:01:21 +0000 (11:01 +0800)]
Merge branch 'master' into develop

6 years agomerge all the shit together
Colt [Wed, 6 Sep 2017 11:03:26 +0000 (19:03 +0800)]
merge all the shit together

6 years agoadded example to test issue function.
gguoss [Wed, 6 Sep 2017 10:42:23 +0000 (18:42 +0800)]
added example to test issue function.

6 years agoMerge branch 'master' into bvm
Colt [Wed, 6 Sep 2017 10:18:18 +0000 (18:18 +0800)]
Merge branch 'master' into bvm

6 years agomerged and reslove confilic in zhouyasong-patch-1.
gguoss [Wed, 6 Sep 2017 02:19:47 +0000 (10:19 +0800)]
merged and reslove confilic in zhouyasong-patch-1.

6 years agoMerge branch 'master' into zhouyasong-patch-1
gguoss [Wed, 6 Sep 2017 02:14:38 +0000 (10:14 +0800)]
Merge branch 'master' into zhouyasong-patch-1

6 years agoMerge pull request #12 from Bytom/develop
Guanghua Guo [Wed, 6 Sep 2017 02:13:01 +0000 (10:13 +0800)]
Merge pull request #12 from Bytom/develop

Develop

6 years agoRemoved died code.
gguoss [Wed, 6 Sep 2017 01:53:34 +0000 (09:53 +0800)]
Removed died code.

6 years agoModify the assets.go
root [Tue, 5 Sep 2017 11:09:07 +0000 (11:09 +0000)]
Modify the assets.go

6 years agoprepare added submitTx function.
gguoss [Tue, 5 Sep 2017 08:04:15 +0000 (16:04 +0800)]
prepare added submitTx function.

6 years agoMerge branch 'master' into develop
gguoss [Tue, 5 Sep 2017 06:12:59 +0000 (14:12 +0800)]
Merge branch 'master' into develop

6 years agoAdded issue.py to test issue function.
gguoss [Tue, 5 Sep 2017 05:04:12 +0000 (13:04 +0800)]
Added issue.py to test issue function.

6 years agomerge bvm branch with master
Colt [Tue, 5 Sep 2017 02:16:07 +0000 (10:16 +0800)]
merge bvm branch with master

6 years agoMerge branch 'zhouyasong-patch-1' of https://github.com/Bytom/bytom into zhouyasong...
root [Mon, 4 Sep 2017 09:17:01 +0000 (09:17 +0000)]
Merge branch 'zhouyasong-patch-1' of https://github.com/Bytom/bytom into zhouyasong-patch-1

6 years agoadd txfeed
root [Mon, 4 Sep 2017 06:44:45 +0000 (06:44 +0000)]
add txfeed

6 years agotmp save for branch merge
Colt [Mon, 4 Sep 2017 06:41:58 +0000 (14:41 +0800)]
tmp save for branch merge

6 years agomempool and unit test
Colt [Fri, 1 Sep 2017 09:27:02 +0000 (17:27 +0800)]
mempool and unit test

6 years agoMerge branch 'develop'
gguoss [Thu, 31 Aug 2017 09:02:39 +0000 (17:02 +0800)]
Merge branch 'develop'

6 years agoDelete tendermint's types.
gguoss [Thu, 31 Aug 2017 08:58:44 +0000 (16:58 +0800)]
Delete tendermint's types.

6 years agoMerge branch 'zhouyasong-patch-1' of https://github.com/Bytom/bytom into zhouyasong...
gguoss [Thu, 31 Aug 2017 07:59:52 +0000 (15:59 +0800)]
Merge branch 'zhouyasong-patch-1' of https://github.com/Bytom/bytom into zhouyasong-patch-1

6 years agoMerge branch 'master' into zhouyasong-patch-1
gguoss [Thu, 31 Aug 2017 07:59:13 +0000 (15:59 +0800)]
Merge branch 'master' into zhouyasong-patch-1

6 years agoadd createAccountReceiver
root [Thu, 31 Aug 2017 07:47:53 +0000 (07:47 +0000)]
add createAccountReceiver

6 years agoMerge pull request #11 from Bytom/develop
Guanghua Guo [Thu, 31 Aug 2017 07:23:10 +0000 (15:23 +0800)]
Merge pull request #11 from Bytom/develop

Develop

6 years agoDelete lib/pq, because lib/pq is sql.
gguoss [Thu, 31 Aug 2017 07:19:18 +0000 (15:19 +0800)]
Delete lib/pq, because lib/pq is sql.

6 years agoMerge branch 'master' into develop
gguoss [Thu, 31 Aug 2017 07:09:17 +0000 (15:09 +0800)]
Merge branch 'master' into develop

6 years agoadd createControlProgram
root [Thu, 31 Aug 2017 07:04:05 +0000 (07:04 +0000)]
add createControlProgram

6 years agoFixed a bug about genesis.json defect.
gguoss [Thu, 31 Aug 2017 06:51:33 +0000 (14:51 +0800)]
Fixed a bug about genesis.json defect.

6 years agoAdded genesis block.
gguoss [Thu, 31 Aug 2017 06:29:26 +0000 (14:29 +0800)]
Added genesis block.

6 years agoAdded PrivateKey into genesis.
gguoss [Thu, 31 Aug 2017 05:53:22 +0000 (13:53 +0800)]
Added PrivateKey into genesis.

6 years agoMerge pull request #10 from Bytom/zhouyasong-patch-1
Guanghua Guo [Thu, 31 Aug 2017 05:46:24 +0000 (13:46 +0800)]
Merge pull request #10 from Bytom/zhouyasong-patch-1

Zhouyasong patch 1

6 years agoadd updateAssetTags
root [Thu, 31 Aug 2017 05:41:54 +0000 (05:41 +0000)]
add updateAssetTags

6 years agoadd asset and asset'sbytomcli
root [Thu, 31 Aug 2017 02:49:03 +0000 (02:49 +0000)]
add asset and asset'sbytomcli

6 years agoAdded setupGenesisBlock function.
gguoss [Wed, 30 Aug 2017 08:37:38 +0000 (16:37 +0800)]
Added setupGenesisBlock function.

6 years agoModified readme.md
gguoss [Wed, 30 Aug 2017 07:18:57 +0000 (15:18 +0800)]
Modified readme.md

6 years agonamed arguments
root [Wed, 30 Aug 2017 05:47:03 +0000 (05:47 +0000)]
named arguments

6 years agoadd insertAccountControlProgram
root [Wed, 30 Aug 2017 05:39:38 +0000 (05:39 +0000)]
add insertAccountControlProgram

6 years agoChanged bytom node test.
gguoss [Wed, 30 Aug 2017 02:58:36 +0000 (10:58 +0800)]
Changed bytom node test.

6 years agoAdded configure API address and test ok.
gguoss [Wed, 30 Aug 2017 02:46:19 +0000 (10:46 +0800)]
Added configure API address and test ok.

6 years agolimit the block size and transaction size
Colt [Tue, 29 Aug 2017 10:09:15 +0000 (18:09 +0800)]
limit the block size and transaction size

6 years agoadd update-account-tags
root [Tue, 29 Aug 2017 09:55:55 +0000 (09:55 +0000)]
add update-account-tags

6 years agoRemoved validate.config. and Modified config.
gguoss [Tue, 29 Aug 2017 08:35:09 +0000 (16:35 +0800)]
Removed validate.config. and Modified config.

6 years agoadd BlockSubsidy function
Colt [Tue, 29 Aug 2017 06:39:14 +0000 (14:39 +0800)]
add BlockSubsidy function

6 years agoMerge pull request #9 from Bytom/zhouyasong-patch-1
Guanghua Guo [Tue, 29 Aug 2017 03:14:21 +0000 (11:14 +0800)]
Merge pull request #9 from Bytom/zhouyasong-patch-1

Update reactor.go

6 years agoUpdate reactor.go
zhouyasong [Tue, 29 Aug 2017 03:12:15 +0000 (11:12 +0800)]
Update reactor.go

6 years agoUpdate README.md
Guanghua Guo [Tue, 29 Aug 2017 03:01:30 +0000 (11:01 +0800)]
Update README.md

6 years agovalidation part unit test
Colt [Mon, 28 Aug 2017 09:01:00 +0000 (17:01 +0800)]
validation part unit test