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

feat: opengov staking #836

Merged
merged 22 commits into from
Jul 8, 2024
Merged

feat: opengov staking #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
92e3e6f
add conviciton voting pallet
enthusiastmartin Jun 6, 2024
499c166
add hooks trait
enthusiastmartin Jun 6, 2024
0743e1d
integrate voting hooks
enthusiastmartin Jun 6, 2024
f3bfd35
integrate referenda and use concrete index type
enthusiastmartin Jun 7, 2024
7b9df52
implement get referenda status for pallet-referenda
enthusiastmartin Jun 7, 2024
f31f064
Merge branch 'master' into feat/opengov-staking
enthusiastmartin Jun 24, 2024
2c7bd2d
Merge branch 'opengov' into feat/opengov-staking
enthusiastmartin Jun 24, 2024
641ff79
integrate staking for referenda
enthusiastmartin Jun 24, 2024
dd16960
fix staking integration tests
Roznovjak Jun 27, 2024
e6e1e8e
fix staking reward amount in integration test
enthusiastmartin Jul 3, 2024
3297e0a
clippy fix
enthusiastmartin Jul 4, 2024
9d53fd8
staking migration; conviction-voting benchmark update
enthusiastmartin Jul 4, 2024
cd12cff
Merge branch 'opengov' into feat/opengov-staking
enthusiastmartin Jul 4, 2024
49d1aaa
fix integration tests
enthusiastmartin Jul 4, 2024
0e220db
fix integration tests
enthusiastmartin Jul 4, 2024
8711d26
clippy fix
enthusiastmartin Jul 4, 2024
7309fc2
clippy fix
enthusiastmartin Jul 4, 2024
304719b
Merge branch 'opengov' into feat/opengov-staking
enthusiastmartin Jul 8, 2024
ceb70c5
conviction voting clippy
enthusiastmartin Jul 8, 2024
1bab689
review comments
enthusiastmartin Jul 8, 2024
6186499
formatting
enthusiastmartin Jul 8, 2024
e69897f
clippy fix
enthusiastmartin Jul 8, 2024
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
42 changes: 32 additions & 10 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.

11 changes: 5 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ members = [
'pallets/evm-accounts',
'pallets/dynamic-evm-fee',
'pallets/xyk-liquidity-mining',
'pallets/conviction-voting',
'precompiles/call-permit',
'runtime-mock'
]
Expand Down Expand Up @@ -100,6 +101,7 @@ warehouse-liquidity-mining = { package = "pallet-liquidity-mining", path = "pall
pallet-bonds = { path = "pallets/bonds", default-features = false}
pallet-lbp = { path = "pallets/lbp", default-features = false}
pallet-xyk = { path = "pallets/xyk", default-features = false}
pallet-conviction-voting = { path = "pallets/conviction-voting", default-features = false}
pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false}
pallet-referrals = { path = "pallets/referrals", default-features = false}
pallet-evm-accounts = { path = "pallets/evm-accounts", default-features = false}
Expand Down Expand Up @@ -198,7 +200,6 @@ pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch =
pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
Expand Down Expand Up @@ -324,6 +325,7 @@ cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sd
cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }


[patch."https://github.com/moonbeam-foundation/open-runtime-module-library"]
# ORML dependencies
orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
Expand Down Expand Up @@ -411,13 +413,11 @@ pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "re
pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
Expand All @@ -430,9 +430,8 @@ pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch =
pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk",branch = "release-polkadot-v1.7.2" }
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}

substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
Expand Down
3 changes: 2 additions & 1 deletion integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.23.0"
version = "1.23.1"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down Expand Up @@ -49,6 +49,7 @@ pallet-tips = { workspace = true }
pallet-xyk-liquidity-mining = { workspace = true }
pallet-transaction-pause = { workspace = true }
pallet-referenda = { workspace = true }
pallet-conviction-voting= { workspace = true }

# collator support
pallet-collator-selection = { workspace = true }
Expand Down
Loading