* Update to latest substrate

* Fix as much as I can

* Store key out of Environment::init

* Fix service compile