merge upstream

This commit is contained in:
realbigsean
2023-06-07 14:36:54 -04:00
76 changed files with 1866 additions and 1300 deletions

View File

@@ -49,7 +49,5 @@ operation_pool = { path = "../operation_pool" }
execution_layer = { path = "../execution_layer" }
[features]
deterministic_long_lived_attnets = [ "ethereum-types" ]
spec-minimal = ["beacon_chain/spec-minimal"]
fork_from_env = ["beacon_chain/fork_from_env"]
# default = ["deterministic_long_lived_attnets"]