Update Substrate (#812)

* Update to latest Substrate master

* upgrade decl_storage declaration

* Companion PR to Substrate#4752

* Substrate update: Identity should bound additional fields (#4770)

Substrate commit: 2c9ce7296b19934b1ffd50150be2fdb2ddf81a4e

* WIP

* WIP

* Updated substrate and fixes

* Fix compilation and switch to latest wasm-builder-runner

* Fixed missing doc

* Update collator/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
Co-authored-by: Cecile Tonglet <cecile.tonglet@cecton.com>
This commit is contained in:
Gavin Wood
2020-01-31 11:47:02 +00:00
committed by GitHub
parent cfb9e7c8cb
commit 131ad136cb
24 changed files with 618 additions and 569 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ dlmalloc = { version = "0.1.3", features = [ "global" ] }
runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "disable_allocator" ] }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
[features]
default = [ "std" ]
+6 -6
View File
@@ -14,12 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
use wasm_builder_runner::WasmBuilder;
fn main() {
build_current_project_with_rustflags(
"wasm_binary.rs",
WasmBuilderSource::Crates("1.0.9"),
"-C link-arg=--export=__heap_base",
);
WasmBuilder::new()
.with_current_project()
.with_wasm_builder_from_crates("1.0.9")
.export_heap_base()
.build()
}
@@ -150,12 +150,15 @@ fn main() {
_network: None,
};
let mut config = Configuration::default();
config.chain_spec = load_spec("dev").unwrap();
let res = collator::run_collator(
context,
id,
exit,
key,
Configuration::default_with_spec_and_base_path(load_spec("dev").unwrap().unwrap(), None),
config,
);
if let Err(e) = res {
+1 -1
View File
@@ -9,7 +9,7 @@ build = "build.rs"
[dependencies]
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
[features]
default = [ "std" ]
+6 -6
View File
@@ -14,12 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource};
use wasm_builder_runner::WasmBuilder;
fn main() {
build_current_project_with_rustflags(
"wasm_binary.rs",
WasmBuilderSource::Crates("1.0.9"),
"-C link-arg=--export=__heap_base",
);
WasmBuilder::new()
.with_current_project()
.with_wasm_builder_from_crates("1.0.9")
.export_heap_base()
.build()
}