Skip to content

Commit e644730

Browse files
L1-290: Cp 5a47d23 (#1828)
# Description Cherry-pick of 5a47d23 --------- Co-authored-by: lesniak43 <lesniak43@gmail.com>
1 parent 739bf37 commit e644730

3 files changed

Lines changed: 21 additions & 22 deletions

File tree

aleph-client/src/aleph_zero.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,9 +1928,9 @@ pub mod api {
19281928
.hash();
19291929
runtime_metadata_hash
19301930
== [
1931-
40u8, 53u8, 171u8, 65u8, 233u8, 174u8, 122u8, 153u8, 252u8, 119u8, 246u8, 12u8,
1932-
237u8, 31u8, 207u8, 113u8, 190u8, 190u8, 71u8, 208u8, 23u8, 54u8, 42u8, 14u8,
1933-
166u8, 254u8, 20u8, 201u8, 161u8, 222u8, 230u8, 60u8,
1931+
67u8, 165u8, 78u8, 166u8, 227u8, 222u8, 51u8, 144u8, 10u8, 118u8, 145u8, 173u8,
1932+
253u8, 118u8, 62u8, 29u8, 190u8, 70u8, 4u8, 88u8, 141u8, 92u8, 198u8, 11u8, 140u8,
1933+
236u8, 70u8, 196u8, 231u8, 143u8, 237u8, 147u8,
19341934
]
19351935
}
19361936
pub mod system {
@@ -8861,10 +8861,10 @@ pub mod api {
88618861
"AzeroCap",
88628862
vec![],
88638863
[
8864-
68u8, 239u8, 10u8, 241u8, 109u8, 153u8, 129u8, 3u8, 237u8, 251u8,
8865-
251u8, 221u8, 156u8, 81u8, 117u8, 166u8, 101u8, 196u8, 227u8, 176u8,
8866-
209u8, 123u8, 127u8, 146u8, 252u8, 88u8, 138u8, 227u8, 183u8, 117u8,
8867-
148u8, 36u8,
8864+
232u8, 50u8, 48u8, 200u8, 187u8, 205u8, 197u8, 195u8, 172u8, 140u8,
8865+
72u8, 253u8, 63u8, 190u8, 23u8, 70u8, 154u8, 96u8, 238u8, 203u8, 39u8,
8866+
129u8, 219u8, 220u8, 119u8, 214u8, 95u8, 174u8, 65u8, 80u8, 25u8,
8867+
156u8,
88688868
],
88698869
)
88708870
}
@@ -8882,10 +8882,10 @@ pub mod api {
88828882
"ExponentialInflationHorizon",
88838883
vec![],
88848884
[
8885-
7u8, 241u8, 156u8, 243u8, 174u8, 255u8, 212u8, 252u8, 53u8, 59u8,
8886-
145u8, 100u8, 166u8, 17u8, 167u8, 127u8, 41u8, 227u8, 188u8, 149u8,
8887-
207u8, 61u8, 65u8, 215u8, 42u8, 241u8, 18u8, 145u8, 24u8, 123u8, 1u8,
8888-
65u8,
8885+
96u8, 228u8, 98u8, 28u8, 209u8, 210u8, 67u8, 181u8, 1u8, 111u8, 174u8,
8886+
131u8, 254u8, 131u8, 238u8, 112u8, 243u8, 203u8, 160u8, 240u8, 65u8,
8887+
141u8, 108u8, 235u8, 114u8, 44u8, 115u8, 114u8, 135u8, 217u8, 90u8,
8888+
63u8,
88898889
],
88908890
)
88918891
}
@@ -8923,10 +8923,10 @@ pub mod api {
89238923
"NextAuthorities",
89248924
vec![],
89258925
[
8926-
51u8, 65u8, 234u8, 11u8, 44u8, 149u8, 188u8, 66u8, 103u8, 198u8, 151u8,
8927-
33u8, 119u8, 241u8, 178u8, 116u8, 121u8, 166u8, 36u8, 18u8, 164u8,
8928-
37u8, 233u8, 202u8, 116u8, 230u8, 129u8, 137u8, 43u8, 75u8, 234u8,
8929-
118u8,
8926+
161u8, 161u8, 19u8, 223u8, 66u8, 53u8, 163u8, 225u8, 121u8, 150u8,
8927+
226u8, 84u8, 62u8, 244u8, 153u8, 227u8, 82u8, 137u8, 209u8, 221u8,
8928+
123u8, 120u8, 244u8, 0u8, 103u8, 43u8, 138u8, 177u8, 57u8, 90u8, 24u8,
8929+
119u8,
89308930
],
89318931
)
89328932
}

e2e-tests/src/test/era_payout.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ async fn force_era_payout(config: &Config) -> anyhow::Result<()> {
6969
// These must be adjusted every time we change the default values of:
7070
// * AzeroCap
7171
// * ExponentialInflationHorizon
72-
let expected_payout = 1776 * TOKEN;
73-
let delta = 3 * TOKEN;
72+
let expected_payout = 114 * TOKEN;
73+
let delta = TOKEN;
7474

7575
assert_within_delta_interval(
7676
expected_era_duration,
@@ -101,8 +101,8 @@ async fn normal_era_payout(config: &Config) -> anyhow::Result<()> {
101101
// These must be adjusted every time we change the default values of:
102102
// * AzeroCap
103103
// * ExponentialInflationHorizon
104-
let expected_payout = 1776 * TOKEN;
105-
let delta = 3 * TOKEN;
104+
let expected_payout = 114 * TOKEN;
105+
let delta = TOKEN;
106106

107107
assert_within_delta_interval(
108108
expected_era_duration,

pallets/aleph/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,14 @@ pub mod pallet {
8080
/// Default AZERO Cap. Relevant for eras before we set this value by hand.
8181
#[pallet::type_value]
8282
pub fn DefaultAzeroCap() -> Balance {
83-
1_000_000_000 * TOKEN
83+
520_000_000 * TOKEN
8484
}
8585

8686
/// Default length of the exponential inflation horizon.
8787
/// Relevant for eras before we set this value by hand.
8888
#[pallet::type_value]
8989
pub fn DefaultExponentialInflationHorizon() -> u64 {
90-
const MILLISECS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100;
91-
MILLISECS_PER_YEAR
90+
154_283_512_497
9291
}
9392

9493
#[pallet::storage]

0 commit comments

Comments
 (0)