From 937117ed0ef60d4b344071a3ca7e871981635880 Mon Sep 17 00:00:00 2001
From: kwxm <kenneth.mackenzie@iohk.io>
Date: Thu, 24 Jul 2025 04:29:00 +0100
Subject: [PATCH] Revert from function to map

---
 .../src/PlutusLedgerApi/Common/Versions.hs    | 75 ++++++++-----------
 1 file changed, 30 insertions(+), 45 deletions(-)

diff --git a/plutus-ledger-api/src/PlutusLedgerApi/Common/Versions.hs b/plutus-ledger-api/src/PlutusLedgerApi/Common/Versions.hs
index e87b3aad69f..37d55ff0495 100644
--- a/plutus-ledger-api/src/PlutusLedgerApi/Common/Versions.hs
+++ b/plutus-ledger-api/src/PlutusLedgerApi/Common/Versions.hs
@@ -114,16 +114,17 @@ ledgerLanguagesAvailableIn :: MajorProtocolVersion -> Set.Set PlutusLedgerLangua
 ledgerLanguagesAvailableIn searchPv =
   Set.fromList $ takeWhile (\ll -> ledgerLanguageIntroducedIn ll <= searchPv) enumerate
 
--- | Given a map from PVs to a type `a`, return a `Set a` containing all of the
--- entries with PV <= thisPv
+-- | Given a map from (LL, PV) pairs to a type `a`, return a `Set a` containing all of the
+-- entries with LL = thisLL and PV <= thisPv
 collectUpTo
   :: Ord a
-  => Map.Map MajorProtocolVersion (Set.Set a)
+  => Map.Map (PlutusLedgerLanguage, MajorProtocolVersion) (Set.Set a)
+  -> PlutusLedgerLanguage
   -> MajorProtocolVersion
   -> Set.Set a
-collectUpTo m thisPv =
-  fold $  -- ie, iterated `union`
-  Map.elems $ Map.takeWhileAntitone (<= thisPv) m
+collectUpTo m thisLL thisPV =
+    fold $ Map.elems $ Map.filterWithKey (\(ll,pv) _ -> ll == thisLL && pv <= thisPV) m
+--  Map.elems $ Map.takeWhileAntitone (<= thisPv) m
 
 {- Batches of builtins which were introduced in the same hard fork (but perhaps
    not for all LLs): see the Plutus Core specification and
@@ -227,32 +228,24 @@ batch6 =
   where no new builtins are added.  See Note [New builtins/language versions and
   protocol versions]
 -}
-builtinsIntroducedIn :: PlutusLedgerLanguage -> Map.Map MajorProtocolVersion (Set.Set DefaultFun)
+builtinsIntroducedIn :: Map.Map (PlutusLedgerLanguage, MajorProtocolVersion) (Set.Set DefaultFun)
 builtinsIntroducedIn =
-  \case
-    PlutusV1 ->
-      Map.fromList
-      [ (alonzoPV, Set.fromList batch1)
-      , (pv11PV,   Set.fromList (batch2 ++ batch3 ++ batch4 ++ batch5 ++ batch6))
-      ]
-    PlutusV2 ->
-      Map.fromList
-      [ (vasilPV,     Set.fromList (batch1 ++ batch2))
-      , (valentinePV, Set.fromList batch3)
-      , (plominPV,    Set.fromList batch4b)
-      , (pv11PV ,     Set.fromList (batch4a ++ batch5 ++ batch6))
-      ]
-    PlutusV3 ->
-      Map.fromList
-      [ (changPV,  Set.fromList (batch1 ++ batch2 ++ batch3 ++ batch4))
-      , (plominPV, Set.fromList batch5)
-      , (pv11PV,   Set.fromList batch6)
-      ]
+  Map.fromList
+  [ ((PlutusV1, alonzoPV),    Set.fromList batch1)
+  , ((PlutusV1, pv11PV),      Set.fromList (batch2 ++ batch3 ++ batch4 ++ batch5 ++ batch6))
+  , ((PlutusV2, vasilPV),     Set.fromList (batch1 ++ batch2))
+  , ((PlutusV2, valentinePV), Set.fromList batch3)
+  , ((PlutusV2, plominPV),    Set.fromList batch4b)
+  , ((PlutusV2, pv11PV) ,     Set.fromList (batch4a ++ batch5 ++ batch6))
+  , ((PlutusV3, changPV),     Set.fromList (batch1 ++ batch2 ++ batch3 ++ batch4))
+  , ((PlutusV3, plominPV),    Set.fromList batch5)
+  , ((PlutusV3, pv11PV),      Set.fromList batch6)
+  ]
 
 {- | Return a set containing the builtins which are available in a given LL in a
 given PV.  All builtins are available in all LLs from `pv11PV` onwards. -}
 builtinsAvailableIn :: PlutusLedgerLanguage -> MajorProtocolVersion -> Set.Set DefaultFun
-builtinsAvailableIn = collectUpTo . builtinsIntroducedIn
+builtinsAvailableIn = collectUpTo builtinsIntroducedIn
 
 
 {-| A map indicating which Plutus Core versions were introduced in which
@@ -260,25 +253,17 @@ builtinsAvailableIn = collectUpTo . builtinsIntroducedIn
 This __must__ be updated when new versions are added.
 See Note [New builtins/language versions and protocol versions]
 -}
-plcVersionsIntroducedIn :: PlutusLedgerLanguage -> Map.Map MajorProtocolVersion (Set.Set Version)
+plcVersionsIntroducedIn :: Map.Map (PlutusLedgerLanguage, MajorProtocolVersion) (Set.Set Version)
 plcVersionsIntroducedIn =
-  \case
-    PlutusV1 ->
-      Map.fromList
-      [ (alonzoPV, Set.fromList [ plcVersion100 ])
-      , (pv11PV,   Set.fromList [ plcVersion110 ])
-      ]
-    PlutusV2 ->
-      Map.fromList
-      [ (alonzoPV, Set.fromList [ plcVersion100 ])
-      , (pv11PV,   Set.fromList [ plcVersion110 ])
-      ]
-    PlutusV3 ->
-      Map.fromList
-      [(changPV, Set.fromList [ plcVersion110 ])
-      ]
+  Map.fromList
+  [ ((PlutusV1, alonzoPV), Set.fromList [ plcVersion100 ])
+  , ((PlutusV1, pv11PV),   Set.fromList [ plcVersion110 ])
+  , ((PlutusV2, alonzoPV), Set.fromList [ plcVersion100 ])
+  , ((PlutusV2, pv11PV),   Set.fromList [ plcVersion110 ])
+  , ((PlutusV3, changPV),  Set.fromList [ plcVersion110 ])
+  ]
 
 {-| Which Plutus Core language versions are available in the given 'PlutusLedgerLanguage'
 and 'MajorProtocolVersion'? -}
-plcVersionsAvailableIn :: PlutusLedgerLanguage -> MajorProtocolVersion -> Set.Set Version
-plcVersionsAvailableIn = collectUpTo . plcVersionsIntroducedIn
+plcVersionsAvailableIn :: PlutusLedgerLanguage -> MajorProtocolVersion -> (Set.Set Version)
+plcVersionsAvailableIn = collectUpTo plcVersionsIntroducedIn