Skip to content

Commit

Permalink
Merge release branch release-v0.3.10 into main (#1051)
Browse files Browse the repository at this point in the history
* Update versions (#1047)

Update version

Also removes unused code and modifies changelog layout for v0.3.10

* Update weights (#1048)
  • Loading branch information
sea212 authored Jul 24, 2023
1 parent 3d4ebe5 commit 04df9c3
Show file tree
Hide file tree
Showing 54 changed files with 1,045 additions and 1,082 deletions.
38 changes: 19 additions & 19 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion docs/changelog_for_devs.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ https://keepachangelog.com/en/1.0.0/ and ⚠️ marks changes that might break
components which query the chain's storage, the extrinsics or the runtime
APIs/RPC interface.

## v0.4.0
## v0.3.10

[#1022]: https://github.com/zeitgeistpm/zeitgeist/pull/1022

### Added

- Use pallet-asset-tx-payment for allowing to pay transaction fees in foreign
currencies ([#1022]). This requires each transaction to specify the fee
payment token with `asset_id` (`None` is ZTG).
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ description = "An evolving blockchain for prediction markets and futarchy."
edition = "2021"
homepage = "https://zeitgeist.pm"
name = "zeitgeist-node"
version = "0.3.9"
version = "0.3.10"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ with-global-disputes = []
authors = ["Zeitgeist PM <[email protected]>"]
edition = "2021"
name = "zeitgeist-primitives"
version = "0.3.9"
version = "0.3.10"
2 changes: 1 addition & 1 deletion runtime/battery-station/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ with-global-disputes = [
authors = ["Zeitgeist PM <[email protected]>"]
edition = "2021"
name = "battery-station-runtime"
version = "0.3.9"
version = "0.3.10"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
4 changes: 2 additions & 2 deletions runtime/battery-station/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("zeitgeist"),
impl_name: create_runtime_str!("zeitgeist"),
authoring_version: 1,
spec_version: 46,
spec_version: 47,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 21,
transaction_version: 22,
state_version: 1,
};

Expand Down
2 changes: 1 addition & 1 deletion runtime/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ with-global-disputes = []
authors = ["Zeitgeist PM <[email protected]>"]
edition = "2021"
name = "common-runtime"
version = "0.3.9"
version = "0.3.10"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
8 changes: 0 additions & 8 deletions runtime/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ macro_rules! decl_common_types {

type Address = sp_runtime::MultiAddress<AccountId, ()>;

// Migration for scheduler pallet to move from a plain RuntimeCall to a CallOrHash.
pub struct SchedulerMigrationV1toV4;
impl OnRuntimeUpgrade for SchedulerMigrationV1toV4 {
fn on_runtime_upgrade() -> frame_support::weights::Weight {
Scheduler::migrate_v1_to_v4()
}
}

pub type Executive = frame_executive::Executive<
Runtime,
Block,
Expand Down
6 changes: 3 additions & 3 deletions runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
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 4.0.0-dev
//! DATE: 2023-06-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2023-07-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -51,13 +51,13 @@ pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::weights::WeightInfo for WeightInfo<T> {
// Storage: XcmpQueue QueueConfig (r:1 w:1)
fn set_config_with_u32() -> Weight {
Weight::from_ref_time(14_130_000)
Weight::from_ref_time(12_761_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: XcmpQueue QueueConfig (r:1 w:1)
fn set_config_with_weight() -> Weight {
Weight::from_ref_time(14_070_000)
Weight::from_ref_time(14_000_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand Down
34 changes: 17 additions & 17 deletions runtime/common/src/weights/frame_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! Autogenerated weights for frame_system
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-06-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2023-07-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -50,41 +50,41 @@ use frame_support::{
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> frame_system::weights::WeightInfo for WeightInfo<T> {
fn remark(b: u32) -> Weight {
Weight::from_ref_time(7_750_000)
// Standard Error: 1
.saturating_add(Weight::from_ref_time(692).saturating_mul(b.into()))
Weight::from_ref_time(19_766_390)
// Standard Error: 5
.saturating_add(Weight::from_ref_time(744).saturating_mul(b.into()))
}
fn remark_with_event(b: u32) -> Weight {
Weight::from_ref_time(23_520_000)
// Standard Error: 4
.saturating_add(Weight::from_ref_time(2_341).saturating_mul(b.into()))
Weight::from_ref_time(25_430_000)
// Standard Error: 5
.saturating_add(Weight::from_ref_time(2_575).saturating_mul(b.into()))
}
// Storage: System Digest (r:1 w:1)
// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
fn set_heap_pages() -> Weight {
Weight::from_ref_time(16_260_000)
Weight::from_ref_time(20_660_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
}
// Storage: Skipped Metadata (r:0 w:0)
fn set_storage(i: u32) -> Weight {
Weight::from_ref_time(7_690_000)
// Standard Error: 4_435
.saturating_add(Weight::from_ref_time(1_133_019).saturating_mul(i.into()))
Weight::from_ref_time(9_380_000)
// Standard Error: 5_116
.saturating_add(Weight::from_ref_time(1_191_116).saturating_mul(i.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_storage(i: u32) -> Weight {
Weight::from_ref_time(589_951)
// Standard Error: 8_232
.saturating_add(Weight::from_ref_time(925_898).saturating_mul(i.into()))
Weight::from_ref_time(8_680_000)
// Standard Error: 5_971
.saturating_add(Weight::from_ref_time(1_029_338).saturating_mul(i.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_prefix(p: u32) -> Weight {
Weight::from_ref_time(10_930_000)
// Standard Error: 10_457
.saturating_add(Weight::from_ref_time(2_090_894).saturating_mul(p.into()))
Weight::from_ref_time(13_530_000)
// Standard Error: 9_303
.saturating_add(Weight::from_ref_time(2_263_779).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
}
}
12 changes: 6 additions & 6 deletions runtime/common/src/weights/orml_currencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//! Autogenerated weights for orml_currencies
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-06-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2023-07-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -49,33 +49,33 @@ impl<T: frame_system::Config> orml_currencies::WeightInfo for WeightInfo<T> {
// Storage: Tokens Accounts (r:2 w:2)
// Storage: System Account (r:1 w:1)
fn transfer_non_native_currency() -> Weight {
Weight::from_ref_time(126_411_000)
Weight::from_ref_time(89_810_000)
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(3))
}
// Storage: System Account (r:1 w:1)
fn transfer_native_currency() -> Weight {
Weight::from_ref_time(108_350_000)
Weight::from_ref_time(72_860_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: Tokens Accounts (r:1 w:1)
// Storage: Tokens TotalIssuance (r:1 w:1)
// Storage: System Account (r:1 w:1)
fn update_balance_non_native_currency() -> Weight {
Weight::from_ref_time(81_740_000)
Weight::from_ref_time(57_100_000)
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(3))
}
// Storage: System Account (r:1 w:1)
fn update_balance_native_currency_creating() -> Weight {
Weight::from_ref_time(60_170_000)
Weight::from_ref_time(66_691_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
// Storage: System Account (r:1 w:1)
fn update_balance_native_currency_killing() -> Weight {
Weight::from_ref_time(56_730_000)
Weight::from_ref_time(53_220_000)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand Down
Loading

0 comments on commit 04df9c3

Please sign in to comment.