update polkadot-sdk deps to stable2407 (polkadot-evm#1484)

* update polkadot-sdk deps to stable2407 * remove unused imports * bump nightly version to suport upgrading curve25519-dalek * try compiling with rustc stable
moonbeam-foundation · Aug 5, 2024 · 2e219e1 · 2e219e1
1 parent cacdfd7
commit 2e219e1
Show file tree

Hide file tree

Showing 8 changed files with 1,257 additions and 1,439 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/client/consensus/src/lib.rs b/client/consensus/src/lib.rs
@@ -105,10 +105,7 @@ where
 {
 	type Error = ConsensusError;
 
-	async fn check_block(
-		&mut self,
-		block: BlockCheckParams<B>,
-	) -> Result<ImportResult, Self::Error> {
+	async fn check_block(&self, block: BlockCheckParams<B>) -> Result<ImportResult, Self::Error> {
 		self.inner.check_block(block).await.map_err(Into::into)
 	}
 

diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs
@@ -17,7 +17,6 @@
 
 //! Test mock for unit tests and benchmarking
 
-use alloc::boxed::Box;
 use core::str::FromStr;
 use frame_support::{
 	derive_impl, parameter_types,

diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs
@@ -17,7 +17,6 @@
 
 //! Test mock for unit tests and benchmarking
 
-use alloc::boxed::Box;
 use core::str::FromStr;
 use frame_support::{
 	derive_impl, parameter_types,

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,8 +1,8 @@
 [toolchain]
 # Stable
-#channel = "1.75.0" # rustc 1.75.0 (82e1608df 2023-12-21)
+channel = "1.77.0" # rustc 1.77.0 (aedd173a2 2024-03-21)
 # Nightly
-channel = "nightly-2024-01-22" # rustc 1.77.0-nightly (ef71f1047 2024-01-21)
+#channel = "nightly-2024-02-05" # rustc 1.78.0-nightly (f067fd608 2024-02-05)
 components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src", "rust-docs"]
 profile = "minimal"
-targets = ["wasm32-unknown-unknown"]
+targets = ["wasm32-unknown-unknown"]
diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs
@@ -10,15 +10,13 @@ use sp_core::ecdsa;
 use sp_core::{Pair, Public, H160, U256};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 // Frontier
-use frontier_template_runtime::{
-	AccountId, Balance, RuntimeGenesisConfig, SS58Prefix, Signature, WASM_BINARY,
-};
+use frontier_template_runtime::{AccountId, Balance, SS58Prefix, Signature, WASM_BINARY};
 
 // The URL for the telemetry server.
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig>;
+pub type ChainSpec = sc_service::GenericChainSpec;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {

diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -12,7 +12,7 @@ extern crate alloc;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use alloc::{boxed::Box, vec, vec::Vec};
+use alloc::{vec, vec::Vec};
 use core::marker::PhantomData;
 use scale_codec::{Decode, Encode};
 use sp_api::impl_runtime_apis;