[CO-334] Implement remaining V0 endpoints to V1

wallet-new/cardano-sl-wallet-new.cabal

@@ -16,11 +16,9 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:     Cardano.Wallet.API
-                       Cardano.Wallet.API.Development
-                       Cardano.Wallet.API.Development.Handlers
-                       Cardano.Wallet.API.Development.Helpers
-                       Cardano.Wallet.API.Development.LegacyHandlers
                        Cardano.Wallet.API.Indices
+                       Cardano.Wallet.API.Internal
+                       Cardano.Wallet.API.Internal.Handlers
                        Cardano.Wallet.API.Request
                        Cardano.Wallet.API.Request.Filter
                        Cardano.Wallet.API.Request.Pagination
@@ -292,6 +290,7 @@ executable cardano-generate-swagger-file
                      , cardano-sl-core
                      , cardano-sl-wallet-new
                      , optparse-applicative
+                     , servant-server
                      , swagger2
                      , universum >= 0.1.11
 
@@ -302,6 +301,7 @@ executable cardano-generate-swagger-file
                        ScopedTypeVariables
                        FlexibleContexts
                        MonadFailDesugaring
+                       TypeOperators
 
 
 -- Cryptic executable name to mitigate $PATH limitation
@@ -506,7 +506,7 @@ test-suite wallet-new-specs
   hs-source-dirs:   test test/unit
 
   other-modules:    APISpec
-                    DevelopmentSpec
+                    InternalAPISpec
                     MarshallingSpec
                     SwaggerSpec
                     RequestSpec

wallet-new/generate-swagger-file/Main.hs

@@ -1,14 +1,14 @@
-{-# LANGUAGE LambdaCase      #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE LambdaCase #-}
 
 module Main where
 
 import           Universum
 
 import           Data.Swagger (Swagger)
 import           Options.Applicative
+import           Servant ((:<|>))
 
-import           Cardano.Wallet.API (devAPI, v0API, v1API)
+import           Cardano.Wallet.API (InternalAPI, V1API, v0API)
 import           Pos.Core.Update (ApplicationName (..), SoftwareVersion (..))
 import           Pos.Util.CompileInfo (CompileTimeInfo (CompileTimeInfo),
                      gitRev)
@@ -27,7 +27,6 @@ data Command = Command
 data TargetAPI
     = TargetWalletV1
     | TargetWalletV0
-    | TargetWalletDev
     deriving (Show)
 
 
@@ -49,7 +48,7 @@ main =
         cmdParser :: Parser Command
         cmdParser = Command
             <$> targetAPIOption (short 't' <> long "target" <> metavar "API"
-                  <> help "Target API with version (e.g. 'wallet@v1', 'wallet@v0', 'wallet@dev'...)")
+                  <> help "Target API with version (e.g. 'wallet@v1', 'wallet@v0')")
 
             <*> optional (strOption (short 'o' <> long "output-file" <> metavar "FILEPATH"
                     <> help ("Output file, default to: " <> defaultOutputFilename)))
@@ -58,7 +57,6 @@ main =
         targetAPIOption = option $ maybeReader $ \case
             "wallet@v0"  -> Just TargetWalletV0
             "wallet@v1"  -> Just TargetWalletV1
-            "wallet@dev" -> Just TargetWalletDev
             _            -> Nothing
     in do
         Command{..} <-
@@ -71,12 +69,12 @@ main =
 
 mkSwagger :: (CompileTimeInfo, SoftwareVersion) -> TargetAPI -> Swagger
 mkSwagger details = \case
-    TargetWalletDev ->
-        Swagger.api details devAPI Swagger.highLevelShortDescription
     TargetWalletV0 ->
         Swagger.api details v0API  Swagger.highLevelShortDescription
     TargetWalletV1  ->
-        Swagger.api details v1API  Swagger.highLevelDescription
+        Swagger.api details v1API' Swagger.highLevelDescription
+  where
+    v1API' = Proxy :: Proxy (V1API :<|> InternalAPI)
 
 
 -- NOTE The software version is hard-coded here. Do determine the SoftwareVersion,

wallet-new/integration/TransactionSpecs.hs

@@ -45,18 +45,25 @@ transactionSpecs wRef wc = do
                     , pmtGroupingPolicy = Nothing
                     , pmtSpendingPassword = Nothing
                     }
-                tenthOf (V1 c) = V1 (Core.mkCoin (Core.getCoin c `div` 10))
+                tenthOf (V1 c) =
+                    V1 (Core.mkCoin (max 1 (Core.getCoin c `div` 10)))
 
             etxn <- postTransaction wc payment
 
             txn <- fmap wrData etxn `shouldPrism` _Right
 
-            eresp <- getTransactionIndex wc (Just (walId wallet)) (Just (accIndex toAcct)) Nothing
+            eresp <- getTransactionIndex
+                wc
+                (Just (walId wallet))
+                (Just (accIndex toAcct))
+                Nothing
             resp <- fmap wrData eresp `shouldPrism` _Right
 
             map txId resp `shouldContain` [txId txn]
 
