Merge pull request #3462 from input-output-hk/develop-new

Make develop great again

Author: KtorZ

cardano-sl-wallet-new.cabal

@@ -19,6 +19,7 @@ library
                        Cardano.Wallet.API.Indices
                        Cardano.Wallet.API.Internal
                        Cardano.Wallet.API.Internal.Handlers
+                       Cardano.Wallet.API.Internal.LegacyHandlers
                        Cardano.Wallet.API.Request
                        Cardano.Wallet.API.Request.Filter
                        Cardano.Wallet.API.Request.Pagination
@@ -97,6 +98,7 @@ library
                        Cardano.Wallet.Kernel.DB.Sqlite
                        Cardano.Wallet.Kernel.DB.TxMeta
                        Cardano.Wallet.Kernel.DB.TxMeta.Types
+                       Cardano.Wallet.Kernel.DB.Updates
                        Cardano.Wallet.Kernel.DB.Util.AcidState
                        Cardano.Wallet.Kernel.DB.Util.IxSet
                        Cardano.Wallet.Kernel.Diffusion
@@ -114,6 +116,8 @@ library
                        Cardano.Wallet.Kernel.Types
                        Cardano.Wallet.Kernel.Util
                        Cardano.Wallet.Kernel.Util.Core
+                       Cardano.Wallet.Kernel.Util.StrictList
+                       Cardano.Wallet.Kernel.Util.StrictNonEmpty
                        Cardano.Wallet.Kernel.Util.StrictStateT
                        Cardano.Wallet.Kernel.Wallets
                        Cardano.Wallet.LegacyServer
@@ -137,11 +141,11 @@ library
                        Cardano.Wallet.WalletLayer.Kernel.Addresses
                        Cardano.Wallet.WalletLayer.Kernel.Conv
                        Cardano.Wallet.WalletLayer.Kernel.Info
+                       Cardano.Wallet.WalletLayer.Kernel.Internal
                        Cardano.Wallet.WalletLayer.Kernel.Settings
                        Cardano.Wallet.WalletLayer.Kernel.Transactions
                        Cardano.Wallet.WalletLayer.Kernel.Wallets
                        Cardano.Wallet.WalletLayer.Kernel
-                       Cardano.Wallet.WalletLayer.Error
 
   other-modules:       Paths_cardano_sl_wallet_new
   ghc-options:         -Wall
@@ -172,13 +176,15 @@ library
                      , cardano-sl-util
                      , cardano-sl-wallet
                      , cardano-sl-wallet-test
+                     , cereal
                      , conduit
                      , connection
                      , containers
                      , cryptonite
                      , data-default
                      , data-default-class
                      , directory
+                     , ed25519
                      , exceptions
                      , formatting
                      , formatting
@@ -390,7 +396,7 @@ executable wal-integr-test
                       MonadFailDesugaring
 
 test-suite wallet-unit-tests
-  ghc-options:        -Wall
+  ghc-options:        -Wall -O2
   type:               exitcode-stdio-1.0
   main-is:            WalletUnitTest.hs
   other-modules:      InputSelection.Evaluation
@@ -523,7 +529,7 @@ test-suite wallet-unit-tests
                     , time
 
 test-suite wallet-new-specs
-  ghc-options:      -Wall
+  ghc-options:      -Wall -O2 -threaded -rtsopts
   type:             exitcode-stdio-1.0
   main-is:          Spec.hs
   hs-source-dirs:   test test/unit
@@ -567,17 +573,20 @@ test-suite wallet-new-specs
   build-depends:      base
                     , aeson
                     , bytestring
+                    , cardano-crypto
                     , cardano-sl
                     , cardano-sl-binary-test
                     , cardano-sl-client
                     , cardano-sl-client
+                    , cardano-sl-chain-test
                     , cardano-sl-core
                     , cardano-sl-core-test
                     , cardano-sl-crypto
                     , cardano-sl-chain
                     , cardano-sl-util-test
                     , cardano-sl-wallet
                     , cardano-sl-wallet-new
+                    , cereal
                     , data-default
                     , directory
                     , directory
@@ -587,6 +596,7 @@ test-suite wallet-new-specs
                     , lens
                     , QuickCheck
                     , quickcheck-instances
+                    , safecopy
                     , safe-exceptions
                     , servant
                     , servant-server

server/Main.hs

