From cdbddc0b4b7b5f48dd9f942ec375869478e17e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 29 Jul 2024 16:28:24 +0200
Subject: [PATCH] Wasm-builder: Set the resolver version (#5174)
---
prdoc/pr_5174.prdoc | 10 ++++++++++
substrate/utils/wasm-builder/src/wasm_project.rs | 5 ++++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 prdoc/pr_5174.prdoc
diff --git a/prdoc/pr_5174.prdoc b/prdoc/pr_5174.prdoc
new file mode 100644
index 00000000000..2c7a6983377
--- /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
diff --git a/substrate/utils/wasm-builder/src/wasm_project.rs b/substrate/utils/wasm-builder/src/wasm_project.rs
index 63887389fb1..a6eda078fde 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.
--
GitLab