Merge pull request #5553 from IntersectMBO/nm/cardano-base-orphans

Move `Arbitrary` instances to `cardano-base`

Author: lehins

cabal.project

@@ -28,7 +28,7 @@ source-repository-package
 -- see CONTRIBUTING.md#to-update-the-referenced-agda-ledger-spec
 index-state:
   , hackage.haskell.org 2025-12-11T11:28:18Z
-  , cardano-haskell-packages 2025-12-10T11:48:32Z
+  , cardano-haskell-packages 2026-02-17T21:19:19Z
 
 packages:
   -- == Byron era ==
@@ -91,6 +91,9 @@ tests: true
 benchmarks: true
 -- The only sensible test display option
 test-show-details: streaming
+allow-newer:
+  -- Drop this when the bounds in plutus-core are updated
+  plutus-core:cardano-crypto-class
 
 if impl(ghc >=9.12)
   allow-newer:

eras/byron/ledger/impl/cardano-ledger-byron.cabal

@@ -240,7 +240,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-binary,
+    cardano-binary >=1.7.3,
     cardano-crypto,
     cardano-crypto-wrapper >=1.6,
     cardano-ledger-binary >=1.8,
@@ -346,7 +346,7 @@ library testlib
     byron-spec-chain,
     byron-spec-ledger,
     bytestring,
-    cardano-binary:{cardano-binary, testlib} >=1.7.2,
+    cardano-binary:{cardano-binary, testlib},
     cardano-crypto,
     cardano-crypto-wrapper:{cardano-crypto-wrapper, testlib},
     cardano-ledger-binary:{cardano-ledger-binary, testlib},

eras/byron/ledger/impl/src/Cardano/Chain/Block/Block.hs

@@ -417,7 +417,7 @@ decCBORABlockOrBoundary epochSlots = do
   decCBOR @Word >>= \case
     0 -> ABOBBoundary <$> decCBORABoundaryBlock
     1 -> ABOBBlock <$> decCBORABlock epochSlots
-    t -> cborError $ DecoderErrorUnknownTag "Block" (fromIntegral t)
+    t -> cborError $ DecoderErrorUnknownTag "Block" t
 
 encCBORABlockOrBoundary ::
   ProtocolMagicId -> EpochSlots -> ABlockOrBoundary a -> Encoding

eras/byron/ledger/impl/src/Cardano/Chain/Block/Header.hs

@@ -415,7 +415,7 @@ decCBORHeaderToHash epochSlots = do
       void decCBORABoundaryHeader
       pure Nothing
     1 -> Just <$!> decCBORHeader epochSlots
-    t -> cborError $ DecoderErrorUnknownTag "Header" (fromIntegral t)
+    t -> cborError $ DecoderErrorUnknownTag "Header" t
 
 --------------------------------------------------------------------------------
 -- Header Formatting
@@ -691,13 +691,13 @@ instance DecCBOR BlockSignature where
 instance DecCBOR (ABlockSignature ByteSpan) where
   decCBOR = do
     enforceSize "BlockSignature" 2
-    decCBOR >>= \case
+    decCBOR @Word8 >>= \case
       2 ->
         ABlockSignature
           <$ enforceSize "BlockSignature" 2
           <*> decCBOR
           <*> decCBOR
-      t -> cborError $ DecoderErrorUnknownTag "BlockSignature" t
+      t -> cborError $ DecoderErrorUnknownTag "BlockSignature" $ fromIntegral @Word8 @Word t
 
 --------------------------------------------------------------------------------
 -- ToSign

