diff --git a/substrate/abi/src/in_instructions.rs b/substrate/abi/src/in_instructions.rs index f3b96a32..765a5053 100644 --- a/substrate/abi/src/in_instructions.rs +++ b/substrate/abi/src/in_instructions.rs @@ -18,5 +18,5 @@ pub enum Call { pub enum Event { Batch { network: ExternalNetworkId, id: u32, block: BlockHash, instructions_hash: [u8; 32] }, InstructionFailure { network: ExternalNetworkId, id: u32, index: u32 }, - Halt { network: NetworkId }, + Halt { network: ExternalNetworkId }, } diff --git a/substrate/in-instructions/pallet/src/lib.rs b/substrate/in-instructions/pallet/src/lib.rs index 3c161e8a..e3f69f41 100644 --- a/substrate/in-instructions/pallet/src/lib.rs +++ b/substrate/in-instructions/pallet/src/lib.rs @@ -60,7 +60,7 @@ pub mod pallet { pub enum Event { Batch { network: ExternalNetworkId, id: u32, block: BlockHash, instructions_hash: [u8; 32] }, InstructionFailure { network: ExternalNetworkId, id: u32, index: u32 }, - Halt { network: NetworkId }, + Halt { network: ExternalNetworkId }, } #[pallet::error] @@ -86,7 +86,7 @@ pub mod pallet { // Halted networks. #[pallet::storage] - pub(crate) type Halted = StorageMap<_, Identity, NetworkId, (), OptionQuery>; + pub(crate) type Halted = StorageMap<_, Identity, ExternalNetworkId, (), OptionQuery>; // The latest block a network has acknowledged as finalized #[pallet::storage] @@ -231,8 +231,7 @@ pub mod pallet { Ok(()) } - pub fn halt(network: NetworkId) -> Result<(), DispatchError> { - // TODO: is it possible to halt serai network? + pub fn halt(network: ExternalNetworkId) -> Result<(), DispatchError> { Halted::::set(network, Some(())); Self::deposit_event(Event::Halt { network }); Ok(()) @@ -325,7 +324,7 @@ pub mod pallet { Err(InvalidTransaction::BadProof)?; } - if Halted::::contains_key(NetworkId::from(network)) { + if Halted::::contains_key(network) { Err(InvalidTransaction::Custom(1))?; } diff --git a/substrate/signals/primitives/src/lib.rs b/substrate/signals/primitives/src/lib.rs index cfd8aac5..c7f0565a 100644 --- a/substrate/signals/primitives/src/lib.rs +++ b/substrate/signals/primitives/src/lib.rs @@ -5,7 +5,7 @@ use scale::{Encode, Decode, MaxEncodedLen}; use scale_info::TypeInfo; -use serai_primitives::NetworkId; +use serai_primitives::ExternalNetworkId; #[derive(Clone, Copy, PartialEq, Eq, Debug, Encode, Decode, MaxEncodedLen, TypeInfo)] #[cfg_attr(feature = "std", derive(zeroize::Zeroize))] @@ -13,5 +13,5 @@ use serai_primitives::NetworkId; #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum SignalId { Retirement([u8; 32]), - Halt(NetworkId), + Halt(ExternalNetworkId), }