Make halting for external networks

serai-dex · Oct 4, 2024 · 43cdbb1 · 43cdbb1
1 parent 1b58754
commit 43cdbb1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -60,7 +60,7 @@ pub mod pallet {
  pub enum Event<T: Config> {
  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<T: Config> = StorageMap<_, Identity, NetworkId, (), OptionQuery>;
+ pub(crate) type Halted<T: Config> = 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::<T>::set(network, Some(()));
  Self::deposit_event(Event::Halt { network });
  Ok(())
@@ -325,7 +324,7 @@ pub mod pallet {
  Err(InvalidTransaction::BadProof)?;
  }
 
- if Halted::<T>::contains_key(NetworkId::from(network)) {
+ if Halted::<T>::contains_key(network) {
  Err(InvalidTransaction::Custom(1))?;
  }
 

diff --git a/substrate/signals/primitives/src/lib.rs b/substrate/signals/primitives/src/lib.rs
@@ -5,13 +5,13 @@
 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))]
 #[cfg_attr(feature = "borsh", derive(borsh::BorshSerialize, borsh::BorshDeserialize))]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum SignalId {
  Retirement([u8; 32]),
- Halt(NetworkId),
+ Halt(ExternalNetworkId),
 }