New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add new fork block and precompile contract for BEP294 and BEP299 #2047

Merged

unclezoro merged 36 commits into develop from bc-fusion

Feb 26, 2024

Collaborator

unclezoro commented Dec 7, 2023

Description

This pr is to support

BEP-294: BSC Native Staking after BC Fusion
BEP-299: Token Migration after BC Fusion

Rationale

See 4. Motivation in BEP-294, BEP-299,

Changes

Notable changes:

add new precompile contract verifyDoubleSignEvidence and secp256k1SignatureRecover
add new systemTx to parlia to update validatorSet everyday after the fusion fork
add upgrade setting

pythonberg1997 and others added 4 commits

November 30, 2023 19:36


          feat: add new fork block and precompile contract for BEP294 and BEP299 (

030e416

#1874)


          chore: update contracts code (#2024)

d3f882d


          feat: add generate-proof to geth cmd (#2028)

5743b06

* feat: add `generate-proof` to geth cmd

* chore: rename variable


          Merge remote-tracking branch 'BNBChain/develop' into bc-fusion

3e9e642

# Conflicts:
#	cmd/geth/blsaccountcmd.go
#	params/config.go

unclezoro commented

View reviewed changes

.github/workflows/build-test.yml Outdated Show resolved Hide resolved

unclezoro commented

View reviewed changes

.github/workflows/lint.yml Outdated Show resolved Hide resolved

unclezoro commented

View reviewed changes

consensus/parlia/feynmanfork.go Show resolved Hide resolved

unclezoro commented

View reviewed changes

consensus/parlia/feynmanfork.go Show resolved Hide resolved

unclezoro commented

View reviewed changes

consensus/parlia/feynmanfork.go Outdated Show resolved Hide resolved

unclezoro commented

View reviewed changes

consensus/parlia/fusionfork_test.go Outdated Show resolved Hide resolved

unclezoro commented

View reviewed changes

core/vm/contracts.go Show resolved Hide resolved

pythonberg1997 and others added 19 commits

December 8, 2023 16:20


          chore: resolve merge conflicts and fix review comments

8f3c525


          Merge pull request #2048 from Pythonberg1997/bc-fusion

3414e56

chore: merge with develop branch


          chore: modify breath block interval for test (#2054)

6744d7c


          fix: bug in determining breathe block (#2055)

ab8793a


          chore: update logic of determining breathe block and returned data of…

94b6815

… `verifyDoubleSignEvidence` (#2056)


          chore: remove unused code (#2061)

d4f7313


          chore: fix CI issues (#2085)

6685f68


          chore: update system contracts' byte code (#2093)

08f75ca


          Merge branch 'develop' into merge

167da21

# Conflicts:
#	params/config.go


          chore: add new byte code of TokenHub and GovHub to Feynman upgrade

c0df5e7


          Merge pull request #2096 from Pythonberg1997/bc-fusion

aab5ad9

chore: merge with develop branch


          fix: avoid update validators on Feynman block (#2102)

432085e


          chore: add SystemTxsGas for Feynman upgrade (#2133)

e582264


          chore: update abi and bytecode (#2137)

64a57a3


          Merge branch 'develop' into bc-fusion

7466f0a

# Conflicts:
#	core/systemcontracts/upgrade.go
#	params/config.go


          Merge pull request #2138 from Pythonberg1997/bc-fusion

85c6750

chore: merge with develop branch


          chore: fix lint issue (#2139)

e2e2ac7


          fix: compare headers' number in Big.Int rather than Uint64 (#2158)

7ade1d2


          fix: adjusted the timing of UpgradeBuildInSystemContract (#2166)

13f17f2

* fix: adjusted the timing of `UpgradeBuildInSystemContract`

* fix review comments

* fix review comments

* fix review comments

* fix review comments

* add `UpgradeBuildInSystemContract` to `traceBlock`

* add `UpgradeBuildInSystemContract` to `traceBlock`

* add `UpgradeBuildInSystemContract` to all trace functions

zzzckck reviewed

View reviewed changes

consensus/parlia/feynmanfork_test.go Show resolved Hide resolved

zzzckck reviewed

View reviewed changes

consensus/parlia/parlia.go Show resolved Hide resolved

zzzckck reviewed

View reviewed changes

consensus/parlia/parlia.go Outdated Show resolved Hide resolved

forcodedancing reviewed

View reviewed changes

cmd/geth/blsaccountcmd.go Show resolved Hide resolved

forcodedancing reviewed

View reviewed changes

consensus/parlia/feynmanfork.go Show resolved Hide resolved

forcodedancing reviewed

View reviewed changes

eth/state_accessor.go

               	for idx, tx := range block.Transactions() {
+              		// upgrade build-in system contract before system txs if Feynman is enabled
+              		if beforeSystemTx {

Contributor

forcodedancing Feb 4, 2024

Is it ok to move this posa, ok := eth.Engine().(consensus.PoSA) before the loop?


          fix: adjust the timing of initializing Feynman system contracts (#2203)

fd0ee7d

* fix: adjust the timing of initializing Feynman system contracts

* fix test case

zzzckck approved these changes

View reviewed changes

Collaborator

zzzckck left a comment

LGTM

buddh0 reviewed

View reviewed changes

consensus/parlia/feynmanfork.go Outdated Show resolved Hide resolved

buddh0 reviewed

View reviewed changes

core/vm/contracts.go Outdated Show resolved Hide resolved

buddh0 reviewed

View reviewed changes

core/vm/contracts.go Outdated Show resolved Hide resolved

zzzckck requested changes

View reviewed changes

Collaborator

zzzckck left a comment

check the latest comments

buddh0 reviewed

View reviewed changes

params/protocol_params.go Outdated Show resolved Hide resolved


          fix: change the wrong precompile contract (#2206)

9e4d15b

zzzckck previously approved these changes

View reviewed changes


          chore: update bls generate-proof cmd (#2215)

a2ddb75

unclezoro dismissed zzzckck’s stale review via

a2ddb75

February 16, 2024 08:19

j75689 force-pushed the bc-fusion branch from 761e54f to a2ddb75 Compare

February 19, 2024 03:26

j75689 and others added 2 commits

February 19, 2024 12:06


          ci: add nancy job (#2221)

316585b


          fix the double sign testcase

70adb60

blxdyx mentioned this pull request

Support feynman hardfork node-real/bsc-erigon#308

Merged


          upgrade: update testnet contracts bytecode and hardfork time for Feyn…

…man (#2237)

buddh0 approved these changes

View reviewed changes

forcodedancing approved these changes

View reviewed changes

pythonberg1997 approved these changes

View reviewed changes

unclezoro merged commit 73f27a5 into develop

6 of 7 checks passed

This was referenced Feb 27, 2024

draft release v1.3.10 #2239

Merged

release: prepare for release v1.3.10 #2238

Merged

fslmultiservice22 commented Mar 4, 2024

Ottimo.

WARbitCOIN commented May 28, 2024

Description

This pr is to support

BEP-294: BSC Native Staking after BC Fusion

BEP-299: Token Migration after BC Fusion

Rationale

See 4. Motivation in BEP-294, BEP-299,

Changes

Notable changes:

add new precompile contract verifyDoubleSignEvidence and secp256k1SignatureRecover

add new systemTx to parlia to update validatorSet everyday after the fusion fork

add upgrade setting

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet