From 147db0552f2c38b86cbcff36fabc12a29b6cf968 Mon Sep 17 00:00:00 2001
From: Dmitry Zuikov <dzuikov@gmail.com>
Date: Wed, 10 Apr 2024 07:00:30 +0300
Subject: [PATCH] wip, parse notifiers  section

---
 .../lib/HBS2/Peer/Proto/RefChan/Types.hs      | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/hbs2-peer/lib/HBS2/Peer/Proto/RefChan/Types.hs b/hbs2-peer/lib/HBS2/Peer/Proto/RefChan/Types.hs
index ff0e972f..2de5192e 100644
--- a/hbs2-peer/lib/HBS2/Peer/Proto/RefChan/Types.hs
+++ b/hbs2-peer/lib/HBS2/Peer/Proto/RefChan/Types.hs
@@ -228,21 +228,16 @@ instance Pretty (AsBase58 (PubKey 'Sign s )) => Pretty (RefChanLogKey s) where
 
 instance ForRefChans e => FromStringMaybe (RefChanHeadBlock e) where
 
+  -- NOTE: we-dont-support-old-head-formats-anymore
   fromStringMay str =
-    case readers of
-      [] -> RefChanHeadBlockSmall <$> version
-                                  <*> quorum
-                                  <*> wait
-                                  <*> pure (HashMap.fromList peers)
-                                  <*> pure (HashSet.fromList authors)
-
-      rs -> RefChanHeadBlock1 <$> version
-                              <*> quorum
-                              <*> wait
-                              <*> pure (HashMap.fromList peers)
-                              <*> pure (HashSet.fromList authors)
-                              <*> pure (HashSet.fromList rs)
-                              <*> pure mempty
+    RefChanHeadBlock2 <$> version
+                      <*> quorum
+                      <*> wait
+                      <*> pure (HashMap.fromList peers)
+                      <*> pure (HashSet.fromList authors)
+                      <*> pure (HashSet.fromList readers)
+                      <*> pure (HashSet.fromList notifiers)
+                      <*> pure mempty
 
     where
       parsed = parseTop str & fromRight mempty
@@ -262,6 +257,11 @@ instance ForRefChans e => FromStringMaybe (RefChanHeadBlock e) where
                           | (ListVal [SymbolVal "reader", LitStrVal s] ) <- parsed
                           ]
 
+
+      notifiers = catMaybes [ fromStringMay @(PubKey 'Sign (Encryption e)) (Text.unpack s)
+                            | (ListVal [SymbolVal "notifier", LitStrVal s] ) <- parsed
+                            ]
+
 instance (ForRefChans e
          , Pretty (AsBase58 (PubKey 'Sign (Encryption e)))
          , Pretty (AsBase58 (PubKey 'Encrypt (Encryption e)))
@@ -277,11 +277,14 @@ instance (ForRefChans e
                vcat (fmap author (HashSet.toList $ view refChanHeadAuthors blk)) <> line
                <>
                vcat (fmap reader (HashSet.toList $ view refChanHeadReaders blk)) <> line
+               <>
+               vcat (fmap notifier (HashSet.toList $ view refChanHeadNotifiers blk)) <> line
 
     where
       peer (p,w) = parens ("peer" <+> dquotes (pretty (AsBase58 p)) <+> pretty w)
       author p   = parens ("author" <+> dquotes (pretty (AsBase58 p)))
       reader p   = parens ("reader" <+> dquotes (pretty (AsBase58 p)))
+      notifier p = parens ("notifier" <+> dquotes (pretty (AsBase58 p)))
 
 
 -- блок головы может быть довольно большой.