Commit 9d380aa
committed
params: allow post-merge hardforks to be enabled before the merge
Partially revert ethereum/go-ethereum#29023.
This commit intentionally breaks the post-merge hardforks logic to fix
the problem described in
#232 (comment).
Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>1 parent 14c45aa commit 9d380aa
1 file changed
+4
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
958 | 958 | | |
959 | 959 | | |
960 | 960 | | |
961 | | - | |
962 | | - | |
963 | 961 | | |
964 | 962 | | |
965 | 963 | | |
| |||
973 | 971 | | |
974 | 972 | | |
975 | 973 | | |
976 | | - | |
977 | | - | |
978 | | - | |
979 | | - | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
980 | 978 | | |
981 | 979 | | |
0 commit comments