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.

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

Bifrost V0.8.3 #246

Merged
merged 7 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node-cli"
version = "0.8.2"
version = "0.8.3"
authors = ["Liebi Technologies <bifrost@liebi.com>"]
description = "Bifrost Parachain Node"
build = "build.rs"
Expand Down
2 changes: 1 addition & 1 deletion node/service/src/chain_spec/bifrost.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn bifrost_genesis(
council_membership: Default::default(),
technical_membership: Default::default(),
treasury: Default::default(),
elections: Default::default(),
phragmen_election: Default::default(),
sudo: SudoConfig { key: root_key.clone() },
parachain_info: ParachainInfoConfig { parachain_id: id },
collator_selection: CollatorSelectionConfig {
Expand Down
14 changes: 7 additions & 7 deletions runtime/bifrost/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("bifrost"),
impl_name: create_runtime_str!("bifrost"),
authoring_version: 1,
spec_version: 802,
spec_version: 803,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -164,7 +164,8 @@ impl Filter<Call> for CallFilter {
Call::Balances(_) => false,
Call::Vesting(_) => false,
Call::Tokens(_) => false,
Call::Currencies(_) => false,
Call::PhragmenElection(_) => false,
Call::Currencies(orml_currencies::Call::transfer_native_currency(..)) => false,
_ => true,
}
}
Expand Down Expand Up @@ -451,8 +452,7 @@ impl pallet_democracy::Config for Runtime {
type PreimageByteDeposit = PreimageByteDeposit;
type Proposal = Call;
type Scheduler = Scheduler;
// NOTE: Treasury replaced by `()`.
type Slash = ();
type Slash = Treasury;
// Any single technical committee member may veto a coming council proposal, however they can
// only do it once and it lasts only for the cool-off period.
type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
Expand Down Expand Up @@ -521,7 +521,7 @@ impl pallet_tips::Config for Runtime {
type TipCountdown = TipCountdown;
type TipFindersFee = TipFindersFee;
type TipReportDepositBase = TipReportDepositBase;
type Tippers = Elections;
type Tippers = PhragmenElection;
type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
}

Expand Down Expand Up @@ -876,7 +876,7 @@ construct_runtime! {
Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 31,
TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 32,
Elections: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
CouncilMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 34,
TechnicalMembership: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,

Expand Down Expand Up @@ -940,7 +940,7 @@ pub type SignedExtra = (
frame_system::CheckEra<Runtime>,
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
// pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
Expand Down
12 changes: 5 additions & 7 deletions runtime/bifrost/src/weights/bifrost_flexible_fee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
//! Autogenerated weights for bifrost_flexible_fee
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
//! DATE: 2021-08-11, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("asgard-local"), DB CACHE: 128
//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bifrost-genesis"), DB CACHE: 128

// Executed Command:
// target/release/bifrost
// benchmark
// --chain=asgard-local
// --chain=bifrost-genesis
// --steps=50
// --repeat=20
// --pallet=bifrost_flexible_fee
Expand All @@ -34,7 +34,7 @@
// --wasm-execution=compiled
// --heap-pages=4096
// --header=./HEADER-GPL3
// --output=./runtime/asgard/src/weights/bifrost_flexible_fee.rs
// --output=./runtime/bifrost/src/weights/

#![allow(unused_parens)]
#![allow(unused_imports)]
Expand All @@ -46,8 +46,6 @@ use sp_std::marker::PhantomData;
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> bifrost_flexible_fee::WeightInfo for WeightInfo<T> {
fn set_user_fee_charge_order() -> Weight {
(6_081_000 as Weight)
.saturating_add(T::DbWeight::get().writes(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
(8_034_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
30 changes: 15 additions & 15 deletions runtime/bifrost/src/weights/frame_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
//! Autogenerated weights for frame_system
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
//! DATE: 2021-08-18, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bifrost-genesis"), DB CACHE: 128

// Executed Command:
// target/debug/bifrost
// target/release/bifrost
// benchmark
// --chain=bifrost-genesis
// --steps=50
Expand All @@ -46,39 +46,39 @@ use sp_std::marker::PhantomData;
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
fn remark(_b: u32) -> Weight {
(51_052_000 as Weight)
(3_385_000 as Weight)
}
fn remark_with_event(b: u32) -> Weight {
(1_623_480_000 as Weight)
(68_651_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
fn set_heap_pages() -> Weight {
(73_328_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
(4_193_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn set_changes_trie_config() -> Weight {
(373_044_000 as Weight)
(22_114_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
fn set_storage(i: u32) -> Weight {
(358_763_000 as Weight)
// Standard Error: 311_000
.saturating_add((27_904_000 as Weight).saturating_mul(i as Weight))
(0 as Weight)
// Standard Error: 0
.saturating_add((971_000 as Weight).saturating_mul(i as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
fn kill_storage(i: u32) -> Weight {
(0 as Weight)
// Standard Error: 242_000
.saturating_add((24_201_000 as Weight).saturating_mul(i as Weight))
(779_000 as Weight)
// Standard Error: 1_000
.saturating_add((826_000 as Weight).saturating_mul(i as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
fn kill_prefix(p: u32) -> Weight {
(1_234_472_000 as Weight)
// Standard Error: 531_000
.saturating_add((45_655_000 as Weight).saturating_mul(p as Weight))
(14_414_000 as Weight)
// Standard Error: 4_000
.saturating_add((3_271_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
}
}