Merge pull request #375 from autonomys/update-substrate-subspace

Update substrate and subspace deps, rust toolchain and migrate to 2024 edition

Author: vedhavyas

Cargo.lock

@@ -2,10 +2,10 @@
 name = "space-acres"
 description = "Space Acres is an opinionated GUI application for farming on Autonomys Network"
 license = "0BSD"
-version = "0.2.12"
+version = "0.2.13"
 authors = ["Nazar Mokrynskyi <nazar@mokrynskyi.com>"]
 repository = "https://github.com/autonomys/space-acres"
-edition = "2021"
+edition = "2024"
 include = [
     "/src",
     "/Cargo.toml",
@@ -39,7 +39,7 @@ anyhow = "1.0.91"
 arc-swap = "1.7.1"
 async-lock = "3.4.0"
 async-oneshot = "0.5.9"
-async-trait = "0.1.83"
+async-trait = "0.1.88"
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 bytesize = "1.3.0"
 clap = { version = "4.5.20", features = ["derive"] }
@@ -51,7 +51,7 @@ fdlimit = "0.3.0"
 file-rotate = "0.7.6"
 fluent-langneg = "0.14.1"
 fluent-static = "0.4.0"
-frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
+frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
 fs4 = "0.10.0"
 futures = "0.3.31"
 futures-timer = "3.0.3"
@@ -62,49 +62,49 @@ mimalloc = "0.1.43"
 names = "0.14.0"
 notify-rust = { version = "4.11.3", features = ["images"] }
 open = "5.3.0"
-pallet-balances = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
+pallet-balances = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
 parity-scale-codec = "3.6.12"
 parking_lot = "0.12.3"
 relm4 = "0.9.1"
 relm4-components = { version = "0.9.1", default-features = false }
 relm4-icons = "0.10.0-beta.2"
 reqwest = { version = "0.12.8", default-features = false, features = ["json", "rustls-tls"] }
-sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-network-types = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-schnellru = "0.2.3"
+sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-network-types = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+schnellru = "0.2.4"
 semver = "1.0.23"
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 simple_moving_average = "1.0.2"
-sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-sp-objects = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false }
-subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-data-retrieval = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1", default-features = false }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-kzg = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-proof-of-space-gpu = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1", optional = true }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "eed2c70f14e1a47ed845ec1557718869082dc2b1" }
+sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+sp-objects = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba", default-features = false }
+subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-data-retrieval = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376", default-features = false }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-kzg = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-proof-of-space-gpu = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376", optional = true }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "6609138bb8286374297cf4935d72aac872136376" }
 sys-locale = "0.3.1"
 tempfile = "3.13.0"
 thiserror = "2.0.1"
@@ -213,18 +213,34 @@ zeroize = { opt-level = 3 }
 inherits = "release"
 lto = "fat"
 
-# TODO: Remove fork when https://github.com/paritytech/polkadot-sdk/issues/4856 and/or https://github.com/paritytech/litep2p/issues/161
-#  are resolved (our fork removes WebRTC support by default in order to avoid OpenSSL dependency)
 [patch.crates-io]
-litep2p = { git = "https://github.com/subspace/litep2p", rev = "1ea540c6af3ed85a62355a106311740533553677" }
+# Patch away `libp2p-identity` in our dependency tree with the git version.
+# For details see: https://github.com/subspace/rust-libp2p/blob/4ff21ede371f14ea0b90075f676ae21239ef8fbf/Cargo.toml#L140-L145
+libp2p-identity = { git = "https://github.com/subspace/rust-libp2p", rev = "4ff21ede371f14ea0b90075f676ae21239ef8fbf" }
 # TODO: Remove once something newer than 0.15.3 is released with support for `NUMBER()` built-in function and used in `fluent-static`
 fluent-bundle = { git = "https://github.com/projectfluent/fluent-rs", rev = "bda4736095a4a60a9a042b336d0789c22461905d" }
 
 # Reason: We need to patch substrate dependency of frontier to our fork
 # TODO: Remove if/when we are using upstream substrate instead of fork
 [patch."https://github.com/paritytech/polkadot-sdk.git"]
-sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305" }
-sp-io = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305" }
-sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305" }
-sp-runtime-interface = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305" }
-staging-xcm = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305" }
+frame-benchmarking = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+frame-support = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-application-crypto = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-io = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-runtime-interface = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+sp-storage = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+staging-xcm = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
+
+[patch."https://github.com/autonomys/rust-libp2p.git"]
+# Patch away `libp2p` in our dependency tree with the git version.
+# This brings the fixes in our `libp2p` fork into substrate's dependencies.
+#
+# This is a hack: patches to the same repository are rejected by `cargo`. But it considers
+# "subspace/rust-libp2p" and "autonomys/rust-libp2p" to be different repositories, even though
+# they're redirected to the same place by GitHub, so it allows this patch.
+libp2p = { git = "https://github.com/subspace/rust-libp2p", rev = "4ff21ede371f14ea0b90075f676ae21239ef8fbf" }
+libp2p-identity = { git = "https://github.com/subspace/rust-libp2p", rev = "4ff21ede371f14ea0b90075f676ae21239ef8fbf" }

Cargo.toml

@@ -1,4 +1,4 @@
-use fluent_static_codegen::{generate, MessageBundleCodeGenerator};
+use fluent_static_codegen::{MessageBundleCodeGenerator, generate};
 use std::path::Path;
 use std::{env, fs};
 

