Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mainnet Release 1.2.0 - Sudo removal #64

Merged
merged 6 commits into from
Jul 31, 2023
Merged

Mainnet Release 1.2.0 - Sudo removal #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2af64fe
Merge pull request #55 from OriginTrail/develop
NZT48 Jul 19, 2023
2fd9293
Bump runtime version for Alphanet to 113
NZT48 Jul 19, 2023
69c0d62
Disable sudo in chain_spec
NZT48 Jul 22, 2023
5fff57c
Remove sudo pallet
NZT48 Jul 24, 2023
81dbc5d
Merge pull request #60 from OriginTrail/feature/remove-sudo
NZT48 Jul 24, 2023
6e6fdbf
Merge branch 'release/alphanet' into develop
NZT48 Jul 24, 2023
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
3 changes: 1 addition & 2 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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