gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-17 04:48:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge capella

Browse Source
This commit is contained in:
realbigsean
2023-01-12 12:51:09 -05:00
parent c705be202b d0368b0459
commit 06f71e8cce
142 changed files with 3412 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/ef_tests/Cargo.toml
View File

@@ -16,7 +16,7 @@ bls = { path = "../../crypto/bls", default-features = false }
compare_fields = { path = "../../common/compare_fields" }
compare_fields_derive = { path = "../../common/compare_fields_derive" }
derivative = "2.1.1"
ethereum-types = "0.12.1"
ethereum-types = "0.14.1"
hex = "0.4.2"
rayon = "1.4.1"
serde = "1.0.116"

4
testing/execution_engine_integration/Cargo.toml
View File

@@ -15,8 +15,8 @@ execution_layer = { path = "../../beacon_node/execution_layer" }
sensitive_url = { path = "../../common/sensitive_url" }
types = { path = "../../consensus/types" }
unused_port = { path = "../../common/unused_port" }
ethers-core = "0.17.0"
ethers-providers = "0.17.0"
ethers-core = "1.0.2"
ethers-providers = "1.0.2"
deposit_contract = { path = "../../common/deposit_contract" }
reqwest = { version = "0.11.0", features = ["json"] }
hex = "0.4.2"

9
testing/execution_engine_integration/src/test_rig.rs
View File

@@ -110,6 +110,8 @@ impl<E: GenericExecutionEngine> TestRig<E> {
let (runtime_shutdown, exit) = exit_future::signal();
let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
let executor = TaskExecutor::new(Arc::downgrade(&runtime), exit, log.clone(), shutdown_tx);
let mut spec = MainnetEthSpec::default_spec();
spec.terminal_total_difficulty = Uint256::zero();
let fee_recipient = None;
@@ -125,7 +127,7 @@ impl<E: GenericExecutionEngine> TestRig<E> {
..Default::default()
};
let execution_layer =
ExecutionLayer::from_config(config, executor.clone(), log.clone()).unwrap();
ExecutionLayer::from_config(config, executor.clone(), log.clone(), &spec).unwrap();
ExecutionPair {
execution_engine,
execution_layer,
@@ -144,16 +146,13 @@ impl<E: GenericExecutionEngine> TestRig<E> {
..Default::default()
};
let execution_layer =
ExecutionLayer::from_config(config, executor, log.clone()).unwrap();
ExecutionLayer::from_config(config, executor, log.clone(), &spec).unwrap();
ExecutionPair {
execution_engine,
execution_layer,
}
};
let mut spec = MainnetEthSpec::default_spec();
spec.terminal_total_difficulty = Uint256::zero();
Self {
runtime,
ee_a,

2
testing/node_test_rig/Cargo.toml
View File

@@ -13,4 +13,4 @@ eth2 = { path = "../../common/eth2" }
validator_client = { path = "../../validator_client" }
validator_dir = { path = "../../common/validator_dir", features = ["insecure_keys"] }
sensitive_url = { path = "../../common/sensitive_url" }
execution_layer = { path = "../../beacon_node/execution_layer" }
execution_layer = { path = "../../beacon_node/execution_layer" }