Merge pull request #767 from locallycompact/lc/utxo-fromtolist

Add top level fromList and toList functions in `Cardano.Api.UTxO`

Author: carbolymer

cardano-api/src/Cardano/Api/Internal/Convenience/Query.hs

@@ -35,7 +35,7 @@ import Cardano.Api.Internal.ProtocolParameters
 import Cardano.Api.Internal.Query
 import Cardano.Api.Internal.Query.Expr
 import Cardano.Api.Internal.Tx.Body
-import Cardano.Api.Internal.Tx.UTxO
+import Cardano.Api.Internal.Tx.UTxO (UTxO (..))
 import Cardano.Api.Internal.Utils
 
 import Cardano.Ledger.Api qualified as L

cardano-api/src/Cardano/Api/Internal/Fees.hs

@@ -360,7 +360,7 @@ import Cardano.Api.Internal.Query
 import Cardano.Api.Internal.Script
 import Cardano.Api.Internal.Tx.Body
 import Cardano.Api.Internal.Tx.Sign
-import Cardano.Api.Internal.Tx.UTxO
+import Cardano.Api.Internal.Tx.UTxO (UTxO (..))
 import Cardano.Api.Internal.Value
 import Cardano.Api.Ledger.Lens qualified as A
 

cardano-api/src/Cardano/Api/Internal/Query.hs

@@ -79,7 +79,7 @@ import Cardano.Api.Internal.ProtocolParameters
 import Cardano.Api.Internal.Query.Types
 import Cardano.Api.Internal.ReexposeLedger qualified as Ledger
 import Cardano.Api.Internal.Tx.Body
-import Cardano.Api.Internal.Tx.UTxO
+import Cardano.Api.Internal.Tx.UTxO (UTxO (..))
 
 import Cardano.Chain.Update.Validation.Interface qualified as Byron.Update
 import Cardano.Ledger.Api qualified as L

cardano-api/src/Cardano/Api/Internal/Tx/UTxO.hs

@@ -21,11 +21,11 @@ import Data.Map (Map)
 import Data.Map qualified as Map
 import Data.Set (Set)
 import Data.Text (Text)
-import GHC.Exts (IsList (..))
+import GHC.Exts qualified as GHC
 
 newtype UTxO era = UTxO {unUTxO :: Map TxIn (TxOut CtxUTxO era)}
   deriving stock (Eq, Show)
-  deriving newtype (Semigroup, Monoid, IsList)
+  deriving newtype (Semigroup, Monoid, GHC.IsList)
 
 instance IsCardanoEra era => ToJSON (UTxO era) where
   toJSON (UTxO m) = toJSON m
@@ -36,7 +36,7 @@ instance
   => FromJSON (UTxO era)
   where
   parseJSON = Aeson.withObject "UTxO" $ \hm -> do
-    let l = toList $ KeyMap.toHashMapText hm
+    let l = GHC.toList $ KeyMap.toHashMapText hm
     res <- mapM toTxIn l
     pure . UTxO $ Map.fromList res
    where
@@ -77,3 +77,11 @@ inputSet = Map.keysSet . unUTxO
 -- | Remove the right hand side from the left hand side.
 difference :: UTxO era -> UTxO era -> UTxO era
 difference a b = UTxO $ Map.difference (unUTxO a) (unUTxO b)
+
+-- | Convert from a list of key/value pairs.
+fromList :: [(TxIn, TxOut CtxUTxO era)] -> UTxO era
+fromList = UTxO . Map.fromList
+
+-- | Convert to a list of key/value pairs.
+toList :: UTxO era -> [(TxIn, TxOut CtxUTxO era)]
+toList (UTxO xs) = Map.toList xs

cardano-api/src/Cardano/Api/Tx/UTxO.hs

@@ -7,6 +7,8 @@ module Cardano.Api.Tx.UTxO
   , UTxO.filterWithKey
   , UTxO.inputSet
   , UTxO.difference
+  , UTxO.fromList
+  , UTxO.toList
   )
 where