Finish migration to v2 primitives

bridges/bin/rialto/node/src/chain_spec.rs

@@ -16,7 +16,7 @@
 
 use beefy_primitives::crypto::AuthorityId as BeefyId;
 use bp_rialto::derive_account_from_millau_id;
-use polkadot_primitives::v1::{AssignmentId, ValidatorId};
+use polkadot_primitives::v2::{AssignmentId, ValidatorId};
 use rialto_runtime::{
 	AccountId, BabeConfig, BalancesConfig, BeefyConfig, BridgeMillauMessagesConfig,
 	ConfigurationConfig, GenesisConfig, GrandpaConfig, SessionConfig, SessionKeys, Signature,
@@ -250,8 +250,8 @@ fn testnet_genesis(
 				validation_upgrade_frequency: 1u32,
 				validation_upgrade_delay: 1,
 				code_retention_period: 1200,
-				max_code_size: polkadot_primitives::v1::MAX_CODE_SIZE,
-				max_pov_size: polkadot_primitives::v1::MAX_POV_SIZE,
+				max_code_size: polkadot_primitives::v2::MAX_CODE_SIZE,
+				max_pov_size: polkadot_primitives::v2::MAX_POV_SIZE,
 				max_head_data_size: 32 * 1024,
 				group_rotation_frequency: 20,
 				chain_availability_period: 4,

bridges/bin/rialto/node/src/overseer.rs

@@ -36,7 +36,7 @@ use polkadot_overseer::{
 	metrics::Metrics as OverseerMetrics, BlockInfo, MetricsTrait, Overseer, InitializedOverseerBuilder,
 	OverseerConnector, OverseerHandle,
 };
-use polkadot_primitives::v1::ParachainHost;
+use polkadot_primitives::v2::ParachainHost;
 use sc_authority_discovery::Service as AuthorityDiscoveryService;
 use sc_client_api::AuxStore;
 use sc_keystore::LocalKeystore;

bridges/bin/rialto/node/src/service.rs

@@ -29,7 +29,7 @@ use polkadot_node_core_chain_selection::Config as ChainSelectionConfig;
 use polkadot_node_core_dispute_coordinator::Config as DisputeCoordinatorConfig;
 use polkadot_node_network_protocol::request_response::IncomingRequest;
 use polkadot_overseer::{BlockInfo, OverseerConnector};
-use polkadot_primitives::v1::BlockId;
+use polkadot_primitives::v2::BlockId;
 use rialto_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::ExecutorProvider;
 use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch};
@@ -43,7 +43,7 @@ use std::{sync::Arc, time::Duration};
 use substrate_prometheus_endpoint::Registry;
 
 pub use polkadot_overseer::Handle;
-pub use polkadot_primitives::v1::ParachainHost;
+pub use polkadot_primitives::v2::ParachainHost;
 pub use sc_client_api::AuxStore;
 pub use sp_authority_discovery::AuthorityDiscoveryApi;
 pub use sp_blockchain::HeaderBackend;

bridges/bin/rialto/runtime/src/lib.rs

@@ -747,64 +747,64 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl polkadot_primitives::v1::ParachainHost<Block, Hash, BlockNumber> for Runtime {
-		fn validators() -> Vec<polkadot_primitives::v1::ValidatorId> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::validators::<Runtime>()
+	impl polkadot_primitives::v2::ParachainHost<Block, Hash, BlockNumber> for Runtime {
+		fn validators() -> Vec<polkadot_primitives::v2::ValidatorId> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::validators::<Runtime>()
 		}
 
 		fn validator_groups() -> (
-			Vec<Vec<polkadot_primitives::v1::ValidatorIndex>>,
-			polkadot_primitives::v1::GroupRotationInfo<BlockNumber>,
+			Vec<Vec<polkadot_primitives::v2::ValidatorIndex>>,
+			polkadot_primitives::v2::GroupRotationInfo<BlockNumber>,
 		) {
-			polkadot_runtime_parachains::runtime_api_impl::v1::validator_groups::<Runtime>()
+			polkadot_runtime_parachains::runtime_api_impl::v2::validator_groups::<Runtime>()
 		}
 
-		fn availability_cores() -> Vec<polkadot_primitives::v1::CoreState<Hash, BlockNumber>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::availability_cores::<Runtime>()
+		fn availability_cores() -> Vec<polkadot_primitives::v2::CoreState<Hash, BlockNumber>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::availability_cores::<Runtime>()
 		}
 
 		fn persisted_validation_data(
-			para_id: polkadot_primitives::v1::Id,
-			assumption: polkadot_primitives::v1::OccupiedCoreAssumption,
+			para_id: polkadot_primitives::v2::Id,
+			assumption: polkadot_primitives::v2::OccupiedCoreAssumption,
 		)
-			-> Option<polkadot_primitives::v1::PersistedValidationData<Hash, BlockNumber>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::persisted_validation_data::<Runtime>(para_id, assumption)
+			-> Option<polkadot_primitives::v2::PersistedValidationData<Hash, BlockNumber>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::persisted_validation_data::<Runtime>(para_id, assumption)
 		}
 
 		fn assumed_validation_data(
-			para_id: polkadot_primitives::v1::Id,
+			para_id: polkadot_primitives::v2::Id,
 			expected_persisted_validation_data_hash: Hash,
-		) -> Option<(polkadot_primitives::v1::PersistedValidationData<Hash, BlockNumber>, polkadot_primitives::v1::ValidationCodeHash)> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::assumed_validation_data::<Runtime>(para_id, expected_persisted_validation_data_hash)
+		) -> Option<(polkadot_primitives::v2::PersistedValidationData<Hash, BlockNumber>, polkadot_primitives::v2::ValidationCodeHash)> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::assumed_validation_data::<Runtime>(para_id, expected_persisted_validation_data_hash)
 		}
 
 		fn check_validation_outputs(
-			para_id: polkadot_primitives::v1::Id,
-			outputs: polkadot_primitives::v1::CandidateCommitments,
+			para_id: polkadot_primitives::v2::Id,
+			outputs: polkadot_primitives::v2::CandidateCommitments,
 		) -> bool {
-			polkadot_runtime_parachains::runtime_api_impl::v1::check_validation_outputs::<Runtime>(para_id, outputs)
+			polkadot_runtime_parachains::runtime_api_impl::v2::check_validation_outputs::<Runtime>(para_id, outputs)
 		}
 
