Merge pull request #1016 from input-output-hk/hydra-plutus-extras

Create a hydra-plutus-extras package

CHANGELOG.md

@@ -62,6 +62,9 @@ changes.
   - Change `minUTxOValue` to take `BundledProtocolParameters`.
   - Add `fromLedgerMultiAsset` helper as transactions only `mint` `MultiAsset`.
 
+- Created `hydra-plutus-extras` package to re-use some utilities better between
+  packages.
+
 ## [0.11.0] - 2023-06-30
 
 This release contains breaking changes of the persistence and on-chain scripts

cabal.project

@@ -19,6 +19,7 @@ packages:
   hydra-prelude
   hydra-cardano-api
   hydra-test-utils
+  hydra-plutus-extras
   plutus-cbor
   plutus-merkle-tree
   hydra-plutus

hydra-node/bench/tx-cost/Main.hs

@@ -20,7 +20,7 @@ import Options.Applicative (
   short,
   strOption,
  )
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import System.Directory (createDirectoryIfMissing, doesDirectoryExist)
 import System.FilePath ((</>))
 import System.IO.Unsafe (unsafePerformIO)

hydra-node/bench/tx-cost/TxCost.hs

@@ -53,7 +53,7 @@ import Hydra.Ledger.Cardano.Evaluate (
   usedExecutionUnits,
  )
 import Hydra.Snapshot (genConfirmedSnapshot)
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import PlutusLedgerApi.V2 (toBuiltinData)
 import PlutusTx.Builtins (lengthOfByteString, serialiseData)
 import Test.QuickCheck (generate)

hydra-node/hydra-node.cabal

@@ -157,6 +157,7 @@ library
     , http-types
     , hydra-cardano-api
     , hydra-plutus
+    , hydra-plutus-extras
     , hydra-prelude
     , io-classes                                                >=0.3.0.0
     , iohk-monitoring
@@ -223,14 +224,15 @@ executable hydra-net
   main-is:        Main.hs
   other-modules:  Log
   build-depends:
-      aeson
+    , aeson
     , contra-tracer
     , hydra-cardano-api
-    , network
     , hydra-node
     , hydra-prelude
+    , network
     , optparse-applicative
-    , ouroboros-network-framework                                       >=0.3.0.0
+    , ouroboros-network-framework  >=0.3.0.0
+
   ghc-options:    -threaded -rtsopts
 
 benchmark tx-cost
@@ -248,6 +250,7 @@ benchmark tx-cost
     , hydra-cardano-api
     , hydra-node
     , hydra-plutus
+    , hydra-plutus-extras
     , hydra-prelude
     , optparse-applicative
     , plutus-ledger-api
@@ -358,6 +361,7 @@ test-suite tests
     , hydra-cardano-api
     , hydra-node
     , hydra-plutus
+    , hydra-plutus-extras
     , hydra-prelude
     , hydra-test-utils
     , io-classes

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

