Revert signable rep for Snapshot

cardano-scaling · Jan 23, 2024 · 23ff08a · 23ff08a
1 parent c532d02
commit 23ff08a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/hydra-node/src/Hydra/HeadLogic.hs b/hydra-node/src/Hydra/HeadLogic.hs
@@ -846,11 +846,9 @@ update env ledger st ev = case (st, ev) of
     onOpenNetworkReqDec env openState transaction
   (Open openState@OpenState{headId, coordinatedHeadState, currentSlot}, ClientEvent Decommit{decommitTx}) -> do
     requireNoDecommitInFlight openState $
-      -- TODO: Spec: require U̅ ◦ decTx /= ⊥
-      requireValidDecommitTx $ \utxoToDecommit ->
+      requireValidDecommitTx $
         Effects
-          [ ClientEffect ServerOutput.DecommitRequestReceived{headId, utxoToDecommit}
-          , NetworkEffect ReqDec{transaction = decommitTx}
+          [ NetworkEffect ReqDec{transaction = decommitTx}
           ]
    where
     -- TODO: Spec: require U̅ ◦ decTx /= ⊥
@@ -869,7 +867,7 @@ update env ledger st ev = case (st, ev) of
                         }
                   }
             ]
-        Right _ -> cont $ utxoFromTx decommitTx
+        Right _ -> cont
 
     confirmedUTxO = (getSnapshot confirmedSnapshot).utxo
 

diff --git a/hydra-node/src/Hydra/Snapshot.hs b/hydra-node/src/Hydra/Snapshot.hs
@@ -82,9 +82,8 @@ instance forall tx. IsTx tx => SignableRepresentation (Snapshot tx) where
     LBS.toStrict $
       serialise (toData $ toBuiltin $ serialiseToRawBytes headId)
         <> serialise (toData $ toBuiltin $ toInteger number) -- CBOR(I(integer))
-        -- TODO: In the spec we have added new field but here we sign the diff
-        -- between two utxos.
-        <> serialise (toData $ toBuiltin $ hashUTxO @tx (utxo `withoutUTxO` maybe mempty id utxoToDecommit)) -- CBOR(B(bytestring)
+        <> serialise (toData $ toBuiltin $ hashUTxO @tx utxo) -- CBOR(B(bytestring)
+        <> maybe mempty (serialise . (toData . toBuiltin . hashUTxO @tx)) utxoToDecommit -- CBOR(B(bytestring)
 
 instance (Typeable tx, ToCBOR (UTxOType tx), ToCBOR (TxIdType tx)) => ToCBOR (Snapshot tx) where
   toCBOR Snapshot{headId, number, utxo, confirmed, utxoToDecommit} =

diff --git a/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs b/hydra-node/test/Hydra/Chain/Direct/ContractSpec.hs
@@ -213,11 +213,14 @@ prop_verifyOffChainSignatures =
           onChainSig = List.head . toPlutusSignatures $ aggregate [offChainSig]
           onChainParty = partyToChain $ deriveParty sk
           snapshotNumber = toInteger number
-          utxoHash = toBuiltin $ hashUTxO @SimpleTx (utxo `withoutUTxO` maybe mempty id utxoToDecommit)
+          utxoHash =
+            (toBuiltin $ hashUTxO @SimpleTx utxo)
+              <> maybe mempty ((toBuiltin . hashUTxO @SimpleTx)) utxoToDecommit
        in verifyPartySignature (headIdToCurrencySymbol headId) snapshotNumber utxoHash onChainParty onChainSig
             & counterexample ("headId: " <> show headId)
             & counterexample ("signed: " <> show onChainSig)
             & counterexample ("party: " <> show onChainParty)
+            & counterexample ("utxoHash: " <> show utxoHash)
             & counterexample ("message: " <> show (getSignableRepresentation snapshot))
 
 prop_verifySnapshotSignatures :: Property