Change OnDepositTx to not use POSIXTime

Author: ch1bo

hydra-node/hydra-node.cabal

@@ -136,7 +136,6 @@ library
     , http-types
     , hydra-cardano-api
     , hydra-plutus
-    , hydra-plutus-extras
     , hydra-prelude
     , hydra-tx
     , hydra-tx:testlib
@@ -373,7 +372,6 @@ test-suite tests
     , hydra-node:examples
     , hydra-node:testlib
     , hydra-plutus
-    , hydra-plutus-extras
     , hydra-prelude
     , hydra-test-utils
     , hydra-tx

hydra-node/src/Hydra/Chain/Direct/Handlers.hs

@@ -65,7 +65,6 @@ import Hydra.Chain.Direct.Wallet (
  )
 import Hydra.Ledger.Cardano (adjustUTxO, fromChainSlot)
 import Hydra.Logging (Tracer, traceWith)
-import Hydra.Plutus.Extras (posixToUTCTime)
 import Hydra.Tx (
   CommitBlueprintTx (..),
   HeadParameters (..),
@@ -339,14 +338,7 @@ convertObservation TimeHandle{slotToUTCTime} = \case
     pure OnCollectComTx{headId}
   Deposit DepositObservation{headId, depositTxId, deposited, created, deadline} -> do
     createdTime <- either (const Nothing) Just $ slotToUTCTime created
-    pure $
-      OnDepositTx
-        { headId
-        , depositTxId
-        , deposited
-        , created = createdTime
-        , deadline = posixToUTCTime deadline
-        }
+    pure $ OnDepositTx{headId, depositTxId, deposited, created = createdTime, deadline}
   Recover RecoverObservation{headId, recoveredTxId, recoveredUTxO} ->
     pure OnRecoverTx{headId, recoveredTxId, recoveredUTxO}
   Increment IncrementObservation{headId, newVersion, depositTxId} ->

hydra-node/src/Hydra/Chain/Direct/State.hs

@@ -74,7 +74,6 @@ import Hydra.Ledger.Cardano (adjustUTxO)
 import Hydra.Ledger.Cardano.Evaluate (genPointInTimeBefore, genValidityBoundsFromContestationPeriod, slotLength, systemStart)
 import Hydra.Ledger.Cardano.Time (slotNoFromUTCTime)
 import Hydra.Plutus (commitValidatorScript, depositValidatorScript, initialValidatorScript)
-import Hydra.Plutus.Extras (posixToUTCTime)
 import Hydra.Tx (
   CommitBlueprintTx (..),
   ConfirmedSnapshot (..),
@@ -1155,7 +1154,7 @@ genRecoverTx = do
   (_, _, depositedUTxO, txDeposit) <- genDepositTx maximumNumberOfParties
   let DepositObservation{deposited, deadline} =
         fromJust $ observeDepositTx testNetworkId txDeposit
-  let slotNo = slotNoFromUTCTime systemStart slotLength (posixToUTCTime deadline)
+  let slotNo = slotNoFromUTCTime systemStart slotLength deadline
   slotNo' <- arbitrary
   let tx = recoverTx (getTxId $ getTxBody txDeposit) deposited (slotNo + slotNo')
   pure (depositedUTxO, tx)
@@ -1168,7 +1167,7 @@ genIncrementTx numParties = do
   let openUTxO = getKnownUTxO st
   let version = 0
   snapshot <- genConfirmedSnapshot headId version 1 openUTxO (Just deposited) Nothing (ctxHydraSigningKeys ctx)
-  let slotNo = slotNoFromUTCTime systemStart slotLength (posixToUTCTime deadline)
+  let slotNo = slotNoFromUTCTime systemStart slotLength deadline
   pure
     ( cctx
     , st

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

@@ -95,7 +95,6 @@ import Hydra.Ledger.Cardano.Evaluate (
  )
 import Hydra.Ledger.Cardano.Time (slotNoFromUTCTime)
 import Hydra.Plutus (initialValidatorScript)
-import Hydra.Plutus.Extras.Time (posixToUTCTime)
 import Hydra.Tx.ContestationPeriod (toNominalDiffTime)
 import Hydra.Tx.Deposit (DepositObservation (..), observeDepositTx)
 import Hydra.Tx.Observe (
@@ -540,7 +539,7 @@ prop_incrementObservesCorrectUTxO = monadicIO $ do
     Nothing -> assertWith False "Deposit not observed"
     Just DepositObservation{depositTxId = depositedTxId, deadline} -> do
       cctx <- pickBlind $ pickChainContext ctx
-      let slotNo = slotNoFromUTCTime systemStart slotLength (posixToUTCTime deadline)
+      let slotNo = slotNoFromUTCTime systemStart slotLength deadline
       let version = 0
       let openUTxO = getKnownUTxO st
       -- NOTE: Use second deposit utxo deliberately here to test that the

hydra-node/test/Hydra/Events/RotationSpec.hs

@@ -6,7 +6,6 @@ import Test.Hydra.Prelude
 import Data.List qualified as List
 import Hydra.Chain (OnChainTx (..))
 import Hydra.Chain.ChainState (ChainSlot (..), IsChainState)
-import Hydra.Data.ContestationPeriod (addContestationPeriod)
 import Hydra.Events (EventSink (..), HasEventId (..), getEvents)
 import Hydra.Events.Rotation (EventStore (..), RotationConfig (..), newRotatedEventStore)
 import Hydra.HeadLogic (HeadState (..), IdleState (..), StateChanged (..), aggregate)
@@ -15,8 +14,7 @@ import Hydra.Ledger.Simple (SimpleChainState (..), simpleLedger)
 import Hydra.Logging (showLogsOnFailure)
 import Hydra.Node (hydrate)
 import Hydra.NodeSpec (createMockEventStore, inputsToOpenHead, notConnect, observationInput, primeWith, runToCompletion)
-import Hydra.Plutus.Extras (posixFromUTCTime, posixToUTCTime)
-import Hydra.Tx.ContestationPeriod (toChain)
+import Hydra.Tx.ContestationPeriod (toNominalDiffTime)
 import Test.Hydra.Node.Fixture (testEnvironment, testHeadId)
 import Test.Hydra.Tx.Fixture (cperiod)
 import Test.QuickCheck (Positive (..))
@@ -56,8 +54,8 @@ spec = parallel $ do
             >>= primeWith inputsToOpenHead
             >>= runToCompletion
           now <- getCurrentTime
-          let contestationDeadline = addContestationPeriod (posixFromUTCTime now) (toChain cperiod)
-          let closeInput = observationInput $ OnCloseTx testHeadId 0 (posixToUTCTime contestationDeadline)
+          let contestationDeadline = toNominalDiffTime cperiod `addUTCTime` now
+          let closeInput = observationInput $ OnCloseTx testHeadId 0 contestationDeadline
           testHydrate rotatingEventStore []
             >>= notConnect
             >>= primeWith [closeInput]
@@ -69,8 +67,8 @@ spec = parallel $ do
       it "a rotated and non-rotated node have consistent state" $ \testHydrate -> do
         -- prepare inputs
         now <- getCurrentTime
-        let contestationDeadline = addContestationPeriod (posixFromUTCTime now) (toChain cperiod)
-        let closeInput = observationInput $ OnCloseTx testHeadId 0 (posixToUTCTime contestationDeadline)
+        let contestationDeadline = toNominalDiffTime cperiod `addUTCTime` now
+        let closeInput = observationInput $ OnCloseTx testHeadId 0 contestationDeadline
         let inputs = inputsToOpenHead ++ [closeInput]
         failAfter 1 $
           do

hydra-tx/src/Hydra/Tx/Deposit.hs

@@ -1,5 +1,6 @@
 module Hydra.Tx.Deposit where
 
+import Hydra.Cardano.Api
 import Hydra.Prelude hiding (toList)
 
 import Cardano.Api.UTxO qualified as UTxO
@@ -9,11 +10,10 @@ import Data.Maybe.Strict (StrictMaybe (..))
 import Data.Sequence.Strict qualified as StrictSeq
 import Data.Set qualified as Set
 import GHC.IsList (toList)
-import Hydra.Cardano.Api
 import Hydra.Contract.Commit qualified as Commit
 import Hydra.Contract.Deposit qualified as Deposit
 import Hydra.Plutus (depositValidatorScript)
-import Hydra.Plutus.Extras.Time (posixFromUTCTime)
+import Hydra.Plutus.Extras.Time (posixFromUTCTime, posixToUTCTime)
 import Hydra.Tx (CommitBlueprintTx (..), HeadId, currencySymbolToHeadId, headIdToCurrencySymbol, txId)
 import Hydra.Tx.Utils (addMetadata, mkHydraHeadV1TxName)
 import PlutusLedgerApi.V3 (POSIXTime)
@@ -79,19 +79,10 @@ data DepositObservation = DepositObservation
   , depositTxId :: TxId
   , deposited :: UTxO
   , created :: SlotNo
-  , deadline :: POSIXTime
+  , deadline :: UTCTime
   }
   deriving stock (Show, Eq, Generic)
-
-instance ToJSON DepositObservation where
-  toJSON = undefined -- TODO: ToJSON POSIXTime?
-
-instance FromJSON DepositObservation where
-  parseJSON = undefined -- TODO: FromJSON POSIXTime?
-
-instance Arbitrary DepositObservation where
-  arbitrary = undefined -- TODO: Arbitrary TxId and UTxO
-  shrink = undefined -- TODO: Arbitrary TxId and UTxO
+  deriving anyclass (ToJSON, FromJSON)
 
 -- | Observe a deposit transaction by decoding the target head id, deposit
 -- deadline and deposited utxo in the datum.
@@ -116,7 +107,7 @@ observeDepositTx networkId tx = do
       , depositTxId = txId tx
       , deposited
       , created
-      , deadline
+      , deadline = posixToUTCTime deadline
       }
  where
   spendsAll = all (`elem` txIns' tx) . UTxO.inputSet