Merged in dev (pull request #13)

Dev

Author: bwbush

ReadMe.md

@@ -87,7 +87,6 @@ The configuration file contains the basic network information, along with the fu
 	Available commands:
 	  bech32-decode            Decode a Bech32 string.
 	  bech32-encode            Encode a Bech32 string.
-	  chain-scripts            Download scripts used as transaction witnesses.
 	  fingerprint              Compute the Bech32 fingerprint of a token.
 	  info-address             Print information about addresses.
 	  info-tx                  Print contents of transaction files.
@@ -98,6 +97,7 @@ The configuration file contains the basic network information, along with the fu
 	  transact                 Submit Cardano metadata or mint Cardano tokens.
 	  watch-address            Watch transactions at an address.
 	  watch-coin               Watch transactions for a coin.
+	  watch-scripts            Download scripts used as transaction witnesses.
 
 *   [Mint batches of Cardano non-fungible tokens](man/mint.md)
     *   `mantis mint`
@@ -106,7 +106,7 @@ The configuration file contains the basic network information, along with the fu
 *   [Construct a minting script and compute its Policy ID](man/script.md)
     *   `mantis script`
 *   [Download information from all blocks and transactions](man/watch.md)
-    *   `mantis chain-scripts`
+    *   `mantis watch-scripts`
     *   `mantis watch-address`
     *   `mantis watch-coin`
 *   [Encoding and decoding Bech32 text](man/bech32.md)

app/Mantis/Command.hs

@@ -7,6 +7,7 @@ module Mantis.Command (
 ) where
 
 
+import Cardano.Api (AsType(AsAlonzoEra), ShelleyBasedEra(ShelleyBasedEraAlonzo))
 import Data.Version (Version, showVersion)
 import Mantis.Command.Types (Mantis(..))
 import Mantis.Types (debugMantis, runMantisToIO)
@@ -47,13 +48,14 @@ main version =
                   <$> verboseOption
                   <*> O.hsubparser (
                            Bech32.command
-                        <> Chain.command
+                        <> Chain.command'
                         <> Fingerprint.command
                         <> Info.command
                         <> Mint.command
                         <> Script.command
                         <> Transact.command
                         <> Watch.command
+                        <> Chain.command
                       )
                 )
           )
@@ -73,16 +75,18 @@ main version =
     let
       printer  = if quiet then const $ return () else debugMantis
       printer' = if quiet then const $ return () else hPutStrLn stderr
+      sbe = ShelleyBasedEraAlonzo
+      asEra = AsAlonzoEra
     result <- runMantisToIO
       $ case mantis of
-          Transact{..}     -> Transact.main printer configFile tokenName tokenCount tokenSlot outputAddress scriptFile metadataFile
-          Mint{..}         -> Mint.main printer configFile mintingFile tokenSlot outputAddress scriptFile metadataFile
+          Transact{..}     -> Transact.main sbe printer configFile tokenName tokenCount tokenSlot outputAddress scriptFile metadataFile
+          Mint{..}         -> Mint.main sbe printer configFile mintingFile tokenSlot outputAddress scriptFile metadataFile
           Script{..}       -> Script.main printer configFile tokenSlot scriptFile
-          Fingerprint{..}  -> Fingerprint.main printer policyId assetName 
-          InfoUtxo{..}     -> Info.mainUtxo printer configFile addresses
+          Fingerprint{..}  -> Fingerprint.main printer policyId assetName
+          InfoUtxo{..}     -> Info.mainUtxo sbe printer configFile addresses
           InfoAddress{..}  -> Info.mainAddress printer addresses
-          InfoTxBody{..}   -> Info.mainTxBody printer txBodyFiles
-          InfoTx{..}       -> Info.mainTx printer txFiles
+          InfoTxBody{..}   -> Info.mainTxBody asEra printer txBodyFiles
+          InfoTx{..}       -> Info.mainTx asEra printer txFiles
           Bech32Decode{..} -> Bech32.mainDecode printer bech32
           Bech32Encode{..} -> Bech32.mainEncode printer humanReadablePart dataPart
           Chain{..}        -> Chain.main printer' configFile outputDirectory continue

app/Mantis/Command/Chain.hs

@@ -4,11 +4,12 @@
 
 module Mantis.Command.Chain (
   command
+, command'
 , main
 ) where
 
 
-import Cardano.Api (BlockHeader(..), ConsensusModeParams(CardanoModeParams), EpochSlots(..), NetworkId(..), NetworkMagic(..), getTxBody, getTxId, serialiseToRawBytesHex)
+import Cardano.Api (BlockHeader(..), ConsensusModeParams(CardanoModeParams), EpochSlots(..), NetworkId(..), NetworkMagic(..), serialiseToRawBytesHex)
 import Control.Monad.Extra (whenJust)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Data.Aeson.Encode.Pretty (encodePretty)
@@ -24,10 +25,16 @@ import qualified Options.Applicative   as O
 
 command :: O.Mod O.CommandFields Mantis
 command =
