Switch to eraProtVerHigh

Author: Jimbo4350

cardano-api/gen/Test/Hedgehog/Roundtrip/CBOR.hs

@@ -16,7 +16,6 @@ import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.Plutus qualified as Exp
 import Cardano.Api.Ledger qualified as L
 
-import Cardano.Binary
 import Cardano.Ledger.Core qualified as Ledger
 import Cardano.Ledger.Plutus.Language qualified as Plutus
 

cardano-api/src/Cardano/Api/Era/Internal/Eon/ShelleyBasedEra.hs

@@ -30,7 +30,7 @@ module Cardano.Api.Era.Internal.Eon.ShelleyBasedEra
 
     -- ** Mapping to era types from the Shelley ledger library
   , ShelleyLedgerEra
-  , eraProtVerLow
+  , eraProtVerHigh
   , ShelleyBasedEraConstraints
   , shelleyBasedEraConstraints
   )
@@ -357,15 +357,15 @@ type family ShelleyLedgerEra era = ledgerera | ledgerera -> era where
 
 -- | Lookup the lower major protocol version for the shelley based era. In other words
 -- this is the major protocol version that the era has started in.
-eraProtVerLow :: ShelleyBasedEra era -> L.Version
-eraProtVerLow = \case
-  ShelleyBasedEraShelley -> L.eraProtVerLow @L.ShelleyEra
-  ShelleyBasedEraAllegra -> L.eraProtVerLow @L.AllegraEra
-  ShelleyBasedEraMary -> L.eraProtVerLow @L.MaryEra
-  ShelleyBasedEraAlonzo -> L.eraProtVerLow @L.AlonzoEra
-  ShelleyBasedEraBabbage -> L.eraProtVerLow @L.BabbageEra
-  ShelleyBasedEraConway -> L.eraProtVerLow @L.ConwayEra
-  ShelleyBasedEraDijkstra -> L.eraProtVerLow @L.DijkstraEra
+eraProtVerHigh :: ShelleyBasedEra era -> L.Version
+eraProtVerHigh = \case
+  ShelleyBasedEraShelley -> L.eraProtVerHigh @L.ShelleyEra
+  ShelleyBasedEraAllegra -> L.eraProtVerHigh @L.AllegraEra
+  ShelleyBasedEraMary -> L.eraProtVerHigh @L.MaryEra
+  ShelleyBasedEraAlonzo -> L.eraProtVerHigh @L.AlonzoEra
+  ShelleyBasedEraBabbage -> L.eraProtVerHigh @L.BabbageEra
+  ShelleyBasedEraConway -> L.eraProtVerHigh @L.ConwayEra
+  ShelleyBasedEraDijkstra -> L.eraProtVerHigh @L.DijkstraEra
 
 requireShelleyBasedEra
   :: ()

cardano-api/src/Cardano/Api/Experimental/Plutus/Internal/Script.hs

@@ -119,7 +119,7 @@ instance
     L.serialize' (L.eraProtVerHigh @era) s
 
   deserialiseFromCBOR _ bs = do
-    let v = L.eraProtVerLow @era
+    let v = L.eraProtVerHigh @era
         scriptShortBs = SBS.toShort $ removePlutusScriptDoubleEncoding $ LBS.fromStrict bs
     let plutusScript :: Plutus.Plutus lang
         plutusScript = L.Plutus $ L.PlutusBinary scriptShortBs

cardano-api/src/Cardano/Api/Plutus/Internal/Script.hs

@@ -467,7 +467,7 @@ instance IsScriptLanguage lang => SerialiseAsCBOR (Script lang) where
   deserialiseFromCBOR _ bs =
     case scriptLanguage :: ScriptLanguage lang of
       SimpleScriptLanguage ->
-        let version = Ledger.eraProtVerLow @(ShelleyLedgerEra AllegraEra)
+        let version = Ledger.eraProtVerHigh @(ShelleyLedgerEra AllegraEra)
          in SimpleScript . fromAllegraTimelock @(ShelleyLedgerEra AllegraEra)
               <$> Binary.decodeFullAnnotator version "Script" Binary.decCBOR (LBS.fromStrict bs)
       PlutusScriptLanguage PlutusScriptV1 ->
