Add useful fns, change the way we create acc

Author: vrom911

hydra-cluster/test/Test/BlockfrostChainSpec.hs

@@ -104,10 +104,7 @@ spec = around (onlyWithBlockfrostProjectFile . showLogsOnFailure "BlockfrostChai
           aliceChain `observesInTime'` OnCollectComTx{headId}
 
           let snapshotVersion = 0
-          let utxoHash = hashUTxO someUTxO
-              utxoToCommitHash = hashUTxO @Tx mempty
-              utxoToDecommitHash = hashUTxO @Tx mempty
-          let accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+          let accumulator = Accumulator.buildFromUTxO someUTxO
           let snapshot =
                 Snapshot
                   { headId

hydra-cluster/test/Test/DirectChainSpec.hs

@@ -313,10 +313,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
             aliceChain `observesInTime` OnCollectComTx{headId}
             let v = 0
             let snapshotVersion = 0
-                utxoHash = hashUTxO someUTxO
-                utxoToCommitHash = hashUTxO someUTxOToCommit
-                utxoToDecommitHash = hashUTxO @Tx mempty
-                accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+                accumulator = Accumulator.buildFromUTxO someUTxO
             let snapshot =
                   Snapshot
                     { headId
@@ -465,10 +462,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
               _ -> Nothing
             let (inHead, toDecommit) = splitUTxO someUTxO
             -- Alice contests with some snapshot U1 -> successful
-            let utxoHash = hashUTxO inHead
-                utxoToCommitHash = hashUTxO @Tx mempty
-                utxoToDecommitHash = hashUTxO toDecommit
-                accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+            let accumulator = Accumulator.buildFromUTxO inHead
             let snapshot1 =
                   Snapshot
                     { headId

hydra-node/src/Hydra/HeadLogic.hs

@@ -425,10 +425,7 @@ onOpenNetworkReqSn env ledger pendingDeposits currentSlot st otherParty sv sn re
               --       𝑈 ← 𝑈_active ◦ Treq
               requireApplyTxs activeUTxO requestedTxs $ \u -> do
                 let snapshotUTxO = u `withoutUTxO` fromMaybe mempty mUtxoToCommit
-                    utxoHash = hashUTxO snapshotUTxO
-                    utxoToCommitHash = hashUTxO $ fromMaybe mempty mUtxoToCommit
-                    utxoToDecommitHash = hashUTxO $ fromMaybe mempty mUtxoToDecommit
-                    accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+                    accumulator = Accumulator.buildFromUTxO snapshotUTxO
                 -- Spec: ŝ ← ̅S.s + 1
                 -- NOTE: confSn == seenSn == sn here
                 let nextSnapshot =

hydra-node/src/Hydra/Ledger/Simple.hs

@@ -101,6 +101,11 @@ instance IsTx SimpleTx where
       , txOutputs = mempty
       }
 
+  -- \| For SimpleTx, we use a simple pair representation where both elements are the same output.
+  toPairList = Set.toList
+
+  utxoToElement = toStrict . serialise . unSimpleTxOut
+
 -- * Simple chain state
 
 newtype SimpleChainState = SimpleChainState {slot :: ChainSlot}

hydra-node/test/Hydra/API/HTTPServerSpec.hs

@@ -44,7 +44,7 @@ import Hydra.Logging (nullTracer)
 import Hydra.Node.State (NodeState (..))
 import Hydra.Tx (ConfirmedSnapshot (..))
 import Hydra.Tx.Accumulator qualified as Accumulator
-import Hydra.Tx.IsTx (UTxOType, hashUTxO, txId)
+import Hydra.Tx.IsTx (UTxOType, txId)
 import Hydra.Tx.Snapshot (Snapshot (..))
 import System.FilePath ((</>))
 import System.IO.Unsafe (unsafePerformIO)
@@ -700,8 +700,7 @@ apiServerSpec = do
       prop "returns 200 OK on confirmed snapshot" $ do
         responseChannel <- newTChanIO
         let utxo' = mempty
-            utxoHash = hashUTxO utxo'
-            accumulator = Accumulator.build [utxoHash, hashUTxO @SimpleTx mempty, hashUTxO @SimpleTx mempty]
+            accumulator = Accumulator.buildFromUTxO utxo'
             snapshot =
               Snapshot
                 { headId = testHeadId

hydra-node/test/Hydra/Chain/Direct/TxTraceSpec.hs

@@ -770,10 +770,7 @@ signedSnapshot ms =
     let u = realWorldModelUTxO (toCommit ms)
      in if UTxO.null u then Nothing else Just u
 
-  utxoHash = hashUTxO utxo
-  utxoToCommitHash = hashUTxO @Tx $ fromMaybe mempty utxoToCommit
-  utxoToDecommitHash = hashUTxO @Tx $ fromMaybe mempty utxoToDecommit
-  accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+  accumulator = Accumulator.buildFromUTxO utxo
 
 -- | A confirmed snapshot (either initial or later confirmed), based onTxTra
 -- 'signedSnapshot'.

hydra-node/test/Hydra/HeadLogicSnapshotSpec.hs

@@ -18,7 +18,7 @@ import Hydra.Options (defaultContestationPeriod, defaultDepositPeriod)
 import Hydra.Tx.Accumulator qualified as Accumulator
 import Hydra.Tx.Crypto (sign)
 import Hydra.Tx.HeadParameters (HeadParameters (..))
-import Hydra.Tx.IsTx (IsTx, UTxOType, hashUTxO, txId)
+import Hydra.Tx.IsTx (IsTx, UTxOType, txId)
 import Hydra.Tx.Party (Party, deriveParty)
 import Hydra.Tx.Snapshot (ConfirmedSnapshot (..), Snapshot (..), SnapshotNumber, SnapshotVersion, getSnapshot)
 import Test.Hydra.Tx.Fixture (
@@ -232,10 +232,7 @@ testSnapshot ::
   UTxOType tx ->
   Snapshot tx
 testSnapshot number version confirmed utxo =
-  let utxoHash = hashUTxO utxo
-      utxoToCommitHash = hashUTxO @tx mempty
-      utxoToDecommitHash = hashUTxO @tx mempty
-      accumulator = Accumulator.build [utxoHash, utxoToCommitHash, utxoToDecommitHash]
+  let accumulator = Accumulator.buildFromUTxO utxo
    in Snapshot
         { headId = testHeadId
         , version

hydra-node/test/Hydra/HeadLogicSpec.hs

@@ -590,7 +590,6 @@ spec =
         let decommitTx1 = SimpleTx 1 (utxoRef 1) (utxoRef 3)
             decommitTx2 = SimpleTx 2 (utxoRef 2) (utxoRef 4)
             activeUTxO = utxoRefs [1, 2]
-            utxoHash = hashUTxO activeUTxO
             snapshot =
               Snapshot
                 { headId = testHeadId
@@ -600,7 +599,7 @@ spec =
                 , utxo = activeUTxO
                 , utxoToCommit = Nothing
                 , utxoToDecommit = Just $ utxoRefs [3]
-                , accumulator = Accumulator.build [utxoHash, hashUTxO @SimpleTx mempty, hashUTxO @SimpleTx $ utxoRefs [3]]
+                , accumulator = Accumulator.buildFromUTxO activeUTxO
                 }
             s0 =
               inOpenState'
@@ -892,8 +891,7 @@ spec =
         prop "reject side load confirmed snapshot because wrong snapshot utxoToDecommit" $ \utxoToDecommit -> do
           getConfirmedSnapshot startingState `shouldBe` Just snapshot1
           let utxo' = utxoRef 3
-              utxoHash = hashUTxO utxo'
-              accumulator = Accumulator.build [utxoHash, hashUTxO @SimpleTx mempty, hashUTxO @SimpleTx $ fromMaybe mempty (Just utxoToDecommit)]
+              accumulator = Accumulator.buildFromUTxO utxo'
               snapshot2 = Snapshot testHeadId 0 2 [tx2] utxo' Nothing (Just utxoToDecommit) accumulator
               multisig2 = aggregate [sign aliceSk snapshot2, sign bobSk snapshot2]
 
@@ -904,8 +902,7 @@ spec =
           getConfirmedSnapshot startingState `shouldBe` Just snapshot1
 
           let utxo' = utxoRef 3
-              utxoHash = hashUTxO utxo'
-              accumulator = Accumulator.build [utxoHash, hashUTxO @SimpleTx $ fromMaybe mempty (Just utxoToCommit), hashUTxO @SimpleTx mempty]
+              accumulator = Accumulator.buildFromUTxO utxo'
               snapshot2 = Snapshot testHeadId 0 2 [tx2] utxo' (Just utxoToCommit) Nothing accumulator
               multisig2 = aggregate [sign aliceSk snapshot2, sign bobSk snapshot2]
 
@@ -1430,14 +1427,13 @@ testSnapshot ::
   UTxOType tx ->
   Snapshot tx
 testSnapshot number version confirmed utxo =
-  let utxoHash = hashUTxO utxo
-   in Snapshot
-        { headId = testHeadId
-        , version
-        , number
-        , confirmed
-        , utxo
-        , utxoToCommit = mempty
-        , utxoToDecommit = mempty
-        , accumulator = Accumulator.build [utxoHash, hashUTxO @tx mempty, hashUTxO @tx mempty]
-        }
+  Snapshot
+    { headId = testHeadId
+    , version
+    , number
+    , confirmed
+    , utxo
+    , utxoToCommit = mempty
+    , utxoToDecommit = mempty
+    , accumulator = Accumulator.buildFromUTxO utxo
+    }

hydra-node/test/Hydra/Model/Payment.hs

@@ -94,6 +94,12 @@ instance IsTx Payment where
         result = Set.toList $ Set.fromList as \\ Set.fromList bs
      in second fromList <$> result
 
+  -- For Payment, UTxO is already a list of pairs
+  toPairList = id
+
+  -- For Payment, just use show for serialization (consistent with hashUTxO)
+  utxoToElement = encodeUtf8 . show @Text
+
 applyTx :: UTxOType Payment -> Payment -> UTxOType Payment
 applyTx utxo Payment{from, to, value} =
   (to, value) : List.delete (from, value) utxo

hydra-tx/hydra-tx.cabal

@@ -102,6 +102,7 @@ library
     , ouroboros-consensus
     , ouroboros-consensus-cardano
     , plutus-ledger-api
+    , plutus-tx
     , prettyprinter
     , QuickCheck
     , quickcheck-instances