Merge pull request #505 from input-output-hk/scp-5010-cli-proxy

SCP-5010 Update `marlowe` to use `marlowe-proxy`

Author: Jamie Bertram

cabal.project

@@ -31,6 +31,7 @@ packages:
   marlowe-integration-tests
   marlowe-protocols
   marlowe-runtime
+  marlowe-runtime-cli
   marlowe-runtime-web
   marlowe-test
 
@@ -84,6 +85,9 @@ package marlowe-protocols
 package marlowe-runtime
   ghc-options: -Werror
 
+package marlowe-runtime-cli
+  ghc-options: -Werror
+
 package marlowe-runtime-web
   ghc-options: -Werror
 

marlowe-runtime-cli/LICENSE

@@ -0,0 +1,53 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. 
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

marlowe-runtime-cli/NOTICE

@@ -0,0 +1,14 @@
+Copyright 2019 Input Output (Hong Kong) Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

marlowe-runtime/cli/Language/Marlowe/Runtime/CLI/Command.hs renamed to marlowe-runtime-cli/app/Language/Marlowe/Runtime/CLI/Command.hs

@@ -8,7 +8,6 @@ module Language.Marlowe.Runtime.CLI.Command
 import Control.Concurrent.STM (STM)
 import Control.Monad.Trans.Reader (runReaderT)
 import Data.Foldable (asum)
