Skip to content

Big merge v1.10.16 v1.12.2 fix ci#1850

Merged
brilliant-lx merged 51 commits intobig_merge_v1.10.16_v1.12.2from
big_merge_v1.10.16_v1.12.2_fixCI
Sep 7, 2023
Merged

Big merge v1.10.16 v1.12.2 fix ci#1850
brilliant-lx merged 51 commits intobig_merge_v1.10.16_v1.12.2from
big_merge_v1.10.16_v1.12.2_fixCI

Conversation

@NathanBSC
Copy link
Copy Markdown
Contributor

@NathanBSC NathanBSC commented Sep 4, 2023 •
edited
Loading

Description

fix unit test cases which failed upon big merge

Rationale

Improve code correctness by fixing UT

Example

  1. make test pass
  2. can work as miner using node-deploy(branch adapt_for_big_merge)
  3. full sync mainnet works ( sync 1M blocks)

Changes

UT

  1. add unit test dir internal and `ethstats
  2. fix all UT cases (except dir tests)

Bug Fix:

  1. statedb related
    a. fix hasher race in statedb
    b. fix using wrong value in closures
    c. fix face in map iteration and map write
    d. reset snap after commit
    e. disable pipeCommit
    f. do not copy nil accessList
  2. fix ApplyTransaction missing param NewReceiptBloomGenerator
  3. fix forgetting to decHandlers when runBscExtension

Remove Useless

  1. remove diffsync
  2. remove useless skipCheckFreezerType param

Others

  1. add omitempty tag for unused new fields of core.Genesis
  2. revert interface Finalize of consensus
  3. use Leveldb as default

brilliant-lx and others added 30 commits August 25, 2023 16:13
@brilliant-lx
fix: crash of highestVerifiedHeader
dddf3af
@brilliant-lx
fix: panic of blobpool
613d177
@brilliant-lx
fix: genesis set up
f6df8fb
@NathanBSC
1. modify NewDatabaseWithNodeDB to upstream
a96c1c4 
2. fix race use of hasher in statedb
3. fix use wrong value when updateTrie
@NathanBSC
fix dir legacypool
d109892
@NathanBSC
fix dir blobpool
60df007
@NathanBSC
fix dir vote
ba9c019
@NathanBSC
remove diffsync related code
8d84b81
@NathanBSC
fix core/state/snapshot
7afa678
@NathanBSC
disable pipeCommit for now
85b59dd
@NathanBSC
fix applyTransaction for bloom setting
b3f998f
@brilliant-lx
CI: fast finality in gasprice test
2e7a4f3
@brilliant-lx
CI: diffFetcher was removed
e514a86
@brilliant-lx
CI: downloader, remove beaconsync test
6149ab3
@brilliant-lx
CI: no beaconsync in downloader, remove a failed case
ca716d8 
TestCheckpointChallenge was removed in:
ethereum/go-ethereum#27147
since after merge, it is useless for ethereum, but might be useful for BSC.
disable the case right now, as it is not a big issue.
@brilliant-lx
CI: bsc protocol decHandlers
511e478
@brilliant-lx
CI: receipt Bloom process
bcef3bc
@NathanBSC
1. skip CheckConfigForkOrder for non-parlia engine
a4a2c43 
2. all test cases in core work well now
	cd core && go test ./... -v
@NathanBSC
fix test cases in trie dir
929b9eb
@NathanBSC
CI: no beaconsync in downloader, remove a failed case(redo)
d6afbf5
@NathanBSC
fix dir miner
d966898
@NathanBSC
fix dir cmd/geth
37eb793
@brilliant-lx
CI: filter test, BaseFee & Finality
e9232dc
@NathanBSC
fix dir graphql
2a03afd
@NathanBSC
remove diffStore
df343b1
@NathanBSC
fix ethclient
6e38d32
@NathanBSC
fix TestRPCGetTransactionReceipt
4c7f556
@NathanBSC
fix dir internal
87aba51
@NathanBSC
ut add dir ethstats and signer
e1e8598
@NathanBSC
disable pipeCommit thoroughly; fix concurrent map iteration and map w…
74dd48f 
…rite in statedb
brilliant-lx
brilliant-lx approved these changes Sep 7, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@brilliant-lx brilliant-lx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@brilliant-lx brilliant-lx merged commit 202ab70 into big_merge_v1.10.16_v1.12.2 Sep 7, 2023
@buddh0 buddh0 deleted the big_merge_v1.10.16_v1.12.2_fixCI branch September 14, 2023 03:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@brilliant-lx brilliant-lx brilliant-lx approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@NathanBSC @brilliant-lx