Skip to content

Proposals.Version 2.Iteration 8 #279

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

Merged
bedeho merged 23 commits into from
Apr 20, 2020
Merged

Proposals.Version 2.Iteration 8 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
34b0e7c
Add codex ProposalDetails for the frontend
shamil-gadelshin Apr 1, 2020
51cde50
Add ‘create_evict_storage_provider_proposal’ extrinsic
shamil-gadelshin Apr 2, 2020
b994ee7
Add ‘create_set_validator_count_proposal’ extrinsic
shamil-gadelshin Apr 2, 2020
e77768a
Add ‘create_set_storage_role_parameters_proposal’ extrinsic
shamil-gadelshin Apr 2, 2020
6c01c09
Fix reset_proposal() in the engine module
shamil-gadelshin Apr 3, 2020
020f3c7
Change upgrade runtime proposal
shamil-gadelshin Apr 3, 2020
ab54a82
Add some comments to proposal modules
shamil-gadelshin Apr 3, 2020
c27a869
Set min validator count for the proposals
shamil-gadelshin Apr 6, 2020
aa793af
Add ensure_storage_role_parameters_valid() to the codex
shamil-gadelshin Apr 6, 2020
96720b4
Add ensure_council_election_parameters_valid() to the codex
shamil-gadelshin Apr 7, 2020
e8dbdcb
Change min_validator_count() limit in the codex
shamil-gadelshin Apr 7, 2020
b679257
Add veto for the pending execution proposal.
shamil-gadelshin Apr 8, 2020
f55dcf6
Set general proposal parameters.
shamil-gadelshin Apr 9, 2020
1884aa0
Update proposals runtime parameters
shamil-gadelshin Apr 9, 2020
dda832e
Set proposal parameters
shamil-gadelshin Apr 10, 2020
61a8127
Fix clippy comments
shamil-gadelshin Apr 13, 2020
a9bbf47
Add comments
shamil-gadelshin Apr 13, 2020
74e1fe2
Update comments
shamil-gadelshin Apr 13, 2020
00872d6
Add missing tests
shamil-gadelshin Apr 15, 2020
1683ac4
Add tests for proposal status resolution
shamil-gadelshin Apr 15, 2020
cb80ece
Migrate proposal votes calculations to Perbill
shamil-gadelshin Apr 15, 2020
ad3705b
Remove allowd member_id list for runtime upgrade proposal
shamil-gadelshin Apr 15, 2020
c2c9cb3
Remove ‘set council mint capacity’ proposal
shamil-gadelshin Apr 20, 2020
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 runtime-modules/membership/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = 'substrate-membership-module'
version = '1.0.0'
version = '1.0.1'
authors = ['Joystream contributors']
edition = '2018'

Expand Down
4 changes: 4 additions & 0 deletions runtime-modules/membership/src/role_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ use codec::{Decode, Encode};
use rstd::collections::btree_set::BTreeSet;
use rstd::prelude::*;

#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};

#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
#[derive(Encode, Decode, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Debug)]
pub enum Role {
StorageProvider,
Expand Down
35 changes: 31 additions & 4 deletions runtime-modules/proposals/codex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ std = [
'sr-primitives/std',
'system/std',
'timestamp/std',
'staking/std',
'serde',
'proposal_engine/std',
'proposal_discussion/std',
Expand All @@ -23,6 +24,7 @@ std = [
'membership/std',
'governance/std',
'mint/std',
'roles/std',
]


Expand Down Expand Up @@ -83,6 +85,18 @@ default-features = false
git = 'https://github.com/paritytech/substrate.git'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

[dependencies.staking]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'srml-staking'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

[dependencies.runtime-io]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'sr-io'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

[dependencies.stake]
default_features = false
package = 'substrate-stake-module'
Expand Down Expand Up @@ -123,11 +137,10 @@ default_features = false
package = 'substrate-content-working-group-module'
path = '../../content-working-group'

[dev-dependencies.runtime-io]
[dependencies.roles]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'sr-io'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
package = 'substrate-roles-module'
path = '../../roles'

[dev-dependencies.hiring]
default_features = false
Expand All @@ -153,3 +166,17 @@ path = '../../versioned-store-permissions'
default_features = false
package = 'substrate-recurring-reward-module'
path = '../../recurring-reward'

[dev-dependencies.sr-staking-primitives]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'sr-staking-primitives'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

# don't rename the dependency it is causing some strange compiler error:
# https://github.com/rust-lang/rust/issues/64450
[dev-dependencies.srml-staking-reward-curve]
package = 'srml-staking-reward-curve'
git = 'https://github.com/paritytech/substrate.git'
default_features = false
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
Loading