Merge pull request #3128 from input-output-hk/Squad1/CBR-288/review-wallet-peripheral-utilities

[CBR-288] Review wallet peripheral utilities

Author: KtorZ

crypto/Pos/Crypto/Encryption.hs

@@ -1,13 +1,9 @@
-{-# LANGUAGE RankNTypes #-}
-
 -- | Wrapper over AES. `encode` and `decode` use AES256 CTR mode with
 -- IV = 0.
 -- Decryption functions are used in wallet. Encryption is not used anywhere.
 
 module Pos.Crypto.Encryption
-       ( AesKey
-       , deriveAesKey
-       , deriveAesKeyBS
+       ( AesKey(..)
        , aesEncrypt
        , aesDecrypt
        ) where
@@ -17,9 +13,7 @@ import           Universum hiding (init)
 import           Crypto.Cipher.AES (AES256)
 import           Crypto.Cipher.Types (BlockCipher (..), cipherInit, ctrCombine, nullIV)
 import           Crypto.Error (CryptoError, eitherCryptoError)
-import           Crypto.Hash (Blake2b_256, Digest, hash)
-import           Data.ByteArray (convert)
-import qualified Data.Text.Encoding as TE
+
 
 ----------------------------------------------------------------------------
 -- AES
@@ -30,17 +24,11 @@ newtype AesKey = AesKey
     { fromAESKey :: ByteString
     } deriving (Show, Eq, Generic, Hashable)
 
-deriveAesKey :: Text -> AesKey
-deriveAesKey = deriveAesKeyBS . TE.encodeUtf8
-
-deriveAesKeyBS :: ByteString -> AesKey
-deriveAesKeyBS = AesKey . blake2b
-  where
-    blake2b :: ByteString -> ByteString
-    blake2b = convert @(Digest Blake2b_256) . hash
-
 aesEncrypt :: ByteString -> AesKey -> Either CryptoError ByteString
-aesEncrypt input (fromAESKey -> sk) = ctrCombine <$> init <*> pure nullIV <*> pure input
+aesEncrypt input (fromAESKey -> sk) = ctrCombine
+    <$> init
+    <*> pure nullIV
+    <*> pure input
   where
     -- FIXME: return either here
     init :: Either CryptoError AES256

crypto/Pos/Crypto/Orphans.hs

@@ -4,16 +4,13 @@ module Pos.Crypto.Orphans
        (
        ) where
 
-import           Prelude (show)
-import           Universum hiding (show)
+import           Universum
 
-import qualified Cardano.Crypto.Wallet as CC
 import qualified Crypto.SCRAPE as Scrape
 import           Crypto.Scrypt (EncryptedPass (..))
 import qualified Crypto.Sign.Ed25519 as Ed25519
 import           Data.Aeson (FromJSON (..), ToJSON (..))
 import           Data.Hashable (Hashable)
-import qualified Data.Hashable as Hashable
 import           Serokell.Util.Base64 (JsonByteString (..))
 
 import           Pos.Binary.Class (Bi (..), decodeBinary, encodeBinary)
@@ -50,18 +47,6 @@ instance Bi Ed25519.Signature where
     encode (Ed25519.Signature s) = encode s
     decode = Ed25519.Signature <$> decode
 
-instance Eq CC.XPub where
-    a == b = CC.unXPub a == CC.unXPub b
-
-instance Ord CC.XPub where
-    compare = comparing CC.unXPub
-
-instance Show CC.XPub where
-    show = show . CC.unXPub
-
-instance Hashable CC.XPub where
-    hashWithSalt n = Hashable.hashWithSalt n . CC.unXPub
-
 ----------------------------------------------------------------------------
 -- Bi instances for Scrape
 ----------------------------------------------------------------------------

pkgs/default.nix

@@ -14516,33 +14516,41 @@ license = stdenv.lib.licenses.mit;
 ({
   mkDerivation
 , base
+, basement
 , bytestring
 , cryptonite
 , cryptonite-openssl
 , deepseq
 , fetchgit
+, foundation
 , hashable
+, integer-gmp
 , memory
 , stdenv
 }:
 mkDerivation {
 
 pname = "cardano-crypto";
-version = "1.0.0";
+version = "1.1.0";
 src = fetchgit {
 
 url = "https://github.com/input-output-hk/cardano-crypto";
-sha256 = "05i1z01fzg0la4hk2ff0l89sk0a5ada81w60kwj9i8ix74jchp94";
-rev = "287cc575fafe86af9d24af9d012c47f9d3f04da0";
+sha256 = "1v165n4cmp4g272406vaaan7bwvrw2m55jwcbz8qqjxslxv1l63p";
+rev = "33c7ecc6e4bd71c3ea0195e9d796eeace7be22cf";
 
 };
+isLibrary = true;
+isExecutable = true;
 libraryHaskellDepends = [
 base
+basement
 bytestring
 cryptonite
 cryptonite-openssl
 deepseq
+foundation
 hashable
+integer-gmp
 memory
 ];
 doHaddock = false;
@@ -17985,7 +17993,9 @@ license = stdenv.lib.licenses.mit;
 , async
 , base
 , base58-bytestring
+, basement
 , bytestring
+, cardano-crypto
 , cardano-sl
 , cardano-sl-block
 , cardano-sl-client
@@ -18073,7 +18083,9 @@ aeson
 async
 base
 base58-bytestring
+basement
 bytestring
+cardano-crypto
 cardano-sl
 cardano-sl-block
 cardano-sl-client
@@ -18141,8 +18153,10 @@ libraryToolDepends = [
 cpphs
 ];
 testHaskellDepends = [
+aeson
 base
 bytestring
+cardano-crypto
 cardano-sl
 cardano-sl-block
 cardano-sl-client
@@ -18163,6 +18177,7 @@ cardano-sl-update
 cardano-sl-util
 cardano-sl-util-test
 containers
+cryptonite
 data-default
 deepseq
 ekg-core
@@ -18171,9 +18186,11 @@ formatting
 hspec
 lens
 log-warper
+memory
 MonadRandom
 mtl
 QuickCheck
+quickcheck-instances
 safe-exceptions
 safecopy
 serokell-util

scripts/test/wallet/integration.sh

@@ -91,7 +91,7 @@ packages:
   extra-dep: true
 - location:
     git: https://github.com/input-output-hk/cardano-crypto
-    commit: 287cc575fafe86af9d24af9d012c47f9d3f04da0
+    commit: 33c7ecc6e4bd71c3ea0195e9d796eeace7be22cf
   extra-dep: true
 # Waiting on the flexible types PR to be merged:
 # https://github.com/acid-state/acid-state/pull/94

scripts/test/wallet/multi-integration.sh

@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE DeriveGeneric       #-}
 {-# LANGUAGE FlexibleContexts    #-}
 {-# LANGUAGE GADTs               #-}
@@ -19,23 +20,21 @@ import           Data.String.Conv (toS)
 import           Data.Time (diffUTCTime, getCurrentTime)
 import           GHC.Generics (Generic)
 
-import           Crypto.Random.Entropy (getEntropy)
 import           Pos.Client.Txp (TxHistoryEntry (..))
 import           Pos.Core (Address, Coin, mkCoin)
 import           Pos.Data.Attributes (mkAttributes)
 import           Pos.DB.GState.Common (getTip)
 import           Pos.Infra.StateLock (StateLock (..))
 import           Pos.Txp (Tx (..), TxId, TxIn (..), TxOut (..), TxOutAux (..))
 import           Pos.Txp.Toil.Types (utxoToModifier)
-import           Pos.Util.BackupPhrase (BackupPhrase (..))
-import           Pos.Util.Mnemonics (toMnemonic)
+import           Pos.Util.Mnemonic (Mnemonic, entropyToMnemonic, genEntropy)
 import           Pos.Util.Servant (decodeCType)
 import           Pos.Util.Util (lensOf)
 import           Pos.Wallet.Web.Account (GenSeed (..))
 import           Pos.Wallet.Web.ClientTypes (AccountId (..), CAccount (..), CAccountInit (..),
-                                             CAccountMeta (..), CAddress (..), CId (..),
-                                             CWallet (..), CWalletAssurance (..), CWalletInit (..),
-                                             CWalletMeta (..), Wal)
+                                             CAccountMeta (..), CAddress (..), CBackupPhrase (..),
+                                             CId (..), CWallet (..), CWalletAssurance (..),
+                                             CWalletInit (..), CWalletMeta (..), Wal)
 import           Pos.Wallet.Web.ClientTypes.Instances ()
 import           Pos.Wallet.Web.Methods.Logic (getAccounts, newAccountIncludeUnready, newAddress)
 import           Pos.Wallet.Web.Methods.Restore (newWallet)
@@ -215,7 +214,7 @@ generateWalletDB CLI{..} spec@GenSpec{..} = do
 
     case addTo of
         Just accId ->
-            if (checkIfAddTo fakeUtxoSpec fakeTxs) then
+            if checkIfAddTo fakeUtxoSpec fakeTxs then
                 addAddressesTo spec accId
             else do
                 timed $ generateFakeUtxo fakeUtxoSpec accId
@@ -299,7 +298,7 @@ generateRealTxHistE outputAddresses = do
     fakeTime  <- liftIO $ generate arbitrary
     fakeTx    <- liftIO $ generate $ genTxs fakeTxOut
 
-    pure $ THEntry
+    pure THEntry
         { _thTxId        = fakeTxIds
         , _thTx          = fakeTx
         , _thDifficulty  = fakeChain
@@ -330,7 +329,7 @@ generateRealTxHistE outputAddresses = do
         let _txOutputs = NE.fromList txOut
         let _txAttributes = mkAttributes ()
 
-        pure $ UnsafeTx {..}
+        pure UnsafeTx {..}
 
     -- | Generate sensible amount of coins.
     genCoins :: Gen Coin
@@ -375,7 +374,7 @@ unwrapCAddress = decodeCType . cadId
 
 
 addAddressesTo :: GenSpec -> AccountId -> UberMonad ()
-addAddressesTo spec cid = genAddresses spec cid
+addAddressesTo = genAddresses
 
 
 genAccounts :: GenSpec -> (Int, CWallet) -> UberMonad ()
@@ -404,35 +403,26 @@ genWallet walletNum = do
     mnemonic  <- newRandomMnemonic
     newWallet mempty (walletInit mnemonic)
   where
-    walletInit :: BackupPhrase -> CWalletInit
+    walletInit :: Mnemonic 12 -> CWalletInit
     walletInit backupPhrase = CWalletInit {
       cwInitMeta      = CWalletMeta
           { cwName      = "Wallet #" <> show walletNum
           , cwAssurance = CWANormal
           , cwUnit      = 0
         }
-      , cwBackupPhrase  = backupPhrase
+      , cwBackupPhrase  = CBackupPhrase backupPhrase
       }
 
 
--- | Generates a new 'BackupPhrase'.
-newRandomMnemonic :: WalletWebMode BackupPhrase
-newRandomMnemonic = do
-
-    -- The size 16 should give you 12 words after bip39 encoding.
-    let mnemonic :: IO ByteString
-        mnemonic = getEntropy 16
-
-    genMnemonic  <- liftIO mnemonic
-
-    let newMnemonic = either (error . show) id (toMnemonic genMnemonic)
-
-    pure $ BackupPhrase $ words newMnemonic
+-- | Generates a new 'Mnemonic'.
+newRandomMnemonic :: WalletWebMode (Mnemonic 12)
+newRandomMnemonic =
+    liftIO (entropyToMnemonic <$> genEntropy)
 
 
 -- | Creates a new 'CAccount'.
 genAccount :: CWallet -> Integer -> UberMonad CAccount
-genAccount CWallet{..} accountNum = do
+genAccount CWallet{..} accountNum =
     newAccountIncludeUnready True RandomSeed mempty accountInit
   where
     accountInit :: CAccountInit