replace HistoricalValidationCode usages with ValidationCodeByHash (#3210)

* replace HistoricalValidationCode usages with ValidationCodeByHash

* runtime-api: tabify tests file

* update implementers guide

node/core/approval-voting/src/lib.rs

@@ -1879,7 +1879,6 @@ async fn launch_approval(
 ) -> SubsystemResult<Option<RemoteHandle<()>>> {
 	let (a_tx, a_rx) = oneshot::channel();
 	let (code_tx, code_rx) = oneshot::channel();
-	let (context_num_tx, context_num_rx) = oneshot::channel();
 
 	let candidate_hash = candidate.hash();
 
@@ -1897,30 +1896,11 @@ async fn launch_approval(
 		a_tx,
 	).into()).await;
 
-	ctx.send_message(
-		ChainApiMessage::BlockNumber(candidate.descriptor.relay_parent, context_num_tx).into()
-	).await;
-
-	let in_context_number = match context_num_rx.await {
-		Ok(Ok(Some(n))) => n,
-		Ok(Ok(None)) | Ok(Err(_)) | Err(_) => {
-			tracing::warn!(
-				target: LOG_TARGET,
-				"Could not launch approval work for candidate {:?}: Number of block {} unknown",
-				(candidate_hash, candidate.descriptor.para_id),
-				candidate.descriptor.relay_parent,
-			);
-
-			return Ok(None);
-		}
-	};
-
 	ctx.send_message(
 		RuntimeApiMessage::Request(
 			block_hash,
-			RuntimeApiRequest::HistoricalValidationCode(
-				candidate.descriptor.para_id,
-				in_context_number,
+			RuntimeApiRequest::ValidationCodeByHash(
+				candidate.descriptor.validation_code_hash,
 				code_tx,
 			),
 		).into()

node/core/runtime-api/src/cache.rs

@@ -14,20 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use polkadot_primitives::v1::{
-	BlockNumber, CandidateCommitments, CommittedCandidateReceipt, CandidateEvent,
-	CoreState, GroupRotationInfo, InboundDownwardMessage, InboundHrmpMessage, Hash,
-	PersistedValidationData, Id as ParaId, OccupiedCoreAssumption,
-	SessionIndex, SessionInfo, ValidationCode, ValidatorId, ValidatorIndex,
-	AuthorityDiscoveryId,
-};
-use sp_consensus_babe::Epoch;
-use parity_util_mem::{MallocSizeOf, MallocSizeOfExt};
-
+use std::collections::btree_map::BTreeMap;
 
 use memory_lru::{MemoryLruCache, ResidentSize};
+use parity_util_mem::{MallocSizeOf, MallocSizeOfExt};
+use sp_consensus_babe::Epoch;
 
-use std::collections::btree_map::BTreeMap;
+use polkadot_primitives::v1::{
+	AuthorityDiscoveryId, BlockNumber, CandidateCommitments, CandidateEvent,
+	CommittedCandidateReceipt, CoreState, GroupRotationInfo, Hash, Id as ParaId,
+	InboundDownwardMessage, InboundHrmpMessage, OccupiedCoreAssumption, PersistedValidationData,
+	SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
+};
 
 const AUTHORITIES_CACHE_SIZE: usize = 128 * 1024;
 const VALIDATORS_CACHE_SIZE: usize = 64 * 1024;
@@ -37,7 +35,6 @@ const PERSISTED_VALIDATION_DATA_CACHE_SIZE: usize = 64 * 1024;
 const CHECK_VALIDATION_OUTPUTS_CACHE_SIZE: usize = 64 * 1024;
 const SESSION_INDEX_FOR_CHILD_CACHE_SIZE: usize = 64 * 1024;
 const VALIDATION_CODE_CACHE_SIZE: usize = 10 * 1024 * 1024;
-const HISTORICAL_VALIDATION_CODE_CACHE_SIZE: usize = 10 * 1024 * 1024;
 const CANDIDATE_PENDING_AVAILABILITY_CACHE_SIZE: usize = 64 * 1024;
 const CANDIDATE_EVENTS_CACHE_SIZE: usize = 64 * 1024;
 const SESSION_INFO_CACHE_SIZE: usize = 64 * 1024;
@@ -80,7 +77,7 @@ pub(crate) struct RequestResultCache {
 	check_validation_outputs: MemoryLruCache<(Hash, ParaId, CandidateCommitments), ResidentSizeOf<bool>>,
 	session_index_for_child: MemoryLruCache<Hash, ResidentSizeOf<SessionIndex>>,
 	validation_code: MemoryLruCache<(Hash, ParaId, OccupiedCoreAssumption), ResidentSizeOf<Option<ValidationCode>>>,
-	historical_validation_code: MemoryLruCache<(Hash, ParaId, BlockNumber), ResidentSizeOf<Option<ValidationCode>>>,
+	validation_code_by_hash: MemoryLruCache<(Hash, ValidationCodeHash), ResidentSizeOf<Option<ValidationCode>>>,
 	candidate_pending_availability: MemoryLruCache<(Hash, ParaId), ResidentSizeOf<Option<CommittedCandidateReceipt>>>,
 	candidate_events: MemoryLruCache<Hash, ResidentSizeOf<Vec<CandidateEvent>>>,
 	session_info: MemoryLruCache<(Hash, SessionIndex), ResidentSizeOf<Option<SessionInfo>>>,
@@ -100,7 +97,7 @@ impl Default for RequestResultCache {
 			check_validation_outputs: MemoryLruCache::new(CHECK_VALIDATION_OUTPUTS_CACHE_SIZE),
 			session_index_for_child: MemoryLruCache::new(SESSION_INDEX_FOR_CHILD_CACHE_SIZE),
 			validation_code: MemoryLruCache::new(VALIDATION_CODE_CACHE_SIZE),
-			historical_validation_code: MemoryLruCache::new(HISTORICAL_VALIDATION_CODE_CACHE_SIZE),
+			validation_code_by_hash: MemoryLruCache::new(VALIDATION_CODE_CACHE_SIZE),
 			candidate_pending_availability: MemoryLruCache::new(CANDIDATE_PENDING_AVAILABILITY_CACHE_SIZE),
 			candidate_events: MemoryLruCache::new(CANDIDATE_EVENTS_CACHE_SIZE),
 			session_info: MemoryLruCache::new(SESSION_INFO_CACHE_SIZE),
@@ -176,12 +173,12 @@ impl RequestResultCache {
 		self.validation_code.insert(key, ResidentSizeOf(value));
 	}
 
-	pub(crate) fn historical_validation_code(&mut self, key: (Hash, ParaId, BlockNumber)) -> Option<&Option<ValidationCode>> {
-		self.historical_validation_code.get(&key).map(|v| &v.0)
+	pub(crate) fn validation_code_by_hash(&mut self, key: (Hash, ValidationCodeHash)) -> Option<&Option<ValidationCode>> {
+		self.validation_code_by_hash.get(&key).map(|v| &v.0)
 	}
 
-	pub(crate) fn cache_historical_validation_code(&mut self, key: (Hash, ParaId, BlockNumber), value: Option<ValidationCode>) {
-		self.historical_validation_code.insert(key, ResidentSizeOf(value));
+	pub(crate) fn cache_validation_code_by_hash(&mut self, key: (Hash, ValidationCodeHash), value: Option<ValidationCode>) {
+		self.validation_code_by_hash.insert(key, ResidentSizeOf(value));
 	}
 
 	pub(crate) fn candidate_pending_availability(&mut self, key: (Hash, ParaId)) -> Option<&Option<CommittedCandidateReceipt>> {
@@ -242,7 +239,7 @@ pub(crate) enum RequestResult {
 	CheckValidationOutputs(Hash, ParaId, CandidateCommitments, bool),
 	SessionIndexForChild(Hash, SessionIndex),
 	ValidationCode(Hash, ParaId, OccupiedCoreAssumption, Option<ValidationCode>),
-	HistoricalValidationCode(Hash, ParaId, BlockNumber, Option<ValidationCode>),
+	ValidationCodeByHash(Hash, ValidationCodeHash, Option<ValidationCode>),
 	CandidatePendingAvailability(Hash, ParaId, Option<CommittedCandidateReceipt>),
 	CandidateEvents(Hash, Vec<CandidateEvent>),
 	SessionInfo(Hash, SessionIndex, Option<SessionInfo>),

node/core/runtime-api/src/lib.rs

@@ -119,8 +119,8 @@ impl<Client> RuntimeApiSubsystem<Client> where
 				self.requests_cache.cache_session_index_for_child(relay_parent, session_index),
 			ValidationCode(relay_parent, para_id, assumption, code) =>
 				self.requests_cache.cache_validation_code((relay_parent, para_id, assumption), code),
-			HistoricalValidationCode(relay_parent, para_id, n, code) =>
-				self.requests_cache.cache_historical_validation_code((relay_parent, para_id, n), code),
+			ValidationCodeByHash(relay_parent, validation_code_hash, code) =>
+				self.requests_cache.cache_validation_code_by_hash((relay_parent, validation_code_hash), code),
 			CandidatePendingAvailability(relay_parent, para_id, candidate) =>
 				self.requests_cache.cache_candidate_pending_availability((relay_parent, para_id), candidate),
 			CandidateEvents(relay_parent, events) =>
@@ -183,9 +183,9 @@ impl<Client> RuntimeApiSubsystem<Client> where
 			Request::ValidationCode(para, assumption, sender) =>
 				query!(validation_code(para, assumption), sender)
 					.map(|sender| Request::ValidationCode(para, assumption, sender)),
-			Request::HistoricalValidationCode(para, at, sender) =>
-				query!(historical_validation_code(para, at), sender)
-					.map(|sender| Request::HistoricalValidationCode(para, at, sender)),
+			Request::ValidationCodeByHash(validation_code_hash, sender) =>
+				query!(validation_code_by_hash(validation_code_hash), sender)
+					.map(|sender| Request::ValidationCodeByHash(validation_code_hash, sender)),
 			Request::CandidatePendingAvailability(para, sender) =>
 				query!(candidate_pending_availability(para), sender)
 					.map(|sender| Request::CandidatePendingAvailability(para, sender)),
@@ -341,8 +341,8 @@ where
 		Request::SessionIndexForChild(sender) => query!(SessionIndexForChild, session_index_for_child(), sender),
 		Request::ValidationCode(para, assumption, sender) =>
 			query!(ValidationCode, validation_code(para, assumption), sender),
-		Request::HistoricalValidationCode(para, at, sender) =>
-			query!(HistoricalValidationCode, historical_validation_code(para, at), sender),
+		Request::ValidationCodeByHash(validation_code_hash, sender) =>
+			query!(ValidationCodeByHash, validation_code_by_hash(validation_code_hash), sender),
 		Request::CandidatePendingAvailability(para, sender) =>
 			query!(CandidatePendingAvailability, candidate_pending_availability(para), sender),
 		Request::CandidateEvents(sender) => query!(CandidateEvents, candidate_events(), sender),

node/subsystem/src/messages.rs

@@ -22,37 +22,34 @@
 //!
 //! Subsystems' APIs are defined separately from their implementation, leading to easier mocking.
 
+use std::{collections::btree_map::BTreeMap, sync::Arc};
+
 use futures::channel::{mpsc, oneshot};
 use thiserror::Error;
 
 pub use sc_network::IfDisconnected;
 
 use polkadot_node_network_protocol::{
-	PeerId, UnifiedReputationChange, peer_set::PeerSet,
-	request_response::{
-		Requests, request::IncomingRequest, v1 as req_res_v1
-	},
-	v1 as protocol_v1,
+	peer_set::PeerSet,
+	request_response::{request::IncomingRequest, v1 as req_res_v1, Requests},
+	v1 as protocol_v1, PeerId, UnifiedReputationChange,
 };
 use polkadot_node_primitives::{
-	CollationGenerationConfig, SignedFullStatement, ValidationResult,
 	approval::{BlockApprovalMeta, IndirectAssignmentCert, IndirectSignedApprovalVote},
-	BabeEpoch, AvailableData, PoV, ErasureChunk
+	AvailableData, BabeEpoch, CollationGenerationConfig, ErasureChunk, PoV, SignedFullStatement,
+	ValidationResult,
 };
 use polkadot_primitives::v1::{
-	AuthorityDiscoveryId, BackedCandidate, BlockNumber, SessionInfo,
-	Header as BlockHeader, CandidateDescriptor, CandidateEvent, CandidateReceipt,
-	CollatorId, CommittedCandidateReceipt, CoreState,
-	GroupRotationInfo, Hash, Id as ParaId, OccupiedCoreAssumption,
-	PersistedValidationData, SessionIndex, SignedAvailabilityBitfield,
-	ValidationCode, ValidatorId, CandidateHash,
-	ValidatorIndex, ValidatorSignature, InboundDownwardMessage, InboundHrmpMessage,
-	CandidateIndex, GroupIndex, MultiDisputeStatementSet, SignedAvailabilityBitfields,
+	AuthorityDiscoveryId, BackedCandidate, BlockNumber, CandidateDescriptor, CandidateEvent,
+	CandidateHash, CandidateIndex, CandidateReceipt, CollatorId, CommittedCandidateReceipt,
+	CoreState, GroupIndex, GroupRotationInfo, Hash, Header as BlockHeader, Id as ParaId,
+	InboundDownwardMessage, InboundHrmpMessage, MultiDisputeStatementSet, OccupiedCoreAssumption,
+	PersistedValidationData, SessionIndex, SessionInfo, SignedAvailabilityBitfield,
+	SignedAvailabilityBitfields, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
+	ValidatorSignature,
 };
-use polkadot_statement_table::v1::Misbehavior;
 use polkadot_procmacro_subsystem_dispatch_gen::subsystem_dispatch_gen;
-use std::{sync::Arc, collections::btree_map::BTreeMap};
-
+use polkadot_statement_table::v1::Misbehavior;
 
 /// Network events as transmitted to other subsystems, wrapped in their message types.
 pub mod network_bridge_event;
@@ -464,16 +461,9 @@ pub enum RuntimeApiRequest {
 		OccupiedCoreAssumption,
 		RuntimeApiSender<Option<ValidationCode>>,
 	),
-	/// Fetch the historical validation code used by a para for candidates executed in the
-	/// context of a given block height in the current chain.
-	///
-	/// `context_height` may be no greater than the height of the block in whose
-	/// state the runtime API is executed. Otherwise `None` is returned.
-	HistoricalValidationCode(
-		ParaId,
-		BlockNumber,
-		RuntimeApiSender<Option<ValidationCode>>,
-	),
+	/// Get validation code by its hash, either past, current or future code can be returned, as long as state is still
+	/// available.
+	ValidationCodeByHash(ValidationCodeHash, RuntimeApiSender<Option<ValidationCode>>),
 	/// Get a the candidate pending availability for a particular parachain by parachain / core index
 	CandidatePendingAvailability(ParaId, RuntimeApiSender<Option<CommittedCandidateReceipt>>),
 	/// Get all events concerning candidates (backing, inclusion, time-out) in the parent of

parachain/src/primitives.rs

@@ -62,6 +62,9 @@ impl ValidationCode {
 	}
 }
 
+/// A hash of the parachain validation code.
+pub type ValidationCodeHash = Hash;
+
 /// Parachain block data.
 ///
 /// Contains everything required to validate para-block, may contain block and witness data.

primitives/src/v1/mod.rs

@@ -38,7 +38,7 @@ pub use polkadot_core_primitives::v1::{
 
 // Export some polkadot-parachain primitives
 pub use polkadot_parachain::primitives::{
-	Id, LOWEST_USER_ID, LOWEST_PUBLIC_ID, HrmpChannelId, UpwardMessage, HeadData, ValidationCode,
+	Id, LOWEST_USER_ID, LOWEST_PUBLIC_ID, HrmpChannelId, UpwardMessage, HeadData, ValidationCode, ValidationCodeHash,
 };
 
 // Export some basic parachain primitives from v0.
@@ -909,15 +909,6 @@ sp_api::decl_runtime_apis! {
 		fn validation_code(para_id: Id, assumption: OccupiedCoreAssumption)
 			-> Option<ValidationCode>;
 
-		/// Fetch the historical validation code used by a para for candidates executed in the
-		/// context of a given block height in the current chain.
-		///
-		/// `context_height` may be no greater than the height of the block in whose
-		/// state the runtime API is executed.
-		#[skip_initialize_block]
-		fn historical_validation_code(para_id: Id, context_height: N)
-			-> Option<ValidationCode>;
-
 		/// Get the receipt of a candidate pending availability. This returns `Some` for any paras
 		/// assigned to occupied cores in `availability_cores` and `None` otherwise.
 		#[skip_initialize_block]

roadmap/implementers-guide/src/node/approval/approval-voting.md

@@ -271,7 +271,7 @@ On receiving an `ApprovedAncestor(Hash, BlockNumber, response_channel)`:
   * Requires `(SessionIndex, SessionInfo, CandidateReceipt, ValidatorIndex, backing_group, block_hash, candidate_index)`
   * Extract the public key of the `ValidatorIndex` from the `SessionInfo` for the session.
   * Issue an `AvailabilityRecoveryMessage::RecoverAvailableData(candidate, session_index, Some(backing_group), response_sender)`
-  * Load the historical validation code of the parachain by dispatching a `RuntimeApiRequest::HistoricalValidationCode(`descriptor.para_id`, `descriptor.relay_parent`)` against the state of `block_hash`.
+  * Load the historical validation code of the parachain by dispatching a `RuntimeApiRequest::ValidationCodeByHash(`descriptor.validation_code_hash`)` against the state of `block_hash`.
   * Spawn a background task with a clone of `background_tx`
     * Wait for the available data
     * Issue a `CandidateValidationMessage::ValidateFromExhaustive` message

roadmap/implementers-guide/src/node/disputes/dispute-participation.md

@@ -16,14 +16,6 @@ Output:
 
 ## Functionality
 
-In-memory state:
-
-```rust
-struct State {
-    recent_block_hash: Hash
-}
-```
-
 ### On `OverseerSignal::ActiveLeavesUpdate`
 
 Do nothing.
@@ -38,16 +30,14 @@ Conclude.
 
 ### On `DisputeParticipationMessage::Participate`
 
-> TODO: this validation code fetching procedure is not helpful for disputed blocks that are in chains we do not know. After https://github.com/paritytech/polkadot/issues/2457 we should use the `ValidationCodeByHash` runtime API using the code hash in the candidate receipt.
-
 * Decompose into parts: `{ candidate_hash, candidate_receipt, session, voted_indices }`
 * Issue an [`AvailabilityRecoveryMessage::RecoverAvailableData`][AvailabilityRecoveryMessage]
 * If the result is `Unavailable`, return.
 * If the result is `Invalid`, [cast invalid votes](#cast-votes) and return.
 * Fetch the block number of `candidate_receipt.descriptor.relay_parent` using a [`ChainApiMessage::BlockNumber`][ChainApiMessage].
-* If the data is recovered, dispatch a [`RuntimeApiMessage::HistoricalValidationCode`][RuntimeApiMessage] with the parameters `(candidate_receipt.descriptor.para_id, relay_parent_number)`.
+* If the data is recovered, dispatch a [`RuntimeApiMessage::ValidationCodeByHash`][RuntimeApiMessage] with the parameters `(candidate_receipt.descriptor.validation_code_hash)`.
 * Dispatch a [`AvailabilityStoreMessage::StoreAvailableData`][AvailabilityStoreMessage] with the data.
-* If the code is not fetched from the chain, return. This should be impossible with correct relay chain configuration after the TODO above is addressed and is unlikely before then, at least if chain synchronization is working correctly.
+* If the code is not fetched from the chain, return. This should be impossible with correct relay chain configuration, at least if chain synchronization is working correctly.
 * Dispatch a [`CandidateValidationMessage::ValidateFromExhaustive`][CandidateValidationMessage] with the available data and the validation code.
 * If the validation result is `Invalid`, [cast invalid votes](#cast-votes) and return.
 * If the validation fails, [cast invalid votes](#cast-votes) and return.
@@ -57,9 +47,7 @@ Conclude.
 
 This requires the parameters `{ candidate_receipt, candidate_hash, session, voted_indices }` as well as a choice of either `Valid` or `Invalid`.
 
-Invoke [`DisputeCoordinatorMessage::IssueLocalStatement`][DisputeCoordinatorMessage] with `is_valid` according to the parameterization.
-
-Invoke [`DisputeCoordinatorMessage::ImportStatements`][DisputeCoordinatorMessage] with each signed statement.
+Invoke [`DisputeCoordinatorMessage::IssueLocalStatement`][DisputeCoordinatorMessage] with `is_valid` according to the parametrization.
 
 [RuntimeApiMessage]: ../../types/overseer-protocol.md#runtime-api-message
 [DisputeParticipationMessage]: ../../types/overseer-protocol.md#dispute-participation-message

roadmap/implementers-guide/src/runtime-api/historical_validation_code.md

-# Historical Validation Code
-
-Fetch the historical validation code used by a para for candidates executed in the context of a given block height in the current chain.
-
-```rust
-fn historical_validation_code(at: Block, para_id: ParaId, context_height: BlockNumber) -> Option<ValidationCode>;
-```

roadmap/implementers-guide/src/runtime-api/validation-code.md

@@ -5,3 +5,9 @@ Fetch the validation code used by a para, making the given `OccupiedCoreAssumpti
 ```rust
 fn validation_code(at: Block, ParaId, OccupiedCoreAssumption) -> Option<ValidationCode>;
 ```
+
+Fetch the validation code (past, present or future) by its hash.
+
+```rust
+fn validation_code_by_hash(at: Block, Hash) -> Option<ValidationCode>;
+```

roadmap/implementers-guide/src/runtime/paras.md

@@ -144,7 +144,7 @@ UpcomingParasGenesis: map ParaId => Option<ParaGenesisArgs>;
 /// The number of references on the validation code in `CodeByHash` storage.
 CodeByHashRefs: map Hash => u32;
 /// Validation code stored by its hash.
-CoeByHash: map Hash => Option<ValidationCode>
+CodeByHash: map Hash => Option<ValidationCode>
 ```
 
 ## Session Change

roadmap/implementers-guide/src/types/overseer-protocol.md

@@ -618,9 +618,9 @@ enum RuntimeApiRequest {
     SessionIndexForChild(ResponseChannel<SessionIndex>),
     /// Get the validation code for a specific para, using the given occupied core assumption.
     ValidationCode(ParaId, OccupiedCoreAssumption, ResponseChannel<Option<ValidationCode>>),
-    /// Fetch the historical validation code used by a para for candidates executed in
-    /// the context of a given block height in the current chain.
-    HistoricalValidationCode(ParaId, BlockNumber, ResponseChannel<Option<ValidationCode>>),
+    /// Get validation code by its hash, either past, current or future code can be returned,
+    /// as long as state is still available.
+    ValidationCodeByHash(ValidationCodeHash, RuntimeApiSender<Option<ValidationCode>>),
     /// Get a committed candidate receipt for all candidates pending availability.
     CandidatePendingAvailability(ParaId, ResponseChannel<Option<CommittedCandidateReceipt>>),
     /// Get all events concerning candidates in the last block.

runtime/kusama/src/lib.rs

@@ -1625,12 +1625,6 @@ sp_api::impl_runtime_apis! {
 			parachains_runtime_api_impl::validation_code::<Runtime>(para_id, assumption)
 		}
 
-		fn historical_validation_code(para_id: ParaId, context_height: BlockNumber)
-			-> Option<ValidationCode>
-		{
-			parachains_runtime_api_impl::historical_validation_code::<Runtime>(para_id, context_height)
-		}
-
 		fn candidate_pending_availability(para_id: ParaId) -> Option<CommittedCandidateReceipt<Hash>> {
 			parachains_runtime_api_impl::candidate_pending_availability::<Runtime>(para_id)
 		}

runtime/parachains/src/paras.rs

@@ -858,25 +858,6 @@ impl<T: Config> Module<T> {
 		}
 	}
 
-	/// Fetch validation code of para in specific context, see [`Self::validation_code_hash_at`].
-	pub(crate) fn validation_code_at(
-		id: ParaId,
-		at: T::BlockNumber,
-		assume_intermediate: Option<T::BlockNumber>,
-	) -> Option<ValidationCode> {
-		Self::validation_code_hash_at(id, at, assume_intermediate).and_then(|code_hash| {
-			let code = CodeByHash::get(&code_hash);
-			if code.is_none() {
-				log::error!(
-					"Pallet paras storage is inconsistent, code not found for hash {}",
-					code_hash,
-				);
-				debug_assert!(false, "inconsistent paras storages");
-			}
-			code
-		})
-	}
-
 	/// Returns the current lifecycle state of the para.
 	pub fn lifecycle(id: ParaId) -> Option<ParaLifecycle> {
 		ParaLifecycles::get(&id)
@@ -1022,6 +1003,15 @@ mod tests {
 		assert!(!<Paras as Store>::CodeByHash::contains_key(validation_code.hash()));
 	}
 
+	fn fetch_validation_code_at(
+		para_id: ParaId,
+		at: BlockNumber,
+		assume_intermediate: Option<BlockNumber>,
+	) -> Option<ValidationCode> {
+		Paras::validation_code_hash_at(para_id, at, assume_intermediate)
+			.and_then(Paras::code_by_hash)
+	}
+
 	#[test]
 	fn para_past_code_meta_gives_right_code() {
 		let mut past_code = ParaPastCodeMeta::default();
@@ -1661,7 +1651,7 @@ mod tests {
 	}
 
 	#[test]
-	fn code_at_with_intermediate() {
+	fn code_hash_at_with_intermediate() {
 		let code_retention_period = 10;
 
 		let paras = vec![
@@ -1691,29 +1681,29 @@ mod tests {
 			Paras::schedule_code_upgrade(para_id, new_code.clone(), 10);
 
 			// no intermediate, falls back on current/past.
-			assert_eq!(Paras::validation_code_at(para_id, 1, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 10, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 100, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 1, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 10, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 100, None), Some(old_code.clone()));
 
 			// intermediate before upgrade meant to be applied, falls back on current.
-			assert_eq!(Paras::validation_code_at(para_id, 9, Some(8)), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 10, Some(9)), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 11, Some(9)), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 9, Some(8)), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 10, Some(9)), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 11, Some(9)), Some(old_code.clone()));
 
 			// intermediate at or after upgrade applied
-			assert_eq!(Paras::validation_code_at(para_id, 11, Some(10)), Some(new_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 100, Some(11)), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 11, Some(10)), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 100, Some(11)), Some(new_code.clone()));
 
 			run_to_block(code_retention_period + 5, None);
 
 			// at <= intermediate not allowed
-			assert_eq!(Paras::validation_code_at(para_id, 10, Some(10)), None);
-			assert_eq!(Paras::validation_code_at(para_id, 9, Some(10)), None);
+			assert_eq!(fetch_validation_code_at(para_id, 10, Some(10)), None);
+			assert_eq!(fetch_validation_code_at(para_id, 9, Some(10)), None);
 		});
 	}
 
 	#[test]
-	fn code_at_returns_up_to_end_of_code_retention_period() {
+	fn code_hash_at_returns_up_to_end_of_code_retention_period() {
 		let code_retention_period = 10;
 
 		let paras = vec![
@@ -1750,17 +1740,17 @@ mod tests {
 				vec![upgrade_at(2, 10)],
 			);
 
-			assert_eq!(Paras::validation_code_at(para_id, 2, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 3, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 9, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 10, None), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 2, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 3, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 9, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 10, None), Some(new_code.clone()));
 
 			run_to_block(10 + code_retention_period, None);
 
-			assert_eq!(Paras::validation_code_at(para_id, 2, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 3, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 9, None), Some(old_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 10, None), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 2, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 3, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 9, None), Some(old_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 10, None), Some(new_code.clone()));
 
 			run_to_block(10 + code_retention_period + 1, None);
 
@@ -1774,10 +1764,10 @@ mod tests {
 				},
 			);
 
-			assert_eq!(Paras::validation_code_at(para_id, 2, None), None); // pruned :(
-			assert_eq!(Paras::validation_code_at(para_id, 9, None), None);
-			assert_eq!(Paras::validation_code_at(para_id, 10, None), Some(new_code.clone()));
-			assert_eq!(Paras::validation_code_at(para_id, 11, None), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 2, None), None); // pruned :(
+			assert_eq!(fetch_validation_code_at(para_id, 9, None), None);
+			assert_eq!(fetch_validation_code_at(para_id, 10, None), Some(new_code.clone()));
+			assert_eq!(fetch_validation_code_at(para_id, 11, None), Some(new_code.clone()));
 		});
 	}
 

runtime/parachains/src/runtime_api_impl/v1.rs

@@ -274,14 +274,6 @@ pub fn validation_code<T: initializer::Config>(
 	)
 }
 
-/// Implementation for the `historical_validation_code` function of the runtime API.
-pub fn historical_validation_code<T: initializer::Config>(
-	para_id: ParaId,
-	context_height: T::BlockNumber,
-) -> Option<ValidationCode> {
-	<paras::Module<T>>::validation_code_at(para_id, context_height, None)
-}
-
 /// Implementation for the `candidate_pending_availability` function of the runtime API.
 pub fn candidate_pending_availability<T: initializer::Config>(para_id: ParaId)
 	-> Option<CommittedCandidateReceipt<T::Hash>>

runtime/polkadot/src/lib.rs

@@ -1187,10 +1187,6 @@ sp_api::impl_runtime_apis! {
 			None
 		}
 
-		fn historical_validation_code(_: Id, _: BlockNumber) -> Option<ValidationCode> {
-			None
-		}
-
 		fn candidate_pending_availability(_: Id) -> Option<CommittedCandidateReceipt<Hash>> {
 			None
 		}

runtime/rococo/src/lib.rs

@@ -1107,12 +1107,6 @@ sp_api::impl_runtime_apis! {
 			runtime_api_impl::validation_code::<Runtime>(para_id, assumption)
 		}
 
-		fn historical_validation_code(para_id: Id, context_height: BlockNumber)
-			-> Option<ValidationCode>
-		{
-			runtime_api_impl::historical_validation_code::<Runtime>(para_id, context_height)
-		}
-
 		fn candidate_pending_availability(para_id: Id) -> Option<CommittedCandidateReceipt<Hash>> {
 			runtime_api_impl::candidate_pending_availability::<Runtime>(para_id)
 		}

runtime/test-runtime/src/lib.rs

@@ -670,13 +670,6 @@ sp_api::impl_runtime_apis! {
 			runtime_impl::validation_code::<Runtime>(para_id, assumption)
 		}
 
-		fn historical_validation_code(para_id: ParaId, context_height: BlockNumber)
-			-> Option<ValidationCode>
-		{
-			runtime_impl::historical_validation_code::<Runtime>(para_id, context_height)
-		}
-
-
 		fn candidate_pending_availability(para_id: ParaId) -> Option<CommittedCandidateReceipt<Hash>> {
 			runtime_impl::candidate_pending_availability::<Runtime>(para_id)
 		}

runtime/westend/src/lib.rs

@@ -1223,12 +1223,6 @@ sp_api::impl_runtime_apis! {
 			parachains_runtime_api_impl::validation_code::<Runtime>(para_id, assumption)
 		}
 
-		fn historical_validation_code(para_id: ParaId, context_height: BlockNumber)
-			-> Option<ValidationCode>
-		{
-			parachains_runtime_api_impl::historical_validation_code::<Runtime>(para_id, context_height)
-		}