eras/byron/ledger/impl/src/Cardano/Chain/Byron/API/Mempool.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Cardano.Chain.Byron.API.Mempool (
   ApplyMempoolPayloadErr (..),
@@ -70,7 +71,7 @@ instance DecCBOR ApplyMempoolPayloadErr where
       1 -> MempoolDlgErr <$> decCBOR
       2 -> MempoolUpdateProposalErr <$> decCBOR
       3 -> MempoolUpdateVoteErr <$> decCBOR
-      tag -> cborError $ DecoderErrorUnknownTag "ApplyMempoolPayloadErr" tag
+      tag -> cborError $ DecoderErrorUnknownTag "ApplyMempoolPayloadErr" $ fromIntegral @Word8 @Word tag
 
 applyMempoolPayload ::
   MonadError ApplyMempoolPayloadErr m =>

eras/byron/ledger/impl/src/Cardano/Chain/Common/AddrSpendingData.hs

@@ -77,7 +77,7 @@ instance DecCBOR AddrSpendingData where
     decodeWord8Canonical >>= \case
       0 -> VerKeyASD <$> decCBOR
       2 -> RedeemASD <$> decCBOR
-      tag -> cborError $ DecoderErrorUnknownTag "AddrSpendingData" tag
+      tag -> cborError $ DecoderErrorUnknownTag "AddrSpendingData" $ fromIntegral @Word8 @Word tag
 
 -- | Type of an address. It corresponds to constructors of 'AddrSpendingData'.
 --   It's separated, because 'Address' doesn't store 'AddrSpendingData', but we
@@ -110,7 +110,7 @@ instance DecCBOR AddrType where
     decodeWord8Canonical >>= \case
       0 -> pure ATVerKey
       2 -> pure ATRedeem
-      tag -> cborError $ DecoderErrorUnknownTag "AddrType" tag
+      tag -> cborError $ DecoderErrorUnknownTag "AddrType" $ fromIntegral @Word8 @Word tag
 
 instance HeapWords AddrType where
   heapWords = \case

eras/byron/ledger/impl/src/Cardano/Chain/Common/Lovelace.hs

@@ -173,7 +173,7 @@ instance DecCBOR LovelaceError where
       1 -> checkSize 2 >> LovelaceTooLarge <$> decCBOR
       2 -> checkSize 2 >> LovelaceTooSmall <$> decCBOR
       3 -> checkSize 3 >> LovelaceUnderflow <$> decCBOR <*> decCBOR
-      _ -> cborError $ DecoderErrorUnknownTag "TxValidationError" tag
+      _ -> cborError $ DecoderErrorUnknownTag "TxValidationError" $ fromIntegral @Word8 @Word tag
 
 -- | Maximal possible value of 'Lovelace'
 maxLovelaceVal :: Word64

eras/byron/ledger/impl/src/Cardano/Chain/Common/NetworkMagic.hs

@@ -75,7 +75,7 @@ instance DecCBOR NetworkMagic where
     case tag of
       0 -> matchSize "NetworkMagic" 1 len $> NetworkMainOrStage
       1 -> matchSize "NetworkMagic" 2 len >> NetworkTestnet <$> decCBOR
-      _ -> cborError $ DecoderErrorUnknownTag "NetworkMagic" tag
+      _ -> cborError $ DecoderErrorUnknownTag "NetworkMagic" $ fromIntegral @Word8 @Word tag
 
 makeNetworkMagic :: AProtocolMagic a -> NetworkMagic
 makeNetworkMagic pm = case getRequiresNetworkMagic pm of

eras/byron/ledger/impl/src/Cardano/Chain/Common/TxFeePolicy.hs

@@ -96,7 +96,7 @@ instance DecCBOR TxFeePolicy where
     tag <- decCBOR @Word8
     case tag of
       0 -> TxFeePolicyTxSizeLinear <$> decodeKnownCborDataItem
-      _ -> cborError $ DecoderErrorUnknownTag "TxFeePolicy" tag
+      _ -> cborError $ DecoderErrorUnknownTag "TxFeePolicy" $ fromIntegral @Word8 @Word tag
 
 instance Monad m => ToJSON m TxFeePolicy where
   -- We multiply by 1e9 to keep compatibility with 'Nano' coefficients

eras/byron/ledger/impl/src/Cardano/Chain/Delegation/Validation/Scheduling.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Cardano.Chain.Delegation.Validation.Scheduling (
   -- * Scheduling
@@ -168,7 +169,7 @@ instance DecCBOR Error where
       2 -> checkSize 3 >> MultipleDelegationsForSlot <$> decCBOR <*> decCBOR
       3 -> checkSize 2 >> NonGenesisDelegator <$> decCBOR
       4 -> checkSize 3 >> WrongEpoch <$> decCBOR <*> decCBOR
-      _ -> cborError $ DecoderErrorUnknownTag "Scheduling.Error" tag
+      _ -> cborError $ DecoderErrorUnknownTag "Scheduling.Error" $ fromIntegral @Word8 @Word tag
 
 -- | Update the delegation 'State' with a 'Certificate' if it passes
 --   all the validation rules. This is an implementation of the delegation