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

Feature/plmc 398 add treasury pallet to base runtime should like the one in #154

Merged
merged 32 commits into from
Feb 1, 2024
Merged

Feature/plmc 398 add treasury pallet to base runtime should like the one in #154

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dce6abd
add treasury and elections-phragmen
vstam1 Jan 23, 2024
ecbcb8b
move to holds and freezes for election pallet
vstam1 Jan 23, 2024
7f50735
fix test
vstam1 Jan 23, 2024
399d396
add pallets to base
vstam1 Jan 24, 2024
4ec7b03
add democracy pallet
vstam1 Jan 24, 2024
0926a56
set correct Governance config items
vstam1 Jan 24, 2024
e8c58d9
remove migrations
vstam1 Jan 25, 2024
46c75cb
add test + default fast-gov
vstam1 Jan 25, 2024
0124d17
change fast-gov to fast-mode
vstam1 Jan 25, 2024
a8c4483
add instant-mode
vstam1 Jan 26, 2024
230c93c
add gov tests
vstam1 Jan 26, 2024
8f0e01c
fmt
vstam1 Jan 26, 2024
7277fe1
license changes + readme mentions
vstam1 Jan 26, 2024
5b84947
updated config items
vstam1 Jan 26, 2024
d256dfa
merge master
vstam1 Jan 29, 2024
272e6aa
fix integration tests
vstam1 Jan 29, 2024
9e2cad8
add locking period to elections phragmen
vstam1 Jan 29, 2024
f20d404
add default members cargo config and fix benchmark tests
vstam1 Jan 29, 2024
82fc083
add test + remove try-runtime + benchmarks from integration tests
vstam1 Jan 29, 2024
904c52d
fix cargo test
vstam1 Jan 30, 2024
00fc14f
cargo fmt
JuaniRios Jan 30, 2024
161adf7
fix technical committee assignment
vstam1 Jan 30, 2024
d7155c8
fix tc assignment correctly and add tests
vstam1 Jan 31, 2024
facfe89
comments
vstam1 Jan 31, 2024
d381b8c
add initialization migrations and update custom_migrations
vstam1 Jan 31, 2024
d259045
update cancellation origin
vstam1 Jan 31, 2024
6f257af
change GrowthTreasury back to Treasury and add comments to tests
vstam1 Jan 31, 2024
9ed6f12
zepter
vstam1 Jan 31, 2024
2c6e201
fix migrations logging
vstam1 Jan 31, 2024
7f5cff0
ignore and fix build spec test
vstam1 Jan 31, 2024
3d0ab21
update pallet reference
vstam1 Jan 31, 2024
cdebd4f
fmt
vstam1 Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 81 additions & 14 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.

10 changes: 7 additions & 3 deletions Cargo.toml
View file
Open in desktop
vstam1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ members = [
"macros/tests",
"polimec-common",
]

default-members = ["nodes/*", "pallets/*"]
resolver = "2"

[workspace.package]
Expand Down Expand Up @@ -56,6 +56,8 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran

# Internal pallets (with default disabled)
pallet-funding = { path = "pallets/funding", default-features = false }
pallet-democracy = { path = "pallets/democracy", default-features = false }
pallet-elections-phragmen = { path = "pallets/elections-phragmen", default-features = false }
pallet-oracle-ocw = { path = "pallets/oracle-ocw", default-features = false }
pallet-sandbox = { path = "pallets/sandbox", default-features = false }
pallet-parachain-staking = { path = "pallets/parachain-staking", default-features = false }
Expand Down Expand Up @@ -121,6 +123,8 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default
sp-trie = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-im-online = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-authority-discovery = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
Expand All @@ -138,7 +142,6 @@ pallet-session = { git = "https://github.com/paritytech/substrate", default-feat
pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
Expand Down Expand Up @@ -224,10 +227,11 @@ sc-transaction_pool-api = { git = "https://github.com/paritytech/substrate", bra
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }

# Benchmarking (with default disabled)
cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "release-v1.0.0" }

