Closed Tristan-Wilson closed 3 months ago
We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2
Does not apply to Nitro because exploit requires pre EIP-150 block to trigger issue. Since EIP-150 has been active since genesis, there are no pre EIP_150 blocks.
This change will be merged with regular upstream merges
Closes NIT-2397
This PR fixes an overflow which can could happen if inconsistent blockchain rules were configured. Additionally, it tries to prevent such inconsistencies from occurring by making sure that merge cannot be enabled unless previous fork(s) are also enabled.
(cherry picked from commit ac0ff044606a663eeb47ef60ed5506f842753084) aka https://github.com/ethereum/go-ethereum/pull/29023