store private key in DB & provide an accessor to read it back later

cardano-foundation · Apr 26, 2019 · 40ca2c2 · 40ca2c2
1 parent cc79fcc
commit 40ca2c2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/src/Cardano/Wallet.hs b/src/Cardano/Wallet.hs
@@ -57,6 +57,7 @@ import Cardano.Wallet.Primitive.AddressDerivation
     , XPrv
     , deriveAccountPrivateKey
     , digest
+    , encryptPassphrase
     , generateKeyFromSeed
     , publicKey
     )
@@ -252,7 +253,9 @@ mkWalletLayer db network = WalletLayer
                 , status = Restoring minBound
                 , delegation = NotDelegating
                 }
-        DB.createWallet db (PrimaryKey wid) checkpoint metadata $> wid
+        hpwd <- liftIO $ encryptPassphrase (passphrase w)
+        let creds = ( rootXPrv, hpwd )
+        DB.createWallet db (PrimaryKey wid) checkpoint metadata creds $> wid
 
     , readWallet = _readWallet
 

diff --git a/src/Cardano/Wallet/DB.hs b/src/Cardano/Wallet/DB.hs
@@ -20,6 +20,8 @@ module Cardano.Wallet.DB
 
 import Prelude
 
+import Cardano.Wallet.Primitive.AddressDerivation
+    ( Depth (..), Key, XPrv )
 import Cardano.Wallet.Primitive.Model
     ( Wallet )
 import Cardano.Wallet.Primitive.Types
@@ -38,6 +40,7 @@ data DBLayer m s = DBLayer
         :: PrimaryKey WalletId
         -> Wallet s
         -> WalletMetadata
+        -> (Key 'RootK XPrv, Hash "encryption")
         -> ExceptT ErrWalletAlreadyExists m ()
         -- ^ Initialize a database entry for a given wallet. 'putCheckpoint',
         -- 'putWalletMeta' or 'putTxHistory' will actually all fail if they are
@@ -103,6 +106,12 @@ data DBLayer m s = DBLayer
         --
         -- Returns an empty map if the wallet isn't found.
 
+    , readPrivateKey
+        :: PrimaryKey WalletId
+        -> m (Maybe (Key 'RootK XPrv, Hash "encryption"))
+        -- ^ Read a previously stored private key and its associated passphrase
+        -- hash.
+
     , withLock
         :: forall e a. ()
         => ExceptT e m a

diff --git a/src/Cardano/Wallet/DB/MVar.hs b/src/Cardano/Wallet/DB/MVar.hs
@@ -22,6 +22,8 @@ import Cardano.Wallet.DB
     , ErrWalletAlreadyExists (..)
     , PrimaryKey (..)
     )
+import Cardano.Wallet.Primitive.AddressDerivation
+    ( Depth (..), Key, XPrv )
 import Cardano.Wallet.Primitive.Model
     ( Wallet )
 import Cardano.Wallet.Primitive.Types
@@ -41,6 +43,7 @@ data Database s = Database
     { wallet :: Wallet s
     , metadata :: WalletMetadata
     , txHistory :: Map (Hash "Tx") (Tx, TxMeta)
+    , xprv :: (Key 'RootK XPrv, Hash "encryption")
     }
 
 -- | Instantiate a new in-memory "database" layer that simply stores data in
@@ -55,10 +58,10 @@ newDBLayer = do
                                       Wallets
         -----------------------------------------------------------------------}
 
-        { createWallet = \key@(PrimaryKey wid) cp meta -> ExceptT $ do
+        { createWallet = \key@(PrimaryKey wid) cp meta k -> ExceptT $ do
             let alter = \case
                     Nothing ->
-                        Right $ Just $ Database cp meta mempty
+                        Right $ Just $ Database cp meta mempty k
                     Just _ ->
                         Left (ErrWalletAlreadyExists wid)
             cp `deepseq` meta `deepseq` alterMVar db alter key
@@ -82,8 +85,8 @@ newDBLayer = do
             let alter = \case
                     Nothing ->
                         Left (ErrNoSuchWallet wid)
-                    Just (Database _ meta history) ->
-                        Right $ Just $ Database cp meta history
+                    Just (Database _ meta history k) ->
+                        Right $ Just $ Database cp meta history k
             cp `deepseq` alterMVar db alter key
 
         , readCheckpoint = \key ->
@@ -97,8 +100,8 @@ newDBLayer = do
             let alter = \case
                     Nothing ->
                         Left (ErrNoSuchWallet wid)
-                    Just (Database cp _ history) ->
-                        Right $ Just $ Database cp meta history
+                    Just (Database cp _ history k) ->
+                        Right $ Just $ Database cp meta history k
             meta `deepseq` alterMVar db alter key
 
         , readWalletMeta = \key -> do
@@ -112,13 +115,20 @@ newDBLayer = do
             let alter = \case
                     Nothing ->
                         Left (ErrNoSuchWallet wid)
-                    Just (Database cp meta txs) ->
-                        Right $ Just $ Database cp meta (txs' <> txs)
+                    Just (Database cp meta txs k) ->
+                        Right $ Just $ Database cp meta (txs' <> txs) k
             txs' `deepseq` alterMVar db alter key
 
         , readTxHistory = \key ->
             maybe mempty txHistory . Map.lookup key <$> readMVar db
 
+        {-----------------------------------------------------------------------
+                                       Keystore
+        -----------------------------------------------------------------------}
+
+        , readPrivateKey = \key ->
+            fmap xprv . Map.lookup key <$> readMVar db
+
         {-----------------------------------------------------------------------
                                        Lock
         -----------------------------------------------------------------------}