Kintsugi rebase patches (#2769)

* Freshen Cargo.lock

* Fix gossip worker

* Update map_fork_name_with

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)
+            }
         }
     };
 }