OSDN Git Service
HAOYUatHZ [Wed, 12 Jun 2019 09:02:23 +0000 (17:02 +0800)]
fix asset create
HAOYUatHZ [Wed, 12 Jun 2019 08:47:30 +0000 (16:47 +0800)]
fix https://github.com/Bytom/vapor/pull/152#discussion_r292805572
HAOYUatHZ [Wed, 12 Jun 2019 08:42:33 +0000 (16:42 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
muscle_boy [Wed, 12 Jun 2019 08:38:28 +0000 (16:38 +0800)]
add get-consensus-nodes api (#159)
* add get-consensus-nodes api
* add get vote result api
* bug fix
* remove is consensus node
* bug fix
* remove is consensus
* add sort for get vote result api
* rename
HAOYUatHZ [Wed, 12 Jun 2019 08:36:18 +0000 (16:36 +0800)]
use golang/groupcache/lru
HAOYUatHZ [Wed, 12 Jun 2019 08:19:00 +0000 (16:19 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
HAOYUatHZ [Wed, 12 Jun 2019 08:18:55 +0000 (16:18 +0800)]
Merge branch 'asset' of github.com:Bytom/vapor into asset
HAOYUatHZ [Wed, 12 Jun 2019 08:16:57 +0000 (16:16 +0800)]
fix submodule
muscle_boy [Wed, 12 Jun 2019 08:16:23 +0000 (16:16 +0800)]
fix detach vote (#164)
Paladz [Wed, 12 Jun 2019 08:13:13 +0000 (16:13 +0800)]
Merge branch 'v0.1' into asset
HAOYUatHZ [Wed, 12 Jun 2019 08:12:21 +0000 (16:12 +0800)]
fix: waive charging storage gas for cross-chain (#162)
* fix: do not charge storage gas for cross-chain
* fix: fix skip-storage-gas attack
HAOYUatHZ [Wed, 12 Jun 2019 07:51:37 +0000 (15:51 +0800)]
add bytom vendor
HAOYUatHZ [Wed, 12 Jun 2019 07:20:43 +0000 (15:20 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
HAOYUatHZ [Wed, 12 Jun 2019 07:20:17 +0000 (15:20 +0800)]
use hashicorp/golang-lru
wz [Wed, 12 Jun 2019 06:45:35 +0000 (14:45 +0800)]
modify (#161)
Paladz [Wed, 12 Jun 2019 05:50:32 +0000 (13:50 +0800)]
fix bug (#160)
* fix bug
* fix bug
muscle_boy [Tue, 11 Jun 2019 08:32:09 +0000 (16:32 +0800)]
add witness to get block api (#158)
wz [Tue, 11 Jun 2019 08:24:14 +0000 (16:24 +0800)]
add api for vote num (#149)
* add api for vote num
* fix review
* fix review
HAOYUatHZ [Tue, 11 Jun 2019 07:49:00 +0000 (15:49 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
Paladz [Tue, 11 Jun 2019 06:43:49 +0000 (14:43 +0800)]
prevent the double sign lock (#157)
yahtoo [Tue, 11 Jun 2019 06:18:52 +0000 (14:18 +0800)]
Del useless status update (#156)
Paladz [Tue, 11 Jun 2019 05:45:51 +0000 (13:45 +0800)]
init push for roll back in special case (#153)
* init push for roll back in special case
* edit for the problem
* edit the smal issue
* edit for code review
HAOYUatHZ [Tue, 11 Jun 2019 03:00:54 +0000 (11:00 +0800)]
use assetCache instead of assetMap
HAOYUatHZ [Tue, 11 Jun 2019 02:53:35 +0000 (10:53 +0800)]
implement add get remove assetCache
HAOYUatHZ [Tue, 11 Jun 2019 02:07:21 +0000 (10:07 +0800)]
add rm get
HAOYUatHZ [Tue, 11 Jun 2019 02:05:13 +0000 (10:05 +0800)]
set maxAssetCached
HAOYUatHZ [Tue, 11 Jun 2019 02:03:31 +0000 (10:03 +0800)]
init AssetCache
wz [Tue, 11 Jun 2019 01:55:06 +0000 (09:55 +0800)]
add docs for vote (#155)
HAOYUatHZ [Tue, 11 Jun 2019 01:27:37 +0000 (09:27 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
HAOYUatHZ [Tue, 11 Jun 2019 01:20:46 +0000 (09:20 +0800)]
doc: add cross-chain tx api doc (#154)
* init doc
* finish cross-chain api doc
* revert
* clean
HAOYUatHZ [Mon, 10 Jun 2019 12:31:23 +0000 (20:31 +0800)]
fix https://github.com/Bytom/vapor/pull/152#discussion_r291964871 & https://github.com/Bytom/vapor/pull/152#discussion_r291964144
HAOYUatHZ [Mon, 10 Jun 2019 12:25:58 +0000 (20:25 +0800)]
Merge remote-tracking branch 'origin/v0.1' into asset
HAOYUatHZ [Mon, 10 Jun 2019 10:32:34 +0000 (18:32 +0800)]
add getAsset
muscle_boy [Mon, 10 Jun 2019 10:00:34 +0000 (18:00 +0800)]
fix reorganize vote result (#151)
yahtoo [Mon, 10 Jun 2019 09:27:51 +0000 (17:27 +0800)]
Fix consensus msg sync bugs (#150)
fix peer status update error
fix block signature mark error
HAOYUatHZ [Mon, 10 Jun 2019 09:19:56 +0000 (17:19 +0800)]
clean db
HAOYUatHZ [Mon, 10 Jun 2019 09:16:51 +0000 (17:16 +0800)]
add processBlock
HAOYUatHZ [Mon, 10 Jun 2019 09:10:09 +0000 (17:10 +0800)]
fix
HAOYUatHZ [Mon, 10 Jun 2019 09:01:51 +0000 (17:01 +0800)]
add confirmations
HAOYUatHZ [Mon, 10 Jun 2019 08:31:16 +0000 (16:31 +0800)]
init asset
HAOYUatHZ [Mon, 10 Jun 2019 08:19:34 +0000 (16:19 +0800)]
add doc (#148)
muscle_boy [Mon, 10 Jun 2019 07:09:24 +0000 (15:09 +0800)]
Fix get consensus edge case (#147)
* fix get consensus node edge case
* fix get consensus node edge case
* fix get consensus node edge case
HAOYUatHZ [Mon, 10 Jun 2019 06:56:23 +0000 (14:56 +0800)]
feat: init cross_tx keepers (#146)
* add config
* add config
* fix typos
wz [Mon, 10 Jun 2019 06:40:28 +0000 (14:40 +0800)]
fix bug for cancel vote (#145)
yahtoo [Mon, 10 Jun 2019 06:04:24 +0000 (14:04 +0800)]
Change p2p SendRate/RecvRate limit (#144)
yahtoo [Mon, 10 Jun 2019 02:41:36 +0000 (10:41 +0800)]
Add p2p security module (#143)
* tmp
* Add p2p security module
* Fix review bugs
Chengcheng Zhang [Thu, 6 Jun 2019 08:26:25 +0000 (16:26 +0800)]
find whether config xpubs equal genesis block xpubs (#142)
* find whether config xpubs equal genesis block xpubs
* update
muscle_boy [Thu, 6 Jun 2019 02:10:11 +0000 (10:10 +0800)]
add broadcast block signature (#139)
Chengcheng Zhang [Wed, 5 Jun 2019 13:36:31 +0000 (21:36 +0800)]
add mac function, modify nextBlockTime (#122)
* add mac function, modify nextBlockTime
* delete max function
* update
* modify block timestamp
* update
* update
* update
* update
* update
* update
* update
* update
yahtoo [Wed, 5 Jun 2019 06:27:43 +0000 (14:27 +0800)]
Resolve consensus message sub error (#137)
HAOYUatHZ [Wed, 5 Jun 2019 06:08:54 +0000 (14:08 +0800)]
feat: add fed orm (#136)
* init orm
* feat: add orm
* add status
* fix: fix type mismatch
Paladz [Wed, 5 Jun 2019 05:25:44 +0000 (13:25 +0800)]
Edit bbft (#133)
* Revert "Revert "edit" (#132)"
This reverts commit
885e0da9b0527988339a5039250ef88449adc95a.
* edit the consensus node
* fix the solo net
* edit for code review
HAOYUatHZ [Wed, 5 Jun 2019 03:06:38 +0000 (11:06 +0800)]
fix: add CrossChainInput in NewTxVMContext (#124)
HAOYUatHZ [Wed, 5 Jun 2019 03:00:18 +0000 (11:00 +0800)]
doc: add fed sql schema (#134)
* doc: add gitignore
* chore: clean release-notes
* doc: update fed doc
* doc: add fed sql schema
Paladz [Tue, 4 Jun 2019 09:02:10 +0000 (17:02 +0800)]
Revert "edit" (#132)
Paladz [Tue, 4 Jun 2019 08:59:48 +0000 (16:59 +0800)]
edit (#129)
Paladz [Tue, 4 Jun 2019 08:59:31 +0000 (16:59 +0800)]
Merge branch 'v0.1' into merge_bbft
HAOYUatHZ [Tue, 4 Jun 2019 08:57:29 +0000 (16:57 +0800)]
fix: use mainchain address for cross_chain_out (#131)
* refactor: rename cross_out action
* clean
* fix: fix output address
paladz [Tue, 4 Jun 2019 08:09:15 +0000 (16:09 +0800)]
edit
HAOYUatHZ [Tue, 4 Jun 2019 07:43:53 +0000 (15:43 +0800)]
fix: fix fed program (#127)
* fix FederationProgrom
* fix: fix log
muscle_boy [Tue, 4 Jun 2019 07:40:43 +0000 (15:40 +0800)]
validate vote pubkey (#128)
Paladz [Tue, 4 Jun 2019 06:06:34 +0000 (14:06 +0800)]
tmp save (#123)
* tmp save
* keep edit
* keep edit
* keep edit
* edit for run
* edit the config
yahtoo [Tue, 4 Jun 2019 02:16:30 +0000 (10:16 +0800)]
Modify the p2p module encryption library (#125)
Paladz [Mon, 3 Jun 2019 09:15:40 +0000 (17:15 +0800)]
init push for easy code review (#121)
wz [Mon, 3 Jun 2019 07:35:57 +0000 (15:35 +0800)]
modify list transaction (#119)
wz [Mon, 3 Jun 2019 07:35:09 +0000 (15:35 +0800)]
V0.1 num of consensus node (#118)
* modify num of consensus_node
* fix review
* fix review
Paladz [Mon, 3 Jun 2019 05:51:24 +0000 (13:51 +0800)]
Edit consensus (#116)
* move the config file
* edit the mining block time
muscle_boy [Mon, 3 Jun 2019 02:56:05 +0000 (10:56 +0800)]
fix timestamp (#115)
yahtoo [Mon, 3 Jun 2019 02:45:54 +0000 (10:45 +0800)]
Add mempool sync test (#114)
Paladz [Mon, 3 Jun 2019 01:46:56 +0000 (09:46 +0800)]
Fix mining (#113)
* delete the unused stuff
* edit the mining part
* fix small bug
muscle_boy [Sun, 2 Jun 2019 14:15:12 +0000 (22:15 +0800)]
fix sign block (#112)
* fix sign block
* rename
HAOYUatHZ [Sat, 1 Jun 2019 08:44:39 +0000 (16:44 +0800)]
fix: fix api port (#108)
wz [Sat, 1 Jun 2019 08:41:10 +0000 (16:41 +0800)]
add min vote num (#110)
muscle_boy [Sat, 1 Jun 2019 08:13:42 +0000 (16:13 +0800)]
临时排坑 (#111)
Paladz [Sat, 1 Jun 2019 06:36:24 +0000 (14:36 +0800)]
little edit (#107)
muscle_boy [Sat, 1 Jun 2019 06:27:24 +0000 (14:27 +0800)]
Fix vote (#106)
* fix vote
* fix vote
wz [Sat, 1 Jun 2019 06:22:01 +0000 (14:22 +0800)]
add coinbase staking (#105)
* add coinbase staking
* fix
* fix
* fix test
* fix ci
* fix ci
* fix review
* fix ci
muscle_boy [Fri, 31 May 2019 07:16:25 +0000 (15:16 +0800)]
Accumulate vote (#104)
* accumulate vote
* bug fix
* fix ci
muscle_boy [Fri, 31 May 2019 06:39:12 +0000 (14:39 +0800)]
accumulate vote (#103)
wz [Fri, 31 May 2019 05:53:01 +0000 (13:53 +0800)]
add time limit for votetx (#102)
* add time limit for votetx
* fix
oysheng [Fri, 31 May 2019 03:16:25 +0000 (11:16 +0800)]
fix dpos nodes less than config number (#101)
* fix dpos nodes less than config number
* optimise
* fix
yahtoo [Fri, 31 May 2019 02:59:46 +0000 (10:59 +0800)]
Modify BlockSignatureMsg pubkey length (#100)
muscle_boy [Fri, 31 May 2019 02:40:28 +0000 (10:40 +0800)]
fix next leader time (#98)
* fix next leader time
* launch
* fix verify block signature
Paladz [Thu, 30 May 2019 07:36:31 +0000 (15:36 +0800)]
add init consensus node as fed node (#97)
* add init consensus node as fed node
* add node private key
* logic work
* edit for code review
* edit for code review
* fix in the real case
* fix for run
muscle_boy [Wed, 29 May 2019 10:24:08 +0000 (18:24 +0800)]
fix dpos (#96)
* fix dpos
* modify func name
HAOYUatHZ [Wed, 29 May 2019 10:16:17 +0000 (18:16 +0800)]
feat: add build crosschain input (#91)
* wip: init DecodeCrossOutAction
* refactor: move DecodeCrossInAction to AccountMgr
* fix: fix account/builder.go
* fix: fix asset in crossInAction.Build
* update source in crossInAction.Build
* refactor: clean up
* fix: fix sourceID in crossInAction.Build
* init
* feat: serializeAssetDef & checkValidJSON
* fix
* refactor: add asset.Registry into accountManager
* wip: add asset definition comparison
* feat: cheack asset definition mismatch
* wip
* fix: add
* refactor: add lines
* wup
* revert
* clean
* revert
* merge
* wip
* revert
* clean
* fix
* fix
* clean
* fix
* clean
* fix MustDecodeHash
* fix
* clean up
* init saveExternalAssetDefinition
* fix
* fk
* update
* wip
* update
* draft
* update
* draft
* check replay
* clean
* init
* wwww
* draft conseus fed
* clean
* merfe
* clean
* clean
* clean
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286745872
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286742937
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286744128
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286744426
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286744843
* 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
* fix https://github.com/Bytom/vapor/pull/77#discussion_r286744322
* minor
* update
* update
* minor
* format code
* fix
* use genesis config
* update
* update
* clean
* utxo database
* utxo database test
* aha
* wip
* wip
* wip
* claimed
* ???
* init
* foix
* dododod
* fk
* add mainchainOutputIDs
* roll back
* dododo
* update
* revert
* fix
* fix
* fk
* dd
* clean
* roll back
* fix detach
* clean up
* fix https://github.com/Bytom/vapor/pull/91#discussion_r287974764
* fix https://github.com/Bytom/vapor/pull/91#discussion_r287975636
* fix https://github.com/Bytom/vapor/pull/91#discussion_r287976043
* rm path
* fix https://github.com/Bytom/vapor/pull/91#discussion_r287974969
* use type for utxo
* uint32
* add iota
* fix https://github.com/Bytom/vapor/pull/91#discussion_r287980844
* modify build
* modify utxo type
* fix
* fix
yahtoo [Wed, 29 May 2019 09:49:10 +0000 (17:49 +0800)]
Fix block fetcher block insert bug (#95)
muscle_boy [Wed, 29 May 2019 09:26:48 +0000 (17:26 +0800)]
fix vote result (#94)
* fix vote result
* bug fix
* bug fix
* opt code'
* opt code
* bug fix
* bug fix
wz [Wed, 29 May 2019 07:27:09 +0000 (15:27 +0800)]
V0.1 cross chain input prog (#93)
* add federation contract prog
* modify
* delete code
* add validate federation prog for crossinput
* fix
* fix
* fix
yahtoo [Tue, 28 May 2019 13:39:07 +0000 (21:39 +0800)]
Add consensus messages transfer (#90)
* Add consensus messages transfer
* Abstract broadcast message processing
* opz code format
muscle_boy [Tue, 28 May 2019 05:52:35 +0000 (13:52 +0800)]
modify miner block to propose block (#92)
* modify miner block to propose block
* modify miner block to propose block
wz [Mon, 27 May 2019 16:18:10 +0000 (00:18 +0800)]
V0.1 federation parse (#89)
* add init federation
* add init
* add load federation info
* add test
yahtoo [Mon, 27 May 2019 07:30:22 +0000 (15:30 +0800)]
Format netsync module code directory (#88)
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
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
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
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
wz [Tue, 21 May 2019 07:17:38 +0000 (15:17 +0800)]
add votetx output action (#79)
yahtoo [Tue, 21 May 2019 06:22:26 +0000 (14:22 +0800)]
netsync: add txs msg (#78)