@@ -29,12 +29,12 @@ import           Pos.Launcher.Configuration (AssetLockPath (..),
 import           Pos.Util (logException)
 import           Pos.Util.CompileInfo (HasCompileInfo, withCompileInfo)
 import           Pos.Util.UserSecret (usVss)
-import           Pos.Wallet.Web (bracketWalletWS, bracketWalletWebDB, getSKById,
-                     getWalletAddresses, runWRealMode)
+import           Pos.Wallet.Web (bracketWalletWS, bracketWalletWebDB,
+                     getKeyById, getWalletAddresses, runWRealMode)
 import           Pos.Wallet.Web.Mode (WalletWebMode)
 import           Pos.Wallet.Web.State (askWalletDB, askWalletSnapshot,
                      flushWalletStorage)
-import           Pos.Wallet.Web.Tracking.Decrypt (eskToWalletDecrCredentials)
+import           Pos.Wallet.Web.Tracking.Decrypt (keyToWalletDecrCredentials)
 import           Pos.Wallet.Web.Tracking.Sync (syncWallet)
 import           System.Wlog (LoggerName, Severity (..), logInfo, logMessage,
                      usingLoggerName)
@@ -100,8 +100,8 @@ actionWithWallet pm txpConfig sscParams nodeParams ntpConfig wArgs@WalletBackend
     syncWallets :: WalletWebMode ()
     syncWallets = do
         addrs <- getWalletAddresses <$> askWalletSnapshot
-        sks <- mapM getSKById addrs
-        forM_ sks (syncWallet . eskToWalletDecrCredentials)
+        keys' <- mapM getKeyById addrs
+        forM_ keys' (syncWallet . keyToWalletDecrCredentials)
 
     plugins :: TVar NtpStatus -> Plugins.Plugin WalletWebMode
     plugins ntpStatus =

src/Cardano/Wallet/API/Internal.hs

@@ -3,13 +3,20 @@
 -- Daedalus client, and aren't useful for wallets, exchanges, and other users.
 module Cardano.Wallet.API.Internal where
 
+import           Pos.Core.Update (SoftwareVersion)
+
+import           Servant
+
 import           Cardano.Wallet.API.Response (ValidJSON)
 import           Cardano.Wallet.API.Types (Tags)
-import           Servant ((:<|>), (:>), DeleteNoContent, NoContent, Post,
-                     Summary)
+import           Cardano.Wallet.API.V1.Types (V1)
 
 type API = Tags '["Internal"] :>
-    (    "apply-update"
+    (    "next-update"
+        :> Summary "Version of the next update (404 if none)"
+        :> Get '[ValidJSON] (V1 SoftwareVersion)
+
+    :<|> "apply-update"
         :> Summary "Apply the next available update"
         :> Post '[ValidJSON] NoContent
 

src/Cardano/Wallet/API/Internal/Handlers.hs

@@ -1,50 +1,34 @@
-{-# LANGUAGE DataKinds             #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE PolyKinds             #-}
-{-# LANGUAGE RankNTypes            #-}
-{-# LANGUAGE TypeFamilies          #-}
-
-module Cardano.Wallet.API.Internal.Handlers where
+module Cardano.Wallet.API.Internal.Handlers (handlers) where
 
 import           Universum
 
-import           Control.Monad.Catch (MonadThrow)
 import           Servant
 
-import           Cardano.Wallet.API.V1.Migration
-import           Cardano.Wallet.Server.CLI (RunMode (..), isDebugMode)
+import           Pos.Core.Update (SoftwareVersion)
 
 import qualified Cardano.Wallet.API.Internal as Internal
-import qualified Pos.Client.KeyStorage as V0
-import qualified Pos.Wallet.Web.Methods.Misc as V0
-import qualified Pos.Wallet.Web.State as V0
-
-
--- | Until we depend from V0 logic to implement the each 'Handler' we
--- still need the natural transformation here.
-handlers
-    :: (forall a. MonadV1 a -> Handler a)
-    -> RunMode
-    -> Server Internal.API
-handlers naturalTransformation runMode =
-    let
-        handlers' =
-                 V0.applyUpdate
-            :<|> V0.postponeUpdate
-            :<|> resetWalletState runMode
-    in
-        hoistServer (Proxy @Internal.API) naturalTransformation handlers'
-
-
-resetWalletState
-    :: (V0.WalletDbReader ctx m, V0.MonadKeys m, MonadThrow m, MonadIO m)
-    => RunMode
-    -> m NoContent
-resetWalletState runMode
-    | isDebugMode runMode = do
-        V0.deleteAllSecretKeys
-        void (V0.askWalletDB >>= V0.testReset)
-        return NoContent
-    | otherwise =
-        throwM err403
+import           Cardano.Wallet.API.V1.Types (V1)
+import           Cardano.Wallet.WalletLayer (PassiveWalletLayer)
+import qualified Cardano.Wallet.WalletLayer as WalletLayer
+
+handlers :: PassiveWalletLayer IO -> ServerT Internal.API Handler
+handlers w = nextUpdate       w
+        :<|> applyUpdate      w
+        :<|> postponeUpdate   w
+        :<|> resetWalletState w
+
+nextUpdate :: PassiveWalletLayer IO -> Handler (V1 SoftwareVersion)
+nextUpdate w = do
+    mUpd <- liftIO $ WalletLayer.nextUpdate w
+    case mUpd of
+      Just upd -> return upd
+      Nothing  -> throwError err404
+
+applyUpdate :: PassiveWalletLayer IO -> Handler NoContent
+applyUpdate w = liftIO (WalletLayer.applyUpdate w) >> return NoContent
+
+postponeUpdate :: PassiveWalletLayer IO -> Handler NoContent
+postponeUpdate w = liftIO (WalletLayer.postponeUpdate w) >> return NoContent
+
+resetWalletState :: PassiveWalletLayer IO -> Handler NoContent
+resetWalletState w = liftIO (WalletLayer.resetWalletState w) >> return NoContent

src/Cardano/Wallet/API/Internal/LegacyHandlers.hs

@@ -0,0 +1,63 @@
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE PolyKinds             #-}
+{-# LANGUAGE RankNTypes            #-}
+{-# LANGUAGE TypeFamilies          #-}
+
+module Cardano.Wallet.API.Internal.LegacyHandlers where
+
+import           Universum
+
+import           Control.Monad.Catch (MonadThrow)
+
+import           Servant
+
+import qualified Pos.Client.KeyStorage as V0
+import           Pos.Core.Update (SoftwareVersion)
+import qualified Pos.Wallet.Web.ClientTypes as V0
+import qualified Pos.Wallet.Web.Methods.Misc as V0
+import qualified Pos.Wallet.Web.State as V0
+
+import qualified Cardano.Wallet.API.Internal as Internal
+import           Cardano.Wallet.API.V1.Migration
+import           Cardano.Wallet.API.V1.Types (V1 (..))
+import           Cardano.Wallet.Server.CLI (RunMode (..), isDebugMode)
+
+-- | Until we depend from V0 logic to implement the each 'Handler' we
+-- still need the natural transformation here.
+handlers
+    :: (HasConfiguration, HasUpdateConfiguration)
+    => (forall a. MonadV1 a -> Handler a)
+    -> RunMode
+    -> Server Internal.API
+handlers naturalTransformation runMode =
+    let
+        handlers' =
+                 nextUpdate
+            :<|> V0.applyUpdate
+            :<|> V0.postponeUpdate
+            :<|> resetWalletState runMode
+    in
+        hoistServer (Proxy @Internal.API) naturalTransformation handlers'
+
+nextUpdate :: ( MonadIO m
+              , HasConfiguration
+              , MonadThrow m
+              , V0.WalletDbReader ctx m
+              , HasUpdateConfiguration
+              )
+           => m (V1 SoftwareVersion)
+nextUpdate = (V1 . V0.cuiSoftwareVersion) <$> V0.nextUpdate
+
+resetWalletState
+    :: (V0.WalletDbReader ctx m, V0.MonadKeys m, MonadThrow m, MonadIO m)
+    => RunMode
+    -> m NoContent
+resetWalletState runMode
+    | isDebugMode runMode = do
+        V0.deleteAllSecretKeys
+        void (V0.askWalletDB >>= V0.testReset)
+        return NoContent
+    | otherwise =
+        throwM err403

src/Cardano/Wallet/API/Request/Pagination.hs

@@ -153,7 +153,7 @@ instance Buildable PaginationMetadata where
 -- | `PaginationParams` is datatype which combines request params related
 -- to pagination together.
 data PaginationParams = PaginationParams
-    { ppPage    :: Page
+    { ppPage    :: Page -- ^ Greater than 0.
     , ppPerPage :: PerPage
     } deriving (Show, Eq, Generic)
 

src/Cardano/Wallet/API/V1/Handlers/Transactions.hs

@@ -17,8 +17,7 @@ import           Data.Coerce (coerce)
 import           Pos.Client.Txp.Util (InputSelectionPolicy (..),
                      defaultInputSelectionPolicy)
 import           Pos.Core (Address, Timestamp)
-import           Pos.Core.Txp (Tx (..), TxId, TxOut (..))
-import           Pos.Crypto (hash)
+import           Pos.Core.Txp (TxId)
 
 import           Cardano.Wallet.API.Request
 import           Cardano.Wallet.API.Response
@@ -28,8 +27,7 @@ import           Cardano.Wallet.Kernel.CoinSelection.FromGeneric
                      (ExpenseRegulation (..), InputGrouping (..))
 import           Cardano.Wallet.Kernel.DB.HdWallet (UnknownHdAccount)
 import           Cardano.Wallet.Kernel.DB.TxMeta (TxMeta)
-import           Cardano.Wallet.Kernel.Util.Core (getCurrentTimestamp,
-                     paymentAmount)
+import qualified Cardano.Wallet.Kernel.Transactions as Kernel
 import           Cardano.Wallet.WalletLayer (ActiveWalletLayer,
                      NewPaymentError (..), PassiveWalletLayer)
 import qualified Cardano.Wallet.WalletLayer as WalletLayer
@@ -109,28 +107,11 @@ estimateFees aw payment@Payment{..} = do
 redeemAda :: ActiveWalletLayer IO
           -> Redemption
           -> Handler (WalletResponse Transaction)
-redeemAda layer redemption = do
-    res <- liftIO $ WalletLayer.redeemAda layer redemption
+redeemAda aw redemption = liftIO $ do
+    res <- WalletLayer.redeemAda aw redemption
     case res of
-         Left e -> throwM e
-         Right tx -> do
-             -- TODO: This is a straight copy and paste from 'newTransaction' in
-             -- "Cardano.Wallet.API.V1.Handlers.Transactions". Once [CBR-239]
-             -- is fixed, we should fix both instances.
-             now <- liftIO getCurrentTimestamp
-             -- NOTE(adn) As part of [CBR-239], we could simply fetch the
-             -- entire 'Transaction' as part of the TxMeta.
-             return $ single Transaction {
-                 txId            = V1 (hash tx)
-               , txConfirmations = 0
-               , txAmount        = V1 (paymentAmount $ _txOutputs tx)
-               , txInputs        = error "TODO, see [CBR-324]"
-               , txOutputs       = fmap outputsToDistribution (_txOutputs tx)
-               , txType          = error "TODO, see [CBR-324]"
-               , txDirection     = OutgoingTransaction
-               , txCreationTime  = V1 now
-               , txStatus        = Creating
-               }
+      Left err        -> throwM err
+      Right (_, meta) -> txFromMeta aw embedErr meta
   where
-    outputsToDistribution :: TxOut -> PaymentDistribution
-    outputsToDistribution (TxOut addr amount) = PaymentDistribution (V1 addr) (V1 amount)
+    embedErr :: UnknownHdAccount -> WalletLayer.RedeemAdaError
+    embedErr = WalletLayer.RedeemAdaError . Kernel.RedeemAdaUnknownAccountId

src/Cardano/Wallet/API/V1/LegacyHandlers/Addresses.hs

@@ -27,7 +27,7 @@ import qualified Pos.Wallet.Web.State.State as V0State
 import           Pos.Wallet.Web.State.Storage (getWalletAddresses)
 import qualified Pos.Wallet.Web.State.Storage as V0
 import qualified Pos.Wallet.Web.Tracking as V0 (txMempoolToModifier)
-import           Pos.Wallet.Web.Tracking.Decrypt (eskToWalletDecrCredentials)
+import           Pos.Wallet.Web.Tracking.Decrypt (keyToWalletDecrCredentials)
 
 import           Cardano.Wallet.API.Indices (IxSet)
 import           Cardano.Wallet.API.Request
@@ -126,6 +126,6 @@ getAddress addrText = do
         Just (_walletMeta, V0.AddressInfo{..}) -> do
             let accId = adiWAddressMeta ^. V0.wamAccount
             mps <- V0.withTxpLocalData V0.getMempoolSnapshot
-            accMod <- V0.txMempoolToModifier ws mps . eskToWalletDecrCredentials =<< V0.findKey accId
+            accMod <- V0.txMempoolToModifier ws mps . keyToWalletDecrCredentials =<< V0.findKey accId
             let caddr = V0.getWAddress ws accMod adiWAddressMeta
             single <$> migrate caddr