Get faucet working

Author: Ben Ford

Diff for: faucet/cardano-sl-faucet.cabal

@@ -20,20 +20,29 @@ extra-source-files:
 library
   hs-source-dirs:
       src
-  build-depends:       base
+  build-depends:       QuickCheck
                      , aeson
+                     , base
+                     , base16-bytestring
+                     , bytestring
                      , cardano-sl-core
+                     , cardano-sl-crypto
                      , cardano-sl-wallet
                      , cardano-sl-wallet-new
+                     , connection
+                     , cryptonite
+                     , data-default
                      , ekg-core
                      , ekg-statsd
                      , exceptions
                      , http-client
+                     , http-client-tls
                      , lens
                      , log-warper
+                     , memory
                      , mmorph
                      , mtl
-                     , QuickCheck
+                     , serokell-util
                      , servant
                      , servant-client
                      , servant-client-core
@@ -42,6 +51,8 @@ library
                      , servant-swagger-ui
                      , swagger2
                      , text
+                     , text-format
+                     , tls
   exposed-modules:
                       Cardano.Faucet
                     , Cardano.Faucet.Types

Diff for: faucet/default.nix

@@ -1,9 +1,12 @@
-{ mkDerivation, aeson, base, cardano-sl-core, cardano-sl-wallet
-, cardano-sl-wallet-new, ekg, ekg-core, ekg-statsd, exceptions
-, http-client, lens, log-warper, mmorph, mtl, optparse-applicative
-, QuickCheck, servant, servant-client, servant-client-core
-, servant-server, servant-swagger, servant-swagger-ui, stdenv
-, swagger2, text, wai, wai-cors, wai-extra, warp
+{ mkDerivation, aeson, base, base16-bytestring, bytestring
+, cardano-sl-core, cardano-sl-crypto, cardano-sl-wallet
+, cardano-sl-wallet-new, connection, cryptonite, data-default, ekg
+, ekg-core, ekg-statsd, exceptions, http-client, http-client-tls
+, lens, log-warper, memory, mmorph, mtl, optparse-applicative
+, QuickCheck, serokell-util, servant, servant-client
+, servant-client-core, servant-server, servant-swagger
+, servant-swagger-ui, stdenv, swagger2, text, text-format, tls, wai
+, wai-cors, wai-extra, warp
 }:
 mkDerivation {
   pname = "cardano-sl-faucet";
@@ -12,10 +15,13 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson base cardano-sl-core cardano-sl-wallet cardano-sl-wallet-new
-    ekg-core ekg-statsd exceptions http-client lens log-warper mmorph
-    mtl QuickCheck servant servant-client servant-client-core
+    aeson base base16-bytestring bytestring cardano-sl-core
+    cardano-sl-crypto cardano-sl-wallet cardano-sl-wallet-new
+    connection cryptonite data-default ekg-core ekg-statsd exceptions
+    http-client http-client-tls lens log-warper memory mmorph mtl
+    QuickCheck serokell-util servant servant-client servant-client-core
     servant-server servant-swagger servant-swagger-ui swagger2 text
+    text-format tls
   ];
   executableHaskellDepends = [
     base cardano-sl-core cardano-sl-wallet cardano-sl-wallet-new ekg

Diff for: faucet/server/Main.hs

@@ -8,17 +8,15 @@ import           Network.Wai.Handler.Warp (run)
 import           Servant
 
 import Control.Monad.Except
-import           Cardano.Wallet.API.V1.Types (PaymentSource (..), WalletId(..), AccountIndex)
+-- import           Cardano.Wallet.API.V1.Types (PaymentSource (..), WalletId(..), AccountIndex)
 import           Cardano.Faucet
 import System.Remote.Monitoring (forkServer, serverMetricStore)
-import           System.Remote.Monitoring.Statsd (defaultStatsdOptions, forkStatsd)
+import           System.Remote.Monitoring.Statsd (forkStatsd)
 
 main :: IO ()
 main = do
   ekg <- forkServer "localhost" 8001
-  let w = WalletId "test"
-      idx = 0
-      c = mkFaucetConfig "wallet-url" 8000 (PaymentSource w idx) defaultStatsdOptions "./logging.cfg"
+  let c = testFC -- mkFaucetConfig "wallet-url" 8000 (PaymentSource w idx) defaultStatsdOptions "./logging.cfg"
   fEnv <- initEnv c (serverMetricStore ekg)
   _statsd <- forkStatsd (c ^. fcStatsdOpts) (fEnv ^. feStore)
   run 8081 (serve serverAPI $ s fEnv)

Diff for: faucet/src/Cardano/Faucet.hs

@@ -18,7 +18,8 @@ import           System.Wlog (HasLoggerName, LoggerName (..), WithLogger, logErr
                               withSublogger)
 
 import           Pos.Core (Address (..))
-import           Cardano.Wallet.API.V1.Types (V1(..))
+import           Cardano.Wallet.API.V1.Types (V1(..), unV1)
+import           Cardano.Wallet.API.Response (WalletResponse(..))
 import           Cardano.Faucet.Types
 import qualified Cardano.WalletClient as Client
 -- import           Client.Cardano.Wallet.Web.Run     (runEndpointClient)
@@ -28,14 +29,19 @@ type API = "withdraw" :> ReqBody '[JSON] WithDrawlRequest :> Post '[JSON] WithDr
 
 withdraw :: (MonadFaucet c m) => WithDrawlRequest -> m WithDrawlResult
 withdraw wd = withSublogger (LoggerName "withdraw") $ do
-    resp <- Client.withdraw addr (wd ^. wAmount . to V1)
-    incWithDrawn (wd ^. wAmount)
-    logInfo ((wd ^. to show . packed) <> " withdrawn")
-    return WithDrawlResult
-    where
-        addr :: V1 Address
-        -- TODO: What goes here?
-        addr = _
+    resp <- Client.withdraw (wd ^. wAddress) (wd ^. wAmount)
+    case resp of
+        Left err -> do
+            logError ("Error withdrawing " <> (wd ^. to show . packed)
+                                           <> " error: "
+                                           <> (err ^. to show . packed))
+            return $ WithdrawlError err
+        Right wr -> do
+            let txn = wrData wr
+            logInfo ((wd ^. to show . packed) <> " withdrawn. txn: "
+                                              <> (txn ^. to show . packed))
+            incWithDrawn (wd ^. wAmount . to unV1)
+            return $ WithdrawlSuccess txn
 
 deposit :: (MonadFaucet c m) => DepositRequest -> m DepositResult
 deposit dr = withSublogger (LoggerName "deposit") $ do

Diff for: faucet/src/Cardano/Faucet/Types.hs

@@ -1,20 +1,20 @@
+{-# LANGUAGE ConstraintKinds            #-}
 {-# LANGUAGE DeriveGeneric              #-}
-{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DuplicateRecordFields      #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings          #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE ViewPatterns               #-}
 {-# OPTIONS_GHC -Wall #-}
 module Cardano.Faucet.Types (
-   FaucetConfig(..), mkFaucetConfig
+   FaucetConfig(..), mkFaucetConfig, testFC
  , HasFaucetConfig(..)
  , FaucetEnv(..), initEnv
  , HasFaucetEnv(..)
  , incWithDrawn
  , decrWithDrawn
  , setWalletBalance
- , WithDrawlRequest(..), wWalletId, wAmount
+ , WithDrawlRequest(..), wAddress, wAmount
  , WithDrawlResult(..)
  , DepositRequest(..), dWalletId, dAmount
  , DepositResult(..)
@@ -26,47 +26,64 @@ import           Control.Lens hiding ((.=))
 import           Control.Monad.Except
 import           Control.Monad.Reader
 import           Data.Aeson (FromJSON (..), ToJSON (..), object, withObject, (.:), (.=))
-import Data.Text (Text)
+import qualified Data.ByteString as BS
+import           Data.Default (def)
+import           Data.Monoid ((<>))
+import           Data.Text (Text)
+import           Data.Text.Lens (packed)
 import           Data.Typeable (Typeable)
 import           GHC.Generics (Generic)
+import           Network.Connection (TLSSettings (..))
+import           Network.HTTP.Client (Manager, newManager)
+import           Network.HTTP.Client.TLS (mkManagerSettings)
+import           Network.TLS (ClientParams (..), credentialLoadX509FromMemory, defaultParamsClient,
+                              onCertificateRequest, onServerCertificate, supportedCiphers)
+import           Network.TLS.Extra.Cipher (ciphersuite_all)
 import           Servant (ServantErr)
 import           Servant.Client.Core (BaseUrl (..), Scheme (..))
 import           System.Metrics (Store, createCounter, createGauge)
 import           System.Metrics.Counter (Counter)
 import qualified System.Metrics.Counter as Counter
 import           System.Metrics.Gauge (Gauge)
 import qualified System.Metrics.Gauge as Gauge
-import           System.Remote.Monitoring.Statsd (StatsdOptions)
-import           System.Wlog (CanLog, WithLogger, HasLoggerName, LoggerName (..), LoggerNameBox (..),
-                              launchFromFile)
+import           System.Remote.Monitoring.Statsd (StatsdOptions, defaultStatsdOptions)
+import           System.Wlog (CanLog, HasLoggerName, LoggerName (..), LoggerNameBox (..),
+                              WithLogger, launchFromFile)
 
-import           Cardano.Wallet.API.V1.Types (PaymentSource (..))
-import           Cardano.Wallet.Client (WalletClient)
-import           Cardano.Wallet.Client.Http (defaultManagerSettings, mkHttpClient, newManager)
-import           Pos.Core (Coin (..))
-import           Pos.Wallet.Web.ClientTypes.Types (Addr (..), CAccountId (..), CId (..))
+import           Cardano.Wallet.API.V1.Types (PaymentSource (..), Transaction,
+                                              V1, WalletId (..))
+import           Cardano.Wallet.Client (ClientError (..), WalletClient)
+import           Cardano.Wallet.Client.Http (mkHttpClient)
+import           Pos.Core (Address (..), Coin (..))
+--
 
 --------------------------------------------------------------------------------
 data WithDrawlRequest = WithDrawlRequest {
-    _wWalletId :: Text -- Pos.Wallet.Web.ClientTypes.Types.CAccountId
-  , _wAmount   :: Coin -- Pos.Core.Common.Types.Coin
+    _wAddress :: V1 Address -- Pos.Wallet.Web.ClientTypes.Types.CAccountId
+  , _wAmount  :: V1 Coin -- Pos.Core.Common.Types.Coin
   } deriving (Show, Typeable, Generic)
 
 makeLenses ''WithDrawlRequest
 
 instance FromJSON WithDrawlRequest where
   parseJSON = withObject "WithDrawlRequest" $ \v -> WithDrawlRequest
-    <$> v .: "wallet"
-    <*> (Coin <$> v .: "amount")
+    <$> v .: "address"
+    <*> v .: "amount"
 
 instance ToJSON WithDrawlRequest where
-    toJSON (WithDrawlRequest w (Coin a)) =
-        object ["wallet" .= w, "amount" .= a]
+    toJSON (WithDrawlRequest w a) =
+        object ["address" .= w, "amount" .= a]
 
-data WithDrawlResult = WithDrawlResult
+data WithDrawlResult =
+    WithdrawlError ClientError
+  | WithdrawlSuccess Transaction
   deriving (Show, Typeable, Generic)
 
-instance ToJSON WithDrawlResult
+instance ToJSON WithDrawlResult where
+    toJSON (WithdrawlSuccess txn) =
+        object ["success" .= txn]
+    toJSON (WithdrawlError err) =
+        object ["error" .= show err]
 
 
 --------------------------------------------------------------------------------
@@ -94,13 +111,28 @@ data FaucetConfig = FaucetConfig {
   , _fcFaucetPaymentSource :: PaymentSource
   , _fcStatsdOpts          :: StatsdOptions
   , _fcLoggerConfigFile    :: FilePath
+  , _fcPubCertFile         :: FilePath
+  , _fcPrivKeyFile         :: FilePath
   }
 
 makeClassy ''FaucetConfig
 
-mkFaucetConfig :: String -> Int -> PaymentSource -> StatsdOptions -> String -> FaucetConfig
+mkFaucetConfig
+    :: String
+    -> Int
+    -> PaymentSource
+    -> StatsdOptions
+    -> FilePath
+    -> FilePath
+    -> FilePath
+    -> FaucetConfig
 mkFaucetConfig = FaucetConfig
 
+testFC :: FaucetConfig
+testFC = FaucetConfig "127.0.0.1" 8090 ps defaultStatsdOptions "./logging.cfg" "./tls/ca.crt" "./tls/server.key"
+    where
+        ps = PaymentSource (WalletId "Ae2tdPwUPEZLBG2sEmiv8Y6DqD4LoZKQ5wosXucbLnYoacg2YZSPhMn4ETi") 2147483648
+
 --------------------------------------------------------------------------------
 data FaucetEnv = FaucetEnv {
     _feWithdrawn     :: Counter
@@ -119,13 +151,34 @@ initEnv fc store = do
     withdrawn <- createCounter "total-withdrawn" store
     withdrawCount <- createCounter "num-withdrawals" store
     balance <- createGauge "wallet-balance" store
-    manager <- newManager defaultManagerSettings
-    let url = BaseUrl Http (fc ^. fcWalletApiHost) (fc ^. fcWalletApiPort) ""
+    manager <- createManager fc
+    let url = BaseUrl Https (fc ^. fcWalletApiHost) (fc ^. fcWalletApiPort) ""
     return $ FaucetEnv withdrawn withdrawCount balance
                        store
                        fc
                        (mkHttpClient url manager)
 
+createManager :: FaucetConfig -> IO Manager
+createManager fc = do
+    pubCert <- BS.readFile (fc ^. fcPubCertFile)
+    privKey <- BS.readFile (fc ^. fcPrivKeyFile)
+    case credentialLoadX509FromMemory pubCert privKey of
+        Left problem -> error $ "Unable to load credentials: " <> (problem ^. packed)
+        Right credential ->
+            let hooks = def {
+                            onCertificateRequest = \_ -> return $ Just credential,
+                            onServerCertificate  = \_ _ _ _ -> return []
+                        }
+                clientParams = (defaultParamsClient "localhost" "") {
+                                   clientHooks = hooks,
+                                   clientSupported = def {
+                                       supportedCiphers = ciphersuite_all
+                                   }
+                               }
+                tlsSettings = TLSSettings clientParams
+            in
+            newManager $ mkManagerSettings tlsSettings Nothing
+
 incWithDrawn :: (MonadReader e m, HasFaucetEnv e, MonadIO m) => Coin -> m ()
 incWithDrawn (Coin (fromIntegral -> c)) = do
   wd <- view feWithdrawn

Diff for: faucet/src/Cardano/WalletClient.hs

@@ -1,19 +1,31 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 module Cardano.WalletClient where
     -- ( export
     -- , export
     -- ) where
 
+import Crypto.Hash (Blake2b, Blake2b_224, Blake2b_256, Digest)
+import Data.ByteString (ByteString)
+import qualified Data.ByteString.Base16 as Base16
+import qualified Data.ByteArray as BA
+-- import qualified Serokell.Util.Base16 as Base16
+import qualified Crypto.Hash as CryptoHash
 import           Control.Lens
 import           Control.Monad.Reader
+import Data.Text (Text)
 import Data.List.NonEmpty (NonEmpty(..))
+import Data.Text.Buildable (build)
 import           Cardano.Faucet.Types
 import           Cardano.Wallet.API.V1.Types (Payment (..), PaymentDistribution (..),
-                                              PaymentSource (..), V1(..))
+                                              PaymentSource (..), V1(..), mkPassPhrase)
 -- import           Cardano.Wallet.API.V1.Types.V1 (Coin (..), Address(..))
 import           Cardano.Wallet.Client (Resp, Transaction, WalletClient (..), WalletResponse (..),
                                         liftClient)
 import           Pos.Wallet.Web.Methods.Payment (newPayment)
 import           Pos.Core (Coin (..), Address(..))
+import Pos.Crypto.Signing (PassPhrase(..))
 import           Pos.Wallet.Web.ClientTypes.Types (Addr (..), CId (..))
 
 
@@ -22,5 +34,13 @@ withdraw addr coin = do
     paymentSource <- view (feFaucetConfig . fcFaucetPaymentSource)
     client <- liftClient <$> view feWalletClient
     let paymentDist = (PaymentDistribution addr coin :| [])
-        payment = Payment paymentSource paymentDist Nothing Nothing
+        payment = Payment paymentSource paymentDist Nothing sp
     postTransaction client payment
+  where
+    sp :: Maybe (V1 PassPhrase)
+    sp = Just $ V1 $ hashPwd "XXX" -- TODO: get from config
+
+hashPwd :: ByteString -> PassPhrase
+hashPwd  bs =
+    let blake = CryptoHash.hash bs :: Digest (Blake2b_256)
+    in BA.convert blake