-		fn session_index_for_child() -> polkadot_primitives::v1::SessionIndex {
-			polkadot_runtime_parachains::runtime_api_impl::v1::session_index_for_child::<Runtime>()
+		fn session_index_for_child() -> polkadot_primitives::v2::SessionIndex {
+			polkadot_runtime_parachains::runtime_api_impl::v2::session_index_for_child::<Runtime>()
 		}
 
 		fn validation_code(
-			para_id: polkadot_primitives::v1::Id,
-			assumption: polkadot_primitives::v1::OccupiedCoreAssumption,
+			para_id: polkadot_primitives::v2::Id,
+			assumption: polkadot_primitives::v2::OccupiedCoreAssumption,
 		)
-			-> Option<polkadot_primitives::v1::ValidationCode> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::validation_code::<Runtime>(para_id, assumption)
+			-> Option<polkadot_primitives::v2::ValidationCode> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::validation_code::<Runtime>(para_id, assumption)
 		}
 
 		fn candidate_pending_availability(
-			para_id: polkadot_primitives::v1::Id,
-		) -> Option<polkadot_primitives::v1::CommittedCandidateReceipt<Hash>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::candidate_pending_availability::<Runtime>(para_id)
+			para_id: polkadot_primitives::v2::Id,
+		) -> Option<polkadot_primitives::v2::CommittedCandidateReceipt<Hash>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::candidate_pending_availability::<Runtime>(para_id)
 		}
 
