From 36c917eb7a0312bdd19733126dc1762d0ebdd0cd Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Fri, 6 Dec 2019 13:12:08 +0100 Subject: [PATCH] validate-chainspecs: check istanbul eips are in the foundation spec (#11305) * validate-chainspecs: check istanbul eips are in foundation spec * foundation: specify 1283 disable/reenable transitions --- ethcore/res/ethereum/foundation.json | 8 +++++--- scripts/gitlab/validate-chainspecs.sh | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json index 3eadfe410..7f9f68824 100644 --- a/ethcore/res/ethereum/foundation.json +++ b/ethcore/res/ethereum/foundation.json @@ -164,11 +164,13 @@ "eip145Transition": "0x6f1580", "eip1014Transition": "0x6f1580", "eip1052Transition": "0x6f1580", - "eip1283Transition": "0x8a61c8", + "eip1283Transition": "0x0", + "eip1283DisableTransition": "0x0", + "eip1283ReenableTransition": "0x8a61c8", + "eip1344Transition": "0x8a61c8", "eip1706Transition": "0x8a61c8", "eip1884Transition": "0x8a61c8", - "eip2028Transition": "0x8a61c8", - "eip1344Transition": "0x8a61c8" + "eip2028Transition": "0x8a61c8" }, "genesis": { "seal": { diff --git a/scripts/gitlab/validate-chainspecs.sh b/scripts/gitlab/validate-chainspecs.sh index 210d86e52..fd0f73926 100755 --- a/scripts/gitlab/validate-chainspecs.sh +++ b/scripts/gitlab/validate-chainspecs.sh @@ -15,6 +15,15 @@ done for spec in ethcore/res/ethereum/*.json; do if ! ./target/release/chainspec "$spec"; then ERR=1; fi done + +echo "________Mainnet contains Istanbul EIPs________" +for eip in $(grep --only-matching "eip.*Transition" ethcore/res/ethereum/istanbul_test.json); do + if ! grep -q $eip ethcore/res/ethereum/foundation.json; then + echo "ERROR: $eip is missing in the foundation json spec" + ERR=1 + fi +done + #show sccache statistics sccache --show-stats exit $ERR