Browse Source

Merge branch 'giza-reward-curve-tweak' into giza-staging-update

Mokhtar Naamani 3 years ago
parent
commit
a773beede6
5 changed files with 7 additions and 7 deletions
  1. 2 2
      Cargo.lock
  2. 0 0
      chain-metadata.json
  3. 1 1
      node/Cargo.toml
  4. 1 1
      runtime/Cargo.toml
  5. 3 3
      runtime/src/lib.rs

+ 2 - 2
Cargo.lock

@@ -2332,7 +2332,7 @@ dependencies = [
 
 [[package]]
 name = "joystream-node"
-version = "5.9.0"
+version = "5.12.0"
 dependencies = [
  "frame-benchmarking",
  "frame-benchmarking-cli",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "joystream-node-runtime"
-version = "9.11.0"
+version = "9.12.0"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",

File diff suppressed because it is too large
+ 0 - 0
chain-metadata.json


+ 1 - 1
node/Cargo.toml

@@ -3,7 +3,7 @@ authors = ['Joystream contributors']
 build = 'build.rs'
 edition = '2018'
 name = 'joystream-node'
-version = '5.9.0'
+version = '5.12.0'
 default-run = "joystream-node"
 
 [[bin]]

+ 1 - 1
runtime/Cargo.toml

@@ -4,7 +4,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '9.11.0'
+version = '9.12.0'
 
 [dependencies]
 # Third-party dependencies

+ 3 - 3
runtime/src/lib.rs

@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 9,
-    spec_version: 11,
+    spec_version: 12,
     impl_version: 0,
     apis: crate::runtime_api::EXPORTED_RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -340,8 +340,8 @@ impl pallet_session::historical::Trait for Runtime {
 pallet_staking_reward_curve::build! {
     const REWARD_CURVE: PiecewiseLinear<'static> = curve!(
         min_inflation: 0_050_000,
-        max_inflation: 0_750_000,
-        ideal_stake: 0_300_000,
+        max_inflation: 0_150_000,
+        ideal_stake: 0_250_000,
         falloff: 0_050_000,
         max_piece_count: 100,
         test_precision: 0_005_000,

Some files were not shown because too many files changed in this diff