Bump codec version 3.0.0 -> 3.1.5 + unify parity-scale-codec vs codec (#1552)

bridges/bin/millau/runtime/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 hex-literal = "0.3"
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }

bridges/bin/rialto-parachain/node/Cargo.toml

@@ -20,7 +20,7 @@ runtime-benchmarks = ['rialto-parachain-runtime/runtime-benchmarks']
 clap = { version = "3.1", features = ["derive"] }
 derive_more = '0.99.2'
 log = '0.4.17'
-codec = { package = 'parity-scale-codec', version = '3.0.0' }
+codec = { package = 'parity-scale-codec', version = '3.1.5' }
 serde = { version = '1.0', features = ['derive'] }
 hex-literal = '0.3.1'
 

bridges/bin/rialto-parachain/runtime/Cargo.toml

@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [dependencies]
-codec = { package = 'parity-scale-codec', version = '3.0.0', default-features = false, features = ['derive']}
+codec = { package = 'parity-scale-codec', version = '3.1.5', default-features = false, features = ['derive']}
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = '1.0', optional = true, features = ['derive'] }

bridges/bin/rialto/runtime/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 hex-literal = "0.3"
 libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] }
 log = { version = "0.4.17", default-features = false }

bridges/bin/runtime-common/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 hash-db = { version = "0.15.2", default-features = false }
 log = { version = "0.4.17", default-features = false }
 num-traits = { version = "0.2", default-features = false }

bridges/modules/grandpa/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 finality-grandpa = { version = "0.15.0", default-features = false }
 log = { version = "0.4.17", default-features = false }
 num-traits = { version = "0.2", default-features = false }

bridges/modules/messages/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 log = { version = "0.4.17", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }

bridges/modules/parachains/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }

bridges/modules/relayers/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 log = { version = "0.4.17", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }

bridges/modules/shift-session-manager/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
 # Substrate Dependencies

bridges/primitives/chain-rococo/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 paste = "1.0"
 smallvec = "1.7"
 