build.rs

@@ -28,7 +28,6 @@ intl.dll
 jpeg62.dll
 libexpat.dll
 libpng16.dll
-libxml2.dll
 pango-1.0-0.dll
 pangocairo-1.0-0.dll
 pangowin32-1.0-0.dll
@@ -37,9 +36,10 @@ pcre2-32-0.dll
 pcre2-8-0.dll
 pcre2-posix-3.dll
 pixman-1-0.dll
-pkgconf-5.dll
+pkgconf-6.dll
 rsvg-2-2.dll
 textstyle.dll
 tiff.dll
 turbojpeg.dll
+xml2-16.dll
 zlib1.dll

res/windows/wix/expected-dlls.log

@@ -210,9 +210,6 @@
                         <Component Id='gtk4_libpng16.dll' Guid='f1eb894a-fd88-469d-81ea-640791560a1e'>
                             <File Id='libpng16.dll' Name='libpng16.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\libpng16.dll' />
                         </Component>
-                        <Component Id='gtk4_libxml2.dll' Guid='dfb79114-fe77-480d-8118-050bd86c3aa5'>
-                            <File Id='libxml2.dll' Name='libxml2.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\libxml2.dll' />
-                        </Component>
                         <Component Id='gtk4_pango_1.0_0.dll' Guid='9f680fdc-42a1-4efa-a526-c04a4a9eb68f'>
                             <File Id='pango_1.0_0.dll' Name='pango-1.0-0.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\pango-1.0-0.dll' />
                         </Component>
@@ -237,8 +234,8 @@
                         <Component Id='gtk4_pixman_1_0.dll' Guid='9f6dff89-ea6e-4355-9863-f076e915697d'>
                             <File Id='pixman_1_0.dll' Name='pixman-1-0.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\pixman-1-0.dll' />
                         </Component>
-                        <Component Id='gtk4_pkgconf_5.dll' Guid='9c5ef299-8a73-4c79-8cc5-a48b9833c5a9'>
-                            <File Id='pkgconf_5.dll' Name='pkgconf-5.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\pkgconf-5.dll' />
+                        <Component Id='gtk4_pkgconf_6.dll' Guid='2b0ab36a-d1d0-427f-a63c-6dfd513b8b82'>
+                            <File Id='pkgconf_6.dll' Name='pkgconf-6.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\pkgconf-6.dll' />
                         </Component>
                         <Component Id='gtk4_rsvg_2_2.dll' Guid='c45c78c2-1b52-4bb8-b165-64229cacb357'>
                             <File Id='rsvg_2_2.dll' Name='rsvg-2-2.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\rsvg-2-2.dll' />
@@ -251,6 +248,9 @@
                         </Component>
                         <Component Id='gtk4_turbojpeg.dll' Guid='914f9fc2-a3e4-47a7-85b6-e63f2d901bcb'>
                             <File Id='turbojpeg.dll' Name='turbojpeg.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\turbojpeg.dll' />
+                        </Component>
+                         <Component Id='gtk4_xml2_16.dll' Guid='6c9abb1f-ca51-4054-b148-f368c3661eed'>
+                            <File Id='xml2_16.dll' Name='xml2-16.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\xml2-16.dll' />
                         </Component>
                         <Component Id='gtk4_zlib1.dll' Guid='b83feda4-4cc4-4ef1-9c95-ce74b785f6d9'>
                             <File Id='zlib1.dll' Name='zlib1.dll' DiskId='1' Source='$(var.CargoTargetDir)\wix\gtk4\bin\zlib1.dll' />
@@ -382,7 +382,6 @@
             <ComponentRef Id='gtk4_jpeg62.dll'/>
             <ComponentRef Id='gtk4_libexpat.dll'/>
             <ComponentRef Id='gtk4_libpng16.dll'/>
-            <ComponentRef Id='gtk4_libxml2.dll'/>
             <ComponentRef Id='gtk4_pango_1.0_0.dll'/>
             <ComponentRef Id='gtk4_pangocairo_1.0_0.dll'/>
             <ComponentRef Id='gtk4_pangowin32_1.0_0.dll'/>
@@ -391,11 +390,12 @@
             <ComponentRef Id='gtk4_pcre2_8_0.dll'/>
             <ComponentRef Id='gtk4_pcre2_posix_3.dll'/>
             <ComponentRef Id='gtk4_pixman_1_0.dll'/>
-            <ComponentRef Id='gtk4_pkgconf_5.dll'/>
+            <ComponentRef Id='gtk4_pkgconf_6.dll'/>
             <ComponentRef Id='gtk4_rsvg_2_2.dll'/>
             <ComponentRef Id='gtk4_textstyle.dll'/>
             <ComponentRef Id='gtk4_tiff.dll'/>
             <ComponentRef Id='gtk4_turbojpeg.dll'/>
+            <ComponentRef Id='gtk4_xml2_16.dll'/>
             <ComponentRef Id='gtk4_zlib1.dll'/>
             <ComponentRef Id='gdk_pixbuf_loaders'/>
             <ComponentRef Id='glib_2.gdk_pixbuf_loaders.cache'/>

res/windows/wix/space-acres.wxs

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-12-24"
+channel = "nightly-2025-05-31"
 components = ["rust-src"]
 targets = []
 profile = "default"

rust-toolchain.toml

@@ -1,2 +1,2 @@
-edition = "2021"
+edition = "2024"
 imports_granularity = "Module"