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

Jump to bottom

Mainnet Release 1.1.2 - Governance implementation #59

Merged
merged 12 commits into from
Jul 21, 2023
Merged

Mainnet Release 1.1.2 - Governance implementation #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a967e9a
Fix whitepaper link in README.md
NZT48 Jul 2, 2023
37cd3a2
Add preimage pallet
NZT48 Jul 11, 2023
b52fb0c
Add utlity pallet
NZT48 Jul 11, 2023
48d4efb
Add council implementation
NZT48 Jul 12, 2023
771dc8d
Add democracy and identity pallets, tune up governance parameters
NZT48 Jul 12, 2023
d0d7cc3
Handle fees from evm transactions
NZT48 Jul 14, 2023
cf1ecc7
Bump spec version, on slash for treasury pallet
NZT48 Jul 14, 2023
254f49d
Remove duplice sudo pallet
NZT48 Jul 14, 2023
50eca05
Connect preimage and scheduler pallet
NZT48 Jul 14, 2023
ca651ee
Set ensure type to take AtLeast for Council members
NZT48 Jul 19, 2023
e1d3d86
Code formatting
NZT48 Jul 19, 2023
fde4447
Merge pull request #53 from OriginTrail/feature/governance
NZT48 Jul 19, 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
8 changes: 6 additions & 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.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ docker run -it -p 30333:30333 -p 9933:9933 -p 9944:9944 -p 9615:9615 -v /data:/d

- More about expanding the multi-chain OriginTrail with Polkadot and OriginTrail Parachain development roadmap you can find on
[parachain.origintrail.io](https://parachain.origintrail.io/)
- More about OriginTrail Parachain and Decentralized Knowledge Graph read in [whitepaper](https://parachain.origintrail.io/whitepaper)
- More about OriginTrail Parachain and Decentralized Knowledge Graph read in [whitepaper](https://origintrail.io/ecosystem/whitepaper)
2 changes: 2 additions & 0 deletions node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,7 @@ fn testnet_genesis(
},
ethereum: EthereumConfig {},
base_fee: Default::default(),
council: Default::default(),
democracy: Default::default(),
}
}
33 changes: 26 additions & 7 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.1"
version = "1.1.2"
authors = ["TraceLabs"]
description = "OriginTrail Parachain Runtime - Cumulus FRAME-based Substrate Runtime"
license = "GPL-3.0-only"
Expand All @@ -25,9 +25,6 @@ scale-info = { version = "2.3.1", default-features = false, features = [
] }
smallvec = "1.10.0"

# Local
pallet-template = { path = "../pallets/template", default-features = false }

# Substrate
frame-benchmarking = { git = "https:/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.40" }
frame-executive = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
Expand All @@ -47,6 +44,7 @@ pallet-timestamp = { git = "https:/paritytech/substrate", default-fe
pallet-transaction-payment = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-transaction-payment-rpc-runtime-api = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-treasury = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-utility = { git = "https:/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }
pallet-vesting = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
pallet-xc-asset-config = { path = "../pallets/xc-asset-config", default-features = false }
sp-api = { git = "https:/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.40" }
Expand Down Expand Up @@ -94,6 +92,12 @@ pallet-ethereum = { git = "https:/OriginTrail/frontier", default-fea
fp-rpc = { git = "https:/OriginTrail/frontier", default-features = false, branch = "polkadot-v0.9.40" }
fp-self-contained = { git = "https:/OriginTrail/frontier", default-features = false, branch = "polkadot-v0.9.40" }

# Governance
pallet-collective = { git = "https:/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }
pallet-democracy = { git = "https:/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }
pallet-identity = { git = "https:/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }
pallet-preimage = { git = "https:/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.40" }

[features]
default = ["std"]
std = [
Expand All @@ -120,20 +124,24 @@ std = [
"pallet-balances/std",
"pallet-base-fee/std",
"pallet-collator-selection/std",
"pallet-collective/std",
"pallet-democracy/std",
"pallet-evm/std",
"pallet-evm-accounts/std",
"pallet-evm-precompile-assets-erc20/std",
"pallet-evm-precompile-simple/std",
"pallet-evm-precompile-sha3fips/std",
"pallet-ethereum/std",
"pallet-identity/std",
"pallet-preimage/std",
"pallet-scheduler/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-template/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
"pallet-treasury/std",
"pallet-utility/std",
"pallet-vesting/std",
"pallet-xc-asset-config/std",
"pallet-xcm/std",
Expand Down Expand Up @@ -165,11 +173,16 @@ runtime-benchmarks = [
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
"pallet-democracy/runtime-benchmarks",
"pallet-evm/runtime-benchmarks",
"pallet-ethereum/runtime-benchmarks",
"pallet-template/runtime-benchmarks",
"pallet-identity/runtime-benchmarks",
"pallet-preimage/runtime-benchmarks",
"pallet-scheduler/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-treasury/runtime-benchmarks",
"pallet-utility/runtime-benchmarks",
"pallet-vesting/runtime-benchmarks",
"pallet-xc-asset-config/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
Expand All @@ -192,9 +205,15 @@ try-runtime = [
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-collator-selection/try-runtime",
"pallet-collective/try-runtime",
"pallet-democracy/runtime-benchmarks",
"pallet-identity/runtime-benchmarks",
"pallet-preimage/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-template/try-runtime",
"pallet-utility/try-runtime",
"pallet-vesting/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-xcm/try-runtime",
Expand Down
Loading
Loading