Added tests for nondisjoint RefInputs, Run BabbageFeature tests in Conway

Adjust Constraint based generator genTxAndNewEpoch to enforce disjointness.

Author: TimSheard

eras/babbage/impl/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Version history for `cardano-ledger-babbage`
 
-## 1.6.0.1
+## 1.7.0.0
 
-*
+* Add the constructor BabbageNonDisjointRefInputs to BabbageUtxoPredFailure
+  * Utxo rule raises that PredicateFailure in Conway and future Eras when they are not disjoint.
 
 ## 1.6.0.0
 

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

@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               cardano-ledger-babbage
-version:            1.6.0.1
+version:            1.7.0.0
 license:            Apache-2.0
 maintainer:         operations@iohk.io
 author:             IOHK

eras/babbage/impl/src/Cardano/Ledger/Babbage/Rules/Utxo.hs

@@ -80,6 +80,7 @@ import Control.State.Transition.Extended (
   STS (..),
   TRC (..),
   TransitionRule,
+  failureOnNonEmpty,
   judgmentContext,
   liftSTS,
   trans,
@@ -115,7 +116,7 @@ data BabbageUtxoPredFailure era
       ![(TxOut era, Coin)]
   | -- | TxIns that appear in both inputs and reference inputs
     BabbageNonDisjointRefInputs
-      !(Set (TxIn (EraCrypto era)))
+      !(NonEmpty (TxIn (EraCrypto era)))
   deriving (Generic)
 
 deriving instance
@@ -202,6 +203,7 @@ feesOK pp tx (UTxO utxo) =
             validateTotalCollateral pp txBody utxoCollateral
         ]
 
+-- | Test that inputs and refInpts are disjoint, in Conway and later Eras.
 disjointRefInputs ::
   forall era.
   EraPParams era =>
@@ -212,7 +214,7 @@ disjointRefInputs ::
 disjointRefInputs pp inputs refInputs =
   when
     (pvMajor (pp ^. ppProtocolVersionL) > eraProtVerHigh @(BabbageEra (EraCrypto era)))
-    (failureIf (null common) (BabbageNonDisjointRefInputs common))
+    (failureOnNonEmpty common BabbageNonDisjointRefInputs)
   where
     common = inputs `Set.intersection` refInputs
 
@@ -348,7 +350,7 @@ utxoTransition = do
       inputs = txBody ^. inputsTxBodyL
 
   {- inputs ∩ refInputs = ∅ -}
-  runTest $ disjointRefInputs @era pp inputs refInputs
+  runTest $ disjointRefInputs pp inputs refInputs
 
   {- ininterval slot (txvld txb) -}
   runTest $ Allegra.validateOutsideValidityIntervalUTxO slot txBody

eras/babbage/test-suite/cardano-ledger-babbage-test.cabal

@@ -36,7 +36,7 @@ library
         cardano-ledger-binary:{cardano-ledger-binary, testlib} >=1.0,
         cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >=1.5.1,
         cardano-ledger-alonzo-test >=1.1,
-        cardano-ledger-babbage:{cardano-ledger-babbage, testlib} >=1.5 && <1.7,
+        cardano-ledger-babbage:{cardano-ledger-babbage, testlib} >=1.5 && <1.8,
         cardano-ledger-core:{cardano-ledger-core, testlib} >=1.11,
         cardano-ledger-shelley-ma-test >=1.1,
         cardano-ledger-mary >=1.4,

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

@@ -84,7 +84,7 @@ library
         cardano-ledger-binary ^>=1.3,
         cardano-ledger-allegra ^>=1.3,
         cardano-ledger-alonzo ^>=1.6,
-        cardano-ledger-babbage ^>=1.6,
+        cardano-ledger-babbage ^>=1.7,
         cardano-ledger-core ^>=1.11,
         cardano-ledger-mary ^>=1.5,
         cardano-ledger-shelley ^>=1.10,

eras/conway/test-suite/cardano-ledger-conway-test.cabal

@@ -32,7 +32,7 @@ library
         base >=4.14 && <5,
         cardano-ledger-alonzo:{cardano-ledger-alonzo, testlib} >=1.6,
         cardano-ledger-alonzo-test,
-        cardano-ledger-babbage >=1.3 && <1.7,
+        cardano-ledger-babbage >=1.3 && <1.8,
         cardano-ledger-babbage-test >=1.1.1,
         cardano-ledger-binary >=1.0,
         cardano-ledger-conway:{cardano-ledger-conway, testlib} ^>=1.13,

libs/cardano-ledger-api/cardano-ledger-api.cabal

@@ -56,7 +56,7 @@ library
         bytestring,
         cardano-ledger-allegra ^>=1.3,
         cardano-ledger-alonzo ^>=1.6,
-        cardano-ledger-babbage ^>=1.6,
+        cardano-ledger-babbage ^>=1.7,
         cardano-ledger-binary ^>=1.3,
         cardano-ledger-conway ^>=1.13,
         cardano-ledger-core ^>=1.11,

libs/cardano-ledger-conformance/src/Test/Cardano/Ledger/Conformance.hs

@@ -660,7 +660,7 @@ conformsWhen makeTestsSmall condition impState =
       x
         { usNumPreUtxo = 3
         , usNumColUtxo = 3
-        , usMinInputs = 1
+        , usMinInputs = 2
         , usMaxInputs = 3
         , usMinCollaterals = 1
         , usMaxCollaterals = 3

libs/cardano-ledger-test/src/Test/Cardano/Ledger/Constrained/Preds/Tx.hs

@@ -533,6 +533,8 @@ txBodyPreds sizes@UnivSize {..} p =
        , -- refInputs
          Sized (Range 0 1) refInputs
        , Subset refInputs (Dom (utxo p))
+       , NotMember feeTxIn refInputs
+       , Disjoint refInputs inputs -- New constraint in Conway, added PR #4024
        , Sized (Range 1 2) reqSignerHashes
        , Subset reqSignerHashes (Dom keymapUniv)
        , ttl :<-: (Constr "(+5)" (\x -> x + 5) ^$ currentSlot)