Merge branch 'unstable' of https://github.com/sigp/lighthouse into gloas-payload-cache

beacon_node/http_api/src/beacon/pool.rs

@@ -629,6 +629,13 @@ fn publish_payload_attestation_messages<T: BeaconChainTypes>(
                         "Payload attestation invalid for fork choice"
                     );
                 }
+
+                if let Err(e) = chain.add_payload_attestation_to_pool(&verified) {
+                    warn!(
+                        reason = ?e,
+                        "Failed to add payload attestation to pool"
+                    );
+                }
             }
             Err(PayloadAttestationError::PriorPayloadAttestationMessageKnown { .. }) => {
                 num_already_known += 1;

beacon_node/http_api/src/build_block_contents.rs

@@ -13,7 +13,9 @@ pub fn build_block_contents<E: EthSpec>(
         }
 
         BeaconBlockResponseWrapper::Full(block) => {
-            if fork_name.deneb_enabled() {
+            // TODO(gloas): revisit when produceBlockV4 PR is finalised
+            // https://github.com/ethereum/beacon-APIs/pull/580
+            if fork_name.deneb_enabled() && !fork_name.gloas_enabled() {
                 let BeaconBlockResponse {
                     block,
                     state: _,