-		fn candidate_events() -> Vec<polkadot_primitives::v1::CandidateEvent<Hash>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::candidate_events::<Runtime, _>(|ev| {
+		fn candidate_events() -> Vec<polkadot_primitives::v2::CandidateEvent<Hash>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::candidate_events::<Runtime, _>(|ev| {
 				match ev {
 					Event::Inclusion(ev) => {
 						Some(ev)
@@ -814,36 +814,36 @@ impl_runtime_apis! {
 			})
 		}
 
-		fn session_info(index: polkadot_primitives::v1::SessionIndex) -> Option<polkadot_primitives::v1::SessionInfo> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::session_info::<Runtime>(index)
+		fn session_info(index: polkadot_primitives::v2::SessionIndex) -> Option<polkadot_primitives::v2::SessionInfo> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::session_info::<Runtime>(index)
 		}
 
 		fn dmq_contents(
-			recipient: polkadot_primitives::v1::Id,
-		) -> Vec<polkadot_primitives::v1::InboundDownwardMessage<BlockNumber>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::dmq_contents::<Runtime>(recipient)
+			recipient: polkadot_primitives::v2::Id,
+		) -> Vec<polkadot_primitives::v2::InboundDownwardMessage<BlockNumber>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::dmq_contents::<Runtime>(recipient)
 		}
 
 		fn inbound_hrmp_channels_contents(
-			recipient: polkadot_primitives::v1::Id
-		) -> BTreeMap<polkadot_primitives::v1::Id, Vec<polkadot_primitives::v1::InboundHrmpMessage<BlockNumber>>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::inbound_hrmp_channels_contents::<Runtime>(recipient)
+			recipient: polkadot_primitives::v2::Id
+		) -> BTreeMap<polkadot_primitives::v2::Id, Vec<polkadot_primitives::v2::InboundHrmpMessage<BlockNumber>>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::inbound_hrmp_channels_contents::<Runtime>(recipient)
 		}
 
 		fn validation_code_by_hash(
-			hash: polkadot_primitives::v1::ValidationCodeHash,
-		) -> Option<polkadot_primitives::v1::ValidationCode> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::validation_code_by_hash::<Runtime>(hash)
+			hash: polkadot_primitives::v2::ValidationCodeHash,
+		) -> Option<polkadot_primitives::v2::ValidationCode> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::validation_code_by_hash::<Runtime>(hash)
 		}
 
-		fn on_chain_votes() -> Option<polkadot_primitives::v1::ScrapedOnChainVotes<Hash>> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::on_chain_votes::<Runtime>()
+		fn on_chain_votes() -> Option<polkadot_primitives::v2::ScrapedOnChainVotes<Hash>> {
+			polkadot_runtime_parachains::runtime_api_impl::v2::on_chain_votes::<Runtime>()
 		}
 	}
 
 	impl sp_authority_discovery::AuthorityDiscoveryApi<Block> for Runtime {
 		fn authorities() -> Vec<AuthorityDiscoveryId> {
-			polkadot_runtime_parachains::runtime_api_impl::v1::relevant_authority_ids::<Runtime>()
+			polkadot_runtime_parachains::runtime_api_impl::v2::relevant_authority_ids::<Runtime>()
 		}
 	}
 

bridges/bin/rialto/runtime/src/parachains.rs

