Merge branch 'master' into tweak-benchmark-action

AvaProtocol · Aug 3, 2023 · 1076011 · 1076011
2 parents 4dcdead + 34b568e
commit 1076011
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oak-node"
-version = "1.9.0"
+version = "2.0.0"
 authors = ["OAK Developement Team"]
 description = "Automation-first Blockchain"
 license = "GPL-3.0"

diff --git a/pallets/automation-time/src/migrations/update_xcmp_task.rs b/pallets/automation-time/src/migrations/update_xcmp_task.rs
@@ -5,7 +5,11 @@ use crate::{
 };
 #[cfg(feature = "try-runtime")]
 use codec::{Decode, Encode};
-use frame_support::{traits::OnRuntimeUpgrade, weights::Weight, Twox64Concat};
+use frame_support::{
+	traits::{Get, OnRuntimeUpgrade},
+	weights::{RuntimeDbWeight, Weight},
+	Twox64Concat,
+};
 use sp_runtime::traits::Convert;
 use sp_std::{vec, vec::Vec};
 use xcm::latest::prelude::*;
@@ -72,7 +76,7 @@ impl<T: Config> OnRuntimeUpgrade for UpdateXcmpTask<T> {
 	fn on_runtime_upgrade() -> Weight {
 		log::info!(target: "automation-time", "UpdateXcmpTask migration");
 
-		let mut migrated_tasks = 0u32;
+		let mut migrated_tasks = 0u64;
 
 		let mut tasks: Vec<(AccountOf<T>, TaskOf<T>)> = vec![];
 		AccountTasks::<T>::drain().for_each(|(account_id, _task_id, task)| {
@@ -91,7 +95,8 @@ impl<T: Config> OnRuntimeUpgrade for UpdateXcmpTask<T> {
 			migrated_tasks
 		);
 
-		<T as Config>::WeightInfo::migration_upgrade_xcmp_task(migrated_tasks)
+		let db_weight: RuntimeDbWeight = T::DbWeight::get();
+		db_weight.reads_writes(migrated_tasks + 1, migrated_tasks + 1)
 	}
 
 	#[cfg(feature = "try-runtime")]

diff --git a/runtime/neumann/src/lib.rs b/runtime/neumann/src/lib.rs
@@ -172,8 +172,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("neumann"),
 	impl_name: create_runtime_str!("neumann"),
 	authoring_version: 1,
-	spec_version: 294,
-	impl_version: 1,
+	spec_version: 295,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 17,
 	state_version: 0,

diff --git a/runtime/oak/src/lib.rs b/runtime/oak/src/lib.rs
@@ -172,10 +172,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("oak"),
 	impl_name: create_runtime_str!("oak"),
 	authoring_version: 1,
-	spec_version: 294,
-	impl_version: 1,
+	spec_version: 295,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 17,
+	transaction_version: 18,
 	state_version: 0,
 };
 

diff --git a/runtime/turing/src/lib.rs b/runtime/turing/src/lib.rs
@@ -186,10 +186,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("turing"),
 	impl_name: create_runtime_str!("turing"),
 	authoring_version: 1,
-	spec_version: 294,
-	impl_version: 1,
+	spec_version: 295,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 17,
+	transaction_version: 18,
 	state_version: 0,
 };