remove unused params

Author: JohnReedV

node/src/mev_shield/proposer.rs

@@ -541,7 +541,7 @@ pub fn spawn_revealer<B, C, Pool>(
                         type RuntimeNonce = <node_subtensor_runtime::Runtime as frame_system::Config>::Nonce;
 
                         // Safely parse plaintext layout without panics.
-                        // Layout: signer (32) || nonce (4) || mortality (1) || call (..)
+                        // Layout: signer (32) || nonce (4) || call (..)
                         //         || sig_kind (1) || sig (64)
                         let min_plain_len: usize = 32usize
                             .saturating_add(4)
@@ -582,20 +582,8 @@ pub fn spawn_revealer<B, C, Pool>(
                             }
                         };
 
-                        let mortality_byte = match plaintext.get(36) {
-                            Some(b) => *b,
-                            None => {
-                                log::debug!(
-                                    target: "mev-shield",
-                                    "  id=0x{}: missing mortality byte",
-                                    hex::encode(id.as_bytes())
-                                );
-                                continue;
-                            }
-                        };
-
                         let sig_off = match plaintext.len().checked_sub(65) {
-                            Some(off) if off >= 37 => off,
+                            Some(off) if off >= 36 => off,
                             _ => {
                                 log::debug!(
                                     target: "mev-shield",
@@ -606,7 +594,7 @@ pub fn spawn_revealer<B, C, Pool>(
                             }
                         };
 
-                        let call_bytes = match plaintext.get(37..sig_off) {
+                        let call_bytes = match plaintext.get(36..sig_off) {
                             Some(s) => s,
                             None => {
                                 log::debug!(
@@ -681,13 +669,6 @@ pub fn spawn_revealer<B, C, Pool>(
                         let raw_nonce_u32 = u32::from_le_bytes(nonce_array);
                         let account_nonce: RuntimeNonce = raw_nonce_u32.saturated_into();
 
-                        // Mortality currently only supports immortal; we still
-                        // parse the byte to keep layout consistent.
-                        let _mortality = match mortality_byte {
-                            0 => Era::Immortal,
-                            _ => Era::Immortal,
-                        };
-
                         let inner_call: node_subtensor_runtime::RuntimeCall =
                             match Decode::decode(&mut &call_bytes[..]) {
                                 Ok(c) => c,
@@ -733,7 +714,6 @@ pub fn spawn_revealer<B, C, Pool>(
                                 id,
                                 signer: signer.clone(),
                                 nonce: account_nonce,
-                                mortality: Era::Immortal,
                                 call: Box::new(inner_call),
                                 signature,
                             }

pallets/shield/src/lib.rs

@@ -10,7 +10,7 @@ pub mod pallet {
     use frame_support::{
         dispatch::{GetDispatchInfo, PostDispatchInfo},
         pallet_prelude::*,
-        traits::{ConstU32, Currency},
+        traits::ConstU32,
         weights::Weight,
     };
     use frame_system::pallet_prelude::*;
@@ -60,14 +60,13 @@ pub mod pallet {
     // ----------------- Types -----------------
 
     /// AEAD‑independent commitment over the revealed payload.
-    #[freeze_struct("6c00690caddfeb78")]
+    #[freeze_struct("b307ebc1f8eae75")]
     #[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
     pub struct Submission<AccountId, BlockNumber, Moment, Hash> {
         pub author: AccountId,
         pub key_epoch: u64,
         pub commitment: Hash,
         pub ciphertext: BoundedVec<u8, ConstU32<8192>>,
-        pub payload_version: u16,
         pub submitted_in: BlockNumber,
         pub submitted_at: Moment,
         pub max_weight: Weight,
@@ -96,17 +95,6 @@ pub mod pallet {
             > + GetDispatchInfo;
 
         type AuthorityOrigin: AuthorityOriginExt<Self::RuntimeOrigin, AccountId = AccountId32>;
-
-        #[pallet::constant]
-        type SlotMs: Get<u64>;
-        #[pallet::constant]
-        type AnnounceAtMs: Get<u64>;
-        #[pallet::constant]
-        type GraceMs: Get<u64>;
-        #[pallet::constant]
-        type DecryptWindowMs: Get<u64>;
-
-        type Currency: Currency<Self::AccountId>;
     }
 
     #[pallet::pallet]
@@ -215,7 +203,7 @@ pub mod pallet {
         ///
         /// ```text
         /// raw_payload =
-        ///   signer (32B) || nonce (u32 LE) || mortality_byte || SCALE(call)
+        ///   signer (32B) || nonce (u32 LE) || SCALE(call)
         /// commitment = blake2_256(raw_payload)
         /// ```
         ///
@@ -232,7 +220,6 @@ pub mod pallet {
             key_epoch: u64,
             commitment: T::Hash,
             ciphertext: BoundedVec<u8, ConstU32<8192>>,
-            payload_version: u16,
             max_weight: Weight,
         ) -> DispatchResult {
             let who = ensure_signed(origin)?;
@@ -248,7 +235,6 @@ pub mod pallet {
                 key_epoch,
                 commitment,
                 ciphertext,
-                payload_version,
                 submitted_in: <frame_system::Pallet<T>>::block_number(),
                 submitted_at: now,
                 max_weight,
@@ -278,7 +264,6 @@ pub mod pallet {
             id: T::Hash,
             signer: T::AccountId,
             nonce: T::Nonce,
-            mortality: sp_runtime::generic::Era,
             call: Box<<T as Config>::RuntimeCall>,
             signature: MultiSignature,
         ) -> DispatchResultWithPostInfo {
@@ -289,7 +274,7 @@ pub mod pallet {
             };
 
             let payload_bytes =
-                Self::build_raw_payload_bytes(&signer, nonce, &mortality, call.as_ref());
+                Self::build_raw_payload_bytes(&signer, nonce, call.as_ref());
 
             // 1) Commitment check against on-chain stored commitment.
             let recomputed: T::Hash = T::Hashing::hash(&payload_bytes);
@@ -347,11 +332,10 @@ pub mod pallet {
         ///   - signature message (after domain separation).
         ///
         /// Layout:
-        ///   signer (32B) || nonce (u32 LE) || mortality_byte || SCALE(call)
+        ///   signer (32B) || nonce (u32 LE) || SCALE(call)
         fn build_raw_payload_bytes(
             signer: &T::AccountId,
             nonce: T::Nonce,
-            mortality: &sp_runtime::generic::Era,
             call: &<T as Config>::RuntimeCall,
         ) -> Vec<u8> {
             let mut out = Vec::new();
@@ -361,13 +345,6 @@ pub mod pallet {
             let n_u32: u32 = nonce.saturated_into();
             out.extend_from_slice(&n_u32.to_le_bytes());
 
-            // Simple 1-byte mortality code to match the off-chain layout.
-            let m_byte: u8 = match mortality {
-                sp_runtime::generic::Era::Immortal => 0,
-                _ => 1,
-            };
-            out.push(m_byte);
-
             // Append SCALE-encoded call.
             out.extend(call.encode());
 

runtime/src/lib.rs

@@ -122,11 +122,6 @@ impl frame_system::offchain::SigningTypes for Runtime {
 
 impl pallet_shield::Config for Runtime {
     type RuntimeCall = RuntimeCall;
-    type SlotMs = ShieldSlotMs;
-    type AnnounceAtMs = ShieldAnnounceAtMs;
-    type GraceMs = ShieldGraceMs;
-    type DecryptWindowMs = ShieldDecryptWindowMs;
-    type Currency = Balances;
     type AuthorityOrigin = pallet_shield::EnsureAuraAuthority<Self>;
 }