@@ -1494,7 +1494,7 @@ instance
   serialiseToCBOR (PlutusScriptInEra (PlutusScriptSerialised s)) =
     SBS.fromShort s
   deserialiseFromCBOR _ bs = do
-    let v = Ledger.eraProtVerLow @(ShelleyLedgerEra era)
+    let v = Ledger.eraProtVerHigh @(ShelleyLedgerEra era)
         scriptShortBs = SBS.toShort $ removePlutusScriptDoubleEncoding $ LBS.fromStrict bs
     let plutusScript :: Plutus.Plutus (ToLedgerPlutusLanguage lang)
         plutusScript = PlutusScriptBinary scriptShortBs

cardano-api/src/Cardano/Api/Query/Internal/Type/QueryInMode.hs

@@ -398,7 +398,7 @@ decodePoolState
   -> Either DecoderError (PoolState era)
 decodePoolState sbe (SerialisedPoolState (Serialised ls)) =
   shelleyBasedEraConstraints sbe $
-    PoolState <$> decodeFull (Core.eraProtVerLow @(ShelleyLedgerEra era)) ls
+    PoolState <$> decodeFull (Core.eraProtVerHigh @(ShelleyLedgerEra era)) ls
 
 newtype PoolDistribution era = PoolDistribution
   { unPoolDistr :: Shelley.PoolDistr
@@ -410,7 +410,7 @@ decodePoolDistribution
   -> Serialised (PoolDistribution era)
   -> Either DecoderError (PoolDistribution era)
 decodePoolDistribution sbe (Serialised ls) =
-  PoolDistribution <$> decodeFull (eraProtVerLow sbe) ls
+  PoolDistribution <$> decodeFull (eraProtVerHigh sbe) ls
 
 newtype SerialisedStakeSnapshots era
   = SerialisedStakeSnapshots

cardano-api/src/Cardano/Api/Serialise/TextEnvelope/Internal/Cddl.hs

@@ -186,7 +186,7 @@ deserialiseWitnessLedgerCddl sbe te =
         w <-
           first TextEnvelopeCddlErrCBORDecodingError $
             CBOR.decodeFullAnnotator
-              (eraProtVerLow sbe)
+              (eraProtVerHigh sbe)
               "Shelley Witness"
               CBOR.decCBOR
               (LBS.fromStrict teRawCBOR)
@@ -195,7 +195,7 @@ deserialiseWitnessLedgerCddl sbe te =
         w <-
           first TextEnvelopeCddlErrCBORDecodingError $
             CBOR.decodeFullAnnotator
-              (eraProtVerLow sbe)
+              (eraProtVerHigh sbe)
               "Shelley Witness"
               CBOR.decCBOR
               (LBS.fromStrict teRawCBOR)

cardano-api/src/Cardano/Api/Tx/Internal/Serialise.hs

@@ -88,7 +88,7 @@ deserialiseWitnessLedger sbe te =
         w <-
           first TextEnvelopeDecodeError $
             CBOR.decodeFullAnnotator
-              (eraProtVerLow sbe)
+              (eraProtVerHigh sbe)
               "Shelley Witness"
               CBOR.decCBOR
               (LBS.fromStrict teRawCBOR)
@@ -97,7 +97,7 @@ deserialiseWitnessLedger sbe te =
         w <-
           first TextEnvelopeDecodeError $
             CBOR.decodeFullAnnotator
-              (eraProtVerLow sbe)
+              (eraProtVerHigh sbe)
               "Shelley Witness"
               CBOR.decCBOR
               (LBS.fromStrict teRawCBOR)

cardano-api/src/Cardano/Api/Tx/Internal/Sign.hs

@@ -237,7 +237,7 @@ deserialiseShelleyBasedTx
 deserialiseShelleyBasedTx mkTx bs =
   mkTx
     <$> CBOR.decodeFullAnnotator
-      (L.eraProtVerLow @ledgerera)
+      (L.eraProtVerHigh @ledgerera)
       "Shelley Tx"
       CBOR.decCBOR
       (LBS.fromStrict bs)
@@ -729,9 +729,9 @@ instance IsCardanoEra era => SerialiseAsCBOR (KeyWitness era) where
   serialiseToCBOR (ByronKeyWitness wit) =
     Plain.serialize' wit
   serialiseToCBOR (ShelleyKeyWitness sbe wit) =
-    CBOR.serialize' (eraProtVerLow sbe) wit
+    CBOR.serialize' (eraProtVerHigh sbe) wit
   serialiseToCBOR (ShelleyBootstrapWitness sbe wit) =
-    CBOR.serialize' (eraProtVerLow sbe) wit
+    CBOR.serialize' (eraProtVerHigh sbe) wit
 
   deserialiseFromCBOR _ bs =
     case cardanoEra :: CardanoEra era of
@@ -752,12 +752,12 @@ instance IsCardanoEra era => SerialiseAsCBOR (KeyWitness era) where
 -- provides a convenient way to try multiple decoders until one succeeds.
 legacyKeyWitnessEncode :: KeyWitness era -> ByteString
 legacyKeyWitnessEncode (ShelleyKeyWitness sbe wit) =
-  CBOR.serialize' (eraProtVerLow sbe) $
+  CBOR.serialize' (eraProtVerHigh sbe) $
     CBOR.encodeListLen 2
       <> CBOR.encodeWord 0
       <> CBOR.encCBOR wit
 legacyKeyWitnessEncode (ShelleyBootstrapWitness sbe wit) =
-  CBOR.serialize' (eraProtVerLow sbe) $
+  CBOR.serialize' (eraProtVerHigh sbe) $
     CBOR.encodeListLen 2
       <> CBOR.encodeWord 1
       <> CBOR.encCBOR wit
@@ -789,22 +789,22 @@ decodeShelleyBasedWitness sbe bs =
   shelleyKeyWitnessDecoder b =
     ShelleyKeyWitness sbe
       <$> CBOR.decodeFullAnnotator
-        (L.eraProtVerLow @(ShelleyLedgerEra era))
+        (L.eraProtVerHigh @(ShelleyLedgerEra era))
         "Shelley Witness"
         CBOR.decCBOR
         (LBS.fromStrict b)
 
   bootstrapWitnessDecoder b =
     ShelleyBootstrapWitness sbe
       <$> CBOR.decodeFullAnnotator
-        (L.eraProtVerLow @(ShelleyLedgerEra era))
+        (L.eraProtVerHigh @(ShelleyLedgerEra era))
         "Shelley Witness"
         CBOR.decCBOR
         (LBS.fromStrict b)
 
   legacyKeyWitnessDecoder b =
     CBOR.decodeFullAnnotator
-      (L.eraProtVerLow @(ShelleyLedgerEra era))
+      (L.eraProtVerHigh @(ShelleyLedgerEra era))
       "Shelley Witness"
       decodeLegacy
       (LBS.fromStrict b)

cardano-api/test/cardano-api-test/Test/Cardano/Api/CBOR.hs

@@ -346,6 +346,19 @@ prop_decode_only_wrapped_plutus_script_V2_CBOR = H.property $ do
     (SBS.fromShort shortBs)
     Ledger.SPlutusV2
 
+prop_decode_only_wrapped_plutus_script_V2_ByteStringToInteger_CBOR :: Property
+prop_decode_only_wrapped_plutus_script_V2_ByteStringToInteger_CBOR = H.property $ do
+  let v2Special = Base16.decodeLenient "5822582001000022325333573466e1ccde5251333792945200000100111200116375a005"
+  H.decodeOnlyPlutusScriptBytes
+    ShelleyBasedEraConway
+    PlutusScriptV2
+    v2Special
+    (AsScript AsPlutusScriptV2)
+  H.assertValidPlutusScriptBytesExperimental
+    Exp.ConwayEra
+    v2Special
+    Ledger.SPlutusV2
+
 prop_decode_only_wrapped_plutus_script_V3_CBOR :: Property
 prop_decode_only_wrapped_plutus_script_V3_CBOR = H.property $ do
   PlutusScriptSerialised shortBs <- H.forAll $ genPlutusScript PlutusScriptV3
@@ -569,6 +582,9 @@ tests =
     , testProperty
         "decode only wrapped plutus script V2 CBOR"
         prop_decode_only_wrapped_plutus_script_V2_CBOR
+    , testProperty
+        "decode only wrapped plutus script V2 special CBOR"
+        prop_decode_only_wrapped_plutus_script_V2_ByteStringToInteger_CBOR
     , testProperty
         "decode only wrapped plutus script V3 CBOR"
         prop_decode_only_wrapped_plutus_script_V3_CBOR