lighthouse/beacon_node
Jimmy Chen ec416df061
Merge branch 'unstable' into merge-unstable-to-deneb-20230808
# Conflicts:
#	Cargo.lock
#	beacon_node/beacon_chain/src/lib.rs
#	beacon_node/execution_layer/src/engine_api.rs
#	beacon_node/execution_layer/src/engine_api/http.rs
#	beacon_node/execution_layer/src/test_utils/mod.rs
#	beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs
#	beacon_node/lighthouse_network/src/rpc/handler.rs
#	beacon_node/lighthouse_network/src/rpc/protocol.rs
#	beacon_node/lighthouse_network/src/service/utils.rs
#	beacon_node/lighthouse_network/tests/rpc_tests.rs
#	beacon_node/network/Cargo.toml
#	beacon_node/network/src/network_beacon_processor/tests.rs
#	lcli/src/parse_ssz.rs
#	scripts/cross/Dockerfile
#	validator_client/src/block_service.rs
#	validator_client/src/validator_store.rs
2023-08-08 17:02:51 +10:00
..
beacon_chain Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
beacon_processor Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
builder_client resolve merge issues 2023-07-07 10:17:04 -04:00
client Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
eth1 remove patched dependencies (#4470) 2023-07-05 15:53:35 -04:00
execution_layer Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
genesis remove patched dependencies (#4470) 2023-07-05 15:53:35 -04:00
http_api Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
http_metrics upgrade to libp2p 0.52 (#4431) 2023-08-02 00:59:34 +00:00
lighthouse_network Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
network Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
operation_pool remove patched dependencies (#4470) 2023-07-05 15:53:35 -04:00
src Merge branch 'unstable' into merge-unstable-to-deneb-20230808 2023-08-08 17:02:51 +10:00
store Fix beta compiler warnings 2023-07-14 13:16:48 -07:00
tests Appease Clippy 1.68 and refactor http_api (#4068) 2023-03-13 01:40:03 +00:00
timer Use async code when interacting with EL (#3244) 2022-07-03 05:36:50 +00:00
Cargo.toml Merge branch 'deneb-free-blobs' into merge-unstable-deneb-june-6th 2023-07-17 11:47:46 -07:00