diff --git a/Cargo.lock b/Cargo.lock index f721de284e4..bd513d4afba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6217,8 +6217,8 @@ dependencies = [ name = "gbuiltin-staking" version = "1.6.2" dependencies = [ - "derive_more 0.99.18", "gprimitives", + "parity-scale-codec", "scale-info", ] diff --git a/gbuiltins/staking/Cargo.toml b/gbuiltins/staking/Cargo.toml index b3e6404913c..71860b4b882 100644 --- a/gbuiltins/staking/Cargo.toml +++ b/gbuiltins/staking/Cargo.toml @@ -9,6 +9,6 @@ homepage.workspace = true repository.workspace = true [dependencies] -gprimitives.workspace = true -derive_more.workspace = true +parity-scale-codec = { workspace = true, features = ["derive"] } scale-info = { workspace = true, features = ["derive"] } +gprimitives = { workspace = true, features = ["codec"] } diff --git a/gbuiltins/staking/src/lib.rs b/gbuiltins/staking/src/lib.rs index ae3912404d7..ae71c44efc8 100644 --- a/gbuiltins/staking/src/lib.rs +++ b/gbuiltins/staking/src/lib.rs @@ -60,14 +60,13 @@ extern crate alloc; use alloc::vec::Vec; use gprimitives::ActorId; -use scale_info::scale::{self, Decode, Encode}; +use parity_scale_codec::{Decode, Encode}; /// Type that should be used to create a message to the staking built-in actor. /// /// A [partial] mirror of the staking pallet interface. Not all extrinsics /// are supported, more can be added as needed for real-world use cases. #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)] -#[codec(crate = scale)] pub enum Request { /// Bond up to the `value` from the sender to self as the controller. Bond { value: u128, payee: RewardAccount }, @@ -93,7 +92,6 @@ pub enum Request { /// /// A "mirror" of the staking pallet's `RewardDestination` enum. #[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, Debug)] -#[codec(crate = scale)] pub enum RewardAccount { /// Pay rewards to the sender's account and increase the amount at stake. Staked, diff --git a/utils/crates-io/src/lib.rs b/utils/crates-io/src/lib.rs index e0b4f4fb71e..ea24b531bee 100644 --- a/utils/crates-io/src/lib.rs +++ b/utils/crates-io/src/lib.rs @@ -49,6 +49,7 @@ pub const SAFE_DEPENDENCIES: &[&str] = &[ "gsdk-codegen", "gsys", "numerated", + "gbuiltin-bls381", ]; /// Required packages with local dependencies. @@ -58,6 +59,8 @@ pub const SAFE_DEPENDENCIES: &[&str] = &[ /// the order. pub const STACKED_DEPENDENCIES: &[&str] = &[ "gprimitives", + "gbuiltin-eth-bridge", + "gbuiltin-staking", "gstd-codegen", "gcore", "gmeta",