diff --git a/Cargo.lock b/Cargo.lock index 279f9f146e..51f6a415b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -413,7 +413,7 @@ dependencies = [ [[package]] name = "astar-collator" -version = "5.25.0" +version = "5.26.0" dependencies = [ "astar-primitives", "astar-runtime", @@ -543,7 +543,7 @@ dependencies = [ [[package]] name = "astar-runtime" -version = "5.25.0" +version = "5.26.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -6005,7 +6005,7 @@ checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "local-runtime" -version = "5.25.0" +version = "5.26.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -13104,7 +13104,7 @@ dependencies = [ [[package]] name = "shibuya-runtime" -version = "5.25.0" +version = "5.26.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", @@ -13211,7 +13211,7 @@ dependencies = [ [[package]] name = "shiden-runtime" -version = "5.25.0" +version = "5.26.0" dependencies = [ "array-bytes 6.1.0", "astar-primitives", diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 38eac1b0c9..b16d8b56ca 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-collator" -version = "5.25.0" +version = "5.26.0" description = "Astar collator implementation in Rust." build = "build.rs" default-run = "astar-collator" diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index 19939e4338..ca81863261 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-runtime" -version = "5.25.0" +version = "5.26.0" build = "build.rs" authors.workspace = true edition.workspace = true diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 98834e4784..1847dbaba2 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -138,7 +138,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("astar"), impl_name: create_runtime_str!("astar"), authoring_version: 1, - spec_version: 72, + spec_version: 73, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1057,41 +1057,10 @@ pub type Executive = frame_executive::Executive< Migrations, >; -// Used to cleanup BaseFee storage - remove once cleanup is done. -parameter_types! { - pub const BaseFeeStr: &'static str = "BaseFee"; -} - -/// Simple `OnRuntimeUpgrade` logic to prepare Astar runtime for `DynamicEvmBaseFee` pallet. -pub use frame_support::traits::{OnRuntimeUpgrade, StorageVersion}; -pub struct DynamicEvmBaseFeeMigration; -impl OnRuntimeUpgrade for DynamicEvmBaseFeeMigration { - fn on_runtime_upgrade() -> Weight { - // Safety check to ensure we don't execute this migration twice - if pallet_dynamic_evm_base_fee::BaseFeePerGas::::exists() { - return ::DbWeight::get().reads(1); - } - - // Set the init value to what was set before on the old `BaseFee` pallet. - pallet_dynamic_evm_base_fee::BaseFeePerGas::::put(U256::from(1_000_000_000_u128)); - - // Astar's multiplier should be set to lowest value to keep native transaction price as close as possible to the legacy. - pallet_transaction_payment::NextFeeMultiplier::::put(MinimumMultiplier::get()); - - // Set init storage version for the pallet - StorageVersion::new(1).put::>(); - - ::DbWeight::get().reads_writes(1, 3) - } -} - /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. -pub type Migrations = ( - frame_support::migrations::RemovePallet, - DynamicEvmBaseFeeMigration, -); +pub type Migrations = (); type EventRecord = frame_system::EventRecord< ::RuntimeEvent, diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index 90868bcd14..2cbbb07335 100644 --- a/runtime/local/Cargo.toml +++ b/runtime/local/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "local-runtime" -version = "5.25.0" +version = "5.26.0" build = "build.rs" authors.workspace = true edition.workspace = true diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index d5fb4b98d0..b97c54bd62 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shibuya-runtime" -version = "5.25.0" +version = "5.26.0" build = "build.rs" authors.workspace = true edition.workspace = true diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 33e00640c7..68c1dcdf5e 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -167,7 +167,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shibuya"), impl_name: create_runtime_str!("shibuya"), authoring_version: 1, - spec_version: 115, + spec_version: 116, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index 7680ebf7ca..cae85ef369 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shiden-runtime" -version = "5.25.0" +version = "5.26.0" build = "build.rs" authors.workspace = true edition.workspace = true diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 89245b51e9..e988f4ab10 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 112, + spec_version: 113, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1087,6 +1087,7 @@ impl OnRuntimeUpgrade for HybridInflationModelMigration { /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. +/// `HybridInflationModelMigration` to be applied on spec_version: 113 pub type Migrations = HybridInflationModelMigration; type EventRecord = frame_system::EventRecord<