Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes

2026-03-10 20:22:02 +00:00 · 2024-06-20 09:36:56 -04:00
parent f85a124362 f69ccc3b70
commit efb8a01e91
31 changed files with 310 additions and 329 deletions
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -257,9 +257,9 @@ pub mod deposit_methods {
        Latest,
    }

-    impl Into<u64> for Eth1Id {
-        fn into(self) -> u64 {
-            match self {
+    impl From<Eth1Id> for u64 {
+        fn from(from: Eth1Id) -> u64 {
+            match from {
                Eth1Id::Mainnet => 1,
                Eth1Id::Custom(id) => id,
            }