From 2d28694ed83c5b2c52082805afb7157217c72a10 Mon Sep 17 00:00:00 2001 From: zqhxuyuan Date: Thu, 24 Mar 2022 17:14:14 +0800 Subject: [PATCH 1/3] rm without storage info (#717) * rm without storage info * clean * revert nft --- auction/src/lib.rs | 13 ++++++++++--- bencher/test/src/lib.rs | 1 - nft/src/lib.rs | 4 ++-- oracle/src/lib.rs | 8 ++++---- tokens/src/lib.rs | 1 - traits/src/auction.rs | 4 ++-- utilities/src/ordered_set.rs | 4 ++-- weight-meter/src/mock.rs | 1 - 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/auction/src/lib.rs b/auction/src/lib.rs index 625c1862c..278edd146 100644 --- a/auction/src/lib.rs +++ b/auction/src/lib.rs @@ -13,6 +13,7 @@ #![allow(clippy::string_lit_as_bytes)] #![allow(clippy::unused_unit)] +use codec::MaxEncodedLen; use frame_support::pallet_prelude::*; use frame_system::{ensure_signed, pallet_prelude::*}; use orml_traits::{Auction, AuctionHandler, AuctionInfo, Change}; @@ -37,7 +38,13 @@ pub mod module { type Event: From> + IsType<::Event>; /// The balance type for bidding. - type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize; + type Balance: Parameter + + Member + + AtLeast32BitUnsigned + + Default + + Copy + + MaybeSerializeDeserialize + + MaxEncodedLen; /// The auction ID type. type AuctionId: Parameter @@ -47,7 +54,8 @@ pub mod module { + Copy + MaybeSerializeDeserialize + Bounded - + codec::FullCodec; + + codec::FullCodec + + codec::MaxEncodedLen; /// The `AuctionHandler` that allow custom bidding logic and handles /// auction result. @@ -96,7 +104,6 @@ pub mod module { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/bencher/test/src/lib.rs b/bencher/test/src/lib.rs index 3fa5b05ad..6bd2594d0 100644 --- a/bencher/test/src/lib.rs +++ b/bencher/test/src/lib.rs @@ -23,7 +23,6 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] pub struct Pallet(PhantomData); #[pallet::storage] diff --git a/nft/src/lib.rs b/nft/src/lib.rs index 766e1e0a1..06ec47375 100644 --- a/nft/src/lib.rs +++ b/nft/src/lib.rs @@ -66,9 +66,9 @@ pub mod module { #[pallet::config] pub trait Config: frame_system::Config { /// The class ID type - type ClassId: Parameter + Member + AtLeast32BitUnsigned + Default + Copy; + type ClassId: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaxEncodedLen; /// The token ID type - type TokenId: Parameter + Member + AtLeast32BitUnsigned + Default + Copy; + type TokenId: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaxEncodedLen; /// The class properties type type ClassData: Parameter + Member + MaybeSerializeDeserialize; /// The token properties type diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index 9145ae112..6c59d1e82 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -19,7 +19,7 @@ #![allow(clippy::string_lit_as_bytes)] #![allow(clippy::unused_unit)] -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; @@ -55,7 +55,7 @@ pub mod module { pub(crate) type MomentOf = <>::Time as Time>::Moment; pub(crate) type TimestampedValueOf = TimestampedValue<>::OracleValue, MomentOf>; - #[derive(Encode, Decode, RuntimeDebug, Eq, PartialEq, Clone, Copy, Ord, PartialOrd, TypeInfo)] + #[derive(Encode, Decode, RuntimeDebug, Eq, PartialEq, Clone, Copy, Ord, PartialOrd, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct TimestampedValue { pub value: Value, @@ -77,10 +77,10 @@ pub mod module { type Time: Time; /// The data key type - type OracleKey: Parameter + Member; + type OracleKey: Parameter + Member + MaxEncodedLen; /// The data value type - type OracleValue: Parameter + Member + Ord; + type OracleValue: Parameter + Member + Ord + MaxEncodedLen; /// The root operator account id, record all sudo feeds on this account. type RootOperatorAccountId: Get; diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 716cb6a4b..83499b391 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -364,7 +364,6 @@ pub mod module { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/traits/src/auction.rs b/traits/src/auction.rs index 7f2ab7cdb..28d2e10e1 100644 --- a/traits/src/auction.rs +++ b/traits/src/auction.rs @@ -1,6 +1,6 @@ use crate::Change; use codec::FullCodec; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_runtime::{ traits::{AtLeast32Bit, Bounded, MaybeSerializeDeserialize}, @@ -14,7 +14,7 @@ use sp_std::{ /// Auction info. #[cfg_attr(feature = "std", derive(PartialEq, Eq))] -#[derive(Encode, Decode, RuntimeDebug, TypeInfo)] +#[derive(Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)] pub struct AuctionInfo { /// Current bidder and bid price. pub bid: Option<(AccountId, Balance)>, diff --git a/utilities/src/ordered_set.rs b/utilities/src/ordered_set.rs index 32597cda0..2fab37826 100644 --- a/utilities/src/ordered_set.rs +++ b/utilities/src/ordered_set.rs @@ -1,11 +1,11 @@ -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{traits::Get, BoundedVec, DefaultNoBound}; use scale_info::TypeInfo; #[cfg(feature = "std")] use sp_std::{fmt, prelude::*}; /// An ordered set backed by `BoundedVec` -#[derive(PartialEq, Eq, Encode, Decode, DefaultNoBound, Clone, TypeInfo)] +#[derive(PartialEq, Eq, Encode, Decode, DefaultNoBound, Clone, TypeInfo, MaxEncodedLen)] #[scale_info(skip_type_params(S))] pub struct OrderedSet>(pub BoundedVec); diff --git a/weight-meter/src/mock.rs b/weight-meter/src/mock.rs index 2ec2f3c13..1cef5292a 100644 --- a/weight-meter/src/mock.rs +++ b/weight-meter/src/mock.rs @@ -8,7 +8,6 @@ pub mod test_module { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] pub struct Pallet(PhantomData); #[pallet::hooks] From c439a50e01944aedeef33231e0824a17ed1813bc Mon Sep 17 00:00:00 2001 From: Roy Yang Date: Tue, 29 Mar 2022 14:51:00 +1300 Subject: [PATCH 2/3] Changed the way values are updated (#720) * Changed the way values are updated. Instead of updating on "get", values are updated on feed. * minor improvement * Addressed some PR comments * Simplified get_all_values function. * formatted Co-authored-by: Roy Yang --- oracle/src/lib.rs | 55 +++++++++------------------------------------ oracle/src/tests.rs | 54 +++++++++++++------------------------------- 2 files changed, 26 insertions(+), 83 deletions(-) diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs index 6c59d1e82..87a5b1276 100644 --- a/oracle/src/lib.rs +++ b/oracle/src/lib.rs @@ -119,19 +119,13 @@ pub mod module { pub type RawValues, I: 'static = ()> = StorageDoubleMap<_, Twox64Concat, T::AccountId, Twox64Concat, T::OracleKey, TimestampedValueOf>; - /// True if Self::values(key) is up to date, otherwise the value is stale - #[pallet::storage] - #[pallet::getter(fn is_updated)] - pub type IsUpdated, I: 'static = ()> = - StorageMap<_, Twox64Concat, >::OracleKey, bool, ValueQuery>; - - /// Combined value, may not be up to date + /// Up to date combined value from Raw Values #[pallet::storage] #[pallet::getter(fn values)] pub type Values, I: 'static = ()> = StorageMap<_, Twox64Concat, >::OracleKey, TimestampedValueOf>; - /// If an oracle operator has feed a value in this block + /// If an oracle operator has fed a value in this block #[pallet::storage] pub(crate) type HasDispatched, I: 'static = ()> = StorageValue<_, OrderedSet, ValueQuery>; @@ -182,42 +176,14 @@ impl, I: 'static> Pallet { .collect() } - /// Returns fresh combined value if has update, or latest combined - /// value. - /// - /// Note this will update values storage if has update. + /// Fetch current combined value. pub fn get(key: &T::OracleKey) -> Option> { - if Self::is_updated(key) { - >::get(key) - } else { - let timestamped = Self::combined(key)?; - >::insert(key, timestamped.clone()); - IsUpdated::::insert(key, true); - Some(timestamped) - } - } - - /// Returns fresh combined value if has update, or latest combined - /// value. - /// - /// This is a no-op function which would not change storage. - pub fn get_no_op(key: &T::OracleKey) -> Option> { - if Self::is_updated(key) { - Self::values(key) - } else { - Self::combined(key) - } + Self::values(key) } #[allow(clippy::complexity)] pub fn get_all_values() -> Vec<(T::OracleKey, Option>)> { - >::iter() - .map(|(key, _)| key) - .map(|key| { - let v = Self::get_no_op(&key); - (key, v) - }) - .collect() + >::iter().map(|(k, v)| (k, Some(v))).collect() } fn combined(key: &T::OracleKey) -> Option> { @@ -247,7 +213,11 @@ impl, I: 'static> Pallet { timestamp: now, }; RawValues::::insert(&who, &key, timestamped); - IsUpdated::::remove(&key); + + // Update `Values` storage if `combined` yielded result. + if let Some(combined) = Self::combined(key) { + >::insert(key, combined); + } T::OnNewData::on_new_data(&who, key, value); } @@ -262,9 +232,6 @@ impl, I: 'static> ChangeMembers for Pallet { for removed in outgoing { RawValues::::remove_prefix(removed, None); } - - // not bothering to track which key needs recompute, just update all - IsUpdated::::remove_all(None); } fn set_prime(_prime: Option) { @@ -279,7 +246,7 @@ impl, I: 'static> DataProvider for Pa } impl, I: 'static> DataProviderExtended> for Pallet { fn get_no_op(key: &T::OracleKey) -> Option> { - Self::get_no_op(key) + Self::get(key) } #[allow(clippy::complexity)] diff --git a/oracle/src/tests.rs b/oracle/src/tests.rs index 79ecfd9c1..492087ecb 100644 --- a/oracle/src/tests.rs +++ b/oracle/src/tests.rs @@ -100,29 +100,6 @@ fn should_not_feed_values_from_root_directly() { }); } -#[test] -fn should_update_is_updated() { - new_test_ext().execute_with(|| { - let key: u32 = 50; - assert!(!ModuleOracle::is_updated(key)); - assert_ok!(ModuleOracle::feed_values(Origin::signed(1), vec![(key, 1000)])); - assert_ok!(ModuleOracle::feed_values(Origin::signed(2), vec![(key, 1000)])); - assert_ok!(ModuleOracle::feed_values(Origin::signed(3), vec![(key, 1000)])); - assert!(!ModuleOracle::is_updated(key)); - assert_eq!( - ModuleOracle::get(&key).unwrap(), - TimestampedValue { - value: 1000, - timestamp: 12345 - } - ); - assert!(ModuleOracle::is_updated(key)); - ModuleOracle::on_finalize(1); - assert_ok!(ModuleOracle::feed_values(Origin::signed(1), vec![(key, 1000)])); - assert!(!ModuleOracle::is_updated(key)); - }); -} - #[test] fn should_read_raw_values() { new_test_ext().execute_with(|| { @@ -261,35 +238,34 @@ fn change_member_should_work() { } #[test] -fn should_clear_is_updated_on_change_member() { +fn should_clear_data_for_removed_members() { new_test_ext().execute_with(|| { assert_ok!(ModuleOracle::feed_values(Origin::signed(1), vec![(50, 1000)])); assert_ok!(ModuleOracle::feed_values(Origin::signed(2), vec![(50, 1000)])); - assert_ok!(ModuleOracle::feed_values(Origin::signed(3), vec![(50, 1000)])); - - assert_eq!( - ModuleOracle::get(&50).unwrap(), - TimestampedValue { - value: 1000, - timestamp: 12345 - } - ); - assert!(ModuleOracle::is_updated(50)); ModuleOracle::change_members_sorted(&[4], &[1], &[2, 3, 4]); - assert!(!ModuleOracle::is_updated(50)); + assert_eq!(ModuleOracle::raw_values(&1, 50), None); }); } #[test] -fn should_clear_data_for_removed_members() { +fn values_are_updated_on_feed() { new_test_ext().execute_with(|| { - assert_ok!(ModuleOracle::feed_values(Origin::signed(1), vec![(50, 1000)])); + assert_ok!(ModuleOracle::feed_values(Origin::signed(1), vec![(50, 900)])); assert_ok!(ModuleOracle::feed_values(Origin::signed(2), vec![(50, 1000)])); - ModuleOracle::change_members_sorted(&[4], &[1], &[2, 3, 4]); + assert_eq!(ModuleOracle::values(50), None); - assert_eq!(ModuleOracle::raw_values(&1, 50), None); + // Upon the third price feed, the value is updated immediately after `combine` + // can produce valid result. + assert_ok!(ModuleOracle::feed_values(Origin::signed(3), vec![(50, 1100)])); + assert_eq!( + ModuleOracle::values(50), + Some(TimestampedValue { + value: 1000, + timestamp: 12345, + }) + ); }); } From 9c4c898a0b5159612b6316790889b7d57627b795 Mon Sep 17 00:00:00 2001 From: sam elamin Date: Thu, 31 Mar 2022 13:31:50 +0100 Subject: [PATCH 3/3] init commit --- auction/Cargo.toml | 12 ++++----- authority/Cargo.toml | 16 +++++------ bencher/Cargo.toml | 24 ++++++++--------- bencher/test/Cargo.toml | 12 ++++----- benchmarking/Cargo.toml | 18 ++++++------- currencies/Cargo.toml | 14 +++++----- gradually-update/Cargo.toml | 12 ++++----- nft/Cargo.toml | 12 ++++----- oracle/Cargo.toml | 14 +++++----- oracle/rpc/Cargo.toml | 6 ++--- oracle/rpc/runtime-api/Cargo.toml | 4 +-- rewards/Cargo.toml | 14 +++++----- tokens/Cargo.toml | 16 +++++------ tokens/rpc/Cargo.toml | 12 ++++----- tokens/rpc/runtime-api/Cargo.toml | 6 ++--- traits/Cargo.toml | 10 +++---- unknown-tokens/Cargo.toml | 14 +++++----- utilities/Cargo.toml | 10 +++---- vesting/Cargo.toml | 14 +++++----- weight-meter/Cargo.toml | 14 +++++----- xcm-support/Cargo.toml | 10 +++---- xcm/Cargo.toml | 12 ++++----- xtokens/Cargo.toml | 44 +++++++++++++++---------------- 23 files changed, 160 insertions(+), 160 deletions(-) diff --git a/auction/Cargo.toml b/auction/Cargo.toml index cb4863d0e..cfcbec676 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index d804f7aa8..a5c6d6483 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index 4b7d00369..ed2f628a0 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -24,18 +24,18 @@ serde_json = {version = "1.0.68", optional = true } hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["wasmtime"], optional = true } -sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", optional = true } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = ["wasmtime"], optional = true } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", optional = true } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, optional = true } [features] default = ["std"] diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index bf2463015..28f4f7afe 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.136", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-bencher = { path = "..", default-features = false } orml-weight-meter = { path = "../../weight-meter", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 495e9b56c..d0ca397e2 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -12,18 +12,18 @@ serde = { version = "1.0.136", optional = true } paste = "1.0" codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } log = { version = "0.4.14", default-features = false } [dev-dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } hex-literal = "0.3.4" [features] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index d65b31b89..52fb5af8f 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } [features] diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index c88bcd190..8911074a0 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 57f39b506..633dd9326 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 46eda8b54..9aa1b62b8 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 20a23adc8..2a54342b1 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -11,8 +11,8 @@ codec = { package = "parity-scale-codec", version = "2.3.1" } jsonrpc-core = "18.0.0" jsonrpc-core-client = "18.0.0" jsonrpc-derive = "18.0.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index e3e65d61d..90a228ae0 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc." [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [features] default = ["std"] diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index f50b40f34..92e06c4c6 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index d0324d6c5..f0f6e64ab 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index 2b4ea18f3..c1bb2d41b 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -12,10 +12,10 @@ jsonrpc-core = "18.0.0" jsonrpc-core-client = "18.0.0" jsonrpc-derive = "18.0.0" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml index d7e061fac..ed1d1b45c 100644 --- a/tokens/rpc/runtime-api/Cargo.toml +++ b/tokens/rpc/runtime-api/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 47a179323..5cdd7aa93 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } [features] default = ["std"] diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 1b7da88b0..4d80fbb90 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -11,18 +11,18 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 70fd4745f..f54d9b678 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 74b8c5d60..202eb1e57 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 3dda758b9..0a97cce4c 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } codec = { package = "parity-scale-codec", version = "2.3.1" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17"} -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18"} +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 02e0022cb..0bdf69f5c 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,13 +10,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 3dd77989a..3a7b0db83 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -10,16 +10,16 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index a887f7d52..e2b6ce49b 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -11,40 +11,40 @@ edition = "2021" scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } orml-traits = { path = "../traits", default-features = false} [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.17" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.18" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18"} orml-tokens = { path = "../tokens" } orml-xcm = { path = "../xcm" }