Kintsugi rebase patches (#2769)

* Freshen Cargo.lock

* Fix gossip worker

* Update map_fork_name_with

beacon_node/network/src/beacon_processor/worker/gossip_methods.rs

@@ -755,7 +755,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                 debug!(self.log, "Could not verify block for gossip, ignoring the block";
                             "error" => %e);
                 self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
-                return;
+                return None;
             }
             Err(e @ BlockError::StateRootMismatch { .. })
             | Err(e @ BlockError::IncorrectBlockProposer { .. })

consensus/types/src/fork_name.rs

@@ -97,6 +97,10 @@ macro_rules! map_fork_name_with {
                 let (value, extra_data) = $body;
                 ($t::Altair(value), extra_data)
             }
+            ForkName::Merge => {
+                let (value, extra_data) = $body;
+                ($t::Merge(value), extra_data)
+            }
         }
     };
 }