Skip to content

merge v1.6.5 to dev#2805

Merged
xiangjianmeng merged 53 commits intodevfrom
fix-conflict165
Dec 1, 2022
Merged

merge v1.6.5 to dev#2805
xiangjianmeng merged 53 commits intodevfrom
fix-conflict165

Conversation

@KamiD
Copy link
Member

@KamiD KamiD commented Nov 25, 2022

  • 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 Unreleased section in CHANGELOG.md

  • Reviewed Files changed in the github PR explorer


For Admin Use:

  • Added appropriate labels to PR (ex. wip, ready-for-review, docs)
  • Reviewers Assigned
  • Squashed all commits, uses message "Merge PR #XYZ: [title]" (coding standards)

lyh169 and others added 30 commits November 3, 2022 14:37
* delete feesplit innertx

* Update keeper_innertx.go
2. fix the --deliver-txs-mode=2 can not query status
3. update the version
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>
* roll back blocktime

* del flag
* 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
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* 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
* 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>
* optimize start params

* optimize start param

* optimize start param

* optimize start param
* 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>
* 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
* 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>
* 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>
* support dynamic set fast node cache size

* use atomic operate the size

* do not use atomic

* use one const and reduce dup flag
* 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
* add debug test

* preblock test

* restore producer

* adjust channel buffer

Co-authored-by: xiangjianmeng <805442788@qq.com>
* 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>
* 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>
@KamiD KamiD changed the title Fix conflict165 merge v1.6.5 to dev Nov 25, 2022
ilovers and others added 3 commits November 25, 2022 20:58
* 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>
* 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>
@codecov-commenter
Copy link

codecov-commenter commented Nov 26, 2022

Codecov Report

Merging #2805 (2634644) into dev (42e9163) will decrease coverage by 5.25%.
The diff coverage is 19.03%.

@@            Coverage Diff             @@
##              dev    #2805      +/-   ##
==========================================
- Coverage   36.37%   31.11%   -5.26%     
==========================================
  Files         414       53     -361     
  Lines       43557     5431   -38126     
==========================================
- Hits        15843     1690   -14153     
+ Misses      26566     3574   -22992     
+ Partials     1148      167     -981     
Impacted Files Coverage Δ
app/config/local.go 0.00% <0.00%> (ø)
app/elapse_info.go 43.85% <ø> (ø)
app/node_mode.go 8.75% <0.00%> (-0.71%) ⬇️
app/repair_state.go 0.00% <0.00%> (ø)
app/rpc/backend/backend.go 0.00% <0.00%> (ø)
app/rpc/namespaces/eth/api.go 0.00% <0.00%> (ø)
app/types/gasprice.go 0.00% <0.00%> (ø)
app/utils/sanity/start.go 69.23% <ø> (ø)
app/config/config.go 26.90% <26.58%> (+0.71%) ⬆️
app/app_abci.go 55.31% <50.00%> (+8.51%) ⬆️
... and 367 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

KamiD and others added 13 commits November 26, 2022 14:00
* 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>
* support multi-cache when repair state

* add pprof

* fix net pprof
* 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
* fix websocket leak

* optimize code
* remove the lock when get fast node

* replace mutex with rbmutex
xiangjianmeng
xiangjianmeng previously approved these changes Dec 1, 2022
@xiangjianmeng xiangjianmeng merged commit a4005fc into dev Dec 1, 2022
@xiangjianmeng xiangjianmeng deleted the fix-conflict165 branch December 1, 2022 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.