merge with unstable fixes

consensus/state_processing/src/consensus_context.rs

@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 use tree_hash::TreeHash;
 use types::{
-    BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256, SignedBeaconBlock,
-    Slot,
+    AbstractExecPayload, BeaconState, BeaconStateError, ChainSpec, EthSpec, ExecPayload, Hash256,
+    SignedBeaconBlock, Slot,
 };
 
 #[derive(Debug)]
@@ -64,7 +64,7 @@ impl<T: EthSpec> ConsensusContext<T> {
         self
     }
 
-    pub fn get_current_block_root<Payload: ExecPayload<T>>(
+    pub fn get_current_block_root<Payload: AbstractExecPayload<T>>(
         &mut self,
         block: &SignedBeaconBlock<T, Payload>,
     ) -> Result<Hash256, ContextError> {