Merged
Conversation
KamiD
approved these changes
Nov 23, 2022
xiangjianmeng
added a commit
that referenced
this pull request
Dec 1, 2022
* Merge PR: fix the evm2cm tx in parallel in watchdb query status error (#2715) Co-authored-by: Evan Han <iloversevan@gmail.com> * Merge PR: fix feesplit cache contaminate when parallel-tx rerun (#2720) * Merge PR: delete feesplit innertx (#2721) * delete feesplit innertx * Update keeper_innertx.go * Merge PR: optimize the feesplit api (#2725) * Merge PR: fix the watchdb parallel query error (#2730) 2. fix the --deliver-txs-mode=2 can not query status 3. update the version * Merge PR: init commit and merge confilict (#2731) when repair-state we judge the fast-storage flag by data add feesplit module reserve --iavl-enable-fast-storage flag for repair-state merge repair-state we judge... and deal with confict rm NeedLongTimeToUpgrade use the IsFastStorgeStrategy universal Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: query Feesplit params by rest api (#2732) * Merge PR: upadte version (#2735) * Merge PR: fix watchdb duplicate tx bugs (#2736) * Merge PR: rollback blocktime v156 (#2738) * roll back blocktime * del flag * Merge PR: fix the estimateGas crash (#2749) * Merge PR: Compatible start enable-repair-state flag with fss (#2754) * when start with enable-repair-state and the db is fast-storage, we repair with the iavl-enable-fast-storage * adjust the fast-storage node size * Merge PR: patch to fix the potential bug of hgu (#2755) Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: update config default value (#2751) * set chain-id default to exchain-66 * set EnablePrerunTx default to true * set pruning default to everything * enable ac default * disableABCIQueryMutex default * enable fast-query by default * enable BloomFilter by default * update mempool Size default value * update val mode config * add tx_indexer.indexer cmd flags * add enable-concurrency flag * set chainid to exchain65 if make testnet * Merge PR: dump lastrun in case of fastsync (#2760) * Merge PR: recommend gp bug fix (#2744) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: optimize start params (#2762) * optimize start params * optimize start param * optimize start param * optimize start param * Merge PR: DDS lastrun & bump version to v1.6.5.5(#2763) * dds lastrun * Version=v1.6.5.5 * Merge PR: add dynamic dp flag (#2764) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize * add flag: gp maxGas maxTx * Update config.go * Update flags.go Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: add avc flag (#2768) * Merge PR: modify DynamicGpMaxGasUsed flag (#2765) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize * add flag: gp maxGas maxTx * bug fix * modify flag * typo fix * Merge PR: optimiz fss flag (#2769) * fast storage is default true and set by the data * add fast-storage tips when start the node * hidden flag discard-fast-storage * print iavl.IsFastStorage when start node * Update Makefile * restore and hide the old flag Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: evn set (#2782) * Merge PR: commitGapHeight for dynamic update (#2773) * 1. add commitGapHeight for dynamic update * 1. add comment * 1. add UpdateCommitGapHeight at before commitStores * 1. add UpdateCommitGapHeight at before commitStores * 1. modify the spell Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: support dynamic set fast node cache size (#2780) * support dynamic set fast node cache size * use atomic operate the size * do not use atomic * use one const and reduce dup flag * Merge PR: optimize gp flag and fix bug (#2775) * modify dynamic gp flag * fix bug * rewrite ut * magic number fix * replace flag in sh * modify code * fix typo * mark hidden enable-dynamic-gp * improve code * improve code * Merge PR: change avc premakeblock to single (#2778) * add debug test * preblock test * restore producer * adjust channel buffer Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: feesplit support paralleled-tx (#2776) * Update app_parallel.go first. commit Update baseapp_runtx.go Update abci.go 1 Update app_parallel.go Update app_parallel.go Update baseapp_mode_deliver.go 1 Update evm_hooks.go Update baseapp_mode_deliver.go Update base.go Update evm_hooks.go 1 a Update repair_state.go Revert "Update repair_state.go" This reverts commit 3051e30. * fix test * typ * add check * add check Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: workload(lastRun+persist) statistic (#2785) * applybolck workload statistic * complete workload statistic * fix bug & change format * remove BlockExecutor field * fix atomic on lower go version * remove assert * make it more accurately if process started less than 1 hour * make code easier to understand * fix code style Co-authored-by: Zhong Qiu <36867992+zhongqiuwood@users.noreply.github.com> Co-authored-by: yangzhe <zhe.yang@okg.com> * Merge PR: fix random panic parallel tx (#2794) * Merge PR: Bump version to v1.6.5.7 (#2796) * Merge PR: replay cmd default value (#2792) * change default cli params when replay * update Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: disable multi cache (#2802) * Merge PR: bump to v1.6.5.8 (#2803) * Merge PR: fix eth_getTransactionCount error when rpc node is behind the latest block (#2807) * Merge PR: local dynamic config (#2783) * local dynamic config * update go mod * support dynamic config for mempool.cache_size * if enable apollo, local dynamic config will not be applied * update Co-authored-by: ylsGit <bzwdyls@163.com> Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: fix concurrency execute bug (#2808) * fix bug: concurrency execute ApplyBlock in TestFastSyncBadBlockStopsPeer make WrokloadStatistic crash * remove out-of-date comment * add comment for concurrently invoking Co-authored-by: yangzhe <zhe.yang@okg.com> * revert patch for hgu * Merge PR: Update elapse_info.go (#2810) * Merge PR: fix config of timeout_commit (#2806) * fix config of timeout_commit * fix config fmt * add db_backend * add pendingPool=false * del setEnv rocksdb * unify timeout_commit define in one place * testnet.sh * add log * add log Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: support pprof and multi-cache when repair state (#2801) * support multi-cache when repair state * add pprof * fix net pprof * Merge PR: simulate tx async (#2812) * add enable config of hgu * simulate tx in new goroutine * add simulation debug info * start more goroutine for simulation * fix bug * udpate * fix bug of sig cache * disable pendingPool * enable hgu default * add log info and query api of simulation gas * add enable config of pgu and adjustment * use atomic to prevent data race * delete temp code * enable async simulation only when pgb is greater than -1 * check error * Merge PR: fix websocket leak (#2820) * fix websocket leak * optimize code * Merge PR: Change GetFastNode's Lock to Rlock (#2815) * remove the lock when get fast node * replace mutex with rbmutex * bump version to v1.6.6 Co-authored-by: lyh169 <44960676+lyh169@users.noreply.github.com> Co-authored-by: Evan Han <iloversevan@gmail.com> Co-authored-by: ylsGit <bzwdyls@163.com> Co-authored-by: zhangkai <zhangkai.gis@163.com> Co-authored-by: xiangjianmeng <805442788@qq.com> Co-authored-by: lcmmhcc <37269413+lcmmhcc@users.noreply.github.com> Co-authored-by: chengzhinei <chengxue5yuan@163.com> Co-authored-by: YuanXingqiang <xingqiang.yuan@okg.com> Co-authored-by: cwbhhjl <cwbhhjl@gmail.com> Co-authored-by: Leo <52782564+LeoGuo621@users.noreply.github.com> Co-authored-by: Zhong Qiu <36867992+zhongqiuwood@users.noreply.github.com> Co-authored-by: lisuxiaoqi <lisuxiaoqi@gmail.com> Co-authored-by: chunfengSun <516108736@qq.com> Co-authored-by: fatcat22 <pandayt@163.com> Co-authored-by: yangzhe <zhe.yang@okg.com>
KamiD
added a commit
that referenced
this pull request
Dec 8, 2022
…execution (#2829) * Merge PR: fix the evm2cm tx in parallel in watchdb query status error (#2715) Co-authored-by: Evan Han <iloversevan@gmail.com> * Merge PR: fix feesplit cache contaminate when parallel-tx rerun (#2720) * Merge PR: delete feesplit innertx (#2721) * delete feesplit innertx * Update keeper_innertx.go * Merge PR: optimize the feesplit api (#2725) * Merge PR: fix the watchdb parallel query error (#2730) 2. fix the --deliver-txs-mode=2 can not query status 3. update the version * Merge PR: init commit and merge confilict (#2731) when repair-state we judge the fast-storage flag by data add feesplit module reserve --iavl-enable-fast-storage flag for repair-state merge repair-state we judge... and deal with confict rm NeedLongTimeToUpgrade use the IsFastStorgeStrategy universal Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: query Feesplit params by rest api (#2732) * Merge PR: upadte version (#2735) * Merge PR: fix watchdb duplicate tx bugs (#2736) * Merge PR: rollback blocktime v156 (#2738) * roll back blocktime * del flag * Merge PR: fix the estimateGas crash (#2749) * Merge PR: Compatible start enable-repair-state flag with fss (#2754) * when start with enable-repair-state and the db is fast-storage, we repair with the iavl-enable-fast-storage * adjust the fast-storage node size * Merge PR: patch to fix the potential bug of hgu (#2755) Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: update config default value (#2751) * set chain-id default to exchain-66 * set EnablePrerunTx default to true * set pruning default to everything * enable ac default * disableABCIQueryMutex default * enable fast-query by default * enable BloomFilter by default * update mempool Size default value * update val mode config * add tx_indexer.indexer cmd flags * add enable-concurrency flag * set chainid to exchain65 if make testnet * Merge PR: dump lastrun in case of fastsync (#2760) * Merge PR: recommend gp bug fix (#2744) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: optimize start params (#2762) * optimize start params * optimize start param * optimize start param * optimize start param * Merge PR: DDS lastrun & bump version to v1.6.5.5(#2763) * dds lastrun * Version=v1.6.5.5 * Merge PR: add dynamic dp flag (#2764) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize * add flag: gp maxGas maxTx * Update config.go * Update flags.go Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: add avc flag (#2768) * Merge PR: modify DynamicGpMaxGasUsed flag (#2765) * gp bug fix * modify code * add flag DynamicGpAdaptUncongest * modify ut * adapt congest * bug fix * code optimize * add flag: gp maxGas maxTx * bug fix * modify flag * typo fix * Merge PR: optimiz fss flag (#2769) * fast storage is default true and set by the data * add fast-storage tips when start the node * hidden flag discard-fast-storage * print iavl.IsFastStorage when start node * Update Makefile * restore and hide the old flag Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: evn set (#2782) * Merge PR: commitGapHeight for dynamic update (#2773) * 1. add commitGapHeight for dynamic update * 1. add comment * 1. add UpdateCommitGapHeight at before commitStores * 1. add UpdateCommitGapHeight at before commitStores * 1. modify the spell Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * Merge PR: support dynamic set fast node cache size (#2780) * support dynamic set fast node cache size * use atomic operate the size * do not use atomic * use one const and reduce dup flag * Merge PR: optimize gp flag and fix bug (#2775) * modify dynamic gp flag * fix bug * rewrite ut * magic number fix * replace flag in sh * modify code * fix typo * mark hidden enable-dynamic-gp * improve code * improve code * Merge PR: change avc premakeblock to single (#2778) * add debug test * preblock test * restore producer * adjust channel buffer Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: feesplit support paralleled-tx (#2776) * Update app_parallel.go first. commit Update baseapp_runtx.go Update abci.go 1 Update app_parallel.go Update app_parallel.go Update baseapp_mode_deliver.go 1 Update evm_hooks.go Update baseapp_mode_deliver.go Update base.go Update evm_hooks.go 1 a Update repair_state.go Revert "Update repair_state.go" This reverts commit 3051e30. * fix test * typ * add check * add check Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: workload(lastRun+persist) statistic (#2785) * applybolck workload statistic * complete workload statistic * fix bug & change format * remove BlockExecutor field * fix atomic on lower go version * remove assert * make it more accurately if process started less than 1 hour * make code easier to understand * fix code style Co-authored-by: Zhong Qiu <36867992+zhongqiuwood@users.noreply.github.com> Co-authored-by: yangzhe <zhe.yang@okg.com> * Merge PR: fix random panic parallel tx (#2794) * Merge PR: Bump version to v1.6.5.7 (#2796) * Merge PR: replay cmd default value (#2792) * change default cli params when replay * update Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: disable multi cache (#2802) * Merge PR: bump to v1.6.5.8 (#2803) * Merge PR: fix eth_getTransactionCount error when rpc node is behind the latest block (#2807) * Merge PR: local dynamic config (#2783) * local dynamic config * update go mod * support dynamic config for mempool.cache_size * if enable apollo, local dynamic config will not be applied * update Co-authored-by: ylsGit <bzwdyls@163.com> Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: fix concurrency execute bug (#2808) * fix bug: concurrency execute ApplyBlock in TestFastSyncBadBlockStopsPeer make WrokloadStatistic crash * remove out-of-date comment * add comment for concurrently invoking Co-authored-by: yangzhe <zhe.yang@okg.com> * revert patch for hgu * Merge PR: Update elapse_info.go (#2810) * Merge PR: fix config of timeout_commit (#2806) * fix config of timeout_commit * fix config fmt * add db_backend * add pendingPool=false * del setEnv rocksdb * unify timeout_commit define in one place * testnet.sh * add log * add log Co-authored-by: xiangjianmeng <805442788@qq.com> * Merge PR: support pprof and multi-cache when repair state (#2801) * support multi-cache when repair state * add pprof * fix net pprof * Merge PR: simulate tx async (#2812) * add enable config of hgu * simulate tx in new goroutine * add simulation debug info * start more goroutine for simulation * fix bug * udpate * fix bug of sig cache * disable pendingPool * enable hgu default * add log info and query api of simulation gas * add enable config of pgu and adjustment * use atomic to prevent data race * delete temp code * enable async simulation only when pgb is greater than -1 * check error * Merge PR: fix websocket leak (#2820) * fix websocket leak * optimize code * Merge PR: Change GetFastNode's Lock to Rlock (#2815) * remove the lock when get fast node * replace mutex with rbmutex * Merge PR: Dynamic GP compatible with Tx parallel (#2795) * version 1 * bug fix * rename mode and set MinimalGpMode for default * rewrite ut * delete the invalid annotations * improve code * enable dynamic config * improve code * improve code Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com> * rewrite mock and simapp ut * modify deliverTx and parallelTxs Co-authored-by: lyh169 <44960676+lyh169@users.noreply.github.com> Co-authored-by: Evan Han <iloversevan@gmail.com> Co-authored-by: ylsGit <bzwdyls@163.com> Co-authored-by: zhangkai <zhangkai.gis@163.com> Co-authored-by: xiangjianmeng <805442788@qq.com> Co-authored-by: lcmmhcc <37269413+lcmmhcc@users.noreply.github.com> Co-authored-by: chengzhinei <chengxue5yuan@163.com> Co-authored-by: YuanXingqiang <xingqiang.yuan@okg.com> Co-authored-by: cwbhhjl <cwbhhjl@gmail.com> Co-authored-by: Leo <52782564+LeoGuo621@users.noreply.github.com> Co-authored-by: Zhong Qiu <36867992+zhongqiuwood@users.noreply.github.com> Co-authored-by: lisuxiaoqi <lisuxiaoqi@gmail.com> Co-authored-by: chunfengSun <516108736@qq.com> Co-authored-by: fatcat22 <pandayt@163.com> Co-authored-by: yangzhe <zhe.yang@okg.com> Co-authored-by: Leo <335209779@qq.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Targeted PR against correct branch (see CONTRIBUTING.md)
Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
Wrote tests
Updated relevant documentation (
docs/)Added a relevant changelog entry to the
Unreleasedsection inCHANGELOG.mdReviewed
Files changedin the github PR explorerFor Admin Use: