Browse Source

Merge pull request #579 from mnaamani/proposals/tweak-storage-reward-limit

ROLE_PARAMETERS_REWARD_MAX_VALUE to 100_000
shamil-gadelshin 4 years ago
parent
commit
55386dd8b4

+ 1 - 1
Cargo.lock

@@ -1614,7 +1614,7 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "joystream-node-runtime"
 name = "joystream-node-runtime"
-version = "6.14.0"
+version = "6.15.0"
 dependencies = [
 dependencies = [
  "parity-scale-codec",
  "parity-scale-codec",
  "safe-mix",
  "safe-mix",

+ 1 - 1
pioneer/packages/joy-proposals/src/validationSchema.ts

@@ -57,7 +57,7 @@ const MIN_ACTORS_MAX = 1;
 const MAX_ACTORS_MIN = 2;
 const MAX_ACTORS_MIN = 2;
 const MAX_ACTORS_MAX = 99;
 const MAX_ACTORS_MAX = 99;
 const REWARD_MIN = 1;
 const REWARD_MIN = 1;
-const REWARD_MAX = 999;
+const REWARD_MAX = 99999;
 const REWARD_PERIOD_MIN = 600;
 const REWARD_PERIOD_MIN = 600;
 const REWARD_PERIOD_MAX = 3600;
 const REWARD_PERIOD_MAX = 3600;
 const BONDING_PERIOD_MIN = 600;
 const BONDING_PERIOD_MIN = 600;

+ 1 - 1
runtime-modules/proposals/codex/src/lib.rs

@@ -116,7 +116,7 @@ const ROLE_PARAMETERS_ENTRY_REQUEST_FEE_MAX_VALUE: u32 = 100_000;
 // reward min value for the 'set storage role parameters' proposal
 // reward min value for the 'set storage role parameters' proposal
 const ROLE_PARAMETERS_REWARD_MIN_VALUE: u32 = 0;
 const ROLE_PARAMETERS_REWARD_MIN_VALUE: u32 = 0;
 // reward max value for the 'set storage role parameters' proposal
 // reward max value for the 'set storage role parameters' proposal
-const ROLE_PARAMETERS_REWARD_MAX_VALUE: u32 = 1000;
+const ROLE_PARAMETERS_REWARD_MAX_VALUE: u32 = 100_000;
 // council_size min value for the 'set election parameters' proposal
 // council_size min value for the 'set election parameters' proposal
 const ELECTION_PARAMETERS_COUNCIL_SIZE_MIN_VALUE: u32 = 4;
 const ELECTION_PARAMETERS_COUNCIL_SIZE_MIN_VALUE: u32 = 4;
 // council_size max value for the 'set election parameters' proposal
 // council_size max value for the 'set election parameters' proposal

+ 1 - 1
runtime-modules/proposals/codex/src/tests/mod.rs

@@ -1053,7 +1053,7 @@ fn create_set_storage_role_parameters_proposal_fails_with_invalid_parameters() {
         );
         );
 
 
         role_parameters = working_role_parameters;
         role_parameters = working_role_parameters;
-        role_parameters.reward = 1001;
+        role_parameters.reward = 100_000;
         assert_failed_set_storage_parameters_call(
         assert_failed_set_storage_parameters_call(
             role_parameters,
             role_parameters,
             Error::InvalidStorageRoleParameterReward,
             Error::InvalidStorageRoleParameterReward,

+ 2 - 1
runtime/CHANGELOG.md

@@ -1,6 +1,7 @@
-### Version 6.14.0 - Constantinople runtime upgrade A - June 2020
+### Version 6.15.0 - Constantinople runtime upgrade A - June 2020
 - Updated runtime to sort out type name clashes between the proposal discussion module
 - Updated runtime to sort out type name clashes between the proposal discussion module
 and forum module, in preparing to roll out proposal discussion system in pioneer.
 and forum module, in preparing to roll out proposal discussion system in pioneer.
+- Increased ROLE_PARAMETERS_REWARD_MAX_VALUE to 100,000
 
 
 ### Version 6.13.0 - (Constantinople) runtime upgrade - May 20th 2020
 ### Version 6.13.0 - (Constantinople) runtime upgrade - May 20th 2020
 - New proposal system that strengthens the governance structure of the platform
 - New proposal system that strengthens the governance structure of the platform

+ 1 - 1
runtime/Cargo.toml

@@ -5,7 +5,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '6.14.0'
+version = '6.15.0'
 
 
 [features]
 [features]
 default = ['std']
 default = ['std']

+ 1 - 1
runtime/src/lib.rs

@@ -142,7 +142,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 6,
     authoring_version: 6,
-    spec_version: 14,
+    spec_version: 15,
     impl_version: 0,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     apis: RUNTIME_API_VERSIONS,
 };
 };