Companion PR for #7951 (#2336)

* Adapt code to changes in substrate

* WIP

* "Update Substrate"

Co-authored-by: parity-processbot <>
10 jobs for master in 34 minutes and 27 seconds (queued for 6 minutes and 24 seconds)