correct 64-byte restriction on passphrase hash

Author: paweljakubas

lib/core/src/Cardano/Wallet/Api/Types.hs

@@ -149,7 +149,6 @@ import Cardano.Wallet.Primitive.Types
     , WalletBalance (..)
     , WalletId (..)
     , WalletName (..)
-    , hashFromText
     , isValidCoin
     , unsafeEpochNo
     )
@@ -397,7 +396,7 @@ data ByronWalletFromXPrvPostData = ByronWalletFromXPrvPostData
     -- ^ A root private key hex-encoded, encrypted using a given passphrase.
     -- The underlying key should contain: private key, chain code, and public key
     , passphraseHash :: !(ApiT (Hash "encryption"))
-    -- ^ A hash of master passphrase. The hash should be a 64-byte output of a
+    -- ^ A hash of master passphrase. The hash should be an output of a
     -- Scrypt function with the following parameters:
     -- - logN = 14
     -- - r = 8
@@ -685,7 +684,14 @@ instance ToText (ApiT XPrv) where
         . getApiT
 
 instance FromText (ApiT (Hash "encryption"))  where
-    fromText = fmap ApiT . hashFromText 64
+    fromText txt = case convertFromBase Base16 $ T.encodeUtf8 txt of
+        Right bytes -> Right $ ApiT $ Hash bytes
+        Left _ -> textDecodingError
+      where
+        textDecodingError = Left $ TextDecodingError $ unwords
+            [ "Invalid encrypted passphrase:"
+            , "expecting a hex-encoded value."
+            ]
 
 {-------------------------------------------------------------------------------
                               API Types: Byron

lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs

@@ -1092,7 +1092,8 @@ instance Arbitrary ByronWalletFromXPrvPostData where
     arbitrary = do
         n <- arbitrary
         rootXPrv <- ApiT . unsafeXPrv . BS.pack <$> vectorOf 128 arbitrary
-        h <- ApiT . Hash . B8.pack <$> replicateM 64 arbitrary
+        bytesNumber <- choose (64,100)
+        h <- ApiT . Hash . B8.pack <$> replicateM bytesNumber arbitrary
         pure $ ByronWalletFromXPrvPostData n rootXPrv h
 
 instance Arbitrary SomeByronWalletPostData where

specifications/api/swagger.yaml

@@ -270,15 +270,13 @@ x-walletPassphrase: &walletPassphrase
 
 x-walletPassphraseHash: &walletPassphraseHash
   description: |
-    A hash of master passphrase. The hash should be a 64-byte output of a Scrypt function with the following parameters:
+    A hash of master passphrase. The hash should be an output of a Scrypt function with the following parameters:
     - logN = 14
     - r = 8
     - p = 1
   type: string
   format: hex
-  minLength: 128
-  maxLength: 128
-  example: 3be2ead8e3c3be2ea67c41a6e898ceecddeecd88585d11d15d8733f7ad1adbaf3c1570d8e3c67c41a6e898ceecddeecd88585d11d15d8733f7ad1adbaf3c1570
+  example: 31347c387c317c574342652b796362417576356c2b4258676a344a314c6343675375414c2f5653393661364e576a2b7550766655513d3d7c2f376738486c59723174734e394f6e4e753253302b6a65515a6b5437316b45414941366a515867386539493d
 
 x-walletEncryptedRootPrivateKey: &walletEncryptedRootPrivateKey
   description: |