schemas: PoV compatible changes

designdocs/schema_v2.md

@@ -39,3 +39,8 @@ pub struct SchemaInfo {
     pub settings: SchemaSettings,
 }
 ```
+### Expected PoV improvements
+This PoV improvement would not extrinsic weights in this pallet, but it would directly affect any
+pallet that is dependent on **Schemas** pallet. Some of these pallets are **Messages** and
+**Stateful-Storage**. After these changes we are expecting see to see around 30-60KiB decrease in PoV
+for `MaxEncodedLen` mode.

node/cli/src/command.rs

@@ -373,7 +373,9 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::TryRuntime(cmd)) => {
 			use common_runtime::constants::MILLISECS_PER_BLOCK;
 			use try_runtime_cli::block_building_info::timestamp_with_aura_info;
+
 			let runner = cli.create_runner(cmd)?;
+
 			type HostFunctions =
 				(sp_io::SubstrateHostFunctions, frame_benchmarking::benchmarking::HostFunctions);
 

pallets/schemas/src/lib.rs

@@ -395,7 +395,7 @@
 			<CurrentSchemaIdentifierMaximum<T>>::set(n);
 		}
 
-		/// Build the [`SchemaInfo`] and insert it into storage
+		/// Inserts both the [`SchemaInfo`] and Schema Payload into storage
 		/// Updates the `CurrentSchemaIdentifierMaximum` storage
 		pub fn add_schema(
 			model: BoundedVec<u8, T::SchemaModelMaxBytesBoundedVecLimit>,
@@ -434,8 +434,8 @@
 					Some(response)
 				},
 				(None, Some(_)) | (Some(_), None) => {
 					log::error!("Corrupted state for schema {:?}, Should never happen!", schema_id);
 					None
 				},
 				(None, None) => None,
 			}
@@ -443,13 +443,13 @@
 
 		/// Retrieve a schema info by id
 		pub fn get_schema_info_by_id(schema_id: SchemaId) -> Option<SchemaInfoResponse> {
 			if let Some(schema_info) = Self::get_schema_info(schema_id) {
 				let saved_settings = schema_info.settings;
 				let settings = saved_settings.0.iter().collect::<Vec<SchemaSetting>>();
 				let response = SchemaInfoResponse {
 					schema_id,
 					model_type: schema_info.model_type,
 					payload_location: schema_info.payload_location,
 					settings,
 				};
 				return Some(response)
@@ -568,7 +568,7 @@
 		Self::get_schema_by_id(schema_id)
 	}
 
 	fn get_schema_info_by_id(schema_id: SchemaId) -> Option<SchemaInfoResponse> {
 		Self::get_schema_info_by_id(schema_id)
 	}
 }

pallets/schemas/src/migration/v2.rs

@@ -52,9 +52,9 @@
 pub struct MigrateToV2<T>(PhantomData<T>);
 
 impl<T: Config> OnRuntimeUpgrade for MigrateToV2<T> {
 	fn on_runtime_upgrade() -> Weight {
 		migrate_to_v2::<T>()
 	}
 
 	#[cfg(feature = "try-runtime")]
 	fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
@@ -92,13 +92,15 @@
 	let onchain_version = Pallet::<T>::on_chain_storage_version();
 	let current_version = Pallet::<T>::current_storage_version();
 	log::info!(target: LOG_TARGET, "onchain_version= {:?}, current_version={:?}", onchain_version, current_version);
+	let each_layer_access: u64 = 33 * 16;
 
 	if onchain_version < 2 {
 		let mut reads = 1u64;
 		let mut writes = 0u64;
 		let mut bytes = 0u64;
 		for (schema_id, schema) in old::Schemas::<T>::drain() {
 			bytes = bytes.saturating_add(schema.encode().len() as u64);
+			bytes = bytes.saturating_add(each_layer_access * 3); // three layers in merkle tree
 
 			let info = SchemaInfo {
 				model_type: schema.model_type,
@@ -125,12 +127,12 @@
 		log::info!(target: LOG_TARGET, "Migration Calculated weights={:?}",weights);
 		weights
 	} else {
 		log::info!(
 			target: LOG_TARGET,
 			"Migration did not execute. This probably should be removed onchain:{:?}, current:{:?}",
 			onchain_version,
 			current_version
 		);
 		T::DbWeight::get().reads(1)
 	}
 }

pallets/schemas/src/tests/other_tests.rs

@@ -735,6 +735,8 @@ fn schemas_migration_to_v2_should_work_as_expected() {
 			);
 		}
 		let old_schema_1 = v2::old::Schemas::<Test>::get(1u16).expect("should have value");
+		let old_schema_2 = v2::old::Schemas::<Test>::get(2u16).expect("should have value");
+		let old_schema_3 = v2::old::Schemas::<Test>::get(3u16).expect("should have value");
 
 		// Act
 		let _ = v2::migrate_to_v2::<Test>();
@@ -745,17 +747,30 @@ fn schemas_migration_to_v2_should_work_as_expected() {
 		let new_payload_count = SchemaPayloads::<Test>::iter().count();
 		let current_version = SchemasPallet::current_storage_version();
 
-		let schema_info_1 = SchemaInfos::<Test>::get(1).expect("should have value");
-		let schema_payload_1 = SchemaPayloads::<Test>::get(1u16).expect("should have value");
-
 		assert_eq!(old_count, 0);
 		assert_eq!(new_info_count, schemas.len());
 		assert_eq!(new_payload_count, schemas.len());
 		assert_eq!(current_version, StorageVersion::new(2));
 
+		let schema_info_1 = SchemaInfos::<Test>::get(1).expect("should have value");
+		let schema_payload_1 = SchemaPayloads::<Test>::get(1u16).expect("should have value");
 		assert_eq!(schema_info_1.model_type, old_schema_1.model_type);
 		assert_eq!(schema_info_1.payload_location, old_schema_1.payload_location);
 		assert_eq!(schema_info_1.settings, old_schema_1.settings);
 		assert_eq!(schema_payload_1.into_inner(), old_schema_1.model.into_inner());
+
+		let schema_info_2 = SchemaInfos::<Test>::get(2).expect("should have value");
+		let schema_payload_2 = SchemaPayloads::<Test>::get(2u16).expect("should have value");
+		assert_eq!(schema_info_2.model_type, old_schema_2.model_type);
+		assert_eq!(schema_info_2.payload_location, old_schema_2.payload_location);
+		assert_eq!(schema_info_2.settings, old_schema_2.settings);
+		assert_eq!(schema_payload_2.into_inner(), old_schema_2.model.into_inner());
+
+		let schema_info_3 = SchemaInfos::<Test>::get(3).expect("should have value");
+		let schema_payload_3 = SchemaPayloads::<Test>::get(3u16).expect("should have value");
+		assert_eq!(schema_info_3.model_type, old_schema_3.model_type);
+		assert_eq!(schema_info_3.payload_location, old_schema_3.payload_location);
+		assert_eq!(schema_info_3.settings, old_schema_3.settings);
+		assert_eq!(schema_payload_3.into_inner(), old_schema_3.model.into_inner());
 	});
 }

runtime/frequency/src/lib.rs

@@ -220,7 +220,10 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(pallet_schemas::migration::v2::MigrateToV2<Runtime>,),
+	(
+		pallet_messages::migration::v2::MigrateToV2<Runtime>,
+		pallet_schemas::migration::v2::MigrateToV2<Runtime>,
+	),
 >;
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -258,7 +261,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 61,
+	spec_version: 62,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -272,7 +275,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("frequency-rococo"),
 	impl_name: create_runtime_str!("frequency"),
 	authoring_version: 1,
-	spec_version: 61,
+	spec_version: 62,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,