Skip to content

Commit

Permalink
Merge pull request #64 from OriginTrail/develop
Browse files Browse the repository at this point in the history
Mainnet Release 1.2.0 - Sudo removal
  • Loading branch information
NZT48 authored Jul 31, 2023
2 parents 48d5851 + 6e6fdbf commit fde3d87
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions node/src/chain_spec.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use cumulus_primitives_core::ParaId;
use origintrail_parachain_runtime::{AccountId, AuraId,
EVMConfig, EthereumConfig, Signature, SudoConfig, EXISTENTIAL_DEPOSIT};
EVMConfig, EthereumConfig, Signature, EXISTENTIAL_DEPOSIT};
use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
use sc_service::ChainType;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -181,7 +181,7 @@ pub fn local_testnet_config() -> ChainSpec {

fn testnet_genesis(
invulnerables: Vec<(AccountId, AuraId)>,
root_key: AccountId,
_root_key: AccountId,
endowed_accounts: Vec<AccountId>,
id: ParaId,
) -> origintrail_parachain_runtime::GenesisConfig {
Expand Down Expand Up @@ -220,10 +220,10 @@ fn testnet_genesis(
polkadot_xcm: origintrail_parachain_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
},
sudo: SudoConfig {
// Assign network admin rights.
key: Some(root_key),
},
// sudo: SudoConfig {
// // Assign network admin rights.
// key: Some(root_key),
// },
vesting: Default::default(),
treasury: Default::default(),
evm: EVMConfig {
Expand Down
5 changes: 1 addition & 4 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "origintrail-parachain-runtime"
version = "1.1.2"
version = "1.2.0"
authors = ["TraceLabs"]
description = "OriginTrail Parachain Runtime - Cumulus FRAME-based Substrate Runtime"
license = "GPL-3.0-only"
Expand Down Expand Up @@ -39,7 +39,6 @@ pallet-authorship = { git = "https://github.com/paritytech/substrate", default-f
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }
pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
Expand Down Expand Up @@ -136,7 +135,6 @@ std = [
"pallet-preimage/std",
"pallet-scheduler/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
Expand Down Expand Up @@ -211,7 +209,6 @@ try-runtime = [
"pallet-preimage/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-utility/try-runtime",
"pallet-vesting/try-runtime",
"pallet-timestamp/try-runtime",
Expand Down
10 changes: 1 addition & 9 deletions runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("origintrail-parachain"),
impl_name: create_runtime_str!("origintrail-parachain"),
authoring_version: 1,
spec_version: 112,
spec_version: 120,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -620,11 +620,6 @@ impl pallet_scheduler::Config for Runtime {
type OriginPrivilegeCmp = EqualPrivilegeOnly;
}

impl pallet_sudo::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type RuntimeCall = RuntimeCall;
}

parameter_types! {
pub const MinVestedTransfer: Balance = 15 * OTP;
pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
Expand Down Expand Up @@ -1091,9 +1086,6 @@ construct_runtime!(
Council: pallet_collective::<Instance1> = 62,
Democracy: pallet_democracy = 63,
Identity: pallet_identity = 64,

// Temporary.
Sudo: pallet_sudo = 255,
}
);

Expand Down

0 comments on commit fde3d87

Please sign in to comment.