fixes after rebase

Author: ffakenz

hydra-node/json-schemas/api.yaml

@@ -1527,13 +1527,16 @@ components:
       type: object
       required:
         - tag
+        - headId
         - confirmedSnapshot
         - seq
         - timestamp
       properties:
         tag:
           type: string
           enum: ["SnapshotSideLoaded"]
+        headId:
+          $ref: "api.yaml#/components/schemas/HeadId"
         confirmedSnapshot:
           $ref: "api.yaml#/components/schemas/ConfirmedSnapshot"
         seq:

hydra-node/src/Hydra/API/ClientInput.hs

@@ -41,4 +41,4 @@ instance (Arbitrary tx, Arbitrary (TxIdType tx), Arbitrary (UTxOType tx), IsTx t
     Fanout -> []
     SideLoadSnapshot sn -> SideLoadSnapshot <$> shrink sn
 
-instance (Arbitrary tx, Arbitrary (TxIdType tx)) => ToADTArbitrary (ClientInput tx)
+instance (Arbitrary tx, Arbitrary (TxIdType tx), Arbitrary (UTxOType tx), IsTx tx) => ToADTArbitrary (ClientInput tx)

hydra-node/src/Hydra/API/Server.hs

@@ -35,7 +35,7 @@ import Hydra.Events (EventSink (..), EventSource (..), StateEvent (..))
 import Hydra.HeadLogic.Outcome qualified as StateChanged
 import Hydra.Logging (Tracer, traceWith)
 import Hydra.Network (IP, PortNumber)
-import Hydra.Tx (HeadId, IsTx (..), Party, txId)
+import Hydra.Tx (ConfirmedSnapshot (..), HeadId, IsTx (..), Party, txId)
 import Hydra.Tx qualified as Tx
 import Hydra.Tx.Environment (Environment)
 import Network.HTTP.Types (status500)
@@ -225,6 +225,7 @@ mkTimedServerOutputFromStateEvent event =
     StateChanged.TransactionAppliedToLocalUTxO{..} -> Just TxValid{headId, transactionId = txId tx, transaction = tx}
     StateChanged.TxInvalid{..} -> Just $ TxInvalid{..}
     StateChanged.SnapshotConfirmed{..} -> Just SnapshotConfirmed{..}
+    StateChanged.SnapshotSideLoaded{..} -> Just SnapshotSideLoaded{..}
     StateChanged.IgnoredHeadInitializing{..} -> Just IgnoredHeadInitializing{..}
     StateChanged.DecommitRecorded{..} -> Just DecommitRequested{..}
     StateChanged.DecommitInvalid{..} -> Just DecommitInvalid{..}
@@ -294,3 +295,11 @@ projectSnapshotUtxo snapshotUtxo = \case
   StateChanged.SnapshotConfirmed _ snapshot _ -> Just $ Tx.utxo snapshot <> fromMaybe mempty (Tx.utxoToCommit snapshot)
   StateChanged.HeadOpened _ _ utxos -> Just utxos
   _other -> snapshotUtxo
+
+-- | Projection of latest confirmed snapshot.
+projectSnapshotConfirmed :: Maybe (ConfirmedSnapshot tx) -> StateChanged.StateChanged tx -> Maybe (ConfirmedSnapshot tx)
+projectSnapshotConfirmed snapshotConfirmed = \case
+  StateChanged.SnapshotConfirmed _ snapshot signatures -> Just $ ConfirmedSnapshot snapshot signatures
+  StateChanged.HeadOpened headId utxos -> Just $ InitialSnapshot headId utxos
+  StateChanged.SnapshotSideLoaded _ confirmedSnapshot -> Just $ confirmedSnapshot
+  _other -> snapshotConfirmed

hydra-node/src/Hydra/API/ServerOutput.hs

@@ -191,7 +191,7 @@ data ServerOutput tx
   | -- | Snapshot was side-loaded, and the included transactions can be considered final.
     -- The local state has been reset, meaning pending transactions were pruned.
     -- Any signing round has been discarded, and the snapshot leader has changed accordingly.
-    SnapshotSideLoaded {confirmedSnapshot :: ConfirmedSnapshot tx}
+    SnapshotSideLoaded {headId :: HeadId, confirmedSnapshot :: ConfirmedSnapshot tx}
   deriving stock (Generic)
 
 deriving stock instance IsChainState tx => Eq (ServerOutput tx)
@@ -244,7 +244,7 @@ instance ArbitraryIsTx tx => Arbitrary (ServerOutput tx) where
     PeerConnected peer -> PeerConnected <$> shrink peer
     PeerDisconnected peer -> PeerDisconnected <$> shrink peer
     PeerHandshakeFailure host our theirs -> PeerHandshakeFailure <$> shrink host <*> shrink our <*> shrink theirs
-    SnapshotSideLoaded confirmedSnapshot -> SnapshotSideLoaded <$> shrink confirmedSnapshot
+    SnapshotSideLoaded headId confirmedSnapshot -> SnapshotSideLoaded headId <$> shrink confirmedSnapshot
 
 instance (ArbitraryIsTx tx, IsChainState tx) => ToADTArbitrary (ServerOutput tx)
 
@@ -307,15 +307,18 @@ prepareServerOutput config response =
     SnapshotSideLoaded{confirmedSnapshot} ->
       case confirmedSnapshot of
         InitialSnapshot{} ->
-          handleUtxoInclusion (atKey "initialUTxO" .~ Nothing) encodedResponse
+          handleUtxoInclusion config removeInitialUTxO encodedResponse
         ConfirmedSnapshot{} ->
-          handleUtxoInclusion (key "snapshot" . atKey "utxo" .~ Nothing) encodedResponse
+          handleUtxoInclusion config removeSnapshotUTxO encodedResponse
  where
   encodedResponse = encode response
 
 removeSnapshotUTxO :: LBS.ByteString -> LBS.ByteString
 removeSnapshotUTxO = key "snapshot" . atKey "utxo" .~ Nothing
 
+removeInitialUTxO :: LBS.ByteString -> LBS.ByteString
+removeInitialUTxO = atKey "initialUTxO" .~ Nothing
+
 handleUtxoInclusion :: ServerOutputConfig -> (a -> a) -> a -> a
 handleUtxoInclusion config f bs =
   case utxoInSnapshot config of

hydra-node/src/Hydra/HeadLogic.hs

@@ -1118,8 +1118,7 @@ onOpenClientSideLoadSnapshot openState sideLoadConfirmedSnapshot =
         then -- Spec:  ̅S ← snObj(v̂, ŝ, Û, T̂, 𝑈𝛼, 𝑈𝜔)
         --        ̅S.σ ← ̃σ
 
-          newState SnapshotSideLoaded{confirmedSnapshot = sideLoadConfirmedSnapshot}
-            <> cause (ClientEffect $ ServerOutput.SnapshotSideLoaded sideLoadConfirmedSnapshot)
+          newState SnapshotSideLoaded{headId, confirmedSnapshot = sideLoadConfirmedSnapshot}
         else Error $ AssertionFailed "InitalSnapshot side loaded does not match last known."
     ConfirmedSnapshot{snapshot, signatures} ->
       -- REVIEW! should we check utxoToCommit and utxoToDecommit are the same ???
@@ -1134,12 +1133,12 @@ onOpenClientSideLoadSnapshot openState sideLoadConfirmedSnapshot =
             do
               -- Spec:  ̅S ← snObj(v̂, ŝ, Û, T̂, 𝑈𝛼, 𝑈𝜔)
               --        ̅S.σ ← ̃σ
-              newState SnapshotSideLoaded{confirmedSnapshot = sideLoadConfirmedSnapshot}
               -- REVIEW! what if we WaitOnNotApplicableTx for current localTxs not in snapshot confirmed ???
-              <> cause (ClientEffect $ ServerOutput.SnapshotSideLoaded sideLoadConfirmedSnapshot)
+              newState SnapshotSideLoaded{headId, confirmedSnapshot = sideLoadConfirmedSnapshot}
  where
   OpenState
-    { parameters = HeadParameters{parties}
+    { headId
+    , parameters = HeadParameters{parties}
     , coordinatedHeadState
     } = openState
 

hydra-node/src/Hydra/HeadLogic/Outcome.hs

@@ -114,20 +114,12 @@ data StateChanged tx
   | CommitFinalized {headId :: HeadId, newVersion :: SnapshotVersion, depositTxId :: TxIdType tx}
   | DecommitFinalized {headId :: HeadId, decommitTxId :: TxIdType tx, newVersion :: SnapshotVersion}
   | PartySignedSnapshot {snapshot :: Snapshot tx, party :: Party, signature :: Signature (Snapshot tx)}
-<<<<<<< HEAD
   | SnapshotConfirmed {headId :: HeadId, snapshot :: Snapshot tx, signatures :: MultiSignature (Snapshot tx)}
+  | SnapshotSideLoaded {headId :: HeadId, confirmedSnapshot :: ConfirmedSnapshot tx}
   | HeadClosed {headId :: HeadId, snapshotNumber :: SnapshotNumber, chainState :: ChainStateType tx, contestationDeadline :: UTCTime}
   | HeadContested {headId :: HeadId, chainState :: ChainStateType tx, contestationDeadline :: UTCTime, snapshotNumber :: SnapshotNumber}
   | HeadIsReadyToFanout {headId :: HeadId}
   | HeadFannedOut {headId :: HeadId, utxo :: UTxOType tx, chainState :: ChainStateType tx}
-=======
-  | SnapshotConfirmed {snapshot :: Snapshot tx, signatures :: MultiSignature (Snapshot tx)}
-  | SnapshotSideLoaded {confirmedSnapshot :: ConfirmedSnapshot tx}
-  | HeadClosed {chainState :: ChainStateType tx, contestationDeadline :: UTCTime}
-  | HeadContested {chainState :: ChainStateType tx, contestationDeadline :: UTCTime}
-  | HeadIsReadyToFanout
-  | HeadFannedOut {chainState :: ChainStateType tx}
->>>>>>> 156d853b5 (introduce server output, outcome event and aggregate handle in logic)
   | ChainRolledBack {chainState :: ChainStateType tx}
   | TickObserved {chainSlot :: ChainSlot}
   | IgnoredHeadInitializing
@@ -155,41 +147,20 @@ instance (ArbitraryIsTx tx, IsChainState tx) => ToADTArbitrary (StateChanged tx)
 genStateChanged :: (ArbitraryIsTx tx, IsChainState tx) => Environment -> Gen (StateChanged tx)
 genStateChanged env =
   oneof
-<<<<<<< HEAD
     [ HeadInitialized (mkHeadParameters env) <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
     , CommittedUTxO <$> arbitrary <*> pure party <*> arbitrary <*> arbitrary
     , HeadAborted <$> arbitrary <*> arbitrary <*> arbitrary
     , HeadOpened <$> arbitrary <*> arbitrary <*> arbitrary
     , TransactionAppliedToLocalUTxO <$> arbitrary <*> arbitrary <*> arbitrary
     , SnapshotConfirmed <$> arbitrary <*> arbitrary <*> arbitrary
+    , SnapshotSideLoaded <$> arbitrary <*> arbitrary
     , CommitRecorded <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
     , CommitFinalized <$> arbitrary <*> arbitrary <*> arbitrary
     , DecommitFinalized <$> arbitrary <*> arbitrary <*> arbitrary
     , HeadClosed <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
     , HeadContested <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
     , HeadIsReadyToFanout <$> arbitrary
     , HeadFannedOut <$> arbitrary <*> arbitrary <*> arbitrary
-=======
-    [ HeadInitialized (mkHeadParameters env) <$> arbitrary <*> arbitrary <*> arbitrary
-    , CommittedUTxO party <$> arbitrary <*> arbitrary
-    , HeadAborted <$> arbitrary
-    , HeadOpened <$> arbitrary <*> arbitrary
-    , TransactionReceived <$> arbitrary
-    , TransactionAppliedToLocalUTxO <$> arbitrary <*> arbitrary
-    , DecommitRecorded <$> arbitrary <*> arbitrary
-    , SnapshotRequestDecided <$> arbitrary
-    , SnapshotRequested <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
-    , PartySignedSnapshot <$> arbitrary <*> arbitrary <*> arbitrary
-    , SnapshotConfirmed <$> arbitrary <*> arbitrary
-    , SnapshotSideLoaded <$> arbitrary
-    , DecommitFinalized <$> arbitrary
-    , HeadClosed <$> arbitrary <*> arbitrary
-    , HeadContested <$> arbitrary <*> arbitrary
-    , pure HeadIsReadyToFanout
-    , HeadFannedOut <$> arbitrary
-    , ChainRolledBack <$> arbitrary
-    , TickObserved <$> arbitrary
->>>>>>> 156d853b5 (introduce server output, outcome event and aggregate handle in logic)
     ]
  where
   Environment{party} = env