@@ -61,7 +61,7 @@ import Hydra.Chain.Direct.Wallet (
 import Hydra.ContestationPeriod (toNominalDiffTime)
 import Hydra.Ledger (ChainSlot (ChainSlot))
 import Hydra.Logging (Tracer, traceWith)
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import System.IO.Error (userError)
 
 -- | Handle of a local chain state that is kept in the direct chain layer.

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

@@ -104,7 +104,7 @@ import Hydra.Chain.Direct.Tx (
 import Hydra.ContestationPeriod (ContestationPeriod)
 import Hydra.Contract.HeadTokens (mkHeadTokenScript)
 import Hydra.Crypto (HydraKey)
-import Hydra.Data.ContestationPeriod (posixToUTCTime)
+import Hydra.Plutus.Extras (posixToUTCTime)
 import Hydra.Ledger (ChainSlot (ChainSlot), IsTx (hashUTxO))
 import Hydra.Ledger.Cardano (genOneUTxOFor, genUTxOAdaOnlyOfSize, genVerificationKey)
 import Hydra.Ledger.Cardano.Evaluate (genPointInTimeBefore, genValidityBoundsFromContestationPeriod, slotNoFromUTCTime)

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

@@ -31,7 +31,7 @@ import qualified Hydra.Contract.Initial as Initial
 import Hydra.Contract.MintAction (MintAction (Burn, Mint))
 import Hydra.Contract.Util (hydraHeadV1)
 import Hydra.Crypto (MultiSignature, toPlutusSignatures)
-import Hydra.Data.ContestationPeriod (addContestationPeriod, posixFromUTCTime)
+import Hydra.Data.ContestationPeriod (addContestationPeriod)
 import qualified Hydra.Data.ContestationPeriod as OnChain
 import qualified Hydra.Data.Party as OnChain
 import Hydra.Ledger (IsTx (hashUTxO))
@@ -49,8 +49,9 @@ import Hydra.Ledger.Cardano.Builder (
   unsafeBuildTransaction,
  )
 import Hydra.Party (Party, partyFromChain, partyToChain)
+import Hydra.Plutus.Orphans ()
 import Hydra.Snapshot (Snapshot (..), SnapshotNumber, fromChainSnapshot)
-import Plutus.Orphans ()
+import Hydra.Plutus.Extras (posixFromUTCTime)
 import PlutusLedgerApi.V2 (CurrencySymbol (CurrencySymbol), fromBuiltin, toBuiltin)
 import qualified PlutusLedgerApi.V2 as Plutus
 

hydra-node/src/Hydra/Ledger/Cardano/Evaluate.hs

@@ -67,7 +67,7 @@ import Hydra.Cardano.Api (
   toLedgerUTxO,
  )
 import Hydra.ContestationPeriod (ContestationPeriod (UnsafeContestationPeriod))
-import Hydra.Data.ContestationPeriod (posixToUTCTime)
+import Hydra.Plutus.Extras (posixToUTCTime)
 import Ouroboros.Consensus.Cardano.Block (CardanoEras)
 import Ouroboros.Consensus.HardFork.History (
   Bound (Bound, boundEpoch, boundSlot, boundTime),

hydra-node/test/Hydra/Chain/Direct/Contract/Close.hs

@@ -36,15 +36,15 @@ import qualified Hydra.Contract.HeadState as Head
 import Hydra.Contract.HeadTokens (headPolicyId)
 import Hydra.Contract.Util (UtilError (MintingOrBurningIsForbidden))
 import Hydra.Crypto (HydraKey, MultiSignature, aggregate, sign, toPlutusSignatures)
-import Hydra.Data.ContestationPeriod (posixFromUTCTime)
 import qualified Hydra.Data.ContestationPeriod as OnChain
 import qualified Hydra.Data.Party as OnChain
 import Hydra.Ledger (hashUTxO)
 import Hydra.Ledger.Cardano (genAddressInEra, genOneUTxOFor, genValue, genVerificationKey)
 import Hydra.Ledger.Cardano.Evaluate (genValidityBoundsFromContestationPeriod)
 import Hydra.Party (Party, deriveParty, partyToChain)
 import Hydra.Snapshot (Snapshot (..), SnapshotNumber)
-import Plutus.Orphans ()
+import Hydra.Plutus.Extras (posixFromUTCTime)
+import Hydra.Plutus.Orphans ()
 import PlutusLedgerApi.V1.Time (DiffMilliSeconds (..), fromMilliSeconds)
 import PlutusLedgerApi.V2 (BuiltinByteString, POSIXTime, PubKeyHash (PubKeyHash), toBuiltin)
 import Test.Hydra.Fixture (aliceSk, bobSk, carolSk)

hydra-node/test/Hydra/Chain/Direct/Contract/CollectCom.hs

@@ -49,7 +49,7 @@ import Hydra.Ledger.Cardano (
   genVerificationKey,
  )
 import Hydra.Party (Party, partyToChain)
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import PlutusTx.Builtins (toBuiltin)
 import Test.QuickCheck (choose, elements, oneof, suchThat)
 import Test.QuickCheck.Instances ()

hydra-node/test/Hydra/Chain/Direct/Contract/Contest.hs

@@ -37,16 +37,16 @@ import qualified Hydra.Contract.HeadState as Head
 import Hydra.Contract.HeadTokens (headPolicyId)
 import Hydra.Contract.Util (UtilError (MintingOrBurningIsForbidden))
 import Hydra.Crypto (HydraKey, MultiSignature, aggregate, sign, toPlutusSignatures)
-import Hydra.Data.ContestationPeriod (posixFromUTCTime)
 import qualified Hydra.Data.ContestationPeriod as OnChain
 import Hydra.Data.Party (partyFromVerificationKeyBytes)
 import qualified Hydra.Data.Party as OnChain
 import Hydra.Ledger (hashUTxO)
 import Hydra.Ledger.Cardano (genAddressInEra, genOneUTxOFor, genValue, genVerificationKey)
 import Hydra.Ledger.Cardano.Evaluate (slotNoToUTCTime)
 import Hydra.Party (Party, deriveParty, partyToChain)
+import Hydra.Plutus.Orphans ()
 import Hydra.Snapshot (Snapshot (..), SnapshotNumber)
-import Plutus.Orphans ()
+import Hydra.Plutus.Extras (posixFromUTCTime)
 import PlutusLedgerApi.V2 (BuiltinByteString, toBuiltin)
 import qualified PlutusLedgerApi.V2 as Plutus
 import Test.Hydra.Fixture (aliceSk, bobSk, carolSk)

hydra-node/test/Hydra/Chain/Direct/Contract/FanOut.hs

@@ -17,7 +17,6 @@ import Hydra.Contract.Error (toErrorCode)
 import Hydra.Contract.HeadError (HeadError (..))
 import qualified Hydra.Contract.HeadState as Head
 import Hydra.Contract.HeadTokens (mkHeadTokenScript)
-import Hydra.Data.ContestationPeriod (posixFromUTCTime)
 import qualified Hydra.Data.ContestationPeriod as OnChain
 import Hydra.Ledger (IsTx (hashUTxO))
 import Hydra.Ledger.Cardano (
@@ -28,7 +27,8 @@ import Hydra.Ledger.Cardano (
  )
 import Hydra.Ledger.Cardano.Evaluate (slotNoFromUTCTime, slotNoToUTCTime)
 import Hydra.Party (partyToChain)
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
+import Hydra.Plutus.Extras (posixFromUTCTime)
 import PlutusTx.Builtins (toBuiltin)
 import Test.QuickCheck (choose, elements, oneof, suchThat, vectorOf)
 import Test.QuickCheck.Instances ()

hydra-node/test/Hydra/Chain/Direct/Contract/Mutation.hs

@@ -155,7 +155,7 @@ import Hydra.Ledger.Cardano (genKeyPair, genOutput, genVerificationKey)
 import Hydra.Ledger.Cardano.Evaluate (evaluateTx)
 import Hydra.Party (Party)
 import Hydra.Prelude hiding (label)
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import PlutusLedgerApi.V2 (CurrencySymbol, POSIXTime, toData)
 import qualified PlutusLedgerApi.V2 as Plutus
 import qualified System.Directory.Internal.Prelude as Prelude

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

@@ -47,7 +47,7 @@ import Hydra.Ledger.Cardano (
 import Hydra.Ledger.Simple (SimpleTx)
 import Hydra.Party (deriveParty, partyToChain)
 import Hydra.Snapshot (Snapshot (..))
-import Plutus.Orphans ()
+import Hydra.Plutus.Orphans ()
 import PlutusLedgerApi.V2 (fromBuiltin, toBuiltin)
 import Test.QuickCheck (
   Property,