-import Language.Marlowe.Protocol.Sync.Client (marloweSyncClientPeer)
 import Language.Marlowe.Runtime.CLI.Command.Apply
   ( ApplyCommand
   , advanceCommandParser
@@ -27,19 +26,14 @@ import Language.Marlowe.Runtime.CLI.Env (Env(..))
 import Language.Marlowe.Runtime.CLI.Monad (CLI, runCLI)
 import Language.Marlowe.Runtime.CLI.Option (optParserWithEnvDefault)
 import qualified Language.Marlowe.Runtime.CLI.Option as O
-import Network.Protocol.Connection (SomeConnector(..))
-import Network.Protocol.Driver (tcpClient)
-import Network.Protocol.Handshake.Client (handshakeClientConnector)
-import Network.Protocol.Job.Client (jobClientPeer)
+import Language.Marlowe.Runtime.Client (connectToMarloweRuntime)
 import Network.Socket (HostName, PortNumber)
 import Options.Applicative
 
 -- | Top-level options for running a command in the Marlowe Runtime CLI.
 data Options = Options
-  { historyHost :: !HostName
-  , historySyncPort :: !PortNumber
-  , txHost :: !HostName
-  , txCommandPort :: !PortNumber
+  { host :: !HostName
+  , port :: !PortNumber
   , cmd :: !Command
   }
 
@@ -54,10 +48,8 @@ data Command
 -- | Read options from the environment and the command line.
 getOptions :: IO Options
 getOptions = do
-  syncHostParser <- optParserWithEnvDefault O.syncHost
-  syncSyncPort <- optParserWithEnvDefault O.syncSyncPort
-  txHostParser <- optParserWithEnvDefault O.txHost
-  txCommandPortParser <- optParserWithEnvDefault O.txCommandPort
+  hostParser <- optParserWithEnvDefault O.runtimeHost
+  portParser <- optParserWithEnvDefault O.runtimePort
   let
     commandParser = asum
       [ hsubparser $ mconcat
@@ -80,10 +72,8 @@ getOptions = do
           ]
       ]
     parser = Options
-      <$> syncHostParser
-      <*> syncSyncPort
-      <*> txHostParser
-      <*> txCommandPortParser
+      <$> hostParser
+      <*> portParser
       <*> commandParser
     infoMod = mconcat
       [ fullDesc
@@ -102,8 +92,4 @@ runCommand = \case
 
 -- | Interpret a CLI action in IO using the provided options.
 runCLIWithOptions :: STM () -> Options -> CLI a -> IO a
-runCLIWithOptions sigInt Options{..} cli = runReaderT (runCLI cli) Env
-  { marloweSyncConnector = SomeConnector $ handshakeClientConnector $ tcpClient historyHost historySyncPort marloweSyncClientPeer
-  , txJobConnector = SomeConnector $ handshakeClientConnector $ tcpClient txHost txCommandPort jobClientPeer
-  , sigInt
-  }
+runCLIWithOptions sigInt Options{..} cli = runReaderT (connectToMarloweRuntime host port $ runCLI cli) Env { sigInt }

marlowe-runtime/cli/Language/Marlowe/Runtime/CLI/Command/Apply.hs renamed to marlowe-runtime-cli/app/Language/Marlowe/Runtime/CLI/Command/Apply.hs

@@ -24,12 +24,13 @@ import Language.Marlowe (POSIXTime(..))
 import qualified Language.Marlowe.Core.V1.Semantics.Types as V1
 import qualified Language.Marlowe.Core.V1.Semantics.Types.Address as V1
 import Language.Marlowe.Runtime.CLI.Command.Tx (SigningMethod(Manual), TxCommand(..), txCommandParser)
-import Language.Marlowe.Runtime.CLI.Monad (CLI, runCLIExceptT, runTxCommand)
+import Language.Marlowe.Runtime.CLI.Monad (CLI, runCLIExceptT)
 import Language.Marlowe.Runtime.CLI.Option (txOutRefParser)
 import Language.Marlowe.Runtime.ChainSync.Api (TransactionMetadata, fromJSONEncodedTransactionMetadata, unPolicyId)
+import Language.Marlowe.Runtime.Client (applyInputs')
 import Language.Marlowe.Runtime.Core.Api
   (ContractId(..), IsMarloweVersion(..), MarloweVersion(MarloweV1), MarloweVersionTag(..))
-import Language.Marlowe.Runtime.Transaction.Api (ApplyInputsError, InputsApplied(..), MarloweTxCommand(ApplyInputs))
+import Language.Marlowe.Runtime.Transaction.Api (ApplyInputsError, InputsApplied(..))
 import qualified Language.Marlowe.Util as V1
 import Options.Applicative
 import qualified Plutus.V1.Ledger.Api as P
@@ -222,8 +223,7 @@ runApplyCommand TxCommand { walletAddresses, signingMethod, metadataFile, subCom
     validityLowerBound'= posixTimeToUTCTime <$> validityLowerBound
     validityUpperBound'= posixTimeToUTCTime <$> validityUpperBound
 
-    cmd = ApplyInputs MarloweV1 walletAddresses contractId metadata validityLowerBound' validityUpperBound' inputs'
-  InputsApplied{txBody} <- ExceptT $ first ApplyFailed <$> runTxCommand cmd
+  InputsApplied{txBody} <- ExceptT $ first ApplyFailed <$> applyInputs' MarloweV1 walletAddresses contractId metadata validityLowerBound' validityUpperBound' inputs'
   case signingMethod of
     Manual outputFile -> do
       ExceptT $ liftIO $ first TransactionFileWriteFailed <$> C.writeFileTextEnvelope outputFile Nothing txBody

marlowe-runtime/cli/Language/Marlowe/Runtime/CLI/Command/Create.hs renamed to marlowe-runtime-cli/app/Language/Marlowe/Runtime/CLI/Command/Create.hs

@@ -19,7 +19,7 @@ import qualified Data.Yaml as Yaml
 import Data.Yaml.Aeson (decodeFileEither)
 import Language.Marlowe (POSIXTime(POSIXTime))
 import Language.Marlowe.Runtime.CLI.Command.Tx (SigningMethod(Manual), TxCommand(..), txCommandParser)
-import Language.Marlowe.Runtime.CLI.Monad (CLI, runCLIExceptT, runTxCommand)
+import Language.Marlowe.Runtime.CLI.Monad (CLI, runCLIExceptT)
 import Language.Marlowe.Runtime.CLI.Option (keyValueOption, marloweVersionParser, parseAddress)
 import Language.Marlowe.Runtime.ChainSync.Api
   ( Address
@@ -30,15 +30,15 @@ import Language.Marlowe.Runtime.ChainSync.Api
   , fromJSONEncodedTransactionMetadata
   , renderTxOutRef
   )
+import Language.Marlowe.Runtime.Client (createContract)
 import Language.Marlowe.Runtime.Core.Api
   ( ContractId(ContractId)
   , IsMarloweVersion(Contract)
   , MarloweVersion(MarloweV1)
   , MarloweVersionTag(V1)
   , SomeMarloweVersion(SomeMarloweVersion)
   )
-import Language.Marlowe.Runtime.Transaction.Api
-  (ContractCreated(..), CreateError, MarloweTxCommand(Create), RoleTokensConfig(..), mkMint)
+import Language.Marlowe.Runtime.Transaction.Api (ContractCreated(..), CreateError, RoleTokensConfig(..), mkMint)
 import Options.Applicative
 import Options.Applicative.NonEmpty (some1)
 import Text.Read (readMaybe)
@@ -183,9 +183,7 @@ runCreateCommand TxCommand { walletAddresses, signingMethod, metadataFile, subCo
     run version rolesDistribution  = do
       contract <- readContract version
       metadata <- readMetadata
-      let
-        cmd = Create Nothing version walletAddresses rolesDistribution metadata minUTxO contract
-      ContractCreated{contractId,txBody} <- ExceptT $ first CreateFailed <$> runTxCommand cmd
+      ContractCreated{contractId,txBody} <- ExceptT $ first CreateFailed <$> createContract Nothing version walletAddresses rolesDistribution metadata minUTxO contract
       case signingMethod of
         Manual outputFile -> do
           ExceptT $ liftIO $ first TransactionFileWriteFailed <$> C.writeFileTextEnvelope outputFile Nothing txBody

marlowe-runtime/cli/Language/Marlowe/Runtime/CLI/Command/Log.hs renamed to marlowe-runtime-cli/app/Language/Marlowe/Runtime/CLI/Command/Log.hs

@@ -16,7 +16,7 @@ import Language.Marlowe (pretty)
 import qualified Language.Marlowe.Core.V1.Semantics as V1
 import Language.Marlowe.Protocol.Sync.Client
 import Language.Marlowe.Runtime.CLI.Env (Env(..))
-import Language.Marlowe.Runtime.CLI.Monad (CLI, askEnv, runCLIExceptT, runHistorySyncClient)
+import Language.Marlowe.Runtime.CLI.Monad (CLI, askEnv, runCLIExceptT)
 import Language.Marlowe.Runtime.CLI.Option (contractIdArgument)
 import Language.Marlowe.Runtime.ChainSync.Api
   ( AssetId(AssetId)
@@ -30,6 +30,7 @@ import Language.Marlowe.Runtime.ChainSync.Api
   , toBech32
   , unBlockHeaderHash
   )
+import qualified Language.Marlowe.Runtime.Client as Client
 import Language.Marlowe.Runtime.Core.Api
   ( ContractId(..)
   , MarloweVersion(..)
@@ -71,7 +72,7 @@ logCommandParser = info parser $ progDesc "Display the history of a contract"
 runLogCommand :: LogCommand -> CLI ()
 runLogCommand LogCommand{..} = runCLIExceptT
   $ ExceptT
-  $ runHistorySyncClient
+  $ Client.runMarloweSyncClient
   $ MarloweSyncClient
   $ pure
   $ SendMsgFollowContract contractId ClientStFollow

marlowe-runtime/cli/Language/Marlowe/Runtime/CLI/Command/Submit.hs renamed to marlowe-runtime-cli/app/Language/Marlowe/Runtime/CLI/Command/Submit.hs

@@ -11,9 +11,10 @@ import qualified Data.Aeson as A
 import Data.Bifunctor (Bifunctor(first))
 import Data.ByteString.Base16 (encodeBase16)
 import Language.Marlowe.Runtime.CLI.Env (Env(..))
-import Language.Marlowe.Runtime.CLI.Monad (CLI, asksEnv, runCLIExceptT, runTxJobClient)
+import Language.Marlowe.Runtime.CLI.Monad (CLI, asksEnv, runCLIExceptT)
 import Language.Marlowe.Runtime.ChainSync.Api
   (BlockHeader(BlockHeader), BlockHeaderHash(unBlockHeaderHash), BlockNo(unBlockNo), SlotNo(unSlotNo))
+import Language.Marlowe.Runtime.Client (runMarloweTxClient)
 import Language.Marlowe.Runtime.Transaction.Api (MarloweTxCommand(Submit), SubmitError)
 import Network.Protocol.Job.Client
   (ClientStAwait(SendMsgDetach, SendMsgPoll), ClientStCmd(..), ClientStInit(SendMsgExec), JobClient(JobClient))
@@ -33,7 +34,7 @@ submitCommandParser = info parser $ progDesc "Submit a signed transaction to the
       , help "A file containing the CBOR bytes of the signed transaction to submit."
       ]
 
-data CilentSubmitError
+data ClientSubmitError
   = SubmitFailed SubmitError
   | SubmitInterrupted
   | TransactionDecodingFailed
@@ -60,12 +61,11 @@ runSubmitCommand SubmitCommand{txFile} = runCLIExceptT do
       , recvMsgSucceed = pure . Right
       }
     jobClient = JobClient . pure . SendMsgExec cmd $ next
-  BlockHeader slotNo hash blockNo <- ExceptT $ runTxJobClient jobClient
+  BlockHeader slotNo hash blockNo <- ExceptT $ runMarloweTxClient jobClient
   let
     res = A.object
       [ ("slotNo", toJSON $ unSlotNo slotNo)
       , ("blockHeaderHash", toJSON . encodeBase16 $ unBlockHeaderHash hash)
       , ("blockNo", toJSON $ unBlockNo blockNo)
       ]
   liftIO . print $ A.encode res
-