From 2f6ecb0d966155e22d6eb17258a8e0bc1a5dcbaa Mon Sep 17 00:00:00 2001 From: Alex Sedighi Date: Tue, 12 Nov 2024 10:13:08 +1300 Subject: [PATCH] chore: update boot node urls (#880) * chore: update boot node urls * feat(runtime-eden): remove migration logic * feat(runtime-eden): bump the runtime version up for future --- node/res/eden.json | 9 ++--- node/res/eden.spec.json | 9 ++--- runtimes/eden/src/lib.rs | 22 ++---------- runtimes/eden/src/migration.rs | 61 ---------------------------------- runtimes/eden/src/version.rs | 2 +- 5 files changed, 13 insertions(+), 90 deletions(-) delete mode 100644 runtimes/eden/src/migration.rs diff --git a/node/res/eden.json b/node/res/eden.json index 560b0b8e8c2..5c7509d4853 100644 --- a/node/res/eden.json +++ b/node/res/eden.json @@ -3,9 +3,10 @@ "id": "para_eden", "chainType": "Live", "bootNodes": [ - "/dns4/nodle-bootnode-0.p2p.onfinality.io/tcp/20522/ws/p2p/12D3KooWMv1jzb45EMGZVGjqgoAjmqPrsYchHCQ13McFKL1r75b5", - "/dns4/nodle-bootnode-1.p2p.onfinality.io/tcp/25394/ws/p2p/12D3KooW9tfcevBR9DjD1JznXY7TenxVoDvtuVKndjgWNizjGUCs", - "/dns4/nodle-bootnode-2.p2p.onfinality.io/tcp/29357/ws/p2p/12D3KooWNq4J7wySh7uCGg81UMV7ziZVoASucFWH1wXuAUatukpX" + "/dns4/node-7135078940912492544-0.p2p.onfinality.io/tcp/25394/ws/p2p/12D3KooW9tfcevBR9DjD1JznXY7TenxVoDvtuVKndjgWNizjGUCs", + "/dns4/node-7143081889410338816-0.p2p.onfinality.io/tcp/26912/ws/p2p/12D3KooWJ9cZhE6Ve8GAUucTNPDgWnJKweUU9ZVJKrcocFLZ1mc2", + "/dns4/node-7135619368687267840-0.p2p.onfinality.io/tcp/25808/ws/p2p/12D3KooWHxNfp9db5VgGZegobTCJQKn45aHGkWfU1DJQEvBcLh2G", + "/dns4/node-7189842482392596480-0.p2p.onfinality.io/tcp/20565/ws/p2p/12D3KooWJCkHkF4azaSZ9xEu3ojohKfypU94Au4cdGuJz1M3tbRi" ], "telemetryEndpoints": [ [ @@ -96,4 +97,4 @@ "childrenDefault": {} } } -} +} \ No newline at end of file diff --git a/node/res/eden.spec.json b/node/res/eden.spec.json index 8266866a7f3..8dd393f343c 100644 --- a/node/res/eden.spec.json +++ b/node/res/eden.spec.json @@ -3,9 +3,10 @@ "id": "para_eden", "chainType": "Live", "bootNodes": [ - "/dns4/nodle-bootnode-0.p2p.onfinality.io/tcp/20522/ws/p2p/12D3KooWMv1jzb45EMGZVGjqgoAjmqPrsYchHCQ13McFKL1r75b5", - "/dns4/nodle-bootnode-1.p2p.onfinality.io/tcp/25394/ws/p2p/12D3KooW9tfcevBR9DjD1JznXY7TenxVoDvtuVKndjgWNizjGUCs", - "/dns4/nodle-bootnode-2.p2p.onfinality.io/tcp/29357/ws/p2p/12D3KooWNq4J7wySh7uCGg81UMV7ziZVoASucFWH1wXuAUatukpX" + "/dns4/node-7135078940912492544-0.p2p.onfinality.io/tcp/25394/ws/p2p/12D3KooW9tfcevBR9DjD1JznXY7TenxVoDvtuVKndjgWNizjGUCs", + "/dns4/node-7143081889410338816-0.p2p.onfinality.io/tcp/26912/ws/p2p/12D3KooWJ9cZhE6Ve8GAUucTNPDgWnJKweUU9ZVJKrcocFLZ1mc2", + "/dns4/node-7135619368687267840-0.p2p.onfinality.io/tcp/25808/ws/p2p/12D3KooWHxNfp9db5VgGZegobTCJQKn45aHGkWfU1DJQEvBcLh2G", + "/dns4/node-7189842482392596480-0.p2p.onfinality.io/tcp/20565/ws/p2p/12D3KooWJCkHkF4azaSZ9xEu3ojohKfypU94Au4cdGuJz1M3tbRi" ], "telemetryEndpoints": [ [ @@ -116,4 +117,4 @@ } } } -} +} \ No newline at end of file diff --git a/runtimes/eden/src/lib.rs b/runtimes/eden/src/lib.rs index 1a2e00ff282..519685d9805 100644 --- a/runtimes/eden/src/lib.rs +++ b/runtimes/eden/src/lib.rs @@ -70,7 +70,6 @@ use { pub mod constants; mod genesis_config_presets; mod implementations; -mod migration; mod pallets_consensus; mod pallets_governance; mod pallets_nodle; @@ -209,26 +208,9 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; -#[allow(deprecated)] -pub type Migrations = ( - pallet_contracts::Migration, - cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4, - cumulus_pallet_xcmp_queue::migration::v5::MigrateV4ToV5, - pallet_collator_selection::migration::v2::MigrationToV2, - pallet_xcm::migration::MigrateToLatestXcmVersion, - pallet_identity::migration::versioned::V0ToV1, - migration::FromSpec27, -); - /// Executive: handles dispatch to the various modules. -pub type Executive = frame_executive::Executive< - Runtime, - Block, - frame_system::ChainContext, - Runtime, - AllPalletsWithSystem, - Migrations, ->; +pub type Executive = + frame_executive::Executive, Runtime, AllPalletsWithSystem>; #[cfg(feature = "runtime-benchmarks")] pub type XcmGenericBenchmarks = pallet_xcm_benchmarks::generic::Pallet; diff --git a/runtimes/eden/src/migration.rs b/runtimes/eden/src/migration.rs deleted file mode 100644 index 5d5d82384be..00000000000 --- a/runtimes/eden/src/migration.rs +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file is part of the Nodle Chain distributed at https://github.com/NodleCode/chain - * Copyright (C) 2020-2024 Nodle International - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -use frame_support::traits::{OnRuntimeUpgrade, StorageVersion}; -use frame_support::weights::Weight; -use sp_core::Get; -#[cfg(feature = "try-runtime")] -use {frame_support::ensure, sp_runtime::TryRuntimeError, sp_std::prelude::*}; - -pub struct FromSpec27(sp_std::marker::PhantomData); -impl OnRuntimeUpgrade for FromSpec27 -where - T: pallet_uniques::Config, -{ - fn on_runtime_upgrade() -> Weight { - // Fixup one unmigrated storage blocks found on mainnet. - let pre_image_status_for_key = [ - 216_u8, 243, 20, 183, 244, 230, 176, 149, 240, 248, 238, 70, 86, 164, 72, 37, 85, 177, 174, 142, 206, 213, - 82, 47, 60, 64, 73, 188, 132, 237, 164, 168, 134, 165, 126, 209, 14, 33, 121, 241, 141, 181, 169, 30, 183, - 253, 57, 95, 170, 112, 42, 188, 5, 207, 200, 241, 243, 215, 36, 138, 208, 108, 237, 135, - ]; - let _ = frame_support::storage::unhashed::clear_prefix(&pre_image_status_for_key, Some(1), None); - - StorageVersion::new(1).put::>(); - - T::DbWeight::get().writes(2) - } - - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, TryRuntimeError> { - ensure!( - StorageVersion::get::>() == 0, - TryRuntimeError::Other("pallet_uniques storage version is not 0") - ); - Ok(vec![]) - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: Vec) -> Result<(), TryRuntimeError> { - ensure!( - StorageVersion::get::>() == 1, - TryRuntimeError::Other("pallet_uniques post upgrade storage version is not 1") - ); - Ok(()) - } -} diff --git a/runtimes/eden/src/version.rs b/runtimes/eden/src/version.rs index 1c5113850ff..fdd5a522efe 100644 --- a/runtimes/eden/src/version.rs +++ b/runtimes/eden/src/version.rs @@ -40,7 +40,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // Version of the runtime specification. A full-node will not attempt to use its native // runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`, // `spec_version` and `authoring_version` are the same between Wasm and native. - spec_version: 32, + spec_version: 33, // Version of the implementation of the specification. Nodes are free to ignore this; it // serves only as an indication that the code is different; as long as the other two versions