Skip to content
This repository was archived by the owner on May 22, 2023. It is now read-only.

Commit 1b37cd8

Browse files
authored
Merge pull request #153 from Cerebellum-Network/feature/update-to-polkadot-v0-9-8
Feature/update to polkadot v0 9 8
2 parents 7d479fc + d086fa3 commit 1b37cd8

File tree

381 files changed

+13056
-6373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+13056
-6373
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ trim_trailing_whitespace=true
99
max_line_length=100
1010
insert_final_newline=true
1111

12+
[*.md]
13+
max_line_length=80
14+
indent_style=space
15+
indent_size=2
16+
1217
[*.yml]
1318
indent_style=space
1419
indent_size=2

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ test-linux-stable: &test-linux
319319
script:
320320
# this job runs all tests in former runtime-benchmarks, frame-staking and wasmtime tests
321321
- time cargo test --workspace --locked --release --verbose --features runtime-benchmarks --manifest-path bin/node/cli/Cargo.toml
322-
- time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml # does not reuse cache 1 min 44 sec
322+
- time cargo test -p frame-support-test --features=conditional-storage --manifest-path frame/support/test/Cargo.toml --test pallet # does not reuse cache 1 min 44 sec
323323
- SUBSTRATE_TEST_TIMEOUT=1 time cargo test -p substrate-test-utils --release --verbose --locked -- --ignored timeout
324324
- sccache -s
325325

.maintain/monitoring/alerting-rules/alerting-rules.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ groups:
4747
# Under the assumption of an average block production of 6 seconds,
4848
# "best" and "finalized" being more than 10 blocks apart would imply
4949
# more than a 1 minute delay between block production and finalization.
50-
expr: '(polkadot_block_height_number{status="best"} - ignoring(status)
51-
polkadot_block_height_number{status="finalized"}) > 10'
50+
expr: '(polkadot_block_height{status="best"} - ignoring(status)
51+
polkadot_block_height{status="finalized"}) > 10'
5252
for: 8m
5353
labels:
5454
severity: critical
@@ -134,7 +134,7 @@ groups:
134134
##############################################################################
135135

136136
- alert: ContinuousTaskEnded
137-
expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
137+
expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer", task_name != "substrate-rpc-subscription"} == 1)
138138
- on(instance, task_name) group_left() (polkadot_tasks_ended_total == 1)'
139139
for: 5m
140140
labels:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.22.0]
9+
### Changed
10+
- Updated Substrate to polkadot-v0.9.8
11+
812
## [2.21.0]
913
### Changed
1014
- Updated Substrate to polkadot-v0.9.5

Cargo.lock

Lines changed: 28 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ members = [
4646
"client/network/test",
4747
"client/offchain",
4848
"client/peerset",
49+
"client/allocator",
4950
"client/proposer-metrics",
5051
"client/rpc",
5152
"client/rpc-api",
@@ -127,7 +128,6 @@ members = [
127128
"frame/utility",
128129
"frame/vesting",
129130
"frame/ddc-pallet",
130-
"primitives/allocator",
131131
"primitives/api",
132132
"primitives/api/proc-macro",
133133
"primitives/api/test",
@@ -139,7 +139,6 @@ members = [
139139
"primitives/authorship",
140140
"primitives/block-builder",
141141
"primitives/blockchain",
142-
"primitives/chain-spec",
143142
"primitives/consensus/aura",
144143
"primitives/consensus/babe",
145144
"primitives/consensus/common",

bin/node/cli/src/service.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ pub fn new_full_base(
333333
babe_link,
334334
can_author_with,
335335
block_proposal_slot_portion: SlotProportion::new(0.5),
336+
max_block_proposal_slot_portion: None,
336337
telemetry: telemetry.as_ref().map(|x| x.handle()),
337338
};
338339

bin/node/executor/tests/submit_transaction.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,16 @@ fn submitted_transaction_should_be_valid() {
256256
<frame_system::Account<Runtime>>::insert(&address, account);
257257

258258
// check validity
259-
let res = Executive::validate_transaction(source, extrinsic).unwrap();
259+
let res = Executive::validate_transaction(
260+
source,
261+
extrinsic,
262+
frame_system::BlockHash::<Runtime>::get(0),
263+
).unwrap();
260264

261265
// We ignore res.priority since this number can change based on updates to weights and such.
262266
assert_eq!(res.requires, Vec::<TransactionTag>::new());
263267
assert_eq!(res.provides, vec![(address, 0).encode()]);
264-
assert_eq!(res.longevity, 2048);
268+
assert_eq!(res.longevity, 2047);
265269
assert_eq!(res.propagate, true);
266270
});
267271
}

bin/node/runtime/src/impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ mod multiplier_tests {
307307
fn weight_to_fee_should_not_overflow_on_large_weights() {
308308
let kb = 1024 as Weight;
309309
let mb = kb * kb;
310-
let max_fm = Multiplier::saturating_from_integer(i128::max_value());
310+
let max_fm = Multiplier::saturating_from_integer(i128::MAX);
311311

312312
// check that for all values it can compute, correctly.
313313
vec![

0 commit comments

Comments
 (0)