1 files changed, 20 insertions, 79 deletions

diff --git a/src/Erebos/State.hs b/src/Erebos/State.hs
index 324127a..a2ecb9e 100644
--- a/src/Erebos/State.hs
+++ b/src/Erebos/State.hs
@@ -1,13 +1,12 @@
 module Erebos.State (
     LocalState(..),
-    SharedState, SharedType(..),
+    SharedState(..), SharedType(..),
     SharedTypeID, mkSharedTypeID,
 
+    MonadStorage(..),
     MonadHead(..),
     updateLocalHead_,
 
-    loadLocalStateHead,
-
     updateSharedState, updateSharedState_,
     lookupSharedValue, makeSharedStateUpdate,
 
@@ -15,31 +14,28 @@ module Erebos.State (
     headLocalIdentity,
 
     mergeSharedIdentity,
-    updateSharedIdentity,
-    interactiveIdentityUpdate,
 ) where
 
 import Control.Monad.Except
 import Control.Monad.Reader
 
-import Data.Foldable
-import Data.Maybe
-import qualified Data.Text as T
-import qualified Data.Text.IO as T
+import Data.ByteString (ByteString)
+import Data.ByteString.Char8 qualified as BC
 import Data.Typeable
 import Data.UUID (UUID)
-import qualified Data.UUID as U
-
-import System.IO
+import Data.UUID qualified as U
 
 import Erebos.Identity
+import Erebos.Object
 import Erebos.PubKey
-import Erebos.Storage
+import Erebos.Storable
+import Erebos.Storage.Head
 import Erebos.Storage.Merge
 
 data LocalState = LocalState
     { lsIdentity :: Stored (Signed ExtendedIdentityData)
     , lsShared :: [Stored SharedState]
+    , lsOther :: [ ( ByteString, RecItem ) ]
     }
 
 data SharedState = SharedState
@@ -58,13 +54,16 @@ class Mergeable a => SharedType a where
     sharedTypeID :: proxy a -> SharedTypeID
 
 instance Storable LocalState where
-    store' st = storeRec $ do
-        storeRef "id" $ lsIdentity st
-        mapM_ (storeRef "shared") $ lsShared st
+    store' LocalState {..} = storeRec $ do
+        storeRef "id" lsIdentity
+        mapM_ (storeRef "shared") lsShared
+        storeRecItems lsOther
 
-    load' = loadRec $ LocalState
-        <$> loadRef "id"
-        <*> loadRefs "shared"
+    load' = loadRec $ do
+        lsIdentity <- loadRef "id"
+        lsShared <- loadRefs "shared"
+        lsOther <- filter ((`notElem` [ BC.pack "id", BC.pack "shared" ]) . fst) <$> loadRecItems
+        return LocalState {..}
 
 instance HeadType LocalState where
     headTypeID _ = mkHeadTypeID "1d7491a9-7bcb-4eaa-8f13-c8c4c4087e4e"
@@ -98,34 +97,6 @@ instance (HeadType a, MonadIO m) => MonadHead a (ReaderT (Head a) m) where
         snd <$> updateHead h f
 
 
-loadLocalStateHead :: MonadIO m => Storage -> m (Head LocalState)
-loadLocalStateHead st = loadHeads st >>= \case
-    (h:_) -> return h
-    [] -> liftIO $ do
-        putStr "Name: "
-        hFlush stdout
-        name <- T.getLine
-
-        putStr "Device: "
-        hFlush stdout
-        devName <- T.getLine
-
-        owner <- if
-            | T.null name -> return Nothing
-            | otherwise -> Just <$> createIdentity st (Just name) Nothing
-
-        identity <- createIdentity st (if T.null devName then Nothing else Just devName) owner
-
-        shared <- wrappedStore st $ SharedState
-            { ssPrev = []
-            , ssType = Just $ sharedTypeID @(Maybe ComposedIdentity) Proxy
-            , ssValue = [storedRef $ idExtData $ fromMaybe identity owner]
-            }
-        storeHead st $ LocalState
-            { lsIdentity = idExtData identity
-            , lsShared = [shared]
-            }
-
 localIdentity :: LocalState -> UnifiedIdentity
 localIdentity ls = maybe (error "failed to verify local identity")
     (updateOwners $ maybe [] idExtDataF $ lookupSharedValue $ lsShared ls)
@@ -163,39 +134,9 @@ makeSharedStateUpdate st val prev = liftIO $ wrappedStore st SharedState
     }
 
 
-mergeSharedIdentity :: (MonadHead LocalState m, MonadError String m) => m UnifiedIdentity
+mergeSharedIdentity :: (MonadHead LocalState m, MonadError e m, FromErebosError e) => m UnifiedIdentity
 mergeSharedIdentity = updateLocalHead $ updateSharedState $ \case
     Just cidentity -> do
         identity <- mergeIdentity cidentity
         return (Just $ toComposedIdentity identity, identity)
-    Nothing -> throwError "no existing shared identity"
-
-updateSharedIdentity :: (MonadHead LocalState m, MonadError String m) => m ()
-updateSharedIdentity = updateLocalHead_ $ updateSharedState_ $ \case
-    Just identity -> do
-        Just . toComposedIdentity <$> interactiveIdentityUpdate identity
-    Nothing -> throwError "no existing shared identity"
-
-interactiveIdentityUpdate :: (Foldable f, MonadStorage m, MonadIO m, MonadError String m) => Identity f -> m UnifiedIdentity
-interactiveIdentityUpdate identity = do
-    let public = idKeyIdentity identity
-
-    name <- liftIO $ do
-        T.putStr $ T.concat $ concat
-            [ [ T.pack "Name" ]
-            , case idName identity of
-                   Just name -> [T.pack " [", name, T.pack "]"]
-                   Nothing -> []
-            , [ T.pack ": " ]
-            ]
-        hFlush stdout
-        T.getLine
-
-    if  | T.null name -> mergeIdentity identity
-        | otherwise -> do
-            secret <- loadKey public
-            maybe (throwError "created invalid identity") return . validateIdentity =<<
-                mstore =<< sign secret =<< mstore (emptyIdentityData public)
-                { iddPrev = toList $ idDataF identity
-                , iddName = Just name
-                }
+    Nothing -> throwOtherError "no existing shared identity"