@@ -30,7 +30,7 @@ std = [
 	"bp-polkadot-core/std",
 	"bp-runtime/std",
 	"frame-support/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"sp-api/std",
 	"sp-runtime/std",
 	"sp-std/std",

bridges/primitives/chain-westend/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 smallvec = "1.7"
 
@@ -32,7 +32,7 @@ std = [
 	"bp-polkadot-core/std",
 	"bp-runtime/std",
 	"frame-support/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-runtime/std",

bridges/primitives/chain-westend/src/lib.rs

@@ -63,9 +63,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 /// Westend Runtime `Call` enum.
 ///
 /// We are not currently submitting any Westend transactions => it is empty.
-#[derive(
+#[derive(codec::Encode, codec::Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
-	parity_scale_codec::Encode, parity_scale_codec::Decode, Debug, PartialEq, Eq, Clone, TypeInfo,
-)]
 pub enum Call {}
 
 impl sp_runtime::traits::Dispatchable for Call {

bridges/primitives/chain-wococo/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 paste = "1.0"
 
 # Bridge Dependencies
@@ -28,7 +28,7 @@ std = [
 	"bp-polkadot-core/std",
 	"bp-runtime/std",
 	"bp-rococo/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"sp-api/std",
 	"sp-runtime/std",
 	"sp-std/std",

bridges/primitives/header-chain/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 finality-grandpa = { version = "0.15.0", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }

bridges/primitives/messages/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
 impl-trait-for-tuples = "0.2"
 scale-info = { version = "2.1.1", default-features = false, features = ["bit-vec", "derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }

bridges/primitives/parachains/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 

bridges/primitives/polkadot-core/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive"] }
 parity-util-mem = { version = "0.11.0", optional = true }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
@@ -37,7 +37,7 @@ std = [
 	"bp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"parity-util-mem",
 	"scale-info/std",
 	"serde",

bridges/primitives/polkadot-core/src/lib.rs

@@ -18,6 +18,7 @@
 
 use bp_messages::MessageNonce;
 use bp_runtime::{Chain, EncodedOrDecodedCall};
+use codec::Compact;
 use frame_support::{
 	dispatch::Dispatchable,
 	parameter_types,
@@ -28,7 +29,6 @@ use frame_support::{
 	Blake2_128Concat, RuntimeDebug, StorageHasher, Twox128,
 };
 use frame_system::limits;
-use parity_scale_codec::Compact;
 use scale_info::{StaticTypeInfo, TypeInfo};
 use sp_core::Hasher as HasherT;
 use sp_runtime::{
@@ -256,16 +256,14 @@ pub struct SignedExtensions<Call> {
 	_data: sp_std::marker::PhantomData<Call>,
 }
 
-impl<Call> parity_scale_codec::Encode for SignedExtensions<Call> {
+impl<Call> codec::Encode for SignedExtensions<Call> {
 	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
 		self.encode_payload.using_encoded(f)
 	}
 }
 
-impl<Call> parity_scale_codec::Decode for SignedExtensions<Call> {
+impl<Call> codec::Decode for SignedExtensions<Call> {
-	fn decode<I: parity_scale_codec::Input>(
+	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
-		input: &mut I,
-	) -> Result<Self, parity_scale_codec::Error> {
 		SignedExtra::decode(input).map(|encode_payload| SignedExtensions {
 			encode_payload,
 			additional_signed: None,
@@ -323,14 +321,7 @@ impl<Call> SignedExtensions<Call> {
 
 impl<Call> sp_runtime::traits::SignedExtension for SignedExtensions<Call>
 where
-	Call: parity_scale_codec::Codec
+	Call: codec::Codec + sp_std::fmt::Debug + Sync + Send + Clone + Eq + PartialEq + StaticTypeInfo,
-		+ sp_std::fmt::Debug
-		+ Sync
-		+ Send
-		+ Clone
-		+ Eq
-		+ PartialEq
-		+ StaticTypeInfo,
 	Call: Dispatchable,
 {
 	const IDENTIFIER: &'static str = "Not needed.";
@@ -399,7 +390,7 @@ impl Chain for PolkadotLike {
 pub fn account_info_storage_key(id: &AccountId) -> Vec<u8> {
 	let module_prefix_hashed = Twox128::hash(b"System");
 	let storage_prefix_hashed = Twox128::hash(b"Account");
-	let key_hashed = parity_scale_codec::Encode::using_encoded(id, Blake2_128Concat::hash);
+	let key_hashed = codec::Encode::using_encoded(id, Blake2_128Concat::hash);
 
 	let mut final_key = Vec::with_capacity(
 		module_prefix_hashed.len() + storage_prefix_hashed.len() + key_hashed.len(),

bridges/primitives/polkadot-core/src/parachains.rs

@@ -23,8 +23,8 @@
 //! be two versions of polkadot crates included in the runtime. Which is bad.
 
 use bp_runtime::Size;
+use codec::{CompactAs, Decode, Encode, MaxEncodedLen};
 use frame_support::RuntimeDebug;
-use parity_scale_codec::{CompactAs, Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::Hasher;
 use sp_std::vec::Vec;

bridges/primitives/runtime/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 hash-db = { version = "0.15.2", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }

bridges/primitives/test-utils/Cargo.toml

@@ -7,7 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
 bp-header-chain = { path = "../header-chain", default-features = false  }
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
 ed25519-dalek = { version = "1.0", default-features = false, features = ["u64_backend"] }
 finality-grandpa = { version = "0.15.0", default-features = false }
 sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

bridges/relays/bin-substrate/Cargo.toml

@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 anyhow = "1.0"
 async-std = "1.9.0"
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 futures = "0.3.12"
 hex = "0.4"
 log = "0.4.17"

bridges/relays/client-millau/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
 

bridges/relays/client-rialto-parachain/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
 

bridges/relays/client-rialto/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
 

bridges/relays/client-substrate/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 [dependencies]
 async-std = { version = "1.6.5", features = ["attributes"] }
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 futures = "0.3.7"
 jsonrpsee = { version = "0.15", features = ["macros", "ws-client"] }
 log = "0.4.17"

bridges/relays/client-westend/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0" }
 relay-substrate-client = { path = "../client-substrate" }
 relay-utils = { path = "../utils" }
 

bridges/relays/lib-substrate-relay/Cargo.toml

@@ -10,7 +10,7 @@ anyhow = "1.0"
 thiserror = "1.0.26"
 async-std = "1.9.0"
 async-trait = "0.1"
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 futures = "0.3.12"
 num-traits = "0.2"
 log = "0.4.17"

bridges/relays/parachains/Cargo.toml

@@ -23,6 +23,6 @@ bp-polkadot-core = { path = "../../primitives/polkadot-core" }
 relay-substrate-client = { path = "../client-substrate" }
 
 [dev-dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0" }
+codec = { package = "parity-scale-codec", version = "3.1.5" }
 relay-substrate-client = { path = "../client-substrate", features = ["test-helpers"] }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }