Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v6.8.0 #1630

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Release v6.8.0 #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9857ab
Release `v6.8.0`
aurexav Nov 26, 2024
e1d63c0
Benchmark
aurexav Nov 26, 2024
f8a1b8b
Update whitelist origin
aurexav Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2021"
homepage = "https://darwinia.network"
license = "GPL-3.0"
repository = "https://github.com/darwinia-network/darwinia"
version = "6.7.2"
version = "6.8.0"

[workspace.dependencies]
# crates.io
Expand Down
2 changes: 1 addition & 1 deletion node/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
///
/// The worker binaries associated to the node binary should ensure that they are using the same
/// version as the main node that started them.
pub const NODE_VERSION: &str = "6.7.2";
pub const NODE_VERSION: &str = "6.8.0";

/// Sub-commands supported by the collator.
#[derive(Debug, clap::Subcommand)]
Expand Down
2 changes: 1 addition & 1 deletion pallet/account-migration/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
spec_name: sp_runtime::create_runtime_str!("Darwinia2"),
impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
authoring_version: 0,
spec_version: 6_7_2_0,
spec_version: 6_8_0_0,
impl_version: 0,
apis: sp_version::create_apis_vec!([]),
transaction_version: 0,
Expand Down
7 changes: 5 additions & 2 deletions runtime/common/src/pallet_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ use dc_primitives::*;
// polkadot-sdk
use sp_core::U256;
use sp_runtime::traits::AccountIdConversion;
use sp_std::prelude::*;
use sp_std::vec;

/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
/// used to limit the maximal weight of a single extrinsic.
Expand Down Expand Up @@ -137,7 +137,6 @@ frame_support::parameter_types! {
pub MaximumSchedulerWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(80)
* RuntimeBlockWeights::get().max_block;

pub AssetCreators: Vec<AccountId> = vec![super::gov_origin::ROOT];
pub TreasuryAccount: AccountId = TreasuryPid::get().into_account_truncating();

pub MaxProposalWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
Expand All @@ -154,3 +153,7 @@ frame_support::parameter_types! {
// FIXME: https://github.com/rust-lang/rust/issues/88581
pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
}

frame_support::ord_parameter_types! {
pub const AssetCreator: AccountId = super::gov_origin::ROOT;
}
2 changes: 1 addition & 1 deletion runtime/crab/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
spec_name: sp_runtime::create_runtime_str!("Crab2"),
impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
authoring_version: 0,
spec_version: 6_7_2_0,
spec_version: 6_8_0_0,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 0,
Expand Down
5 changes: 1 addition & 4 deletions runtime/crab/src/pallets/assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ impl pallet_assets::Config for Runtime {
type BenchmarkHelper = benchmark_helper::Assets;
type CallbackHandle = ();
type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
frame_system::EnsureSignedBy<
frame_support::traits::IsInVec<pallet_config::AssetCreators>,
Self::AccountId,
>,
frame_system::EnsureSignedBy<pallet_config::AssetCreator, Self::AccountId>,
>;
type Currency = Balances;
type Extra = ();
Expand Down
17 changes: 16 additions & 1 deletion runtime/crab/src/pallets/governance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,25 @@ impl pallet_referenda::Config for Runtime {

impl custom_origins::Config for Runtime {}

frame_support::ord_parameter_types! {
// 0x663fC3000f0101BF16FDc9F73F02DA6Efa8c5875.
pub const DispatchWhitelistedDao: AccountId = AccountId::from([
102, 63, 195, 0, 15, 1, 1, 191, 22, 253, 201, 247, 63, 2, 218, 110, 250, 140, 88, 117,
]);
}

// The purpose of this pallet is to queue calls to be dispatched as by root later => the Dispatch
// origin corresponds to the Gov2 Whitelist track.
impl pallet_whitelist::Config for Runtime {
type DispatchWhitelistedOrigin = RootOr<WhitelistedCaller>;
#[cfg(feature = "runtime-benchmarks")]
type DispatchWhitelistedOrigin = Root;
#[cfg(not(feature = "runtime-benchmarks"))]
type DispatchWhitelistedOrigin = RootOrDiverse<
frame_support::traits::EitherOfDiverse<
WhitelistedCaller,
frame_system::EnsureSignedBy<DispatchWhitelistedDao, Self::AccountId>,
>,
>;
type Preimages = Preimage;
type RuntimeCall = RuntimeCall;
type RuntimeEvent = RuntimeEvent;
Expand Down
8 changes: 4 additions & 4 deletions runtime/crab/src/weights/cumulus_pallet_parachain_system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! Autogenerated weights for `cumulus_pallet_parachain_system`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-10-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-11-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024

Expand Down Expand Up @@ -71,10 +71,10 @@ impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for We
// Measured: `48`
// Estimated: `3517`
// Minimum execution time: 2_000_000 picoseconds.
Weight::from_parts(806_123_245, 0)
Weight::from_parts(2_065_879_588, 0)
.saturating_add(Weight::from_parts(0, 3517))
// Standard Error: 840_467
.saturating_add(Weight::from_parts(101_126_518, 0).saturating_mul(n.into()))
// Standard Error: 478_254
.saturating_add(Weight::from_parts(86_483_068, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(4))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
Expand Down
18 changes: 9 additions & 9 deletions runtime/crab/src/weights/cumulus_pallet_xcmp_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-10-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-11-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024

Expand Down Expand Up @@ -62,7 +62,7 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Measured: `42`
// Estimated: `1527`
// Minimum execution time: 4_000_000 picoseconds.
Weight::from_parts(5_000_000, 0)
Weight::from_parts(4_000_000, 0)
.saturating_add(Weight::from_parts(0, 1527))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -81,8 +81,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `48`
// Estimated: `3517`
// Minimum execution time: 11_000_000 picoseconds.
Weight::from_parts(12_000_000, 0)
// Minimum execution time: 10_000_000 picoseconds.
Weight::from_parts(10_000_000, 0)
.saturating_add(Weight::from_parts(0, 3517))
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(3))
Expand All @@ -93,7 +93,7 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `42`
// Estimated: `1527`
// Minimum execution time: 3_000_000 picoseconds.
// Minimum execution time: 2_000_000 picoseconds.
Weight::from_parts(3_000_000, 0)
.saturating_add(Weight::from_parts(0, 1527))
.saturating_add(T::DbWeight::get().reads(1))
Expand All @@ -116,7 +116,7 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 9_000_000 picoseconds.
Weight::from_parts(10_000_000, 0)
Weight::from_parts(9_000_000, 0)
.saturating_add(Weight::from_parts(0, 0))
}
/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
Expand All @@ -137,8 +137,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `65677`
// Estimated: `69142`
// Minimum execution time: 46_000_000 picoseconds.
Weight::from_parts(48_000_000, 0)
// Minimum execution time: 43_000_000 picoseconds.
Weight::from_parts(43_000_000, 0)
.saturating_add(Weight::from_parts(0, 69142))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(5))
Expand All @@ -152,7 +152,7 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Measured: `65676`
// Estimated: `69141`
// Minimum execution time: 28_000_000 picoseconds.
Weight::from_parts(29_000_000, 0)
Weight::from_parts(37_000_000, 0)
.saturating_add(Weight::from_parts(0, 69141))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
Expand Down
Loading