Merge pull request #1472 from opentensor/improve-tlocked-commitments

feat/Multiple Revealed Commitments

Author: JohnReedV

pallets/commitments/src/lib.rs

@@ -172,7 +172,7 @@ pub mod pallet {
         u16,
         Twox64Concat,
         T::AccountId,
-        RevealedData<BalanceOf<T>, T::MaxFields, BlockNumberFor<T>>,
+        Vec<(Vec<u8>, u64)>, // Reveals<(Data, RevealBlock)>
         OptionQuery,
     >;
 
@@ -478,7 +478,6 @@ where
 
 impl<T: Config> Pallet<T> {
     pub fn reveal_timelocked_commitments() -> DispatchResult {
-        let current_block = <frame_system::Pallet<T>>::block_number();
         let index = TimelockedIndex::<T>::get();
         for (netuid, who) in index.clone() {
             let Some(mut registration) = <CommitmentOf<T>>::get(netuid, &who) else {
@@ -528,10 +527,7 @@ impl<T: Config> Pallet<T> {
                             .ok();
 
                         let Some(sig) = sig else {
-                            remain_fields.push(Data::TimelockEncrypted {
-                                encrypted,
-                                reveal_round,
-                            });
+                            log::warn!("No sig after deserialization");
                             continue;
                         };
 
@@ -547,10 +543,7 @@ impl<T: Config> Pallet<T> {
                             .ok();
 
                         let Some(commit) = commit else {
-                            remain_fields.push(Data::TimelockEncrypted {
-                                encrypted,
-                                reveal_round,
-                            });
+                            log::warn!("No commit after deserialization");
                             continue;
                         };
 
@@ -563,61 +556,41 @@ impl<T: Config> Pallet<T> {
                                 .unwrap_or_default();
 
                         if decrypted_bytes.is_empty() {
-                            remain_fields.push(Data::TimelockEncrypted {
-                                encrypted,
-                                reveal_round,
-                            });
+                            log::warn!("Bytes were decrypted for {:?} but they are empty", who);
                             continue;
                         }
 
-                        let mut reader = &decrypted_bytes[..];
-                        let revealed_info: CommitmentInfo<T::MaxFields> =
-                            match Decode::decode(&mut reader) {
-                                Ok(info) => info,
-                                Err(e) => {
-                                    log::warn!(
-                                        "Failed to decode decrypted data for {:?}: {:?}",
-                                        who,
-                                        e
-                                    );
-                                    remain_fields.push(Data::TimelockEncrypted {
-                                        encrypted,
-                                        reveal_round,
-                                    });
-                                    continue;
-                                }
-                            };
-
-                        revealed_fields.push(revealed_info);
+                        revealed_fields.push(decrypted_bytes);
                     }
 
                     other => remain_fields.push(other),
                 }
             }
 
             if !revealed_fields.is_empty() {
-                let mut all_revealed_data = Vec::new();
-                for info in revealed_fields {
-                    all_revealed_data.extend(info.fields.into_inner());
-                }
+                let mut existing_reveals =
+                    RevealedCommitments::<T>::get(netuid, &who).unwrap_or_default();
 
-                let bounded_revealed = BoundedVec::try_from(all_revealed_data)
-                    .map_err(|_| "Could not build BoundedVec for revealed fields")?;
+                let current_block = <frame_system::Pallet<T>>::block_number();
+                let block_u64 = current_block.saturated_into::<u64>();
 
-                let combined_revealed_info = CommitmentInfo {
-                    fields: bounded_revealed,
-                };
+                // Push newly revealed items onto the tail of existing_reveals and emit the event
+                for revealed_bytes in revealed_fields {
+                    existing_reveals.push((revealed_bytes, block_u64));
 
-                let revealed_data = RevealedData {
-                    info: combined_revealed_info,
-                    revealed_block: current_block,
-                    deposit: registration.deposit,
-                };
-                <RevealedCommitments<T>>::insert(netuid, &who, revealed_data);
-                Self::deposit_event(Event::CommitmentRevealed {
-                    netuid,
-                    who: who.clone(),
-                });
+                    Self::deposit_event(Event::CommitmentRevealed {
+                        netuid,
+                        who: who.clone(),
+                    });
+                }
+
+                const MAX_REVEALS: usize = 10;
+                if existing_reveals.len() > MAX_REVEALS {
+                    let remove_count = existing_reveals.len().saturating_sub(MAX_REVEALS);
+                    existing_reveals.drain(0..remove_count);
+                }
+
+                RevealedCommitments::<T>::insert(netuid, &who, existing_reveals);
             }
 
             registration.info.fields = BoundedVec::try_from(remain_fields)

pallets/commitments/src/mock.rs

@@ -207,6 +207,7 @@ use tle::{ibe::fullident::Identity, stream_ciphers::AESGCMStreamCipherProvider,
 pub const DRAND_QUICKNET_PUBKEY_HEX: &str = "83cf0f2896adee7eb8b5f01fcad3912212c437e0073e911fb90022d3e760183c8c4b450b6\
      a0a6c3ac6a5776a2d1064510d1fec758c921cc22b0e17e63aaf4bcb5ed66304de9cf809b\
      d274ca73bab4af5a6e9c76a4bc09e76eae8991ef5ece45a";
+pub const DRAND_QUICKNET_SIG_2000_HEX: &str = "b6cb8f482a0b15d45936a4c4ea08e98a087e71787caee3f4d07a8a9843b1bc5423c6b3c22f446488b3137eaca799c77e"; // round 20000
 pub const DRAND_QUICKNET_SIG_HEX: &str = "b44679b9a59af2ec876b1a6b1ad52ea9b1615fc3982b19576350f93447cb1125e342b73a8dd2bacbe47e4b6b63ed5e39";
 
 /// Inserts a Drand pulse for `round` with the given `signature_bytes`.