Skip to content

oklll#2

Merged
jjhesk merged 937 commits intotokenchain:devfrom
okx:dev
Jun 6, 2025
Merged

oklll#2
jjhesk merged 937 commits intotokenchain:devfrom
okx:dev

Conversation

@jjhesk
Copy link

@jjhesk jjhesk commented Jun 6, 2025

  • 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)

lisuxiaoqi and others added 30 commits November 4, 2022 00:11
…2713)

* extend the evidence retry gap to avoid frequent p2p send

* use timeout channel to replace sleep

* remove log

* cache retry byte

Co-authored-by: xiangjianmeng <805442788@qq.com>
* Merge PR: fix the evm2cm tx in parallel in watchdb query status error (#2715)

Co-authored-by: Evan Han <iloversevan@gmail.com>

* fix

* Update evm_hooks.go

* Update evm_hooks.go

* delete feesplit info when close the module with parallel

* revert debug

* comment

Co-authored-by: lyh169 <44960676+lyh169@users.noreply.github.com>
Co-authored-by: Evan Han <iloversevan@gmail.com>
Co-authored-by: chunfengSun <516108736@qq.com>
* delete feesplit innertx

* delete unused code
* add params,query

* add evm types

* add evm types

* add watcher/token

* erc20

* add

* add erc20 coverage

* success should really success

* fix reviews

Co-authored-by: Ywmet <xiaoliang.zhang@okg.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
…FSS (#2477)

* add funcItem

add funcItem

add IsUpgrade function

export IsUpgradable from iavl module.

add ut for IsUpgradeable, add IsUpgradeable support for repaire-state

better tips and correct function name

export iavl IsFastStorageStrategy function

add tips with more details

Add tips more details

change ut's behavior when export IsFastStorageStrategy

change default value when the function is changed to IsFastStorageStragety

use constant instead of hard code, rename checkConflictOpts(opt) to tips

fix NewDB function

rm tips function rm hint field rename option to checkOption and put tips to conflictPairOption's field

rename item's value to expect

* fix ut

* when repair-state we judge the fast-storage flag by data

* add feesplit module

* reserve --iavl-enable-fast-storage flag for repair-state

* delete the auto-upgrade flag

* rm NeedLongTimeToUpgrade use the IsFastStorgeStrategy universal

Co-authored-by: xiangjianmeng <805442788@qq.com>
* add ut

* fix ut 1

* fix ut 1

* fix ut 2

* fix ut3

* add ut for pending pool

* fix pending pool concurrency ut

* fix pending pool ut

* add tx random ut

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
Co-authored-by: xiangjianmeng <805442788@qq.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
use table-drive way to test over write empty tree ut

remove useless lines

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* use rocksdb as default

use sdk.FlagDBBackend

restore the default value

* restore the dev code, use filepath to join path

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
2. fix the --deliver-txs-mode=2 can not query status

Co-authored-by: xiangjianmeng <805442788@qq.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
Co-authored-by: Ywmet <xiaoliang.zhang@okg.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* add benchmarks of token transfer and system test

* update fork height

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* dump lastrun in case of fastsync

* dump lastrun in case of fastsync
* roll back blocktime

* del flag

Co-authored-by: xiangjianmeng <805442788@qq.com>
* add debug test

* preblock test

* restore producer

* adjust channel buffer
* 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>
Co-authored-by: Ywmet <xiaoliang.zhang@okg.com>
* 1. optimize query evm2cm tx on the watchdb in serial exec

* 1. optimize query evm2cm tx on the watchdb in serial exec

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* add grpc test and fix script ver

* add bank

* add cap ut

* add paralled tx ut

* revert

* add parelled tx ut

* fix

* fix require true

* add contract tx in ut

* contract function

Co-authored-by: Ywmet <xiaoliang.zhang@okg.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* use real height instead of IGNORE_HEIGHT_CHECKING

* fix RawTxToRealTx

* revert

Co-authored-by: Evan Han <iloversevan@gmail.com>
Co-authored-by: xiangjianmeng <805442788@qq.com>
* 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>
* fix rocksdb install for MacOS

* Delete arm64_crc.patch
* optimize simulate

* add blank

* rm error

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* only update sig cache in VerifySig

* get realTx from mempool in baseApp
* node mode

* set default node mode
xzav3r and others added 29 commits July 6, 2023 10:58
* set nonce of IbcTx

* use ethAddr as fromAddr in mempool for all types of tx

* fix tm rpc
* fix enable-preruntx's comments

* modify comment

---------

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* fix smb bug caused by e2c before venus6

* fix bug

* optimize code

* Update baseapp.go

fix typo

---------

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* add commit mutex

* add pgu threshold

* add regression of hgu bounding

* fix ut

* pack one tx at least

* simulation gas wanted must less than gas limit

* persist estimated gas and refactor pgu

* record hgu block num

* add pgu logger

* fix bug

* add ut

* fix ut

* update

* fix bug of simulation

* temp

* update

* merge dev

* pgu twice

---------

Co-authored-by: KamiD <44460798+KamiD@users.noreply.github.com>
* optimize ut

* Update app_parallel_test.go

modify code

* inrich ut and fix bug of it

* Update app_parallel_test.go

fix bug

* optimize ut

* Update app_parallel_test.go

enrich ut

* support vmb tx

* optimize ut

* Update app_parallel_test.go

remove useless code

* Update app_parallel_test.go

modify ut
* add proposal for modify the MaxGasUsedPerBlock

* modify the issue
* add gas table (#3231)

* add gas table

* change depend wasmvm

* update (#3230)

* wasmvm130 create contract (#3229)

* adapt to  wasmvm v1.2.4

* go mod tidy

* support create contract by contract

* support  create2

* support create contract by codeID

* change contract address2

* update wasmvm version

* change GoAPI as local var: fix create smb

* add CallCreateDepth

* fix merge error

---------

Co-authored-by: ylsGit <oker@192.168.0.101>
Co-authored-by: ylsGit <oker@192.168.0.105>

* wasmvm cross call  (#3232)

* adapt to  wasmvm v1.2.4

* go mod tidy

* switch to wasmvm v1.2.4

* replace the dependce

* add file

* add ut

* add transfer

* modity the go.mod for recursion

* add getCallerInfoFunc transferCoinsFunc in api

* merge

---------

Co-authored-by: ylsGit <oker@192.168.0.101>
Co-authored-by: ylsGit <bzwdyls@163.com>

* fix merge error (#3233)

* update gomod (#3235)

* support the initance for delcall (#3239)

* add venus7 for wasm upgrade (#3243)

* add venus7 for wasm upgrade

* upgrade go mod

* upgrade go mod

* upgrade go mod wasmvm version

* fix ut

---------

Co-authored-by: chengzhinei <chengxue5yuan@163.com>
Co-authored-by: JianGuo <zjg555543@163.com>
Co-authored-by: ylsGit <oker@192.168.0.101>
Co-authored-by: ylsGit <oker@192.168.0.105>
Co-authored-by: lyh169 <44960676+lyh169@users.noreply.github.com>
Co-authored-by: lyh169 <liuyuhang203@sina.com>
* limit max tx count perpeer

* limit tx count of per peer

* remove useles code

* change code location

* can not limit tx count when limit == 0

* solve  bug after merge
* add params to estimateGas api

* fix UT
* add consensus ip whitelist

* hanle fastsync and evidence

* add enableConsensusIPWhitelist

* consensus to p2p

* let status rsp addr empty


---------

Co-authored-by: oker <oker@okerdeMacBook-Pro.local>
Co-authored-by: xiangjianmeng <805442788@qq.com>
…3339)

* fix: update data length checks to use uint64 for consistency

* fix: improve error handling for transaction data unmarshalling
@jjhesk jjhesk merged commit e7a055f into tokenchain:dev Jun 6, 2025
6 of 7 checks passed
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.