Add "txId" field to HydraTx; Add "confirmed" field to HydraSnapshot

Author: errfrom

example/minimal/app/Main.purs

@@ -185,7 +185,7 @@ messageHandler ws =
           setUtxoSnapshot $ HydraSnapshot
             { snapshotNumber: zero
             , utxo
-            -- , confirmedTransactions: mempty
+            , confirmed: mempty
             }
           tx <- runContractInApp $ placeArbitraryDatumL2 $ toUtxoMap utxo
           liftEffect $ ws.submitTxL2 tx

example/minimal/src/App.purs

@@ -35,7 +35,6 @@ import Contract.Utxos (getUtxo)
 import Control.Monad.Error.Class (liftMaybe)
 import Control.Monad.Logger.Trans (LoggerT, runLoggerT)
 import Control.Monad.Reader (ReaderT, ask, asks, runReaderT)
-import Ctl.Internal.ServerConfig (blockfrostPublicSanchonetServerConfig)
 import Data.Log.Formatter.Pretty (prettyFormatter)
 import Data.Log.Message (Message)
 import Data.Maybe (Maybe(Just, Nothing), maybe)
@@ -53,13 +52,7 @@ import Effect.Exception (error, throw)
 import HydraSdk.Example.Minimal.Config (DelegateServerConfig)
 import HydraSdk.Example.Minimal.Contract.Collateral (getCollateral)
 import HydraSdk.Lib (modify) as AVar
-import HydraSdk.Types
-  ( HydraHeadStatus(HeadStatus_Unknown)
-  , HydraSnapshot
-  , Network(Mainnet, Testnet)
-  , emptySnapshot
-  , networkToNetworkId
-  )
+import HydraSdk.Types (HydraHeadStatus(HeadStatus_Unknown), HydraSnapshot, emptySnapshot)
 import Node.Encoding (Encoding(UTF8))
 import Node.FS.Sync (readTextFile)
 

flake.nix

@@ -45,9 +45,6 @@
           ctl.overlays.purescript
           ctl.overlays.runtime
           ctl.overlays.spago
-          (_: _: {
-            arion = (import ctl.inputs.nixpkgs-arion { inherit system; }).arion;
-          })
         ];
       };
 

src/Internal/Types/Snapshot.purs

@@ -9,7 +9,6 @@ module HydraSdk.Internal.Types.Snapshot
 import Prelude
 
 import Aeson (class DecodeAeson, class EncodeAeson, decodeAeson, encodeAeson, getField)
-import Cardano.Types (TransactionHash)
 import Control.Alt ((<|>))
 import Data.Bifunctor (lmap)
 import Data.Codec.Argonaut (JsonCodec, array, decode, encode, object, string) as CA
@@ -19,6 +18,7 @@ import Data.Generic.Rep (class Generic)
 import Data.Newtype (class Newtype, wrap)
 import Data.Show.Generic (genericShow)
 import HydraSdk.Internal.Lib.Codec (aesonCodec, fromCaJsonDecodeError)
+import HydraSdk.Internal.Types.Tx (HydraTx, hydraTxCodec)
 import HydraSdk.Internal.Types.UtxoMap (HydraUtxoMap, hydraUtxoMapCodec)
 
 data ConfirmedSnapshot
@@ -58,8 +58,7 @@ confirmedSnapshotCodec =
 newtype HydraSnapshot = HydraSnapshot
   { snapshotNumber :: Int
   , utxo :: HydraUtxoMap
-  -- FIXME: support full transactions
-  -- , confirmedTransactions :: Array TransactionHash
+  , confirmed :: Array HydraTx
   }
 
 derive instance Generic HydraSnapshot _
@@ -75,19 +74,21 @@ instance DecodeAeson HydraSnapshot where
     snapshotNumber <- getField obj "snapshotNumber" <|> getField obj "number"
     utxo <- (lmap fromCaJsonDecodeError <<< CA.decode hydraUtxoMapCodec) =<< getField obj
       "utxo"
-    -- confirmedTransactions <- getField obj "confirmedTransactions" <|> getField obj "confirmed"
+    confirmed <-
+      (lmap fromCaJsonDecodeError <<< CA.decode (CA.array hydraTxCodec))
+        =<< getField obj "confirmed"
     pure $ wrap
       { snapshotNumber
       , utxo
-      -- , confirmedTransactions
+      , confirmed
       }
 
 instance EncodeAeson HydraSnapshot where
   encodeAeson (HydraSnapshot snapshot) = do
     encodeAeson
       { snapshotNumber: encodeAeson snapshot.snapshotNumber
       , utxo: CA.encode hydraUtxoMapCodec snapshot.utxo
-      -- , confirmedTransactions: encodeAeson snapshot.confirmedTransactions
+      , confirmed: CA.encode (CA.array hydraTxCodec) snapshot.confirmed
       }
 
 hydraSnapshotCodec :: CA.JsonCodec HydraSnapshot
@@ -97,6 +98,6 @@ emptySnapshot :: HydraSnapshot
 emptySnapshot = wrap
   { snapshotNumber: zero
   , utxo: mempty
-  -- , confirmedTransactions: mempty
+  , confirmed: mempty
   }
 

src/Internal/Types/Tx.purs

@@ -7,13 +7,15 @@ module HydraSdk.Internal.Types.Tx
 import Prelude
 
 import Cardano.AsCbor (encodeCbor)
-import Cardano.Types (CborBytes, Transaction)
+import Cardano.Types (CborBytes, Transaction, TransactionHash)
+import Cardano.Types.Transaction (hash) as Transaction
 import Data.Codec.Argonaut (JsonCodec, object, string) as CA
 import Data.Codec.Argonaut.Record (record) as CAR
-import HydraSdk.Internal.Lib.Codec (cborBytesCodec)
+import HydraSdk.Internal.Lib.Codec (cborBytesCodec, txHashCodec)
 
 type HydraTx =
   { cborHex :: CborBytes
+  , txId :: TransactionHash
   , description :: String
   , "type" :: String
   }
@@ -22,13 +24,15 @@ hydraTxCodec :: CA.JsonCodec HydraTx
 hydraTxCodec =
   CA.object "HydraTx" $ CAR.record
     { cborHex: cborBytesCodec
+    , txId: txHashCodec
     , description: CA.string
     , "type": CA.string
     }
 
 mkHydraTx :: Transaction -> HydraTx
 mkHydraTx tx =
   { cborHex: encodeCbor tx
+  , txId: Transaction.hash tx
   , description: ""
   -- In hydra-node, the "type" field is not used to determine content
   -- and any transaction is tried to decode as a "ConwayEra"