Remove networkIdToNetwork in favour of toShelleyNetwork from cardano-api (#1984)

This is now defined in cardano-api.

Author: locallycompact

hydra-cardano-api/hydra-cardano-api.cabal

@@ -48,7 +48,6 @@ library
     Hydra.Cardano.Api.ChainPoint
     Hydra.Cardano.Api.ExecutionUnits
     Hydra.Cardano.Api.Hash
-    Hydra.Cardano.Api.Network
     Hydra.Cardano.Api.NetworkId
     Hydra.Cardano.Api.NetworkMagic
     Hydra.Cardano.Api.PolicyId

hydra-cardano-api/src/Hydra/Cardano/Api.hs

@@ -110,7 +110,6 @@ import Cardano.Api.UTxO (
   UTxO' (..),
  )
 import Cardano.Ledger.Coin as X (Coin (..))
-import Hydra.Cardano.Api.Network as X (networkIdToNetwork)
 import Hydra.Cardano.Api.Prelude (
   Era,
   LedgerEra,
@@ -149,6 +148,7 @@ import Cardano.Api qualified
 import Cardano.Api.Shelley qualified
 import Cardano.Ledger.Alonzo.TxAuxData qualified as Ledger
 import Cardano.Ledger.Alonzo.TxWits qualified as Ledger
+import Cardano.Ledger.BaseTypes as X (Network)
 import Cardano.Ledger.Core qualified as Ledger
 import Cardano.Ledger.Keys qualified as Ledger
 import Data.ByteString.Short (ShortByteString)

hydra-cardano-api/src/Hydra/Cardano/Api/AddressInEra.hs

@@ -6,7 +6,6 @@ import Cardano.Ledger.Address qualified as Ledger
 import Cardano.Ledger.BaseTypes qualified as Ledger
 import Cardano.Ledger.Credential qualified as Ledger
 import Cardano.Ledger.Hashes qualified as Ledger
-import Hydra.Cardano.Api.Network (Network)
 import PlutusLedgerApi.V3 (
   Address (..),
   Credential (..),
@@ -73,7 +72,7 @@ toLedgerAddr = \case
 -- | Convert a plutus 'Address' to an api 'AddressInEra'.
 -- NOTE: Requires the 'Network' discriminator (Testnet or Mainnet) because
 -- Plutus addresses are stripped off it.
-fromPlutusAddress :: IsShelleyBasedEra era => Network -> Plutus.Address -> AddressInEra era
+fromPlutusAddress :: IsShelleyBasedEra era => Ledger.Network -> Plutus.Address -> AddressInEra era
 fromPlutusAddress network plutusAddress =
   fromLedgerAddr $
     case (addressCredential, addressStakingCredential) of

hydra-cardano-api/src/Hydra/Cardano/Api/Network.hs

@@ -7,11 +7,11 @@ import Hydra.Cardano.Api.TxOutValue (mkTxOutValue)
 import Cardano.Api.UTxO qualified as UTxO
 import Cardano.Ledger.Api qualified as Ledger
 import Cardano.Ledger.Babbage.TxInfo qualified as Ledger
+import Cardano.Ledger.BaseTypes qualified as Ledger
 import Cardano.Ledger.Credential qualified as Ledger
 import Data.List qualified as List
 import Hydra.Cardano.Api.AddressInEra (fromPlutusAddress)
 import Hydra.Cardano.Api.Hash (unsafeScriptDataHashFromBytes)
-import Hydra.Cardano.Api.Network (Network)
 import Hydra.Cardano.Api.ScriptData (toScriptData)
 import Hydra.Cardano.Api.Value (fromPlutusValue, minUTxOValue)
 import PlutusLedgerApi.V3 (OutputDatum (..), fromBuiltin)
@@ -159,7 +159,7 @@ toLedgerTxOut =
 fromPlutusTxOut ::
   forall era.
   IsBabbageBasedEra era =>
-  Network ->
+  Ledger.Network ->
   Plutus.TxOut ->
   Maybe (TxOut CtxUTxO era)
 fromPlutusTxOut network out = do

hydra-cardano-api/src/Hydra/Cardano/Api/TxOut.hs

@@ -41,9 +41,9 @@ import Hydra.Cardano.Api (
   isScriptTxOut,
   modifyTxOutValue,
   negateValue,
-  networkIdToNetwork,
   selectAsset,
   selectLovelace,
+  toShelleyNetwork,
   txIns',
   txOutScriptData,
   txOutValue,
@@ -568,7 +568,7 @@ recover ctx headId depositedTxId spendableUTxO lowerValiditySlot = do
       spendableUTxO
       ?> CannotFindDepositOutputToRecover{depositTxId = depositedTxId}
   (headId', deposited, _deadline) <-
-    observeDepositTxOut (networkIdToNetwork networkId) depositedOut
+    observeDepositTxOut (toShelleyNetwork networkId) depositedOut
       ?> CannotFindDepositedOutputToRecover{depositedTxId = depositedTxId}
   if headId /= headId'
     then Left InvalidHeadIdInRecover{headId}

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

@@ -3,7 +3,7 @@
 
 module Hydra.Model.MockChain where
 
-import Hydra.Cardano.Api
+import Hydra.Cardano.Api hiding (Network)
 import Hydra.Prelude hiding (Any, label)
 
 import Cardano.Api.UTxO qualified as UTxO

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

@@ -8,9 +8,8 @@ import PlutusTx.Prelude
 
 import Codec.Serialise (deserialiseOrFail, serialise)
 import Data.ByteString.Lazy (fromStrict, toStrict)
-import Hydra.Cardano.Api (CtxUTxO, fromPlutusTxOut, fromPlutusTxOutRef, toPlutusTxOut, toPlutusTxOutRef)
+import Hydra.Cardano.Api (CtxUTxO, Network, fromPlutusTxOut, fromPlutusTxOutRef, toPlutusTxOut, toPlutusTxOutRef)
 import Hydra.Cardano.Api qualified as OffChain
-import Hydra.Cardano.Api.Network (Network)
 import Hydra.Data.Party (Party)
 import PlutusLedgerApi.V3 (
   CurrencySymbol,

hydra-plutus/src/Hydra/Contract/Commit.hs

@@ -5,7 +5,7 @@ import Hydra.Prelude
 import Cardano.Api.UTxO (UTxO)
 import Cardano.Api.UTxO qualified as UTxO
 import Data.Aeson (eitherDecodeFileStrict)
-import Hydra.Cardano.Api (TxIx (..), networkIdToNetwork, textEnvelopeToJSON, txSpendingUTxO, pattern TxIn)
+import Hydra.Cardano.Api (TxIx (..), textEnvelopeToJSON, toShelleyNetwork, txSpendingUTxO, pattern TxIn)
 import Hydra.Tx.BlueprintTx (CommitBlueprintTx (..))
 import Hydra.Tx.Deposit (depositTx, observeDepositTxOut)
 import Hydra.Tx.Recover (recoverTx)
@@ -25,7 +25,7 @@ main =
           putStrLn $ "Wrote deposit transaction to " <> outFile
     Recover RecoverOptions{networkId, outFile, recoverTxId, utxoFilePath, recoverSlotNo} -> do
       -- XXX: Only requires network discriminator / not networkId
-      let network = networkIdToNetwork networkId
+      let network = toShelleyNetwork networkId
       eitherDecodeFileStrict utxoFilePath >>= \case
         Left err -> die $ "failed to parse provided UTXO file! " <> err
         Right (utxo :: UTxO) -> do

hydra-tx/exe/Main.hs

@@ -197,7 +197,7 @@ observeCommitTx networkId utxo tx = do
   -- the commit into the datum (+ changing the hashing strategy of
   -- collect/fanout)
   committed <- do
-    committedUTxO <- traverse (Commit.deserializeCommit (networkIdToNetwork networkId)) onChainCommits
+    committedUTxO <- traverse (Commit.deserializeCommit (toShelleyNetwork networkId)) onChainCommits
     pure . UTxO.fromList $ committedUTxO
 
   policyId <- fromPlutusCurrencySymbol headId

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

@@ -8,7 +8,6 @@ import Control.Lens ((.~), (^.))
 import Data.Sequence.Strict qualified as StrictSeq
 import Data.Set qualified as Set
 import Hydra.Cardano.Api
-import Hydra.Cardano.Api.Network (Network)
 import Hydra.Contract.Commit qualified as Commit
 import Hydra.Contract.Deposit qualified as Deposit
 import Hydra.Plutus (depositValidatorScript)
@@ -79,7 +78,7 @@ observeDepositTx ::
 observeDepositTx networkId tx = do
   -- TODO: could just use the first output and fail otherwise
   (TxIn depositTxId _, depositOut) <- findTxOutByAddress (depositAddress networkId) tx
-  (headId, deposited, deadline) <- observeDepositTxOut (networkIdToNetwork networkId) (toCtxUTxOTxOut depositOut)
+  (headId, deposited, deadline) <- observeDepositTxOut (toShelleyNetwork networkId) (toCtxUTxOTxOut depositOut)
   if all (`elem` txIns' tx) (UTxO.inputSet deposited)
     then
       Just

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

@@ -60,7 +60,7 @@ observeRecoverTx networkId utxo tx = do
   dat <- txOutScriptData $ fromCtxUTxOTxOut depositOut
   (headCurrencySymbol, _, onChainDeposits) <- fromScriptData dat :: Maybe Deposit.DepositDatum
   deposits <- do
-    depositedUTxO <- traverse (Commit.deserializeCommit (networkIdToNetwork networkId)) onChainDeposits
+    depositedUTxO <- traverse (Commit.deserializeCommit (toShelleyNetwork networkId)) onChainDeposits
     pure $ UTxO.fromList depositedUTxO
   headId <- fmap mkHeadId . fromPlutusCurrencySymbol $ headCurrencySymbol
   let depositOuts = fromCtxUTxOTxOut . snd <$> UTxO.toList deposits

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

@@ -19,8 +19,8 @@ import Hydra.Cardano.Api (
   serialiseToRawBytesHexText,
   toLedgerTxOut,
   toPlutusTxOut,
+  toShelleyNetwork,
  )
-import Hydra.Cardano.Api.Network (networkIdToNetwork)
 import Hydra.Contract.Commit qualified as Commit
 import Hydra.Contract.Head (verifySnapshotSignature)
 import Hydra.Contract.Util qualified as OnChain
@@ -169,7 +169,7 @@ prop_serializingCommitRoundtrip :: Property
 prop_serializingCommitRoundtrip =
   forAllBlind (List.head . UTxO.toList <$> genUTxOSized 1) $ \singleUTxO ->
     let serialized = Commit.serializeCommit singleUTxO
-        deserialized = serialized >>= Commit.deserializeCommit (networkIdToNetwork testNetworkId)
+        deserialized = serialized >>= Commit.deserializeCommit (toShelleyNetwork testNetworkId)
      in case deserialized of
           Just actual -> actual === singleUTxO
           Nothing ->