# Runtimes
polimec-parachain-runtime = { path = "runtimes/testnet" }
polimec-parachain-runtime = { path = "runtimes/testnet"}
polimec-base-runtime = { path = "runtimes/base" }
74 changes: 10 additions & 64 deletions integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pallet-assets.workspace = true
polkadot-core-primitives.workspace = true
polkadot-runtime-parachains.workspace = true
polkadot-parachain.workspace = true
pallet-collective.workspace = true

cumulus-primitives-core.workspace = true
cumulus-pallet-xcm.workspace = true
Expand All @@ -61,6 +62,9 @@ orml-oracle.workspace = true
pallet-parachain-staking.workspace = true
pallet-vesting.workspace = true
itertools.workspace = true
pallet-democracy.workspace = true
pallet-scheduler.workspace = true
pallet-treasury.workspace = true

# Runtimes
polkadot-runtime.workspace = true
Expand All @@ -70,8 +74,8 @@ polimec-base-runtime.workspace = true
penpal-runtime = { path = "./penpal", default-features = false }

[features]
default = [ "std" ]

default = [ "std", "instant-mode" ]
instant-mode = [ "polimec-parachain-runtime/instant-mode", "polimec-base-runtime/instant-mode" ]
std = [
"asset-hub-polkadot-runtime/std",
"cumulus-pallet-xcm/std",
Expand All @@ -83,6 +87,10 @@ std = [
"orml-oracle/std",
"pallet-assets/std",
"pallet-balances/std",
"pallet-collective/std",
"pallet-democracy/std",
"pallet-treasury/std",
"pallet-scheduler/std",
"pallet-funding/std",
"pallet-im-online/std",
"pallet-linear-release/std",
Expand Down Expand Up @@ -118,65 +126,3 @@ std = [
"xcm/std",
]

runtime-benchmarks = [
"asset-hub-polkadot-runtime/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"itertools/use_alloc",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-funding/runtime-benchmarks",
"pallet-im-online/runtime-benchmarks",
"pallet-linear-release/runtime-benchmarks",
"pallet-membership/runtime-benchmarks",
"pallet-message-queue/runtime-benchmarks",
"pallet-parachain-staking/runtime-benchmarks",
"pallet-staking/runtime-benchmarks",
"pallet-vesting/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"penpal-runtime/runtime-benchmarks",
"polimec-base-runtime/runtime-benchmarks",
"polimec-common/runtime-benchmarks",
"polimec-parachain-runtime/runtime-benchmarks",
"polimec-receiver/runtime-benchmarks",
"polkadot-parachain/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
"polkadot-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
]
try-runtime = [
"asset-hub-polkadot-runtime/try-runtime",
"cumulus-pallet-xcm/try-runtime",
"cumulus-pallet-xcmp-queue/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"orml-oracle/try-runtime",
"pallet-assets/try-runtime",
"pallet-balances/try-runtime",
"pallet-funding/try-runtime",
"pallet-im-online/try-runtime",
"pallet-linear-release/try-runtime",
"pallet-membership/try-runtime",
"pallet-message-queue/try-runtime",
"pallet-parachain-staking/try-runtime",
"pallet-staking/try-runtime",
"pallet-vesting/try-runtime",
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"penpal-runtime/try-runtime",
"polimec-base-runtime/try-runtime",
"polimec-common/try-runtime",
"polimec-parachain-runtime/try-runtime",
"polimec-receiver/try-runtime",
"polkadot-runtime-parachains/try-runtime",
"polkadot-runtime/try-runtime",
"polkadot-service/try-runtime",
"sp-runtime/try-runtime",
]
fast-gov = [ "polimec-parachain-runtime/fast-gov" ]

2 changes: 1 addition & 1 deletion integration-tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ with the latest chain specs to provide a realistic testing environment.

```bash
$ cd polimec-node/integration-tests/
$ cargo test --features std,fast-gov
$ cargo test
```