mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 11:41:02 +00:00
* Remove event pallet::metadata attributes * Add scale-info deps, TypeInfo derives, update call variants * Update metadata runtime APIs * Add missing scale_info dependency, update rococo runtime API * Add missing scale_info dependency * Remove pushed diener patches * Cargo.lock * Add missing scale-info dependencies * Fixes * Statemint runtime fixes * Call struct variant empty matches * Add missing scale-info dependency * Fixes * scale-info 1.0 * cargo update -p xcm * update lock * Update Cargo.lock * update to latest polkadot * remove rpc_http_threads https://github.com/paritytech/substrate/pull/9737 * replace task executor with tokio handler https://github.com/paritytech/substrate/pull/9737 * fix test compilation? * Update Cargo.lock * cargo update * remove unused * Update substrate and polkadot * Update test/client/src/lib.rs Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
@@ -6,6 +6,7 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
|
||||
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
|
||||
@@ -17,6 +18,7 @@ cumulus-primitives-core = { path = "../../../primitives/core", default-features
|
||||
default = ["std"]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"cumulus-primitives-core/std",
|
||||
"frame-support/std",
|
||||
|
||||
@@ -6,6 +6,7 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
|
||||
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
|
||||
@@ -22,6 +23,7 @@ cumulus-pallet-xcm = { path = "../../../pallets/xcm", default-features = false }
|
||||
default = ["std"]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"cumulus-primitives-core/std",
|
||||
"sp-std/std",
|
||||
|
||||
@@ -79,7 +79,6 @@ pub mod pallet {
|
||||
|
||||
#[pallet::event]
|
||||
#[pallet::generate_deposit(pub(super) fn deposit_event)]
|
||||
#[pallet::metadata(T::BlockNumber = "BlockNumber")]
|
||||
pub enum Event<T: Config> {
|
||||
PingSent(ParaId, u32, Vec<u8>),
|
||||
Pinged(ParaId, u32, Vec<u8>),
|
||||
@@ -105,7 +104,7 @@ pub mod pallet {
|
||||
Xcm(vec![Transact {
|
||||
origin_type: OriginKind::Native,
|
||||
require_weight_at_most: 1_000,
|
||||
call: <T as Config>::Call::from(Call::<T>::ping(seq, payload.clone())).encode().into(),
|
||||
call: <T as Config>::Call::from(Call::<T>::ping { seq, payload: payload.clone() }).encode().into(),
|
||||
}]),
|
||||
) {
|
||||
Ok(()) => {
|
||||
@@ -167,7 +166,7 @@ pub mod pallet {
|
||||
Xcm(vec![Transact {
|
||||
origin_type: OriginKind::Native,
|
||||
require_weight_at_most: 1_000,
|
||||
call: <T as Config>::Call::from(Call::<T>::pong(seq, payload.clone())).encode().into(),
|
||||
call: <T as Config>::Call::from(Call::<T>::pong { seq, payload: payload.clone() } ).encode().into(),
|
||||
}]),
|
||||
) {
|
||||
Ok(()) => Self::deposit_event(Event::PongSent(para, seq, payload)),
|
||||
|
||||
@@ -11,6 +11,7 @@ targets = ['x86_64-unknown-linux-gnu']
|
||||
[dependencies]
|
||||
# External dependencies
|
||||
codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['derive'], default-features = false }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
|
||||
# Substrate dependencies
|
||||
sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
|
||||
@@ -42,6 +43,7 @@ substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', bran
|
||||
default = ["std"]
|
||||
std = [
|
||||
'codec/std',
|
||||
'scale-info/std',
|
||||
'sp-consensus-aura/std',
|
||||
'sp-std/std',
|
||||
'sp-io/std',
|
||||
|
||||
@@ -7,6 +7,7 @@ description = "Simple runtime used by the rococo parachain(s)"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
|
||||
log = { version = "0.4.14", default-features = false }
|
||||
parachain-info = { path = "../pallets/parachain-info", default-features = false }
|
||||
@@ -63,6 +64,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
|
||||
default = [ "std" ]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"log/std",
|
||||
"sp-api/std",
|
||||
|
||||
@@ -538,7 +538,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl sp_api::Metadata<Block> for Runtime {
|
||||
fn metadata() -> OpaqueMetadata {
|
||||
Runtime::metadata().into()
|
||||
OpaqueMetadata::new(Runtime::metadata().into())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ edition = '2018'
|
||||
[dependencies]
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
log = { version = "0.4.14", default-features = false }
|
||||
parachain-info = { path = "../pallets/parachain-info", default-features = false }
|
||||
|
||||
@@ -44,6 +45,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran
|
||||
default = [ "std" ]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"log/std",
|
||||
"sp-api/std",
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
#[cfg(feature = "std")]
|
||||
include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
use scale_info::TypeInfo;
|
||||
use sp_api::impl_runtime_apis;
|
||||
use sp_core::OpaqueMetadata;
|
||||
use sp_runtime::{
|
||||
@@ -241,7 +243,7 @@ construct_runtime! {
|
||||
}
|
||||
|
||||
/// Simple implementation which fails any transaction which is signed.
|
||||
#[derive(Eq, PartialEq, Clone, Default, sp_core::RuntimeDebug, codec::Encode, codec::Decode)]
|
||||
#[derive(Eq, PartialEq, Clone, Default, sp_core::RuntimeDebug, Encode, Decode, TypeInfo)]
|
||||
pub struct DisallowSigned;
|
||||
impl sp_runtime::traits::SignedExtension for DisallowSigned {
|
||||
const IDENTIFIER: &'static str = "DisallowSigned";
|
||||
@@ -319,7 +321,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl sp_api::Metadata<Block> for Runtime {
|
||||
fn metadata() -> OpaqueMetadata {
|
||||
Runtime::metadata().into()
|
||||
OpaqueMetadata::new(Runtime::metadata().into())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ description = "Kusama variant of Statemint parachain runtime"
|
||||
[dependencies]
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
log = { version = "0.4.14", default-features = false }
|
||||
parachain-info = { path = "../pallets/parachain-info", default-features = false }
|
||||
smallvec = "1.6.1"
|
||||
@@ -101,6 +102,7 @@ runtime-benchmarks = [
|
||||
]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"log/std",
|
||||
"sp-api/std",
|
||||
|
||||
@@ -321,6 +321,7 @@ parameter_types! {
|
||||
/// The type used to represent the kinds of proxying allowed.
|
||||
#[derive(
|
||||
Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
|
||||
scale_info::TypeInfo,
|
||||
)]
|
||||
pub enum ProxyType {
|
||||
/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
|
||||
@@ -348,58 +349,61 @@ impl InstanceFilter<Call> for ProxyType {
|
||||
match self {
|
||||
ProxyType::Any => true,
|
||||
ProxyType::NonTransfer => {
|
||||
!matches!(c, Call::Balances(..) | Call::Assets(..) | Call::Uniques(..))
|
||||
!matches!(c, Call::Balances { .. } | Call::Assets { .. } | Call::Uniques { .. })
|
||||
}
|
||||
ProxyType::CancelProxy => matches!(
|
||||
c,
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Assets => {
|
||||
matches!(
|
||||
c,
|
||||
Call::Assets(..) | Call::Utility(..) | Call::Multisig(..) | Call::Uniques(..)
|
||||
Call::Assets { .. }
|
||||
| Call::Utility { .. }
|
||||
| Call::Multisig { .. }
|
||||
| Call::Uniques { .. }
|
||||
)
|
||||
}
|
||||
ProxyType::AssetOwner => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::create(..))
|
||||
| Call::Assets(pallet_assets::Call::destroy(..))
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership(..))
|
||||
| Call::Assets(pallet_assets::Call::set_team(..))
|
||||
| Call::Assets(pallet_assets::Call::set_metadata(..))
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::create(..))
|
||||
| Call::Uniques(pallet_uniques::Call::destroy(..))
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_team(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::create { .. })
|
||||
| Call::Assets(pallet_assets::Call::destroy { .. })
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_team { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_metadata { .. })
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::create { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::destroy { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_team { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::AssetManager => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::mint(..))
|
||||
| Call::Assets(pallet_assets::Call::burn(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset(..))
|
||||
| Call::Uniques(pallet_uniques::Call::mint(..))
|
||||
| Call::Uniques(pallet_uniques::Call::burn(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::mint { .. })
|
||||
| Call::Assets(pallet_assets::Call::burn { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::mint { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::burn { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Collator => matches!(
|
||||
c,
|
||||
Call::CollatorSelection(..) | Call::Utility(..) | Call::Multisig(..)
|
||||
Call::CollatorSelection { .. } | Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
}
|
||||
}
|
||||
@@ -771,7 +775,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl sp_api::Metadata<Block> for Runtime {
|
||||
fn metadata() -> OpaqueMetadata {
|
||||
Runtime::metadata().into()
|
||||
OpaqueMetadata::new(Runtime::metadata().into())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ description = "Statemint parachain runtime"
|
||||
[dependencies]
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
log = { version = "0.4.14", default-features = false }
|
||||
parachain-info = { path = "../pallets/parachain-info", default-features = false }
|
||||
smallvec = "1.6.1"
|
||||
@@ -101,6 +102,7 @@ runtime-benchmarks = [
|
||||
]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"log/std",
|
||||
"sp-api/std",
|
||||
|
||||
@@ -288,6 +288,7 @@ parameter_types! {
|
||||
/// The type used to represent the kinds of proxying allowed.
|
||||
#[derive(
|
||||
Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
|
||||
scale_info::TypeInfo,
|
||||
)]
|
||||
pub enum ProxyType {
|
||||
/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
|
||||
@@ -315,58 +316,61 @@ impl InstanceFilter<Call> for ProxyType {
|
||||
match self {
|
||||
ProxyType::Any => true,
|
||||
ProxyType::NonTransfer => {
|
||||
!matches!(c, Call::Balances(..) | Call::Assets(..) | Call::Uniques(..))
|
||||
!matches!(c, Call::Balances { .. } | Call::Assets { .. } | Call::Uniques { .. })
|
||||
}
|
||||
ProxyType::CancelProxy => matches!(
|
||||
c,
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Assets => {
|
||||
matches!(
|
||||
c,
|
||||
Call::Assets(..) | Call::Utility(..) | Call::Multisig(..) | Call::Uniques(..)
|
||||
Call::Assets { .. }
|
||||
| Call::Utility { .. }
|
||||
| Call::Multisig { .. }
|
||||
| Call::Uniques { .. }
|
||||
)
|
||||
}
|
||||
ProxyType::AssetOwner => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::create(..))
|
||||
| Call::Assets(pallet_assets::Call::destroy(..))
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership(..))
|
||||
| Call::Assets(pallet_assets::Call::set_team(..))
|
||||
| Call::Assets(pallet_assets::Call::set_metadata(..))
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::create(..))
|
||||
| Call::Uniques(pallet_uniques::Call::destroy(..))
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_team(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::create { .. })
|
||||
| Call::Assets(pallet_assets::Call::destroy { .. })
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_team { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_metadata { .. })
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::create { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::destroy { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_team { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::AssetManager => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::mint(..))
|
||||
| Call::Assets(pallet_assets::Call::burn(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset(..))
|
||||
| Call::Uniques(pallet_uniques::Call::mint(..))
|
||||
| Call::Uniques(pallet_uniques::Call::burn(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::mint { .. })
|
||||
| Call::Assets(pallet_assets::Call::burn { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::mint { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::burn { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Collator => matches!(
|
||||
c,
|
||||
Call::CollatorSelection(..) | Call::Utility(..) | Call::Multisig(..)
|
||||
Call::CollatorSelection { .. } | Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
}
|
||||
}
|
||||
@@ -753,7 +757,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl sp_api::Metadata<Block> for Runtime {
|
||||
fn metadata() -> OpaqueMetadata {
|
||||
Runtime::metadata().into()
|
||||
OpaqueMetadata::new(Runtime::metadata().into())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ description = "Westend variant of Statemint parachain runtime"
|
||||
[dependencies]
|
||||
serde = { version = "1.0.101", optional = true, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
|
||||
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
log = { version = "0.4.14", default-features = false }
|
||||
parachain-info = { path = "../pallets/parachain-info", default-features = false }
|
||||
smallvec = "1.6.1"
|
||||
@@ -101,6 +102,7 @@ runtime-benchmarks = [
|
||||
]
|
||||
std = [
|
||||
"codec/std",
|
||||
"scale-info/std",
|
||||
"serde",
|
||||
"log/std",
|
||||
"sp-api/std",
|
||||
|
||||
@@ -287,6 +287,7 @@ parameter_types! {
|
||||
/// The type used to represent the kinds of proxying allowed.
|
||||
#[derive(
|
||||
Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, MaxEncodedLen,
|
||||
scale_info::TypeInfo,
|
||||
)]
|
||||
pub enum ProxyType {
|
||||
/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
|
||||
@@ -314,58 +315,61 @@ impl InstanceFilter<Call> for ProxyType {
|
||||
match self {
|
||||
ProxyType::Any => true,
|
||||
ProxyType::NonTransfer => {
|
||||
!matches!(c, Call::Balances(..) | Call::Assets(..) | Call::Uniques(..))
|
||||
!matches!(c, Call::Balances { .. } | Call::Assets { .. } | Call::Uniques { .. })
|
||||
}
|
||||
ProxyType::CancelProxy => matches!(
|
||||
c,
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Proxy(pallet_proxy::Call::reject_announcement { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Assets => {
|
||||
matches!(
|
||||
c,
|
||||
Call::Assets(..) | Call::Utility(..) | Call::Multisig(..) | Call::Uniques(..)
|
||||
Call::Assets { .. }
|
||||
| Call::Utility { .. }
|
||||
| Call::Multisig { .. }
|
||||
| Call::Uniques { .. }
|
||||
)
|
||||
}
|
||||
ProxyType::AssetOwner => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::create(..))
|
||||
| Call::Assets(pallet_assets::Call::destroy(..))
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership(..))
|
||||
| Call::Assets(pallet_assets::Call::set_team(..))
|
||||
| Call::Assets(pallet_assets::Call::set_metadata(..))
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::create(..))
|
||||
| Call::Uniques(pallet_uniques::Call::destroy(..))
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_team(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute(..))
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::create { .. })
|
||||
| Call::Assets(pallet_assets::Call::destroy { .. })
|
||||
| Call::Assets(pallet_assets::Call::transfer_ownership { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_team { .. })
|
||||
| Call::Assets(pallet_assets::Call::set_metadata { .. })
|
||||
| Call::Assets(pallet_assets::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::create { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::destroy { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::transfer_ownership { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_team { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::set_class_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_metadata { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_attribute { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::clear_class_metadata { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::AssetManager => matches!(
|
||||
c,
|
||||
Call::Assets(pallet_assets::Call::mint(..))
|
||||
| Call::Assets(pallet_assets::Call::burn(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw(..))
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset(..))
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset(..))
|
||||
| Call::Uniques(pallet_uniques::Call::mint(..))
|
||||
| Call::Uniques(pallet_uniques::Call::burn(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw(..))
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class(..))
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class(..))
|
||||
| Call::Utility(..) | Call::Multisig(..)
|
||||
Call::Assets(pallet_assets::Call::mint { .. })
|
||||
| Call::Assets(pallet_assets::Call::burn { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw { .. })
|
||||
| Call::Assets(pallet_assets::Call::freeze_asset { .. })
|
||||
| Call::Assets(pallet_assets::Call::thaw_asset { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::mint { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::burn { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::freeze_class { .. })
|
||||
| Call::Uniques(pallet_uniques::Call::thaw_class { .. })
|
||||
| Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
ProxyType::Collator => matches!(
|
||||
c,
|
||||
Call::CollatorSelection(..) | Call::Utility(..) | Call::Multisig(..)
|
||||
Call::CollatorSelection { .. } | Call::Utility { .. } | Call::Multisig { .. }
|
||||
),
|
||||
}
|
||||
}
|
||||
@@ -756,7 +760,7 @@ impl_runtime_apis! {
|
||||
|
||||
impl sp_api::Metadata<Block> for Runtime {
|
||||
fn metadata() -> OpaqueMetadata {
|
||||
Runtime::metadata().into()
|
||||
OpaqueMetadata::new(Runtime::metadata().into())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user