-  O.command "chain-scripts"
+  O.command "watch-scripts"
     $ O.info options (O.progDesc "Download scripts used as transaction witnesses.")
 
 
+command' :: O.Mod O.CommandFields Mantis
+command' =
+  O.command "chain-scripts"
+    $ O.info options (O.progDesc "[Renamed to 'watch-scripts'.]")
+
+
 options :: O.Parser Mantis
 options =
   Chain
@@ -54,13 +61,13 @@ main debugIO configFile output continue =
     liftIO . debugIO $ "Network: " ++ show network
 
     extractScripts socketPath protocol network (return $ not continue)
-      $ \(BlockHeader slotNo _ _) tx hash script ->
+      $ \(BlockHeader slotNo _ _) txId hash script ->
         do
           let
             hash' = BS.unpack $ serialiseToRawBytesHex hash
           debugIO ""
           debugIO $ show slotNo
-          debugIO . show . getTxId $ getTxBody tx
+          debugIO $ show txId
           debugIO $ "Hash " ++ hash'
           debugIO $ show script
           whenJust output

app/Mantis/Command/Info.hs

@@ -11,7 +11,7 @@ module Mantis.Command.Info (
 ) where
 
 
-import Cardano.Api (AsType(AsTx, AsTxBody, AsMaryEra), ConsensusModeParams(CardanoModeParams), EpochSlots(..), NetworkId(..), NetworkMagic(..), getTxBody, getTxId, readFileTextEnvelope)
+import Cardano.Api (AsType(AsTx, AsTxBody), ConsensusModeParams(CardanoModeParams), EpochSlots(..), IsCardanoEra, NetworkId(..), NetworkMagic(..), ShelleyBasedEra, getTxBody, getTxId, readFileTextEnvelope)
 import Control.Monad (forM_)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Mantis.Command.Types (Configuration(..), Mantis(InfoAddress, InfoTx, InfoTxBody, InfoUtxo))
@@ -55,13 +55,15 @@ command =
     ]
 
 
-mainUtxo :: MonadFail m
+mainUtxo :: IsCardanoEra era
+         => MonadFail m
          => MonadIO m
-         => (String -> MantisM m ())
+         => ShelleyBasedEra era
+         -> (String -> MantisM m ())
          -> FilePath
          -> [String]
          -> MantisM m ()
-mainUtxo debugMantis configFile addresses =
+mainUtxo sbe debugMantis configFile addresses =
   do
     Configuration{..} <- liftIO $ read <$> readFile configFile
 
@@ -80,7 +82,7 @@ mainUtxo debugMantis configFile addresses =
           debugMantis $ "  " ++ show address
           debugMantis $ "  " ++ show address'
           printMantis "Unspent UTxO:"
-          utxo <- queryUTxO socketPath protocol address' network
+          utxo <- queryUTxO sbe socketPath protocol address' network
           printUTxO "  " utxo
 
 
@@ -99,35 +101,39 @@ mainAddress _ addresses =
         printMantis $ "  " ++ show address'
 
 
-mainTxBody :: MonadIO m
-           => (String -> MantisM m ())
+mainTxBody :: IsCardanoEra era
+           => MonadIO m
+           => AsType era
+           -> (String -> MantisM m ())
            -> [FilePath]
            -> MantisM m ()
-mainTxBody _ txBodyFiles =
+mainTxBody asEra _ txBodyFiles =
   forM_ txBodyFiles
       $ \file ->
         do
           printMantis ""
           printMantis $ "Transaction body file: " ++ file
           txBody <-
             foistMantisEitherIO
-              $ readFileTextEnvelope (AsTxBody AsMaryEra) file
+              $ readFileTextEnvelope (AsTxBody asEra) file
           printMantis . show $ getTxId txBody
           printMantis $ show txBody
 
 
-mainTx :: MonadIO m
-       => (String -> MantisM m ())
+mainTx :: IsCardanoEra era
+       => MonadIO m
+       => AsType era
+       -> (String -> MantisM m ())
        -> [FilePath]
        -> MantisM m ()
-mainTx _ txFiles =
+mainTx asEra _ txFiles =
   forM_ txFiles
       $ \file ->
         do
           printMantis ""
           printMantis $ "Transaction file: " ++ file
           tx <-
             foistMantisEitherIO
-              $ readFileTextEnvelope (AsTx AsMaryEra) file
+              $ readFileTextEnvelope (AsTx asEra) file
           printMantis . show . getTxId $ getTxBody tx
           printMantis $ show tx

app/Mantis/Command/Mint.hs

@@ -8,8 +8,8 @@ module Mantis.Command.Mint (
 ) where
 
 
