Enabled mainnet for marlowe-cli.

marlowe-cli/marlowe-cli.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: marlowe-cli
-version: 0.0.8.1
+version: 0.0.8.2
 license: Apache-2.0
 license-files:
   LICENSE

marlowe-cli/src/Language/Marlowe/CLI/Command/Run.hs

@@ -167,18 +167,20 @@ runRunCommand command =
   do
     costModel <- getDefaultCostModel
     let
-      network' = if True then Mainnet else network command
+      network' =
+        case network command of
+          Testnet (C.NetworkMagic 764824073) -> Mainnet
+          testnet                            -> testnet
       connection =
         LocalNodeConnectInfo
         {
           localConsensusModeParams = CardanoModeParams $ EpochSlots 21600
-        , localNodeNetworkId       = Mainnet   -- network'
+        , localNodeNetworkId       = network'
         , localNodeSocketPath      = socketPath command
         }
       marloweParams' = maybe defaultMarloweParams marloweParams $ rolesCurrency command
       stake'         = fromMaybe NoStakeAddress $ stake command
       printTxId = liftIO . putStrLn . ("TxId " <>) . show
-      guardMainnet = pure ()  -- when (network' == Mainnet) $ throwError "Mainnet usage is not supported."
       padTxOut (address, value) = (address, Nothing, value)
       outputs' = padTxOut <$> outputs command
     case command of
@@ -204,8 +206,7 @@ runRunCommand command =
                           maximumTime
                           outputFile
                           printStats
-      Run{..}        -> guardMainnet
-                          >> runTransaction
+      Run{..}        -> runTransaction
                             connection
                             marloweIn
                             marloweOut
@@ -219,8 +220,7 @@ runRunCommand command =
                             printStats
                             invalid
                           >>= printTxId
-      Withdraw{..}   -> guardMainnet
-                          >> withdrawFunds
+      Withdraw{..}   -> withdrawFunds
                             connection
                             marloweOut
                             roleName
@@ -235,8 +235,7 @@ runRunCommand command =
                             printStats
                             invalid
                           >>= printTxId
-      AutoRun{..}      -> guardMainnet
-                          >> autoRunTransaction
+      AutoRun{..}      -> autoRunTransaction
                             connection
                             marloweIn'
                             marloweOut
@@ -248,8 +247,7 @@ runRunCommand command =
                             printStats
                             invalid
                           >>= printTxId
-      AutoWithdraw{..} -> guardMainnet
-                          >> autoWithdrawFunds
+      AutoWithdraw{..} -> autoWithdrawFunds
                             connection
                             marloweOut
                             roleName

marlowe-cli/src/Language/Marlowe/CLI/Command/Transaction.hs

@@ -33,11 +33,11 @@ import Cardano.Api
   , IsShelleyBasedEra
   , LocalNodeConnectInfo(..)
   , NetworkId(..)
+  , NetworkMagic(..)
   , SlotNo
   , TxIn
   )
-import Control.Monad (when)
-import Control.Monad.Except (MonadError, MonadIO, liftIO, throwError)
+import Control.Monad.Except (MonadError, MonadIO, liftIO)
 import Data.Maybe (fromMaybe)
 import Language.Marlowe.CLI.Command.Parse
   ( parseAddress
@@ -181,7 +181,10 @@ runTransactionCommand :: MonadError CliError m
 runTransactionCommand command =
   do
     let
-      network' = network command
+      network' =
+        case network command of
+          Testnet (NetworkMagic 764824073) -> Mainnet
+          testnet                          -> testnet
       connection =
         LocalNodeConnectInfo
         {
@@ -190,7 +193,6 @@ runTransactionCommand command =
         , localNodeSocketPath      = socketPath command
         }
       printTxId = liftIO . putStrLn . ("TxId " <>) . show
-      guardMainnet = when (network' == Mainnet) $ throwError "Mainnet usage is not supported."
       padTxOut (address, value) = (address, Nothing, value)
       outputs' = padTxOut <$> outputs command
     case command of
@@ -204,8 +206,7 @@ runTransactionCommand command =
                                       printStats
                                       invalid
                                       >>= printTxId
-      BuildCreate{..}            -> guardMainnet
-                                      >> buildIncoming
+      BuildCreate{..}            -> buildIncoming
                                         connection
                                         scriptAddress
                                         signingKeyFiles
@@ -218,8 +219,7 @@ runTransactionCommand command =
                                         printStats
                                         invalid
                                       >>= printTxId
-      BuildAdvance{..}           -> guardMainnet
-                                      >> buildContinuing
+      BuildAdvance{..}           -> buildContinuing
                                         connection
                                         scriptAddress
                                         validatorFile
@@ -237,8 +237,7 @@ runTransactionCommand command =
                                         printStats
                                         invalid
                                       >>= printTxId
-      BuildClose{..}             -> guardMainnet
-                                      >> buildOutgoing
+      BuildClose{..}             -> buildOutgoing
                                         connection
                                         validatorFile
                                         redeemerFile