diff --git a/marlowe-dashboard-client/generated/Marlowe.purs b/marlowe-dashboard-client/generated/Marlowe.purs index c9bf5e4c00..9f0a5272cb 100644 --- a/marlowe-dashboard-client/generated/Marlowe.purs +++ b/marlowe-dashboard-client/generated/Marlowe.purs @@ -24,8 +24,8 @@ import Data.Newtype (unwrap) import Data.String (joinWith) import Effect.Aff.Class (class MonadAff, liftAff) import Marlowe.Run.Dto (WalletIdDto) -import Marlowe.Run.Wallet.API (GetTotalFundsResponse) -import Marlowe.Run.Wallet.CentralizedTestnet.Types +import Marlowe.Run.Wallet.V1.API (GetTotalFundsResponse) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types ( CheckPostData , RestoreError , RestorePostData @@ -101,7 +101,7 @@ getApiVersion = do Left err -> throwError $ { request: affReq, description: DecodingError err } Right body -> pure body -getApiWalletByWalletidGettotalfunds +getApiWalletV1ByWalletidGettotalfunds :: forall env m . HasSPSettings env => MonadAsk env m @@ -109,7 +109,7 @@ getApiWalletByWalletidGettotalfunds => MonadAff m => WalletIdDto -> m GetTotalFundsResponse -getApiWalletByWalletidGettotalfunds wallet_id = do +getApiWalletV1ByWalletidGettotalfunds wallet_id = do spSettings <- asks spSettings let baseURL = spSettings.baseURL let httpMethod = Left GET @@ -129,6 +129,8 @@ getApiWalletByWalletidGettotalfunds wallet_id = do <> "/" <> "wallet" <> "/" + <> "v1" + <> "/" <> encodeURIComponent (toURLPiece wallet_id) <> "/" <> "get-total-funds" @@ -160,7 +162,7 @@ getApiWalletByWalletidGettotalfunds wallet_id = do Left err -> throwError $ { request: affReq, description: DecodingError err } Right body -> pure body -postApiWalletCentralizedtestnetRestore +postApiWalletV1CentralizedtestnetRestore :: forall env m . HasSPSettings env => MonadAsk env m @@ -168,7 +170,7 @@ postApiWalletCentralizedtestnetRestore => MonadAff m => RestorePostData -> m (Either RestoreError WalletInfo) -postApiWalletCentralizedtestnetRestore reqBody = do +postApiWalletV1CentralizedtestnetRestore reqBody = do spSettings <- asks spSettings let baseURL = spSettings.baseURL let httpMethod = Left POST @@ -188,6 +190,8 @@ postApiWalletCentralizedtestnetRestore reqBody = do <> "/" <> "wallet" <> "/" + <> "v1" + <> "/" <> "centralized-testnet" <> "/" <> "restore" @@ -223,7 +227,7 @@ postApiWalletCentralizedtestnetRestore reqBody = do Left err -> throwError $ { request: affReq, description: DecodingError err } Right body -> pure body -postApiWalletCentralizedtestnetCheckmnemonic +postApiWalletV1CentralizedtestnetCheckmnemonic :: forall env m . HasSPSettings env => MonadAsk env m @@ -231,7 +235,7 @@ postApiWalletCentralizedtestnetCheckmnemonic => MonadAff m => CheckPostData -> m Boolean -postApiWalletCentralizedtestnetCheckmnemonic reqBody = do +postApiWalletV1CentralizedtestnetCheckmnemonic reqBody = do spSettings <- asks spSettings let baseURL = spSettings.baseURL let httpMethod = Left POST @@ -251,6 +255,8 @@ postApiWalletCentralizedtestnetCheckmnemonic reqBody = do <> "/" <> "wallet" <> "/" + <> "v1" + <> "/" <> "centralized-testnet" <> "/" <> "check-mnemonic" diff --git a/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/API.purs b/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/API.purs similarity index 96% rename from marlowe-dashboard-client/generated/Marlowe/Run/Wallet/API.purs rename to marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/API.purs index b0a3bb31c0..b588e1f757 100644 --- a/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/API.purs +++ b/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/API.purs @@ -1,5 +1,5 @@ -- File auto generated by purescript-bridge! -- -module Marlowe.Run.Wallet.API where +module Marlowe.Run.Wallet.V1.API where import Prelude diff --git a/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/CentralizedTestnet/Types.purs b/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.purs similarity index 98% rename from marlowe-dashboard-client/generated/Marlowe/Run/Wallet/CentralizedTestnet/Types.purs rename to marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.purs index bbb1aef79a..089428316f 100644 --- a/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/CentralizedTestnet/Types.purs +++ b/marlowe-dashboard-client/generated/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.purs @@ -1,5 +1,5 @@ -- File auto generated by purescript-bridge! -- -module Marlowe.Run.Wallet.CentralizedTestnet.Types where +module Marlowe.Run.Wallet.V1.CentralizedTestnet.Types where import Prelude diff --git a/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet.purs b/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet.purs index 3a8108697d..ab49e9df48 100644 --- a/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet.purs +++ b/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet.purs @@ -10,7 +10,7 @@ import Control.Monad.Error.Class (class MonadError) import Data.Newtype (unwrap) import Effect.Aff.Class (class MonadAff) import Marlowe.Run.Dto (WalletIdDto) -import Marlowe.Run.Wallet.API (GetTotalFundsResponse) +import Marlowe.Run.Wallet.V1.API (GetTotalFundsResponse) import Servant.PureScript (AjaxError) getTotalFunds @@ -20,4 +20,4 @@ getTotalFunds => WalletIdDto -> m GetTotalFundsResponse getTotalFunds wallet = - doGetRequest $ "/api/wallet/" <> unwrap wallet <> "/get-total-funds" + doGetRequest $ "/api/wallet/v1/" <> unwrap wallet <> "/get-total-funds" diff --git a/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet/CentralizedTestnet.purs b/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet/CentralizedTestnet.purs index 01e10738f5..c36831c587 100644 --- a/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet/CentralizedTestnet.purs +++ b/marlowe-dashboard-client/src/API/Marlowe/Run/Wallet/CentralizedTestnet.purs @@ -12,7 +12,7 @@ import Control.Monad.Except (runExceptT) import Data.Argonaut (encodeJson) import Data.Argonaut.Decode.Aeson as D import Effect.Aff.Class (class MonadAff) -import Marlowe.Run.Wallet.CentralizedTestnet.Types +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types ( RestoreError(..) , RestorePostData(..) ) as BE @@ -51,5 +51,5 @@ restoreWallet { walletName, mnemonicPhrase } = do $ runExceptT $ doPostRequestWith { encode: encodeJson, decode: D.decode (D.either D.value D.value) } - "/api/wallet/centralized-testnet/restore" + "/api/wallet/v1/centralized-testnet/restore" body diff --git a/marlowe-dashboard-client/src/AppM.purs b/marlowe-dashboard-client/src/AppM.purs index 1195694a0e..bb74cf2e3c 100644 --- a/marlowe-dashboard-client/src/AppM.purs +++ b/marlowe-dashboard-client/src/AppM.purs @@ -27,7 +27,7 @@ import Halogen.Store.Monad , updateStore ) import Marlowe (postApiWalletCentralizedtestnetCheckmnemonic) -import Marlowe.Run.Wallet.CentralizedTestnet.Types (CheckPostData(..)) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types (CheckPostData(..)) import Store as Store newtype AppM a = AppM (ReaderT Env (StoreT Store.Action Store.Store Aff) a) diff --git a/marlowe-dashboard-client/src/Capability/Wallet.purs b/marlowe-dashboard-client/src/Capability/Wallet.purs index f162c1d2f1..3fcce95e12 100644 --- a/marlowe-dashboard-client/src/Capability/Wallet.purs +++ b/marlowe-dashboard-client/src/Capability/Wallet.purs @@ -23,7 +23,7 @@ import Bridge (toBack, toFront) import Component.Contacts.Types (WalletId, WalletInfo) import Control.Monad.Except (lift, runExceptT) import Halogen (HalogenM) -import Marlowe.Run.Wallet.API as BE +import Marlowe.Run.Wallet.V1.API as BE import Marlowe.Semantics (Assets) import Plutus.V1.Ledger.Tx (Tx) import Types (AjaxResponse) diff --git a/marlowe-dashboard-server/app/PSGenerator.hs b/marlowe-dashboard-server/app/PSGenerator.hs index bb000a1027..8f2200f4e0 100644 --- a/marlowe-dashboard-server/app/PSGenerator.hs +++ b/marlowe-dashboard-server/app/PSGenerator.hs @@ -25,8 +25,8 @@ import Language.PureScript.Bridge.PSTypes (psNumber, psString) import Language.PureScript.Bridge.SumType (equal, genericShow, mkSumType, order) import Marlowe.Run.API (HTTPAPI) import Marlowe.Run.Dto -import Marlowe.Run.Wallet.API (GetTotalFundsResponse) -import Marlowe.Run.Wallet.CentralizedTestnet.Types (CheckPostData, RestoreError, RestorePostData) +import Marlowe.Run.Wallet.V1.API (GetTotalFundsResponse) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types (CheckPostData, RestoreError, RestorePostData) import Marlowe.Run.WebSocket (StreamToClient, StreamToServer) import qualified PSGenerator.Common import Servant.PureScript (HasBridge, Settings, apiModuleName, defaultBridge, defaultSettings, languageBridge, diff --git a/marlowe-dashboard-server/marlowe-dashboard-server.cabal b/marlowe-dashboard-server/marlowe-dashboard-server.cabal index 3a148123c6..f110418089 100644 --- a/marlowe-dashboard-server/marlowe-dashboard-server.cabal +++ b/marlowe-dashboard-server/marlowe-dashboard-server.cabal @@ -18,20 +18,20 @@ source-repository head library default-extensions: NoImplicitPrelude exposed-modules: - Marlowe.Run.Server Marlowe.Run.API Marlowe.Run.Dto - Marlowe.Run.Wallet.API + Marlowe.Run.Server + Marlowe.Run.Wallet.V1.API + Marlowe.Run.Wallet.V1.CentralizedTestnet.Types + Marlowe.Run.Wallet.V1.Client Marlowe.Run.WebSocket - Marlowe.Run.Wallet.CentralizedTestnet.Types - Marlowe.Run.Wallet.Client other-modules: - Paths_marlowe_dashboard_server Marlowe.Run - Marlowe.Run.Wallet - Marlowe.Run.Wallet.Server - Marlowe.Run.Wallet.CentralizedTestnet.API - Marlowe.Run.Wallet.CentralizedTestnet.Server + Marlowe.Run.Wallet.V1 + Marlowe.Run.Wallet.V1.CentralizedTestnet.API + Marlowe.Run.Wallet.V1.CentralizedTestnet.Server + Marlowe.Run.Wallet.V1.Server + Paths_marlowe_dashboard_server hs-source-dirs: src default-language: Haskell2010 diff --git a/marlowe-dashboard-server/src/Marlowe/Run.hs b/marlowe-dashboard-server/src/Marlowe/Run.hs index 1b783becbe..7e8c82f58c 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run.hs @@ -3,40 +3,9 @@ module Marlowe.Run where import Cardano.Prelude hiding (Handler) -import Data.Aeson as Aeson -import Data.List (stripPrefix) -import Data.String as S import qualified Data.Text as Text import Data.Version (showVersion) import qualified Paths_marlowe_dashboard_server as Package.Paths -import Prelude (userError) - -data WBEConfig = WBEConfig { _wbeHost :: String, _wbePort :: Int } - deriving (Eq, Generic, Show) - -normalizeFieldLabel prefix label = - maybe label lower1 $ stripPrefix ('_' : prefix) label - -lower1 (c:cs) = toLower c : cs -lower1 [] = [] - -instance FromJSON WBEConfig where - parseJSON = Aeson.genericParseJSON $ Aeson.defaultOptions - { fieldLabelModifier = normalizeFieldLabel "wbe" } - -data AppConfig = AppConfig { _appWbeConfig :: WBEConfig, _appStaticPath :: FilePath } - deriving (Eq, Generic, Show) - -instance FromJSON AppConfig where - parseJSON = Aeson.genericParseJSON $ Aeson.defaultOptions - { fieldLabelModifier = normalizeFieldLabel "app" } getVersion :: Applicative m => m Text getVersion = pure $ Text.pack $ showVersion Package.Paths.version - -initializeServerContext :: FilePath -> IO AppConfig -initializeServerContext configPath = do - mConfig <- decodeFileStrict configPath - case mConfig of - Just config -> pure config - Nothing -> ioError $ userError "Config file has invalid format" diff --git a/marlowe-dashboard-server/src/Marlowe/Run/API.hs b/marlowe-dashboard-server/src/Marlowe/Run/API.hs index 41748a0e7a..dfaf3131c5 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/API.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/API.hs @@ -4,7 +4,7 @@ module Marlowe.Run.API where import Cardano.Prelude -import qualified Marlowe.Run.Wallet.API as Wallet +import qualified Marlowe.Run.Wallet.V1.API as Wallet import Servant.API (Get, JSON, PlainText, Raw, (:<|>), (:>)) import Servant.API.WebSocket (WebSocketPending) @@ -14,7 +14,7 @@ type API = WebSocketAPI type HTTPAPI = "api" :> ("version" :> Get '[PlainText, JSON] Text - :<|> "wallet" :> Wallet.API + :<|> "wallet" :> "v1" :> Wallet.API ) type WebSocketAPI = "ws" :> WebSocketPending diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Server.hs b/marlowe-dashboard-server/src/Marlowe/Run/Server.hs index e6158194fd..ce8a981571 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Server.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Server.hs @@ -8,7 +8,7 @@ module Marlowe.Run.Server where import Cardano.Prelude hiding (Handler) import Marlowe.Run (getVersion) import Marlowe.Run.API (API) -import qualified Marlowe.Run.Wallet.Server as Wallet +import qualified Marlowe.Run.Wallet.V1.Server as Wallet import qualified Marlowe.Run.WebSocket as WS import Servant (Handler (Handler), Server, ServerError, hoistServer, serveDirectoryFileServer, (:<|>) ((:<|>))) import Servant.Client (ClientEnv) diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1.hs similarity index 98% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1.hs index ff4a5ff2f7..22deb61728 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1.hs @@ -6,7 +6,7 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} -module Marlowe.Run.Wallet where +module Marlowe.Run.Wallet.V1 where import Cardano.Prelude hiding (Handler) import qualified Cardano.Wallet.Api.Types as WBE (ApiT (..), ApiWallet (..), ApiWalletAssetsBalance (..), diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/API.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/API.hs similarity index 84% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/API.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/API.hs index 245e4bd486..34ff2be061 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/API.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/API.hs @@ -6,13 +6,13 @@ {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE TypeOperators #-} -module Marlowe.Run.Wallet.API where +module Marlowe.Run.Wallet.V1.API where import Cardano.Prelude import Data.Aeson (ToJSON) import Marlowe.Run.Dto (AssetsDto, ToDto (..), WalletIdDto) -import qualified Marlowe.Run.Wallet as Domain -import qualified Marlowe.Run.Wallet.CentralizedTestnet.API as CentralizedTestnet +import qualified Marlowe.Run.Wallet.V1 as Domain +import qualified Marlowe.Run.Wallet.V1.CentralizedTestnet.API as CentralizedTestnet import Servant.API (Capture, Get, JSON, (:<|>), (:>)) data GetTotalFundsResponse = diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/API.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/API.hs similarity index 78% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/API.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/API.hs index f6274d44d6..accabd34c1 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/API.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/API.hs @@ -2,10 +2,10 @@ {-# LANGUAGE TypeOperators #-} -- | This module holds the API to access the centralized testnet -module Marlowe.Run.Wallet.CentralizedTestnet.API where +module Marlowe.Run.Wallet.V1.CentralizedTestnet.API where import Cardano.Prelude -import Marlowe.Run.Wallet.CentralizedTestnet.Types (CheckPostData, RestoreError, RestorePostData) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types (CheckPostData, RestoreError, RestorePostData) import Servant.API (JSON, Post, ReqBody, (:<|>), (:>)) -- FIXME: I don't like to use a Mock type here, but we'd need to publish some changes upstream to the PAB to fix this import Cardano.Wallet.Mock.Types (WalletInfo) diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Server.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Server.hs similarity index 94% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Server.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Server.hs index d1b19a54a8..29368cb132 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Server.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Server.hs @@ -5,7 +5,7 @@ {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -Wno-orphans #-} -module Marlowe.Run.Wallet.CentralizedTestnet.Server +module Marlowe.Run.Wallet.V1.CentralizedTestnet.Server ( handlers ) where @@ -24,9 +24,9 @@ import Data.String as S import qualified Data.Text as Text import Data.Text.Class (FromText (..)) import Ledger (PaymentPubKeyHash (..), PubKeyHash (..)) -import Marlowe.Run.Wallet.CentralizedTestnet.API (API) -import Marlowe.Run.Wallet.CentralizedTestnet.Types (CheckPostData (..), RestoreError (..), RestorePostData (..)) -import Marlowe.Run.Wallet.Client (callWBE, decodeError) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.API (API) +import Marlowe.Run.Wallet.V1.CentralizedTestnet.Types (CheckPostData (..), RestoreError (..), RestorePostData (..)) +import Marlowe.Run.Wallet.V1.Client (callWBE, decodeError) import PlutusTx.Builtins.Internal (BuiltinByteString (..)) import Servant (ServerT, (:<|>) ((:<|>)), (:>)) import Servant.Client (ClientEnv, ClientError (FailureResponse), ClientM, ResponseF (responseBody), client) diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Types.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.hs similarity index 92% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Types.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.hs index 38f0e87545..3d71b58047 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/CentralizedTestnet/Types.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/CentralizedTestnet/Types.hs @@ -3,7 +3,7 @@ {-# LANGUAGE DerivingStrategies #-} {-# OPTIONS_GHC -Wno-orphans #-} -module Marlowe.Run.Wallet.CentralizedTestnet.Types where +module Marlowe.Run.Wallet.V1.CentralizedTestnet.Types where import Cardano.Prelude import Data.Aeson.Types (FromJSON, ToJSON) diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/Client.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Client.hs similarity index 95% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/Client.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Client.hs index 621d4b1e65..2422a167ef 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/Client.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Client.hs @@ -2,7 +2,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# OPTIONS_GHC -Wno-orphans #-} -module Marlowe.Run.Wallet.Client +module Marlowe.Run.Wallet.V1.Client ( callWBE , decodeError ) diff --git a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/Server.hs b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Server.hs similarity index 79% rename from marlowe-dashboard-server/src/Marlowe/Run/Wallet/Server.hs rename to marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Server.hs index 4a0452855a..93e9f0fddb 100644 --- a/marlowe-dashboard-server/src/Marlowe/Run/Wallet/Server.hs +++ b/marlowe-dashboard-server/src/Marlowe/Run/Wallet/V1/Server.hs @@ -6,16 +6,16 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} -module Marlowe.Run.Wallet.Server where +module Marlowe.Run.Wallet.V1.Server where import Cardano.Prelude hiding (Handler) import qualified Cardano.Wallet.Api.Client as WBE.Api import qualified Cardano.Wallet.Api.Types as WBE import Marlowe.Run.Dto (WalletIdDto, dtoHandler) -import Marlowe.Run.Wallet (getTotalFunds) -import Marlowe.Run.Wallet.API (API, GetTotalFundsResponse (..)) -import qualified Marlowe.Run.Wallet.CentralizedTestnet.Server as CentralizedTestnet -import Marlowe.Run.Wallet.Client (callWBE) +import Marlowe.Run.Wallet.V1 (getTotalFunds) +import Marlowe.Run.Wallet.V1.API (API, GetTotalFundsResponse (..)) +import qualified Marlowe.Run.Wallet.V1.CentralizedTestnet.Server as CentralizedTestnet +import Marlowe.Run.Wallet.V1.Client (callWBE) import Servant (ServerError, ServerT, err404, (:<|>) ((:<|>))) import Servant.Client (ClientEnv)