Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions runtime/cere-dev/src/hyperbridge_ismp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ use polkadot_sdk::frame_support::{
traits::{
fungibles::{self, Dust, Unbalanced},
tokens::{DepositConsequence, Fortitude, Preservation, Provenance, WithdrawConsequence},
Get,
EitherOfDiverse, Get,
},
weights::WeightToFee,
};
use polkadot_sdk::frame_system::EnsureRoot;
use polkadot_sdk::pallet_collective::EnsureMembers;
use polkadot_sdk::sp_core::H256;
use polkadot_sdk::sp_runtime::{DispatchError, DispatchResult, Weight};

Expand Down Expand Up @@ -65,7 +66,8 @@ impl WeightToFee for IsmpWeightToFee {
}

impl pallet_ismp::Config for Runtime {
type AdminOrigin = EnsureRoot<AccountId>;
type AdminOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 2>>;
type HostStateMachine = HostStateMachine;
type Coprocessor = Coprocessor;
type TimestampProvider = Timestamp;
Expand All @@ -87,7 +89,8 @@ impl pallet_ismp::Config for Runtime {
impl ismp_grandpa::Config for Runtime {
type IsmpHost = pallet_ismp::Pallet<Runtime>;
type WeightInfo = crate::weights::ismp_grandpa::WeightInfo<Runtime>;
type RootOrigin = EnsureRoot<AccountId>;
type RootOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 2>>;
}

parameter_types! {
Expand All @@ -109,10 +112,8 @@ impl pallet_hyper_fungible_token::Config for Runtime {
type Assets = MockAssets;
type NativeCurrency = Balances;
type NativeAssetId = HftNativeAssetId;
// cere-dev is the devnet runtime — permissive so any signed account can
// register an asset for testing without needing sudo. cere mainnet keeps
// EnsureRoot. Preserved from the runtime baseline.
type CreateOrigin = polkadot_sdk::frame_system::EnsureSigned<AccountId>;
type CreateOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 2>>;
type Decimals = HftDecimals;
type EvmToSubstrate = ();
type WeightInfo = ();
Expand Down
2 changes: 1 addition & 1 deletion runtime/cere-dev/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to 0. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 73157,
spec_version: 73158,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 25,
Expand Down
12 changes: 8 additions & 4 deletions runtime/cere/src/hyperbridge_ismp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ use polkadot_sdk::frame_support::{
traits::{
fungibles::{self, Dust, Unbalanced},
tokens::{DepositConsequence, Fortitude, Preservation, Provenance, WithdrawConsequence},
Get,
EitherOfDiverse, Get,
},
weights::WeightToFee,
};
use polkadot_sdk::frame_system::EnsureRoot;
use polkadot_sdk::pallet_collective::EnsureMembers;
use polkadot_sdk::sp_core::H256;
use polkadot_sdk::sp_runtime::{DispatchError, DispatchResult, Weight};

Expand Down Expand Up @@ -64,7 +65,8 @@ impl WeightToFee for IsmpWeightToFee {
}

impl pallet_ismp::Config for Runtime {
type AdminOrigin = EnsureRoot<AccountId>;
type AdminOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 3>>;
type HostStateMachine = HostStateMachine;
type Coprocessor = Coprocessor;
type TimestampProvider = Timestamp;
Expand All @@ -86,7 +88,8 @@ impl pallet_ismp::Config for Runtime {
impl ismp_grandpa::Config for Runtime {
type IsmpHost = pallet_ismp::Pallet<Runtime>;
type WeightInfo = crate::weights::ismp_grandpa::WeightInfo<Runtime>;
type RootOrigin = EnsureRoot<AccountId>;
type RootOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 3>>;
}

parameter_types! {
Expand All @@ -108,7 +111,8 @@ impl pallet_hyper_fungible_token::Config for Runtime {
type Assets = MockAssets;
type NativeCurrency = Balances;
type NativeAssetId = HftNativeAssetId;
type CreateOrigin = EnsureRoot<AccountId>;
type CreateOrigin =
EitherOfDiverse<EnsureRoot<AccountId>, EnsureMembers<AccountId, TechCommCollective, 3>>;
type Decimals = HftDecimals;
type EvmToSubstrate = ();
type WeightInfo = ();
Expand Down
2 changes: 1 addition & 1 deletion runtime/cere/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// and set impl_version to 0. If only runtime
// implementation changes and behavior does not, then leave spec_version as
// is and increment impl_version.
spec_version: 73157,
spec_version: 73158,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 25,
Expand Down
Loading