Roshan 7466f0a075 Merge branch 'develop' into bc-fusion ... # Conflicts: # core/systemcontracts/upgrade.go # params/config.go		2024-01-08 11:37:58 +08:00
..
beacon	Big merge v1.10.16 v1.12.2 fix ci (#1850)	2023-09-07 16:39:29 +08:00
clique	Big merge v1.10.16 v1.12.2 fix ci (#1850)	2023-09-07 16:39:29 +08:00
ethash	lint: fix all golang lint after big merge (#1861)	2023-09-08 16:36:16 +08:00
misc	core: enable Shanghai EIPs (#1970)	2023-11-20 19:19:26 +08:00
parlia	Merge branch 'develop' into bc-fusion	2024-01-08 11:37:58 +08:00
consensus.go	parlia: fix verifyVoteAttestation when verify a batch of headers (#2121)	2024-01-03 15:58:06 +08:00
errors.go	Revert "parlia: consensus changes according to BEP of Early Broadcast (#1268)"	2023-03-14 17:31:21 +08:00
merger.go	all: core rework for the merge transition (#23761)	2021-11-26 13:23:02 +02:00