fix: update crates to v1

crates/annuity/Cargo.toml

@@ -6,7 +6,7 @@ name = "annuity"
 version = "1.0.0"
 
 [dependencies]
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
@@ -35,7 +35,7 @@ reward = { path = "../reward", default-features = false }
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 	"codec/std",
 	"scale-info/std",
 

crates/annuity/src/mock.rs

@@ -82,7 +82,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = ();
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();

crates/bitcoin/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
-impl-serde = { version = "0.3.1", default-features = false, optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
+impl-serde = { version = "0.3.1", default-features = false }
 sha2 = { version = "0.8.2", default-features = false }
 hex = { version = "0.4.2", default-features = false }
 spin = { version = "0.7.1", default-features = false }
@@ -25,13 +25,12 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol
 default = ["std"]
 std = [
 	"codec/std",
+	"impl-serde/std",
 	"scale-info/std",
-	"serde",
-	"impl-serde",
+	"serde/std",
 	"sha2/std",
 	"hex/alloc",
 	"primitive-types/std",
-	"primitive-types/serde",
 	"secp256k1/std",
 ]
 parser = []

crates/bitcoin/src/address.rs

@@ -3,6 +3,7 @@ use bitcoin_hashes::{hash160::Hash as Hash160, Hash};
 use codec::{Decode, Encode, MaxEncodedLen};
 use primitive_types::{H160, H256};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 
 #[cfg(not(feature = "std"))]
@@ -13,8 +14,10 @@ use secp256k1::{constants::PUBLIC_KEY_SIZE, Error as Secp256k1Error, PublicKey a
 /// A Bitcoin address is a serialized identifier that represents the destination for a payment.
 /// Address prefixes are used to indicate the network as well as the format. Since the Parachain
 /// follows SPV assumptions we do not need to know which network a payment is included in.
-#[derive(Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, std::hash::Hash))]
+#[derive(
+    Serialize, Deserialize, Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen,
+)]
+#[cfg_attr(feature = "std", derive(std::hash::Hash))]
 pub enum Address {
     // input: {signature} {pubkey}
     // output: OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG
@@ -150,7 +153,6 @@ impl From<[u8; PUBLIC_KEY_SIZE]> for PublicKey {
     }
 }
 
-#[cfg(feature = "std")]
 impl serde::Serialize for PublicKey {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -161,7 +163,6 @@ impl serde::Serialize for PublicKey {
     }
 }
 
-#[cfg(feature = "std")]
 impl<'de> serde::Deserialize<'de> for PublicKey {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

crates/bitcoin/src/lib.rs

@@ -14,7 +14,6 @@
 //! - Script (address) construction and parsing.
 //! - Merkle proof construction and verification.
 //! - Elliptic curve multiplication over Secp256k1.
-
 #![deny(warnings)]
 #![cfg_attr(test, feature(proc_macro_hygiene))]
 #![cfg_attr(not(feature = "std"), no_std)]

crates/bitcoin/src/types.rs

@@ -19,7 +19,6 @@ use alloc::{vec, vec::Vec};
 #[cfg(feature = "std")]
 use codec::alloc::string::String;
 
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 /// We also check the coinbase proof in order to defend against the 'leaf-node weakness'.
@@ -591,8 +590,9 @@ pub struct BlockChain {
 }
 
 /// Represents a bitcoin 32 bytes hash digest encoded in little-endian
-#[derive(Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(
+    Serialize, Deserialize, Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen,
+)]
 pub struct H256Le {
     content: [u8; 32],
 }

crates/btc-relay/src/lib.rs

