OSDN Git Service
HAOYUatHZ [Mon, 27 May 2019 08:53:01 +0000 (16:53 +0800)]
Merge remote-tracking branch 'origin/v0.1' into buildcrossin
HAOYUatHZ [Mon, 27 May 2019 08:40:44 +0000 (16:40 +0800)]
add NewCrossInViewpoint
HAOYUatHZ [Mon, 27 May 2019 08:39:25 +0000 (16:39 +0800)]
init CrossInViewpoint
HAOYUatHZ [Mon, 27 May 2019 08:18:29 +0000 (16:18 +0800)]
saveMainchainOutputIDs()
HAOYUatHZ [Mon, 27 May 2019 07:47:39 +0000 (15:47 +0800)]
fk
yahtoo [Mon, 27 May 2019 07:30:22 +0000 (15:30 +0800)]
Format netsync module code directory (#88)
HAOYUatHZ [Mon, 27 May 2019 06:05:58 +0000 (14:05 +0800)]
update
HAOYUatHZ [Mon, 27 May 2019 03:09:21 +0000 (11:09 +0800)]
update
HAOYUatHZ [Fri, 24 May 2019 02:48:11 +0000 (10:48 +0800)]
use genesis config
HAOYUatHZ [Fri, 24 May 2019 02:21:12 +0000 (10:21 +0800)]
fix
mars [Fri, 24 May 2019 01:29:08 +0000 (09:29 +0800)]
Merge branch 'buildcrossin' of https://github.com/bytom/vapor into buildcrossin
mars [Fri, 24 May 2019 01:28:48 +0000 (09:28 +0800)]
format code
HAOYUatHZ [Thu, 23 May 2019 09:07:59 +0000 (17:07 +0800)]
Merge remote-tracking branch 'origin/v0.1' into buildcrossin
wz [Thu, 23 May 2019 09:07:27 +0000 (17:07 +0800)]
store federation (#83)
* store federation
* fix test
* fix unit
* add deal err
* fix review
muscle_boy [Thu, 23 May 2019 09:01:05 +0000 (17:01 +0800)]
dispatch signature when proccess block (#85)
* dispatch signature when proccess block
* remove unuse code
* remove unuse code
* add event dispatcher to bbft
HAOYUatHZ [Thu, 23 May 2019 08:12:14 +0000 (16:12 +0800)]
minor
HAOYUatHZ [Thu, 23 May 2019 06:36:33 +0000 (14:36 +0800)]
update
HAOYUatHZ [Thu, 23 May 2019 06:31:34 +0000 (14:31 +0800)]
update
HAOYUatHZ [Thu, 23 May 2019 06:00:00 +0000 (14:00 +0800)]
minor
HAOYUatHZ [Thu, 23 May 2019 02:47:36 +0000 (10:47 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286744322
HAOYUatHZ [Thu, 23 May 2019 02:36:31 +0000 (10:36 +0800)]
merge
HAOYUatHZ [Thu, 23 May 2019 02:29:32 +0000 (10:29 +0800)]
fix https://github.com/Bytom/vapor/pull/77/files#r286744635 & https://github.com/Bytom/vapor/pull/77#discussion_r286744048 & https://github.com/Bytom/vapor/pull/77#discussion_r286743987
HAOYUatHZ [Thu, 23 May 2019 02:12:30 +0000 (10:12 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286744843
HAOYUatHZ [Thu, 23 May 2019 02:00:09 +0000 (10:00 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286744426
HAOYUatHZ [Thu, 23 May 2019 01:58:42 +0000 (09:58 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286744128
muscle_boy [Thu, 23 May 2019 01:55:12 +0000 (09:55 +0800)]
dpos process sign message (#81)
* dpos process sign message
* opt code
* opt code
HAOYUatHZ [Thu, 23 May 2019 01:48:58 +0000 (09:48 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286742937
HAOYUatHZ [Thu, 23 May 2019 01:33:25 +0000 (09:33 +0800)]
fix https://github.com/Bytom/vapor/pull/77#discussion_r286745872
HAOYUatHZ [Wed, 22 May 2019 22:51:29 +0000 (06:51 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 22:25:46 +0000 (06:25 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 22:15:06 +0000 (06:15 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 22:11:56 +0000 (06:11 +0800)]
merfe
HAOYUatHZ [Wed, 22 May 2019 21:46:55 +0000 (05:46 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 21:46:31 +0000 (05:46 +0800)]
draft conseus fed
HAOYUatHZ [Wed, 22 May 2019 20:08:19 +0000 (04:08 +0800)]
wwww
HAOYUatHZ [Wed, 22 May 2019 20:05:42 +0000 (04:05 +0800)]
init
HAOYUatHZ [Wed, 22 May 2019 15:23:20 +0000 (23:23 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 15:22:34 +0000 (23:22 +0800)]
check replay
HAOYUatHZ [Wed, 22 May 2019 13:59:22 +0000 (21:59 +0800)]
draft
HAOYUatHZ [Wed, 22 May 2019 13:39:41 +0000 (21:39 +0800)]
update
HAOYUatHZ [Wed, 22 May 2019 13:32:58 +0000 (21:32 +0800)]
draft
HAOYUatHZ [Wed, 22 May 2019 12:53:27 +0000 (20:53 +0800)]
update
HAOYUatHZ [Wed, 22 May 2019 11:29:57 +0000 (19:29 +0800)]
wip
HAOYUatHZ [Wed, 22 May 2019 08:58:41 +0000 (16:58 +0800)]
update
HAOYUatHZ [Wed, 22 May 2019 08:53:44 +0000 (16:53 +0800)]
fk
HAOYUatHZ [Wed, 22 May 2019 08:26:19 +0000 (16:26 +0800)]
fix
HAOYUatHZ [Wed, 22 May 2019 08:10:55 +0000 (16:10 +0800)]
init saveExternalAssetDefinition
HAOYUatHZ [Wed, 22 May 2019 07:47:11 +0000 (15:47 +0800)]
clean up
HAOYUatHZ [Wed, 22 May 2019 07:45:59 +0000 (15:45 +0800)]
fix
HAOYUatHZ [Wed, 22 May 2019 07:32:53 +0000 (15:32 +0800)]
fix MustDecodeHash
HAOYUatHZ [Wed, 22 May 2019 07:29:43 +0000 (15:29 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 07:25:21 +0000 (15:25 +0800)]
fix
muscle_boy [Wed, 22 May 2019 06:29:17 +0000 (14:29 +0800)]
Dpos process block (#69)
* add bbft process block
* merge v0.1
* remove functional test
* opt code
* opt code
* opt code
* bug fix
* bug fix
* opt code
* opt code
* bug fix
* add update consensus node
* opt code
HAOYUatHZ [Wed, 22 May 2019 03:01:14 +0000 (11:01 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 02:52:16 +0000 (10:52 +0800)]
fix
HAOYUatHZ [Wed, 22 May 2019 02:12:54 +0000 (10:12 +0800)]
fix
HAOYUatHZ [Wed, 22 May 2019 02:11:52 +0000 (10:11 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 02:08:38 +0000 (10:08 +0800)]
revert
HAOYUatHZ [Wed, 22 May 2019 02:05:06 +0000 (10:05 +0800)]
wip
HAOYUatHZ [Wed, 22 May 2019 01:37:53 +0000 (09:37 +0800)]
merge
HAOYUatHZ [Wed, 22 May 2019 01:30:27 +0000 (09:30 +0800)]
revert
HAOYUatHZ [Wed, 22 May 2019 01:28:06 +0000 (09:28 +0800)]
clean
HAOYUatHZ [Wed, 22 May 2019 01:17:41 +0000 (09:17 +0800)]
revert
wz [Tue, 21 May 2019 11:32:35 +0000 (19:32 +0800)]
unvotetx action (#80)
* add votetx output action
* add unvotetx action
* add voteoutput change
* add unit test
HAOYUatHZ [Tue, 21 May 2019 09:08:25 +0000 (17:08 +0800)]
wup
HAOYUatHZ [Tue, 21 May 2019 09:01:31 +0000 (17:01 +0800)]
refactor: add lines
HAOYUatHZ [Tue, 21 May 2019 08:56:02 +0000 (16:56 +0800)]
fix: add
HAOYUatHZ [Tue, 21 May 2019 08:31:53 +0000 (16:31 +0800)]
wip
HAOYUatHZ [Tue, 21 May 2019 08:10:51 +0000 (16:10 +0800)]
feat: cheack asset definition mismatch
HAOYUatHZ [Tue, 21 May 2019 07:50:58 +0000 (15:50 +0800)]
wip: add asset definition comparison
HAOYUatHZ [Tue, 21 May 2019 07:33:44 +0000 (15:33 +0800)]
refactor: add asset.Registry into accountManager
wz [Tue, 21 May 2019 07:17:38 +0000 (15:17 +0800)]
add votetx output action (#79)
HAOYUatHZ [Tue, 21 May 2019 07:03:01 +0000 (15:03 +0800)]
fix
HAOYUatHZ [Tue, 21 May 2019 06:27:45 +0000 (14:27 +0800)]
feat: serializeAssetDef & checkValidJSON
yahtoo [Tue, 21 May 2019 06:22:26 +0000 (14:22 +0800)]
netsync: add txs msg (#78)
HAOYUatHZ [Tue, 21 May 2019 05:50:47 +0000 (13:50 +0800)]
init
HAOYUatHZ [Tue, 21 May 2019 03:28:56 +0000 (11:28 +0800)]
fix: fix sourceID in crossInAction.Build
HAOYUatHZ [Tue, 21 May 2019 03:01:45 +0000 (11:01 +0800)]
refactor: clean up
HAOYUatHZ [Tue, 21 May 2019 03:00:54 +0000 (11:00 +0800)]
update source in crossInAction.Build
HAOYUatHZ [Tue, 21 May 2019 02:52:39 +0000 (10:52 +0800)]
fix: fix asset in crossInAction.Build
HAOYUatHZ [Tue, 21 May 2019 02:45:00 +0000 (10:45 +0800)]
fix: fix account/builder.go
HAOYUatHZ [Tue, 21 May 2019 02:36:44 +0000 (10:36 +0800)]
refactor: move DecodeCrossInAction to AccountMgr
HAOYUatHZ [Tue, 21 May 2019 01:55:25 +0000 (09:55 +0800)]
wip: init DecodeCrossOutAction
HAOYUatHZ [Mon, 20 May 2019 12:16:50 +0000 (20:16 +0800)]
feat: build cross-out tx (#74)
* wip: init for build cross_chain_out
* wip: init DecodeCrossOutAction
* fix: fix crossOutAction.Build()
* wip: rename test
* wip: init TestBuildCrossOut
* feat: add TestBuildCrossOut
* refactor: rename crossOutAction.ActionType
* refactor: add address instead of arbitrary in build crossOutAction
* fix: fix DefaultDataDir
* fix: fix TestBuildCrossOut
* refactor: clean up
wz [Mon, 20 May 2019 07:48:40 +0000 (15:48 +0800)]
fix votetx for validation (#75)
wz [Mon, 20 May 2019 06:37:55 +0000 (14:37 +0800)]
V0.1 votetx utxo (#73)
* Modify utxo for votetx
* fix review
* fix test
HAOYUatHZ [Mon, 20 May 2019 03:22:58 +0000 (11:22 +0800)]
test: add utxo test for cross-chain tx (#72)
* init utxo test for cros
* fix: fix utxo test
* test: add CrossChainOutput utxo test
* wip: init cross-in utxo test
* test: add cross-in utxo test
Paladz [Mon, 20 May 2019 03:10:59 +0000 (11:10 +0800)]
ts to ms (#71)
HAOYUatHZ [Mon, 20 May 2019 01:46:04 +0000 (09:46 +0800)]
test: add read/write test for cross-chain input/output (#70)
* fix read/wrire CrossChainInput
* add TestSerializationCrossChainTxOutput
HAOYUatHZ [Fri, 17 May 2019 06:58:18 +0000 (14:58 +0800)]
feature: add cross-chain input (#61)
* refactor: rename files
* feat: add types.CrossChainInput
* feat: add protocol.CrossChainInput
* wip: init bc.CrossChainInput
* fix: add mainchain output hash
* fix: fix letter cases
* refactor: fix indent
* fix: fix missing value in CrossChainInput
* fix: fix NewCrossChainInput()
* wip: upgrade MapTx()
* refactor: use issue's type indicator for cross-chain input
* revert
* wip: loop Inputs in mapTx()
* wip: add crossIn.SetDestination() in mapTx()
* feat: draft mapTx()
* refactor: remove ruleAA
* feat: add checkValidSrc
* wip: init crossIn in checkValid()
* wip: add vm.Verify for *bc.CrossChainInput
* feat: skip gas for CrossChainInput
* refactor: clean up
* fix: fix protobuf
* fix: fix validate tx
* update (t *TxInput) AssetAmount()
* add (t *TxInput) Amount()
* update
* clean
* wip: types/txinputs.go
* feat: draft types.TxInput
* fix: fix test
* clean
* fix outputID
* init assetDefinition
* add read/write AssetDefinition
* fix the merge issue
yahtoo [Fri, 17 May 2019 04:19:22 +0000 (12:19 +0800)]
Nodeinfo handshake information modification (#68)
* Nodeinfo handshake information modification
* Add moniker to config file
* Add node info test file
* Del useless code
* opz code format
* opz log print
wz [Fri, 17 May 2019 02:57:28 +0000 (10:57 +0800)]
V0.1 votetx input (#67)
* add unvote struct
* modify ComputeOutputID
* add uint test
* fix
yahtoo [Thu, 16 May 2019 14:15:48 +0000 (22:15 +0800)]
Optimize status message process (#66)
* StatusResponseMessage del GenesisHash
* Del useless broadcastMinedBlock msg
* Add StatusMsg process
* Add new status broadcast
Paladz [Thu, 16 May 2019 06:46:15 +0000 (14:46 +0800)]
init for remove issue (#63)
* init for remove issue
* keep remove issue
* delete the issuance
* remove issue related
wz [Thu, 16 May 2019 06:37:07 +0000 (14:37 +0800)]
Add validate votetx (#64)
* Add validate votetx
* delete uint test
* fix review
* recover code
* recover code
* fix
* fix
muscle_boy [Wed, 15 May 2019 15:00:49 +0000 (23:00 +0800)]
bft-dpos (#59)
* bft-dpos
* bug fix
* opt code
* add test case
* opt code
wz [Wed, 15 May 2019 04:54:56 +0000 (12:54 +0800)]
votetx output (#62)
* refactor: move ComputeOutputID() for SpendCommitment
* wip: init OutputType
* refactor: rename NewTxOutput to NewIntraChainTxOutput
* wip: typed intra-chain output
* feat: add CrossChainTxOutput
* fix: fix CrossChainOutputType
* doc: update todo
* init bc
* fix
* wip: bc NewIntraChainOutput
* fix: bc IntraChainOutput
* fix: fix tx.Output()
* move ComputeOutputID back
* fix types.NewIntraChainTxOutput & types.NewCrossChainTxOutput
* doc: update todo
* fix: add VMVersion, ControlProgram and AssetAmount for types.Output
* fix map.go
* fix txfeed
* fix peer.go
* fi
* rename
* fix TxOutput.readFrom()
* fix TxOutput.readFrom()
* use currentAssetVersion
* clean
* update todos
* add cross-chain in mapTx.go
* doc: update comments
* wip: check IntraChainOutput source in validation
* wip: checkValidDest() checks CrossChainOutput
* fix checkStandardTx
* fix: fix checkStandardTx
* fix: fix TxOutput.writeTo()
* fix hard-coded AssetVersion
* roll back assetVersion
* refactor: rename ComputeOutputID
* refactor: rename ComputeOutputID()
* fix blockchain/txbuilder/txbuilder_test.go
* fix: fix crosschainOut as Input
* doc: fix comments
* wip
* clean
* fix
* fix
* fix
* Add vote output for types and bc
* add uint test
* Add uint test
* modify name
* fix review
yahtoo [Wed, 15 May 2019 03:14:35 +0000 (11:14 +0800)]
Fix discovery msg codec hash error (#60)
* Fix udp discovery packet hash error
* Fix test file error
HAOYUatHZ [Tue, 14 May 2019 14:48:30 +0000 (22:48 +0800)]
feat: add cross-chain output (#56)
* refactor: move ComputeOutputID() for SpendCommitment
* wip: init OutputType
* refactor: rename NewTxOutput to NewIntraChainTxOutput
* wip: typed intra-chain output
* feat: add CrossChainTxOutput
* fix: fix CrossChainOutputType
* doc: update todo
* init bc
* fix
* wip: bc NewIntraChainOutput
* fix: bc IntraChainOutput
* fix: fix tx.Output()
* move ComputeOutputID back
* fix types.NewIntraChainTxOutput & types.NewCrossChainTxOutput
* doc: update todo
* fix: add VMVersion, ControlProgram and AssetAmount for types.Output
* fix map.go
* fix txfeed
* fix peer.go
* fi
* rename
* fix TxOutput.readFrom()
* fix TxOutput.readFrom()
* use currentAssetVersion
* clean
* update todos
* add cross-chain in mapTx.go
* doc: update comments
* wip: check IntraChainOutput source in validation
* wip: checkValidDest() checks CrossChainOutput
* fix checkStandardTx
* fix: fix checkStandardTx
* fix: fix TxOutput.writeTo()
* fix hard-coded AssetVersion
* roll back assetVersion
* refactor: rename ComputeOutputID
* refactor: rename ComputeOutputID()
* fix blockchain/txbuilder/txbuilder_test.go
* fix: fix crosschainOut as Input
* doc: fix comments
* wip
* clean
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* fix
* clean
* fix
* fix
* fix
* fix
* fix
* fix wip
* should fix
* figure out
* fix comment
* fix estimate gas
* fixing
* try merkle
* fix merkle test
* fix merkle comp
* fix TestTxOutToUtxos()
* fix TestReadFrom
* minor
* try fix the ci
yahtoo [Tue, 14 May 2019 09:19:14 +0000 (17:19 +0800)]
Add subnet having the same network ID isolation function (#57)
* Network isolation main chain and side chain
* Add test cases
* Del unused code
* Uniform variable name
* Opz log
* Generate unique network ID using genesisBlock hash
* Change Bech32HRPSegwit to 'vp'
* Change netID generate method