@@ -20,7 +20,7 @@ use crate::{AccountId, Balance, Balances, BlockNumber, Event, Origin, Registrar,
 
 use frame_support::{parameter_types, weights::Weight};
 use frame_system::EnsureRoot;
-use polkadot_primitives::v1::ValidatorIndex;
+use polkadot_primitives::v2::ValidatorIndex;
 use polkadot_runtime_common::{paras_registrar, paras_sudo_wrapper, slots};
 use polkadot_runtime_parachains::{
 	configuration as parachains_configuration, dmp as parachains_dmp, hrmp as parachains_hrmp,

bridges/relays/bin-substrate/src/cli/register_parachain.rs

@@ -106,8 +106,8 @@ impl RegisterParachain {
 			let para_id: ParaId = relay_client
 				.storage_value(StorageKey(para_id_key.to_vec()), None)
 				.await?
-				.unwrap_or(polkadot_primitives::v1::LOWEST_PUBLIC_ID)
-				.max(polkadot_primitives::v1::LOWEST_PUBLIC_ID);
+				.unwrap_or(polkadot_primitives::v2::LOWEST_PUBLIC_ID)
+				.max(polkadot_primitives::v2::LOWEST_PUBLIC_ID);
 			log::info!(target: "bridge", "Going to reserve parachain id: {:?}", para_id);
 
 			// step 1: reserve a parachain id

core-primitives/src/lib.rs

@@ -149,7 +149,7 @@ pub struct OutboundHrmpMessage<Id> {
 	pub data: sp_std::vec::Vec<u8>,
 }
 
-/// `V1` primitives.
-pub mod v1 {
+/// `V2` primitives.
+pub mod v2 {
 	pub use super::*;
 }

erasure-coding/src/lib.rs

@@ -28,7 +28,7 @@ use std::convert::TryFrom;
 
 use parity_scale_codec::{Decode, Encode};
 use polkadot_node_primitives::{AvailableData, Proof};
-use polkadot_primitives::v0::{self, BlakeTwo256, Hash as H256, HashT};
+use polkadot_primitives::v2::{BlakeTwo256, Hash as H256, HashT};
 use sp_core::Blake2Hasher;
 use thiserror::Error;
 use trie::{
@@ -115,16 +115,6 @@ fn code_params(n_validators: usize) -> Result<CodeParams, Error> {
 	})
 }
 
-/// Obtain erasure-coded chunks for v0 `AvailableData`, one for each validator.
-///
-/// Works only up to 65536 validators, and `n_validators` must be non-zero.
-pub fn obtain_chunks_v0(
-	n_validators: usize,
-	data: &v0::AvailableData,
-) -> Result<Vec<Vec<u8>>, Error> {
-	obtain_chunks(n_validators, data)
-}
-
 /// Obtain erasure-coded chunks for v1 `AvailableData`, one for each validator.
 ///
 /// Works only up to 65536 validators, and `n_validators` must be non-zero.
@@ -151,20 +141,6 @@ pub fn obtain_chunks<T: Encode>(n_validators: usize, data: &T) -> Result<Vec<Vec
 	Ok(shards.into_iter().map(|w: WrappedShard| w.into_inner()).collect())
 }
 
-/// Reconstruct the v0 available data from a set of chunks.
-///
-/// Provide an iterator containing chunk data and the corresponding index.
-/// The indices of the present chunks must be indicated. If too few chunks
-/// are provided, recovery is not possible.
-///
-/// Works only up to 65536 validators, and `n_validators` must be non-zero.
-pub fn reconstruct_v0<'a, I: 'a>(n_validators: usize, chunks: I) -> Result<v0::AvailableData, Error>
-where
-	I: IntoIterator<Item = (&'a [u8], usize)>,
-{
-	reconstruct(n_validators, chunks)
-}
-
 /// Reconstruct the v1 available data from a set of chunks.
 ///
 /// Provide an iterator containing chunk data and the corresponding index.
@@ -370,7 +346,7 @@ impl<'a, I: Iterator<Item = &'a [u8]>> parity_scale_codec::Input for ShardInput<
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use polkadot_primitives::v0::{AvailableData, BlockData, OmittedValidationData, PoVBlock};
+	use polkadot_node_primitives::{AvailableData, BlockData, PoV};
 
 	// In order to adequately compute the number of entries in the Merkle
 	// trie, we must account for the fixed 16-ary trie structure.
@@ -383,10 +359,9 @@ mod tests {
 
 	#[test]
 	fn round_trip_works() {
-		let pov_block = PoVBlock { block_data: BlockData((0..255).collect()) };
+		let pov = PoV { block_data: BlockData((0..255).collect()) };
 
-		let available_data =
-			AvailableData { pov_block, omitted_validation: OmittedValidationData::default() };
+		let available_data = AvailableData { pov: pov.into(), validation_data: Default::default() };
 		let chunks = obtain_chunks(10, &available_data).unwrap();
 
 		assert_eq!(chunks.len(), 10);
@@ -411,11 +386,9 @@ mod tests {
 
 	fn generate_trie_and_generate_proofs(magnitude: u32) {
 		let n_validators = 2_u32.pow(magnitude) as usize;
-		let pov_block =
-			PoVBlock { block_data: BlockData(vec![2; n_validators / KEY_INDEX_NIBBLE_SIZE]) };
+		let pov = PoV { block_data: BlockData(vec![2; n_validators / KEY_INDEX_NIBBLE_SIZE]) };
 
-		let available_data =
-			AvailableData { pov_block, omitted_validation: OmittedValidationData::default() };
+		let available_data = AvailableData { pov: pov.into(), validation_data: Default::default() };
 
 		let chunks = obtain_chunks(magnitude as usize, &available_data).unwrap();
 

node/client/src/lib.rs

@@ -19,9 +19,8 @@
 //! Provides the [`AbstractClient`] trait that is a super trait that combines all the traits the client implements.
 //! There is also the [`Client`] enum that combines all the different clients into one common structure.
 
-use polkadot_primitives::{
-	v1::{AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce},
-	v2::ParachainHost,
+use polkadot_primitives::v2::{
+	AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce, ParachainHost,
 };
 use sc_client_api::{AuxStore, Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider};
 use sc_executor::NativeElseWasmExecutor;

node/collation-generation/src/lib.rs

@@ -31,7 +31,7 @@ use polkadot_node_subsystem_util::{
 	request_availability_cores, request_persisted_validation_data, request_validation_code,
 	request_validation_code_hash, request_validators,
 };
-use polkadot_primitives::v1::{
+use polkadot_primitives::v2::{
 	collator_signature_payload, CandidateCommitments, CandidateDescriptor, CandidateReceipt,
 	CoreState, Hash, Id as ParaId, OccupiedCoreAssumption, PersistedValidationData,
 	ValidationCodeHash,

node/collation-generation/src/tests.rs

@@ -32,7 +32,7 @@ mod handle_new_activations {
 	use polkadot_node_subsystem_test_helpers::{
 		subsystem_test_harness, TestSubsystemContextHandle,
 	};
-	use polkadot_primitives::v1::{
+	use polkadot_primitives::v2::{
 		CollatorPair, Id as ParaId, PersistedValidationData, ScheduledCore, ValidationCode,
 	};
 	use std::pin::Pin;

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

@@ -18,7 +18,7 @@
 
 use bitvec::{order::Lsb0 as BitOrderLsb0, slice::BitSlice};
 use polkadot_node_primitives::approval::DelayTranche;
-use polkadot_primitives::v1::ValidatorIndex;
+use polkadot_primitives::v2::ValidatorIndex;
 
 use crate::{
 	persisted_entries::{ApprovalEntry, CandidateEntry, TrancheEntry},
@@ -460,7 +460,7 @@ mod tests {
 	use crate::{approval_db, BTreeMap};
 	use ::test_helpers::{dummy_candidate_receipt, dummy_hash};
 	use bitvec::{bitvec, order::Lsb0 as BitOrderLsb0, vec::BitVec};
-	use polkadot_primitives::v1::GroupIndex;
+	use polkadot_primitives::v2::GroupIndex;
 
 	#[test]
 	fn pending_is_not_approved() {

node/core/approval-voting/src/approval_db/v1/mod.rs

@@ -20,7 +20,7 @@ use parity_scale_codec::{Decode, Encode};
 use polkadot_node_primitives::approval::{AssignmentCert, DelayTranche};
 use polkadot_node_subsystem::{SubsystemError, SubsystemResult};
 use polkadot_node_subsystem_util::database::{DBTransaction, Database};
-use polkadot_primitives::v1::{
+use polkadot_primitives::v2::{
 	BlockNumber, CandidateHash, CandidateReceipt, CoreIndex, GroupIndex, Hash, SessionIndex,
 	ValidatorIndex, ValidatorSignature,
 };

node/core/approval-voting/src/approval_db/v1/tests.rs

@@ -22,7 +22,7 @@ use crate::{
 	ops::{add_block_entry, canonicalize, force_approve, NewCandidateInfo},
 };
 use polkadot_node_subsystem_util::database::Database;
-use polkadot_primitives::v1::Id as ParaId;
+use polkadot_primitives::v2::Id as ParaId;
 use std::{collections::HashMap, sync::Arc};
 
 use ::test_helpers::{dummy_candidate_receipt, dummy_candidate_receipt_bad_sig, dummy_hash};

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

@@ -22,7 +22,7 @@
 //! before any commit to the underlying storage is made.
 
 use polkadot_node_subsystem::SubsystemResult;
-use polkadot_primitives::v1::{BlockNumber, CandidateHash, Hash};
+use polkadot_primitives::v2::{BlockNumber, CandidateHash, Hash};
 
 use std::collections::HashMap;