@@ -379,6 +379,7 @@ pub mod pallet {
     pub(super) type DisableInclusionCheck<T: Config> = StorageValue<_, bool, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         /// Global security parameter k for stable Bitcoin transactions
         pub bitcoin_confirmations: u32,
@@ -390,18 +391,6 @@ pub mod pallet {
         pub disable_inclusion_check: bool,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                bitcoin_confirmations: Default::default(),
-                parachain_confirmations: Default::default(),
-                disable_difficulty_check: Default::default(),
-                disable_inclusion_check: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {

crates/clients-info/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Interlay Ltd"]
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
@@ -28,7 +28,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 	"codec/std",
 	"scale-info/std",
 

crates/collator-selection/src/lib.rs

@@ -61,7 +61,6 @@ pub mod pallet {
     use core::ops::Div;
     use frame_support::{
         dispatch::{DispatchClass, DispatchResultWithPostInfo},
-        inherent::Vec,
         pallet_prelude::*,
         sp_runtime::{
             traits::{AccountIdConversion, CheckedSub, Saturating, Zero},
@@ -74,7 +73,7 @@ pub mod pallet {
     use pallet_session::SessionManager;
     use sp_runtime::traits::Convert;
     use sp_staking::SessionIndex;
-
+    use sp_std::prelude::*;
     type BalanceOf<T> = <<T as Config>::StakingCurrency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 
     /// A convertor from collators id. Since this pallet does not have stash/controller, this is
@@ -178,27 +177,20 @@ pub mod pallet {
     pub type CandidacyBond<T> = StorageValue<_, BalanceOf<T>, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub invulnerables: Vec<T::AccountId>,
         pub candidacy_bond: BalanceOf<T>,
         pub desired_candidates: u32,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self {
-                invulnerables: Default::default(),
-                candidacy_bond: Default::default(),
-                desired_candidates: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {
-            let duplicate_invulnerables = self.invulnerables.iter().collect::<std::collections::BTreeSet<_>>();
+            let duplicate_invulnerables = self
+                .invulnerables
+                .iter()
+                .collect::<sp_std::collections::btree_set::BTreeSet<_>>();
             assert!(
                 duplicate_invulnerables.len() == self.invulnerables.len(),
                 "duplicate invulnerables in genesis."

crates/collator-selection/src/mock.rs

@@ -25,7 +25,7 @@ use frame_system::EnsureSignedBy;
 use sp_core::H256;
 use sp_runtime::{
     testing::{Header, UintAuthorityId},
-    traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},
+    traits::{BlakeTwo256, ConstBool, IdentityLookup, OpaqueKeys},
     RuntimeAppPublic,
 };
 
@@ -96,7 +96,7 @@ impl pallet_balances::Config for Test {
     type MaxLocks = ();
     type MaxReserves = MaxReserves;
     type ReserveIdentifier = [u8; 8];
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();
@@ -132,6 +132,7 @@ impl pallet_aura::Config for Test {
     type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
     type MaxAuthorities = MaxAuthorities;
     type DisabledValidators = ();
+    type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
 sp_runtime::impl_opaque_keys! {

crates/currency/Cargo.toml

@@ -7,7 +7,7 @@ name = "currency"
 version = "1.2.0"
 
 [dependencies]
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
@@ -38,7 +38,7 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol
 [features]
 default = ["std"]
 std = [
-  "serde",
+  "serde/std",
   "codec/std",
   "scale-info/std",
 

crates/democracy/Cargo.toml

@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { version = "0.4.17", default-features = false }
-serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true }
+serde = { version = "1.0.130", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
@@ -36,7 +36,7 @@ pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "p
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 	"codec/std",
 	"scale-info/std",
 	"sp-core/std",

crates/democracy/src/lib.rs

@@ -255,21 +255,12 @@ pub mod pallet {
     pub type NextLaunchTimestamp<T: Config> = StorageValue<_, u64, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         _phantom: sp_std::marker::PhantomData<T>,
         next_launch_timestamp: u64,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            GenesisConfig {
-                _phantom: Default::default(),
-                next_launch_timestamp: 0,
-            }
-        }
-    }
-
     #[pallet::genesis_build]
     impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
         fn build(&self) {

crates/democracy/src/migrations.rs

@@ -55,13 +55,15 @@ mod v0 {
 
 pub mod v1 {
     use super::*;
+    #[cfg(feature = "try-runtime")]
+    use sp_runtime::TryRuntimeError;
 
     /// Migration for translating bare `Hash`es into `Bounded<Call>`s.
     pub struct Migration<T>(sp_std::marker::PhantomData<T>);
 
     impl<T: Config + frame_system::Config<Hash = H256>> OnRuntimeUpgrade for Migration<T> {
         #[cfg(feature = "try-runtime")]
-        fn pre_upgrade() -> Result<Vec<u8>, &'static str> {
+        fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
             assert_eq!(StorageVersion::get::<Pallet<T>>(), 0, "can only upgrade from version 0");
 
             let props_count = v0::PublicProps::<T>::get().len();
@@ -154,7 +156,7 @@ pub mod v1 {
         }
 
         #[cfg(feature = "try-runtime")]
-        fn post_upgrade(state: Vec<u8>) -> Result<(), &'static str> {
+        fn post_upgrade(state: Vec<u8>) -> Result<(), TryRuntimeError> {
             assert_eq!(StorageVersion::get::<Pallet<T>>(), 1, "must upgrade");
 
             let (old_props_count, old_ref_count): (u32, u32) =

crates/democracy/src/tests.rs

@@ -142,7 +142,7 @@ impl pallet_balances::Config for Test {
     type ExistentialDeposit = ExistentialDeposit;
     type AccountStore = System;
     type WeightInfo = ();
-    type HoldIdentifier = ();
+    type RuntimeHoldReason = ();
     type FreezeIdentifier = ();
     type MaxFreezes = ();
     type MaxHolds = ();

crates/democracy/src/vote_threshold.rs

@@ -3,14 +3,24 @@
 use crate::Tally;
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::traits::{IntegerSquareRoot, Zero};
 use sp_std::ops::{Add, Div, Mul, Rem};
 
 /// A means of determining if a vote is past pass threshold.
-#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug, TypeInfo, MaxEncodedLen)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(
+    Serialize,
+    Deserialize,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Encode,
+    Decode,
+    sp_runtime::RuntimeDebug,
+    TypeInfo,
+    MaxEncodedLen,
+)]
 pub enum VoteThreshold {
     /// A supermajority of approvals is needed to pass this vote.
     SuperMajorityApprove,

crates/dex-general/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache 2.0"
 
 [dependencies]
 log = { version = "0.4.14", default-features = false }
-serde = { version = "1.0.119", optional = true }
+serde = { version = "1.0.119", default-features = false }
 # alias "parity-scale-code" to "codec"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
@@ -35,7 +35,7 @@ proptest = "1.1.0"
 default = ["std"]
 std = [
     "log/std",
-    "serde",
+    "serde/std",
     "codec/std",
     "scale-info/std",
     "sp-core/std",

crates/dex-general/rpc/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "Apache 2.0"
 
 [dependencies]
-serde = { version = "1.0.119", features = ["derive"], optional = true }
+serde = { version = "1.0.119", features = ["derive"] , default-features = false}
 # alias "parity-scale-code" to "codec"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }