feat: upgrade to 2407-4 (#565)

Co-authored-by: aidan46 <[email protected]>
eigerco · Nov 19, 2024 · 41260b7 · 41260b7
1 parent e74fcfe
commit 41260b7
Show file tree

Hide file tree

Showing 17 changed files with 1,051 additions and 992 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -31,7 +31,7 @@ $ polkadot --version
 polkadot 1.11.0-0bb6249
 
 $ cargo --version
-cargo 1.77.0 (3fe68eabf 2024-02-29)
+cargo 1.81.0 (3fe68eabf 2024-02-29)
 
 $ zombienet version
 1.3.103

diff --git a/cli/polka-storage-provider/server/src/storage.rs b/cli/polka-storage-provider/server/src/storage.rs
@@ -48,7 +48,9 @@ pub struct StorageServerState {
     pub deal_db: Arc<DealDB>,
 
     pub listen_address: SocketAddr,
+
     // I think this just needs the sector size actually
+    #[allow(dead_code)]
     pub post_proof: RegisteredPoStProof,
 }
 

diff --git a/docker/dockerfiles/mater-cli.Dockerfile b/docker/dockerfiles/mater-cli.Dockerfile
@@ -1,6 +1,6 @@
 ################
 ##### Chef
-FROM rust:1.77 AS chef
+FROM rust:1.81.0 AS chef
 RUN cargo install cargo-chef
 WORKDIR /app
 

diff --git a/docker/dockerfiles/polka-storage-node.Dockerfile b/docker/dockerfiles/polka-storage-node.Dockerfile
@@ -1,6 +1,6 @@
 ################
 ##### Chef
-FROM rust:1.77 AS chef
+FROM rust:1.81.0 AS chef
 RUN cargo install cargo-chef
 WORKDIR /app
 

diff --git a/docker/dockerfiles/polka-storage-provider-client.Dockerfile b/docker/dockerfiles/polka-storage-provider-client.Dockerfile
@@ -1,6 +1,6 @@
 ################
 ##### Chef
-FROM rust:1.77 AS chef
+FROM rust:1.81.0 AS chef
 RUN cargo install cargo-chef
 WORKDIR /app
 

diff --git a/docker/dockerfiles/polka-storage-provider-server.Dockerfile b/docker/dockerfiles/polka-storage-provider-server.Dockerfile
@@ -1,6 +1,6 @@
 ################
 ##### Chef
-FROM rust:1.77 AS chef
+FROM rust:1.81.0 AS chef
 RUN cargo install cargo-chef
 WORKDIR /app
 

diff --git a/docker/dockerfiles/storagext-cli.Dockerfile b/docker/dockerfiles/storagext-cli.Dockerfile
@@ -1,6 +1,6 @@
 ################
 ##### Chef
-FROM rust:1.77 AS chef
+FROM rust:1.81.0 AS chef
 RUN cargo install cargo-chef
 WORKDIR /app
 

diff --git a/docs/src/getting-started/building/source.md b/docs/src/getting-started/building/source.md
@@ -23,7 +23,7 @@ cd polka-storage
 
 To build the binaries directly on your system you will need the following tools:
 
-* Rust 1.77 — you can install it using [`rustup`](https://rustup.rs/) and its [guide](https://rust-lang.github.io/rustup/installation/other.html) for help.
+* Rust 1.81.0 — you can install it using [`rustup`](https://rustup.rs/) and its [guide](https://rust-lang.github.io/rustup/installation/other.html) for help.
 * Other dependencies — keep reading, we'll get to it after the end of this list!
 * `just` (optional) — (after installing Rust) you can use `cargo install just` or check the [official list of packages](https://just.systems/man/en/packages.html).
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -23,7 +23,6 @@
         };
         rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
         buildInputs = with pkgs; [
-          azure-cli # Building Docker images and publishing to Azure Container Registry
           cargo-expand
           cargo-tarpaulin
           clang

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -14,71 +14,64 @@ version = "0.0.0"
 name = "polka-storage-node"
 
 [dependencies]
-clap = { workspace = true, features = ["derive"] }
-codec = { workspace = true }
+clap = { features = ["derive"], workspace = true }
+codec = { workspace = true, default-features = true }
+color-print = { workspace = true }
+cumulus-client-cli = { workspace = true, default-features = true }
+cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-client-consensus-aura = { workspace = true, default-features = true }
+cumulus-client-consensus-common = { workspace = true, default-features = true }
+cumulus-client-consensus-proposer = { workspace = true, default-features = true }
+cumulus-client-service = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true, default-features = true }
+cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
+cumulus-relay-chain-interface = { workspace = true, default-features = true }
 docify = { workspace = true }
+frame-benchmarking = { workspace = true, default-features = true }
+frame-benchmarking-cli = { workspace = true, default-features = true }
 futures = { workspace = true }
-jsonrpsee = { workspace = true, features = ["server"] }
+jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc = { workspace = true, default-features = true }
+polka-storage-runtime.workspace = true
+polkadot-cli = { features = ["rococo-native"], workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
+sc-cli = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-consensus = { workspace = true, default-features = true }
+sc-executor = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-network-sync = { workspace = true, default-features = true }
+sc-offchain = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
+sc-telemetry = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-
-# Local
-polka-storage-runtime = { workspace = true }
-
-# Substrate
-frame-benchmarking = { workspace = true }
-frame-benchmarking-cli = { workspace = true }
-pallet-transaction-payment-rpc = { workspace = true }
-sc-basic-authorship = { workspace = true }
-sc-chain-spec = { workspace = true }
-sc-cli = { workspace = true }
-sc-client-api = { workspace = true }
-sc-consensus = { workspace = true }
-sc-executor = { workspace = true }
-sc-network = { workspace = true }
-sc-network-sync = { workspace = true }
-sc-offchain = { workspace = true }
-sc-rpc = { workspace = true }
-sc-service = { workspace = true }
-sc-sysinfo = { workspace = true }
-sc-telemetry = { workspace = true }
-sc-tracing = { workspace = true }
-sc-transaction-pool = { workspace = true }
-sc-transaction-pool-api = { workspace = true }
-sp-api = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-blockchain = { workspace = true }
-sp-consensus-aura = { workspace = true }
-sp-core = { workspace = true }
-sp-io = { workspace = true }
-sp-keystore = { workspace = true }
-sp-runtime = { workspace = true }
-sp-timestamp = { workspace = true }
-substrate-frame-rpc-system = { workspace = true }
-substrate-prometheus-endpoint = { workspace = true }
-
-# Polkadot
-polkadot-cli = { workspace = true, features = ["rococo-native"] }
-polkadot-primitives = { workspace = true }
-xcm = { workspace = true, default-features = false }
-
-# Cumulus
-color-print = { workspace = true }
-cumulus-client-cli = { workspace = true }
-cumulus-client-collator = { workspace = true }
-cumulus-client-consensus-aura = { workspace = true }
-cumulus-client-consensus-common = { workspace = true }
-cumulus-client-consensus-proposer = { workspace = true }
-cumulus-client-service = { workspace = true }
-cumulus-primitives-core = { workspace = true }
-cumulus-primitives-parachain-inherent = { workspace = true }
-cumulus-relay-chain-interface = { workspace = true }
+sp-api = { workspace = true, default-features = true }
+sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+substrate-frame-rpc-system = { workspace = true, default-features = true }
+xcm.workspace = true
 
 [build-dependencies]
-substrate-build-script-utils = { workspace = true }
+substrate-build-script-utils = { workspace = true, default-features = true }
 
 [features]
+default = []
 runtime-benchmarks = [
   "cumulus-primitives-core/runtime-benchmarks",
   "frame-benchmarking-cli/runtime-benchmarks",

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -28,6 +28,7 @@ use polka_storage_runtime::{
     apis::RuntimeApi,
     opaque::{Block, Hash},
 };
+use prometheus_endpoint::Registry;
 use sc_client_api::Backend;
 use sc_consensus::ImportQueue;
 use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
@@ -36,7 +37,6 @@ use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, Ta
 use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_keystore::KeystorePtr;
-use substrate_prometheus_endpoint::Registry;
 
 #[docify::export(wasm_executor)]
 type ParachainExecutor = WasmExecutor<ParachainHostFunctions>;

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.77.0"
+channel = "1.81.0"
 components = ["cargo", "clippy", "llvm-tools-preview", "rust-analyzer", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]
 profile = "minimal"
 targets = ["wasm32-unknown-unknown"]
diff --git a/storage/polka-index/Cargo.toml b/storage/polka-index/Cargo.toml
@@ -12,7 +12,7 @@ async-channel = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true, features = ["serde"] }
 ciborium = { workspace = true }
-cid = { workspace = true, features = ["serde"] }
+cid = { workspace = true, features = ["serde", "std"] }
 clap = { workspace = true, features = ["derive", "string"] }
 integer-encoding = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server"] }

diff --git a/storage/polka-index/src/local_index_directory/rdb.rs b/storage/polka-index/src/local_index_directory/rdb.rs
@@ -574,7 +574,7 @@ impl Service for RocksDBLid {
         records
             .into_iter()
             .map(|record| self.add_index_record(&cursor_prefix, record))
-            .collect::<Result<_, _>>()?;
+            .collect::<Result<(), _>>()?;
 
         metadata.indexed_at = chrono::Utc::now().into();
         self.set_piece_cid_to_metadata(piece_cid, &metadata)