From 7e562370fa7a9f3e06cf4e52d8e6f0ef8fce8844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 29 Jul 2024 12:12:39 +0200 Subject: [PATCH 1/2] Wasm-builder: Set the `resolver` version --- substrate/utils/wasm-builder/src/wasm_project.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/substrate/utils/wasm-builder/src/wasm_project.rs b/substrate/utils/wasm-builder/src/wasm_project.rs index 63887389fb1e..a6eda078fde0 100644 --- a/substrate/utils/wasm-builder/src/wasm_project.rs +++ b/substrate/utils/wasm-builder/src/wasm_project.rs @@ -507,7 +507,10 @@ fn create_project_cargo_toml( wasm_workspace_toml.insert("dependencies".into(), dependencies.into()); - wasm_workspace_toml.insert("workspace".into(), Table::new().into()); + let mut workspace = Table::new(); + workspace.insert("resolver".into(), "2".into()); + + wasm_workspace_toml.insert("workspace".into(), workspace.into()); if target == RuntimeTarget::Riscv { // This dependency currently doesn't compile under RISC-V, so patch it with our own fork. From 1eea03ef4faddfaea8b515d89e97448d8bf59d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 29 Jul 2024 13:51:01 +0200 Subject: [PATCH 2/2] PRDOC --- prdoc/pr_5174.prdoc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 prdoc/pr_5174.prdoc diff --git a/prdoc/pr_5174.prdoc b/prdoc/pr_5174.prdoc new file mode 100644 index 000000000000..2c7a6983377c --- /dev/null +++ b/prdoc/pr_5174.prdoc @@ -0,0 +1,10 @@ +title: "Wasm-builder: Set the `resolver` version to `2`" + +doc: + - audience: Runtime Dev + description: | + Set the `resolver` version to `2` in the generated `Cargo.toml`. + +crates: + - name: substrate-wasm-builder + bump: patch