OSDN Git Service

bytom/vapor.git
4 years agolast review (#519) mov
Paladz [Sat, 21 Mar 2020 02:37:06 +0000 (10:37 +0800)]
last review (#519)

* last review

* edit for code review

* fix test case

Co-authored-by: paladz <453256728@qq.com>
4 years agorollback (#503)
ipqhjjybj [Thu, 19 Mar 2020 18:14:39 +0000 (02:14 +0800)]
rollback (#503)

* rollback

* add

* rollback test

* rollback xiugai

* delete one line

* s

* rename chainData

* reformat it

* opt code

Co-authored-by: shenao78 <shenao.78@163.com>
Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agoOpt is matched (#516)
Poseidon [Thu, 19 Mar 2020 18:14:02 +0000 (02:14 +0800)]
Opt is matched (#516)

* opt is matched

* opt is matched

Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agosmall fix (#517)
Paladz [Thu, 19 Mar 2020 12:28:13 +0000 (20:28 +0800)]
small fix (#517)

* small fix

* prevent timeout

* edit for golint

Co-authored-by: paladz <453256728@qq.com>
4 years agofor publish (#515)
Paladz [Wed, 18 Mar 2020 08:58:03 +0000 (16:58 +0800)]
for publish (#515)

* for publish

* fix test

Co-authored-by: paladz <453256728@qq.com>
4 years agono tricks (#513)
Paladz [Tue, 17 Mar 2020 02:39:49 +0000 (10:39 +0800)]
no tricks (#513)

Co-authored-by: paladz <453256728@qq.com>
4 years agoban status fail for flash swap (#512)
Paladz [Mon, 16 Mar 2020 07:10:50 +0000 (15:10 +0800)]
ban status fail for flash swap (#512)

* ban status fail for flash swap

* set up init check point

Co-authored-by: paladz <453256728@qq.com>
4 years agoopt mov (#511)
Poseidon [Wed, 11 Mar 2020 02:49:05 +0000 (10:49 +0800)]
opt mov (#511)

4 years agoone_thousandth_fee (#508)
Poseidon [Tue, 10 Mar 2020 11:23:41 +0000 (19:23 +0800)]
one_thousandth_fee (#508)

* one_thousandth_fee

* opt code

* update fee

* bug fix

* fix all testcase

4 years agofix_mov_contract_test (#510)
Poseidon [Tue, 10 Mar 2020 10:16:56 +0000 (18:16 +0800)]
fix_mov_contract_test (#510)

4 years agocharge 1% fee (#509)
Paladz [Tue, 10 Mar 2020 09:52:04 +0000 (17:52 +0800)]
charge 1% fee (#509)

* charge 1% fee

* fix weird space

* edit for code review

Co-authored-by: paladz <453256728@qq.com>
4 years agoMatch fee strategy (#507)
Poseidon [Fri, 6 Mar 2020 09:24:06 +0000 (17:24 +0800)]
Match fee strategy (#507)

* match_fee_strategy

* rename variable

* opt code

* rename

* adjust order

* add test case

* bug fix

* bug fix

* add fee for multiple asset tesetcase

* add comment

4 years agovalidate reward address (#505)
Poseidon [Fri, 6 Mar 2020 08:09:40 +0000 (16:09 +0800)]
validate reward address (#505)

* validate reward address

* fix ci

* opt code

* opt code

* opt code

4 years agomatch_fee_strategy (#506)
Paladz [Thu, 5 Mar 2020 15:12:28 +0000 (23:12 +0800)]
match_fee_strategy (#506)

* match_fee_strategy

* rename variable

* opt code

* rename

* adjust order

* add test case

4 years agofixed reward address (#504)
Poseidon [Tue, 3 Mar 2020 06:59:55 +0000 (14:59 +0800)]
fixed reward address (#504)

4 years agoadd_comment_for_bbft (#502)
Poseidon [Wed, 26 Feb 2020 09:09:12 +0000 (17:09 +0800)]
add_comment_for_bbft (#502)

4 years agofix validate tx (#499)
Poseidon [Tue, 25 Feb 2020 05:02:10 +0000 (13:02 +0800)]
fix validate tx (#499)

4 years agofix_add_order_of_order_book (#497)
Poseidon [Sun, 23 Feb 2020 04:32:18 +0000 (12:32 +0800)]
fix_add_order_of_order_book (#497)

* fix_add_order_of_order_book

* fix order book

* opt code

Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agoRollback pr3 (#496)
ipqhjjybj [Thu, 20 Feb 2020 09:01:13 +0000 (17:01 +0800)]
Rollback pr3 (#496)

* rollback chain

* fix test ci

* delete irrblock judge

* update rollblock

* delete test case

* fix bad delete

* change rollback

* delete one test

* add tip

* change rollback

* fix one err

* remove fmt

* remove one test

* rename

* rename variable

Co-authored-by: Poseidon <shenao.78@163.com>
4 years agore design reorganizeChain (#495)
ipqhjjybj [Thu, 20 Feb 2020 02:38:00 +0000 (10:38 +0800)]
re design reorganizeChain (#495)

4 years agoRollback pr2, rollback 的时候,更新 wallet 的状态, 改内核的下一个版本发 (#493)
ipqhjjybj [Wed, 19 Feb 2020 10:09:43 +0000 (18:09 +0800)]
Rollback pr2, rollback 的时候,更新 wallet 的状态, 改内核的下一个版本发 (#493)

* add rollback_func

* add wallet rollback

* update wallet finished

* add new wallet rollback flag

* fix one flag

* new design of new wallet

* update one comment

* rollback status from one wallet best hash start

* change two func name

* fix one test

* change rollback func return info

* remove ugly code

* fix ugly code

* remove ugly code

4 years agofix init mov state (#492)
Poseidon [Wed, 19 Feb 2020 06:43:30 +0000 (14:43 +0800)]
fix init mov state (#492)

* fix init mov state

* remove Junk files

4 years agoadd deleteBlock and then fix some tests (#491) rollback_pr2
ipqhjjybj [Wed, 19 Feb 2020 01:51:27 +0000 (09:51 +0800)]
add deleteBlock and then fix some tests (#491)

* add deleteBlock and then fix some tests

* add new test

* delete line

* fix one error

* change test case

* add s to word

* s

* update test cases

* update package and delete one same case

Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agofilter txpool by asset whitelis (#488)
HAOYUatHZ [Sat, 15 Feb 2020 11:27:46 +0000 (19:27 +0800)]
filter txpool by asset whitelis  (#488)

* add AssetWhitelist to FederationConfig

* use []*bc.AssetID for AssetWhitelist

* add (f *FederationAssetFilter) IsDust()

* fix https://github.com/Bytom/vapor/pull/488#discussion_r379226522

* fix https://github.com/Bytom/vapor/pull/488#discussion_r379226868

* fix https://github.com/Bytom/vapor/pull/488/files#r379226149

* fix https://github.com/Bytom/vapor/pull/488/files#r379225830

* convert assetID to lower-case

* golint

4 years agofix add order bug (#489)
Paladz [Thu, 13 Feb 2020 13:02:14 +0000 (21:02 +0800)]
fix add order bug (#489)

* fix add order bug

* edit for code review

Co-authored-by: Colt-Z <453256728@qq.com>
4 years agoValidate matched tx sequence test (#487)
Poseidon [Thu, 13 Feb 2020 03:25:52 +0000 (11:25 +0800)]
Validate matched tx sequence test (#487)

* validate_matched_tx_sequence_test

* validate_matched_tx_sequence_test

* Supplementary unit tests

* rename

4 years agoValidate matched tx sequence test (#486)
Poseidon [Wed, 12 Feb 2020 10:20:05 +0000 (18:20 +0800)]
Validate matched tx sequence test (#486)

* validate_matched_tx_sequence_test

* validate_matched_tx_sequence_test

4 years agofinal code review (#484)
Paladz [Wed, 12 Feb 2020 02:55:49 +0000 (10:55 +0800)]
final code review (#484)

* final code review

* edit for code review

Co-authored-by: Colt-Z <453256728@qq.com>
4 years agoOpt mathch collector (#482)
Poseidon [Thu, 6 Feb 2020 11:21:34 +0000 (19:21 +0800)]
Opt mathch collector (#482)

* opt_mathch_collector

* opt_mathch_collector

4 years agoopt_mathch_collector (#483)
Poseidon [Thu, 6 Feb 2020 10:50:04 +0000 (18:50 +0800)]
opt_mathch_collector (#483)

4 years agofix match collector (#481)
Poseidon [Thu, 6 Feb 2020 10:39:34 +0000 (18:39 +0800)]
fix match collector (#481)

* fix match collector

* add comment

4 years agoopt mov performance (#480)
Poseidon [Thu, 6 Feb 2020 09:28:51 +0000 (17:28 +0800)]
opt mov performance (#480)

* opt mov performance

* opt mov performance

* fix ci

* bug fix

* bug fix

* opt code

* remove test

* remove unknow file

* opt code

* opt code

* add comment

* opt code

* bug fix

* opt code

* use int for worker num

4 years agofix decimal (#479)
Poseidon [Wed, 22 Jan 2020 07:05:54 +0000 (15:05 +0800)]
fix decimal (#479)

* fix decimal

* fix decimal

* bug fix

* fix decimal

4 years agocomplement mov test (#477)
Poseidon [Mon, 20 Jan 2020 12:27:13 +0000 (20:27 +0800)]
complement mov test (#477)

Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agofix_open_federation_issue_asset (#478)
Poseidon [Mon, 20 Jan 2020 08:06:09 +0000 (16:06 +0800)]
fix_open_federation_issue_asset (#478)

* fix_open_federation_issue_asset

* opt code

4 years agoMerge pull request #473 from Bytom/master
Paladz [Thu, 26 Dec 2019 06:46:26 +0000 (14:46 +0800)]
Merge pull request #473 from Bytom/master

Fix bug (#472)

4 years agoFix bug (#472)
ipqhjjybj [Thu, 26 Dec 2019 06:02:49 +0000 (14:02 +0800)]
Fix bug (#472)

* fix bug for vote & normal output

* 修复提交同样的错误交易时,放回成功的bug

Co-authored-by: Colt-Z <453256728@qq.com>
4 years agoopt mov validate match tx (#470)
Poseidon [Tue, 24 Dec 2019 13:49:50 +0000 (21:49 +0800)]
opt mov validate match tx (#470)

* opt mov validate match tx

* fix validate trade pair

Co-authored-by: Paladz <yzhu101@uottawa.ca>
4 years agoMerge pull request #471 from Bytom/mov_merge_master
Paladz [Tue, 24 Dec 2019 12:20:59 +0000 (20:20 +0800)]
Merge pull request #471 from Bytom/mov_merge_master

Mov merge master

4 years agoMerge branch 'master' into mov
shenao78 [Tue, 24 Dec 2019 12:10:04 +0000 (20:10 +0800)]
Merge branch 'master' into mov

4 years agofix lru bug (#469)
Poseidon [Tue, 24 Dec 2019 11:52:15 +0000 (19:52 +0800)]
fix lru bug (#469)

* fix lru bug

* remove blanck line

4 years agoFix mov issue (#462)
Poseidon [Fri, 6 Dec 2019 12:45:40 +0000 (20:45 +0800)]
Fix mov issue (#462)

* fix mov infinite loop

* validate equals trade pair

* cycle match

* fix ci

4 years agoMerge pull request #466 from Bytom/update-mov
Paladz [Fri, 6 Dec 2019 11:58:55 +0000 (19:58 +0800)]
Merge pull request #466 from Bytom/update-mov

Update mov

4 years agoMerge pull request #467 from Bytom/fix
Paladz [Fri, 6 Dec 2019 11:57:42 +0000 (19:57 +0800)]
Merge pull request #467 from Bytom/fix

fix rename

4 years agoupdate update-mov
Chengcheng Zhang [Fri, 6 Dec 2019 11:05:38 +0000 (19:05 +0800)]
update

4 years agoupdate
Chengcheng Zhang [Fri, 6 Dec 2019 10:48:31 +0000 (18:48 +0800)]
update

4 years agoupdate
Chengcheng Zhang [Fri, 6 Dec 2019 10:46:42 +0000 (18:46 +0800)]
update

4 years agoupdate repo
Chengcheng Zhang [Fri, 6 Dec 2019 10:35:45 +0000 (18:35 +0800)]
update repo

4 years agorename (#465)
Chengcheng Zhang [Fri, 6 Dec 2019 09:01:15 +0000 (17:01 +0800)]
rename (#465)

4 years agofix cache (#463)
Chengcheng Zhang [Fri, 6 Dec 2019 07:37:13 +0000 (15:37 +0800)]
fix cache (#463)

* fix cache

* update

4 years agofix mov infinite loop (#461) v1.0.5
Poseidon [Wed, 4 Dec 2019 09:06:17 +0000 (17:06 +0800)]
fix mov infinite loop (#461)

* fix mov infinite loop

* validate equals trade pair

4 years agoIssuance length (#460)
HAOYUatHZ [Tue, 3 Dec 2019 01:56:54 +0000 (09:56 +0800)]
Issuance length (#460)

* increase  length

* change to mediumtext

* init

4 years agofix recursive order (#458)
Paladz [Mon, 2 Dec 2019 05:15:30 +0000 (13:15 +0800)]
fix recursive order (#458)

* fix recursive order

* edit logic

* fix the test

4 years agotry fix bug (#457)
Paladz [Wed, 27 Nov 2019 11:07:29 +0000 (19:07 +0800)]
try fix bug (#457)

4 years agoinit version for edit sign process (#454)
Paladz [Wed, 27 Nov 2019 11:04:21 +0000 (19:04 +0800)]
init version for edit sign process (#454)

* init version for edit sign process

* eleagent the code

* elegant the code

4 years agotry to fix network issue (#456)
Paladz [Wed, 27 Nov 2019 10:39:28 +0000 (18:39 +0800)]
try to fix network issue (#456)

* try to fix network issue

* try fix bug

* try fix

4 years agodrop the useless tx (#455)
Paladz [Wed, 27 Nov 2019 07:59:13 +0000 (15:59 +0800)]
drop the useless tx (#455)

* drop the useless tx

* fix bug

4 years agofix mov should pay amount (#453)
Poseidon [Wed, 27 Nov 2019 07:25:05 +0000 (15:25 +0800)]
fix mov should pay amount (#453)

* fix mov should pay amount

* opt code

4 years agoadd op mul fraction to solve the mov exchange issue (#452)
Paladz [Wed, 27 Nov 2019 07:14:41 +0000 (15:14 +0800)]
add op mul fraction to solve the mov exchange issue (#452)

* add op mul fraction to solve the mov exchange issue

* minor

* edit for code review

* no water

4 years agoUpdate testnet config (#451)
Poseidon [Mon, 25 Nov 2019 04:30:01 +0000 (12:30 +0800)]
Update testnet config (#451)

* update testnet config

* update testnet param

* rollback federation config

4 years agotimeout level (#450)
Paladz [Mon, 25 Nov 2019 03:33:53 +0000 (11:33 +0800)]
timeout level (#450)

* timeout level

* fix ci

* edit for code review

* edit for code review

4 years agofix (#449)
wz [Mon, 25 Nov 2019 03:12:08 +0000 (11:12 +0800)]
fix (#449)

4 years agofix request amount zero (#448)
Poseidon [Mon, 25 Nov 2019 03:09:02 +0000 (11:09 +0800)]
fix request amount zero (#448)

4 years agosubmit tx protocol verify (#447)
Paladz [Mon, 25 Nov 2019 03:04:00 +0000 (11:04 +0800)]
submit tx protocol verify (#447)

4 years agofix the roll back dead lock (#446)
Paladz [Sat, 23 Nov 2019 02:33:10 +0000 (10:33 +0800)]
fix the roll back dead lock (#446)

4 years agofix(log): change p2p connection error log level (#445)
DeKaiju [Fri, 22 Nov 2019 05:14:14 +0000 (13:14 +0800)]
fix(log): change p2p connection error log level (#445)

4 years agoset proposal have timeout (#444)
Paladz [Thu, 21 Nov 2019 08:56:37 +0000 (16:56 +0800)]
set proposal have timeout (#444)

* set proposal have timeout

* edit for code review

4 years agofix mov dead lock (#443)
Poseidon [Wed, 13 Nov 2019 11:15:55 +0000 (19:15 +0800)]
fix mov dead lock (#443)

* fix mov dead lock

* Delete LOCK

4 years agofix sync status (#442)
Poseidon [Wed, 13 Nov 2019 06:47:56 +0000 (14:47 +0800)]
fix sync status (#442)

4 years agoModify corssout tx action (#441)
wz [Tue, 12 Nov 2019 14:03:03 +0000 (22:03 +0800)]
Modify corssout tx action (#441)

* add program for crossout action

* fix

4 years agoadd the comment (#439)
Paladz [Tue, 12 Nov 2019 02:16:39 +0000 (10:16 +0800)]
add the comment (#439)

4 years agosame change while go over the codes (#438)
Paladz [Wed, 6 Nov 2019 02:08:34 +0000 (10:08 +0800)]
same change while go over the codes (#438)

* same change while go over the codes

* roll back mis edit

4 years agoCheck mov store (#437)
Paladz [Tue, 5 Nov 2019 11:12:36 +0000 (19:12 +0800)]
Check mov store (#437)

* over view code of database/mov_store

* delete the duplicate code

* change the batch read number

4 years agoMerge pull request #436 from Bytom/fix_match
Paladz [Tue, 5 Nov 2019 06:26:24 +0000 (14:26 +0800)]
Merge pull request #436 from Bytom/fix_match

fix match

4 years agoopt code fix_match
shenao78 [Tue, 5 Nov 2019 06:19:01 +0000 (14:19 +0800)]
opt code

4 years agofix match
shenao78 [Tue, 5 Nov 2019 06:11:33 +0000 (14:11 +0800)]
fix match

4 years agoadd mov core test (#435)
Paladz [Mon, 4 Nov 2019 14:33:04 +0000 (22:33 +0800)]
add mov core test (#435)

* add mov core test

* add calcMatchedTxFee test

* import order

4 years agofix order table test
shenao78 [Mon, 4 Nov 2019 14:32:17 +0000 (22:32 +0800)]
fix order table test

4 years agoimport order
shenao78 [Mon, 4 Nov 2019 14:29:04 +0000 (22:29 +0800)]
import order

4 years agoadd calcMatchedTxFee test mov_core_test
shenao78 [Mon, 4 Nov 2019 09:07:33 +0000 (17:07 +0800)]
add calcMatchedTxFee test

4 years agoadd mov core test
shenao78 [Mon, 4 Nov 2019 08:09:09 +0000 (16:09 +0800)]
add mov core test

4 years agofix order table (#434)
Poseidon [Fri, 1 Nov 2019 09:53:15 +0000 (17:53 +0800)]
fix order table (#434)

4 years agomerge order from pool (#432)
Poseidon [Fri, 1 Nov 2019 02:52:52 +0000 (10:52 +0800)]
merge order from pool (#432)

* merge order from pool

* bug fix order table

* bug fix order table

* bug fix

* rename

4 years agofix bug for vote & normal output (#433)
Paladz [Fri, 1 Nov 2019 02:35:16 +0000 (10:35 +0800)]
fix bug for vote & normal output (#433)

4 years agoMov merge (#430)
Poseidon [Thu, 31 Oct 2019 09:50:22 +0000 (17:50 +0800)]
Mov merge (#430)

* Add MOV subprotol framework support

* opz code format

* opz code format

* Del unused code

* Set chain Tx Gas 0 (#409)

* Set chain Tx Gas 0

* Fix test file err

* Revert test file modify

* Modify interface function

* Opz code format

* MOV add startpoint

* mov merge

* fix ci

* opt code

* fix ci

* opt code

* fix dead lock

* opt code

* bug fix

* fix ci

* revert comment

* fix bug

* remove unuse parameter

* fix validate coinbase

* add calc matchedtx gas func

* opt code

* remove useless code

* opt validate

* block height limit for before proposal block

4 years agoadd status fail check (#431)
Poseidon [Tue, 29 Oct 2019 11:28:48 +0000 (19:28 +0800)]
add status fail check (#431)

4 years agofix mov (#429)
Poseidon [Mon, 28 Oct 2019 08:11:57 +0000 (16:11 +0800)]
fix mov (#429)

4 years agomov joint (#428)
Poseidon [Mon, 28 Oct 2019 05:55:30 +0000 (13:55 +0800)]
mov joint (#428)

* mov joint

* bug fix

* opt code

* fix ci

* format code

4 years agofix mov database (#427)
Poseidon [Mon, 28 Oct 2019 02:45:38 +0000 (10:45 +0800)]
fix mov database (#427)

4 years agomov core (#421)
Poseidon [Fri, 25 Oct 2019 01:51:24 +0000 (09:51 +0800)]
mov core (#421)

* mov core

* bug fix

* opt code

* remove validate contract in validate cancel order

* fix validate

* bug fix

* bug fix

* fix ci

4 years agoModify federation sync (#422)
wz [Thu, 24 Oct 2019 14:33:16 +0000 (22:33 +0800)]
Modify federation sync (#422)

* Set chain Tx Gas 0 (#409)

* Set chain Tx Gas 0

* Fix test file err

* Revert test file modify

* add filter asset

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix a small bug

* delete unused

4 years agomodify crossin transaction (#416)
wz [Thu, 24 Oct 2019 07:57:54 +0000 (15:57 +0800)]
modify crossin transaction (#416)

* modify crossin transaction

* add test

* fix review

* fix

* fix

* fix

* fix

* fix

* fix

* fix

4 years agofix travis (#425)
wz [Thu, 24 Oct 2019 07:51:59 +0000 (15:51 +0800)]
fix travis (#425)

4 years agoadd release notes (#424) v1.0.4
wz [Thu, 24 Oct 2019 07:05:17 +0000 (15:05 +0800)]
add release notes (#424)

* add release notes

* fix

* fix

4 years agodashboard: update chain transactions (#414)
Zhiting Lin [Thu, 24 Oct 2019 03:10:15 +0000 (11:10 +0800)]
dashboard: update chain transactions (#414)

* dashboard: update chain transactions

* Dashboard: update chain transactions with switchers.

4 years agoupdate (#423)
Chengcheng Zhang [Thu, 24 Oct 2019 03:05:16 +0000 (11:05 +0800)]
update (#423)

4 years agomatch engine (#418)
Poseidon [Wed, 23 Oct 2019 09:31:05 +0000 (17:31 +0800)]
match engine (#418)

* match engine

* opt code

* update comment

* opt code

* fix validate trade pairs

* remove magic num

* opt canNotMatched func

* refactor

4 years agochange version v1.0.4 (#420)
yahtoo [Wed, 23 Oct 2019 06:13:37 +0000 (14:13 +0800)]
change version v1.0.4 (#420)

4 years agofix log level (#417)
iczc [Tue, 22 Oct 2019 08:27:55 +0000 (16:27 +0800)]
fix log level (#417)

4 years agoMov database iterator (#415)
Poseidon [Tue, 22 Oct 2019 07:13:38 +0000 (15:13 +0800)]
Mov database iterator (#415)

* mov_database_iterator

* opt log