-        it "asset-locked wallets can receive funds and transaction are confirmed in index" $ do
+        it ( "asset-locked wallets can receive funds and transactions are "
+           <> "confirmed in index"
+           ) $ do
             genesis <- genesisWallet wc
             (fromAcct, _) <- firstAccountAndId wc genesis
 

wallet-new/src/Cardano/Wallet/API.hs

@@ -1,26 +1,23 @@
 module Cardano.Wallet.API
        ( V0API
+       , V0API'
        , v0API
        , V1API
        , v1API
-       , DevAPI
-       , devAPI
+       , InternalAPI
+       , internalAPI
        , WalletAPI
        , walletAPI
-       , WalletDevAPI
-       , walletDevAPI
        , WalletDocAPI
        , walletDocAPI
-       , WalletDevDocAPI
-       , walletDevDocAPI
        ) where
 
 import           Cardano.Wallet.API.Types (WalletLoggingConfig)
 import           Pos.Util.Servant (LoggingApi)
 import           Servant ((:<|>), (:>), Proxy (..))
 import           Servant.Swagger.UI (SwaggerSchemaUI)
 
-import qualified Cardano.Wallet.API.Development as Dev
+import qualified Cardano.Wallet.API.Internal as Internal
 import qualified Cardano.Wallet.API.V0 as V0
 import qualified Cardano.Wallet.API.V1 as V1
 
@@ -38,35 +35,30 @@ import qualified Cardano.Wallet.API.V1 as V1
 -- * 'Cardano.Wallet.Server' contains the main server;
 -- * 'Cardano.Wallet.API.V0.Handlers' contains all the @Handler@s serving the V0 API;
 -- * 'Cardano.Wallet.API.V1.Handlers' contains all the @Handler@s serving the V1 API;
--- * 'Cardano.Wallet.API.Development.Handlers' contains all the @Handler@s serving the Dev API;
+-- * 'Cardano.Wallet.API.Internalelopment.Handlers' contains all the @Handler@s serving the Internal API;
 
 type V0Doc = "docs" :> "v0" :> SwaggerSchemaUI "index" "swagger.json"
-type V0API = "api" :> V0.API
+type V1Doc = "docs" :> "v1" :> SwaggerSchemaUI "index" "swagger.json"
+
+
+type V0API  = "api" :> V0.API
+type V0API' = "api" :> "v0" :> V0.API
 v0API :: Proxy V0API
 v0API = Proxy
 
-type V1Doc = "docs" :> "v1" :> SwaggerSchemaUI "index" "swagger.json"
 type V1API = "api" :> "v1" :> V1.API
 v1API :: Proxy V1API
 v1API = Proxy
 
-type DevDoc = "docs" :> "development" :> SwaggerSchemaUI "index" "swagger.json"
-type DevAPI = "api" :> "development" :> Dev.API
-devAPI :: Proxy DevAPI
-devAPI = Proxy
+type InternalAPI = "api" :> "internal" :> Internal.API
+internalAPI :: Proxy InternalAPI
+internalAPI = Proxy
 
-type WalletAPI = LoggingApi WalletLoggingConfig (V0API :<|> V1API)
+
+type WalletAPI = LoggingApi WalletLoggingConfig (V0API' :<|> V0API :<|> V1API :<|> InternalAPI)
 walletAPI :: Proxy WalletAPI
 walletAPI = Proxy
 
-type WalletDevAPI = DevAPI :<|> WalletAPI
-walletDevAPI :: Proxy WalletDevAPI
-walletDevAPI = Proxy
-
 type WalletDocAPI = V0Doc :<|> V1Doc
 walletDocAPI :: Proxy WalletDocAPI
 walletDocAPI = Proxy
-
-type WalletDevDocAPI = DevDoc :<|> WalletDocAPI
-walletDevDocAPI :: Proxy WalletDevDocAPI
-walletDevDocAPI = Proxy

wallet-new/src/Cardano/Wallet/API/Internal.hs

@@ -0,0 +1,23 @@
+-- | This module contains the top level API definition for frontend-related
+-- tasks.  The API endpoints presented here are intended for use with the
+-- Daedalus client, and aren't useful for wallets, exchanges, and other users.
+module Cardano.Wallet.API.Internal where
+
+import           Cardano.Wallet.API.Response (ValidJSON)
+import           Cardano.Wallet.API.Types (Tags)
+import           Servant ((:<|>), (:>), DeleteNoContent, NoContent, Post,
+                     Summary)
+
+type API = Tags '["Internal"] :>
+    (    "apply-update"
+        :> Summary "Apply the next available update"
+        :> Post '[ValidJSON] NoContent
+
+    :<|> "postpone-update"
+        :> Summary "Discard and postpone the next available update"
+        :> Post '[ValidJSON] NoContent
+
+    :<|> "reset-wallet-state"
+        :> Summary "Clear wallet state and all associated secret keys"
+        :> DeleteNoContent '[ValidJSON] NoContent
+    )