-import Cardano.Api (ConsensusModeParams(CardanoModeParams), CardanoEra(MaryEra), EpochSlots(..), NetworkId(..), NetworkMagic(..), PolicyId(..), anyAddressInEra, getTxId, makeTransactionBody)
-import Cardano.Api.Shelley (ShelleyWitnessSigningKey(..), TxOut(..), TxOutValue(..), UTxO(..), makeScriptWitness, makeSignedTransaction, makeShelleyKeyWitness)
+import Cardano.Api (ConsensusModeParams(CardanoModeParams), EpochSlots(..), IsShelleyBasedEra, NetworkId(..), NetworkMagic(..), PolicyId(..), ShelleyBasedEra, TxOutDatumHash(..), anyAddressInEra, getTxId, makeTransactionBody, multiAssetSupportedInEra, shelleyBasedToCardanoEra)
+import Cardano.Api.Shelley (ShelleyWitnessSigningKey(..), TxOut(..), TxOutValue(..), UTxO(..), makeSignedTransaction, makeShelleyKeyWitness)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Control.Monad.Extra (whenJust)
 import Data.Aeson (encode)
@@ -18,7 +18,7 @@ import Data.Maybe (fromMaybe)
 import Mantis.Command.Types (Configuration(..), Mantis(..))
 import Mantis.Query (adjustSlot, queryProtocol, queryTip, queryUTxO, submitTransaction)
 import Mantis.Script (mintingScript)
-import Mantis.Transaction (includeFee, makeTransaction, printUTxO, printValue, readMinting, summarizeValues, supportedMultiAsset)
+import Mantis.Transaction (includeFee, makeTransaction, printUTxO, printValue, readMinting, summarizeValues)
 import Mantis.Types (MantisM, SlotRef, foistMantisEither, printMantis)
 import Mantis.Wallet (makeVerificationKeyHash, readAddress, readSigningKey, readVerificationKey)
 import Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult(..))
@@ -45,21 +45,24 @@ options =
     <*> O.optional (O.strOption     $ O.long "metadata" <> O.metavar "METADATA_FILE" <> O.help "Path to output metadata JSON file."                                                        )
 
 
-main :: MonadFail m
+main :: IsShelleyBasedEra era
+     => MonadFail m
      => MonadIO m
-     => (String -> MantisM m ())
+     => ShelleyBasedEra era
+     -> (String -> MantisM m ())
      -> FilePath
      -> FilePath
      -> Maybe SlotRef
      -> Maybe String
      -> Maybe FilePath
      -> Maybe FilePath
      -> MantisM m ()
-main debugMantis configFile mintingFile tokenSlot outputAddress scriptFile metadataFile =
+main sbe debugMantis configFile mintingFile tokenSlot outputAddress scriptFile metadataFile =
   do
     Configuration{..} <- liftIO $ read <$> readFile configFile
 
     let
+      era = shelleyBasedToCardanoEra sbe
       protocol = CardanoModeParams $ EpochSlots epochSlots
       network = maybe Mainnet (Testnet . NetworkMagic) magic
     debugMantis ""
@@ -71,7 +74,7 @@ main debugMantis configFile mintingFile tokenSlot outputAddress scriptFile metad
     let
       before = (`adjustSlot` tip) <$> tokenSlot
 
-    pparams <- queryProtocol socketPath protocol network
+    pparams <- queryProtocol sbe socketPath protocol network
     debugMantis ""
     debugMantis $ "Protocol parameters: " ++ LBS.unpack (encode pparams)
 
@@ -91,7 +94,7 @@ main debugMantis configFile mintingFile tokenSlot outputAddress scriptFile metad
 
     debugMantis ""
     debugMantis "Unspect UTxO:"
-    utxo@(UTxO utxo') <- queryUTxO socketPath protocol address network
+    utxo@(UTxO utxo') <- queryUTxO sbe socketPath protocol address network
     printUTxO "  " utxo
 
     let
@@ -121,25 +124,24 @@ main debugMantis configFile mintingFile tokenSlot outputAddress scriptFile metad
     debugMantis $ "Minting: " ++ show minting
 
     let
-      Just address'' = anyAddressInEra MaryEra address'
+      Just address'' = anyAddressInEra era address'
+      Right supportedMultiAsset = multiAssetSupportedInEra era
     txBody <- includeFee network pparams nIn 1 1 0
-      $ makeTransaction 
+      $ makeTransaction
         (M.keys utxo')
-        [TxOut address'' (TxOutValue supportedMultiAsset value')]
+        [TxOut address'' (TxOutValue supportedMultiAsset value') TxOutDatumHashNone]
         before
         (Just metadata)
-        Nothing
-        (Just minting)
+        (Just (PolicyId scriptHash, script, minting))
     txRaw <- foistMantisEither $ makeTransactionBody txBody
     debugMantis ""
     debugMantis $ "Transaction: " ++ show txRaw
 
     let
       witness = makeShelleyKeyWitness txRaw
-        $ WitnessPaymentExtendedKey signingKey
-      witness' = makeScriptWitness script
-      txSigned = makeSignedTransaction [witness, witness'] txRaw
-    result <- submitTransaction socketPath protocol network txSigned
+        $ either WitnessPaymentKey WitnessPaymentExtendedKey signingKey
+      txSigned = makeSignedTransaction [witness] txRaw
+    result <- submitTransaction sbe socketPath protocol network txSigned
     printMantis ""
     case result of
       SubmitSuccess     -> printMantis $ "Success: " ++ show (getTxId txRaw)