Extract serialiseCompiledCode from scripts modules to upper module

fmaste · fmaste · commit 13be5927f567 · 2026-02-20T01:03:00.000Z
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs
@@ -12,7 +12,6 @@ module Cardano.Benchmarking.PlutusScripts.CustomCall (script) where
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV2))
 import           Cardano.Benchmarking.PlutusScripts.CustomCallTypes
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V2 as PlutusV2
 import qualified PlutusTx (compile)
@@ -26,7 +25,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV2
            $(LitE . StringL . loc_module <$> qLocation)
-           customCallScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 instance Plutus.Eq CustomCallData where
@@ -64,5 +63,3 @@ unwrap :: BuiltinData -> CustomCallArg
 unwrap  = PlutusV2.unsafeFromBuiltinData
 -- Note: type-constraining unsafeFromBuiltinData decreases script's execution units.
 
-customCallScriptShortBs :: SBS.ShortByteString
-customCallScriptShortBs = PlutusV2.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCallV3.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCallV3.hs
@@ -9,7 +9,6 @@ module Cardano.Benchmarking.PlutusScripts.CustomCallV3 (script) where
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.PlutusScripts.CustomCallTypes
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as PlutusV3
 import qualified PlutusTx (compile)
@@ -25,7 +24,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           customCallScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 instance Plutus.Eq CustomCallData where
@@ -74,5 +73,3 @@ mkValidator arg =
 unwrap :: BuiltinData -> CustomCallArg
 unwrap  = PlutusV3.unsafeFromBuiltinData
 
-customCallScriptShortBs :: SBS.ShortByteString
-customCallScriptShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs
@@ -9,7 +9,6 @@ module Cardano.Benchmarking.PlutusScripts.EcdsaSecp256k1Loop (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV2))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V2 as PlutusV2
 import qualified PlutusTx (compile)
@@ -22,7 +21,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV2
            $(LitE . StringL . loc_module <$> qLocation)
-           v2EcdsaLoopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINEABLE mkValidator #-}
@@ -40,6 +39,3 @@ mkValidator _datum red _txContext =
       | BI.verifyEcdsaSecp256k1Signature v m s = loop (pred i) v m s
       | otherwise = P.traceError "Trace error: ECDSA validation failed"
 
-v2EcdsaLoopScriptShortBs :: SBS.ShortByteString
-v2EcdsaLoopScriptShortBs = PlutusV2.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
-
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1LoopV3.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1LoopV3.hs
@@ -6,7 +6,6 @@ module Cardano.Benchmarking.PlutusScripts.EcdsaSecp256k1LoopV3 (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as PlutusV3
 import qualified PlutusTx (compile)
@@ -21,7 +20,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           ecdsaLoopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -52,6 +51,3 @@ mkValidator arg =
       | Builtins.verifyEcdsaSecp256k1Signature v m s = loop (pred i) v m s
       | otherwise = P.traceError "Trace error: ECDSA validation failed"
 
-ecdsaLoopScriptShortBs :: SBS.ShortByteString
-ecdsaLoopScriptShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
-
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/HashOntoG2AndAdd.hs
@@ -11,7 +11,6 @@ module Cardano.Benchmarking.PlutusScripts.HashOntoG2AndAdd (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           GHC.ByteOrder (ByteOrder (LittleEndian))
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as PlutusV3
@@ -26,7 +25,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           hashAndAddG2ShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -59,5 +58,3 @@ mkValidator arg =
       | i == 1000000 = BI.unitval
       | otherwise    = let !_ = hashAndAddG2 l i in loop (pred i) l
 
-hashAndAddG2ShortBs :: SBS.ShortByteString
-hashAndAddG2ShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop2024.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop2024.hs
@@ -9,9 +9,7 @@ module Cardano.Benchmarking.PlutusScripts.Loop2024 (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV1))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
-import qualified PlutusLedgerApi.V1 as PlutusV1
 import qualified PlutusTx (compile)
 import           PlutusTx.Builtins (unsafeDataAsI)
 import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.), (<$>))
@@ -22,7 +20,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV1
            $(LitE . StringL . loc_module <$> qLocation)
-           loopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -35,5 +33,3 @@ mkValidator _datum redeemer _txContext
     n = unsafeDataAsI redeemer
     loop i = if i == 1000000 then () else loop $ pred i
 
-loopScriptShortBs :: SBS.ShortByteString
-loopScriptShortBs = PlutusV1.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/LoopV3.hs
@@ -6,9 +6,7 @@ module Cardano.Benchmarking.PlutusScripts.LoopV3 (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
-import qualified PlutusLedgerApi.V3 as PlutusV3
 import qualified PlutusTx (compile)
 import           PlutusTx.Builtins (unsafeDataAsI)
 import qualified PlutusTx.Builtins.Internal as BI (BuiltinList, head, snd, tail, unitval,
@@ -21,7 +19,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           loopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -45,5 +43,3 @@ mkValidator arg =
 
     loop i = if i == 1000000 then BI.unitval else loop (pred i)
 
-loopScriptShortBs :: SBS.ShortByteString
-loopScriptShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Ripemd160.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Ripemd160.hs
@@ -7,7 +7,6 @@ module Cardano.Benchmarking.PlutusScripts.Ripemd160 (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as PlutusV3
 import qualified PlutusTx (compile)
@@ -21,7 +20,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           ripEmd160ShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -49,5 +48,3 @@ mkValidator arg =
       | i == 1000000 = BI.unitval
       | otherwise    = let !res' = Tx.ripemd_160 res in loop (pred i) res'
 
-ripEmd160ShortBs :: SBS.ShortByteString
-ripEmd160ShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs
@@ -9,7 +9,6 @@ module Cardano.Benchmarking.PlutusScripts.SchnorrSecp256k1Loop (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV2))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V2 as PlutusV2
 import qualified PlutusTx (compile)
@@ -22,7 +21,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV2
            $(LitE . StringL . loc_module <$> qLocation)
-           v2SchnorrLoopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINEABLE mkValidator #-}
@@ -40,6 +39,3 @@ mkValidator _datum red _txContext =
       | BI.verifySchnorrSecp256k1Signature v m s = loop (pred i) v m s
       | otherwise = P.traceError "Trace error: Schnorr validation failed"
 
-v2SchnorrLoopScriptShortBs :: SBS.ShortByteString
-v2SchnorrLoopScriptShortBs = PlutusV2.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
-
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1LoopV3.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1LoopV3.hs
@@ -6,7 +6,6 @@ module Cardano.Benchmarking.PlutusScripts.SchnorrSecp256k1LoopV3 (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as PlutusV3
 import qualified PlutusTx (compile)
@@ -21,7 +20,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           schnorrLoopScriptShortBs
+           $$(PlutusTx.compile [|| mkValidator ||])
 
 
 {-# INLINABLE mkValidator #-}
@@ -52,6 +51,3 @@ mkValidator arg =
       | Builtins.verifySchnorrSecp256k1Signature v m s = loop (pred i) v m s
       | otherwise = P.traceError "Trace error: Schnorr validation failed"
 
-schnorrLoopScriptShortBs :: SBS.ShortByteString
-schnorrLoopScriptShortBs = PlutusV3.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
-
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SupplementalDatum.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SupplementalDatum.hs
@@ -6,7 +6,6 @@ module Cardano.Benchmarking.PlutusScripts.SupplementalDatum (script) where
 
 import           Cardano.Api (PlutusScriptVersion (PlutusScriptV3))
 import           Cardano.Benchmarking.ScriptAPI
-import qualified Data.ByteString.Short as SBS
 import           Language.Haskell.TH.Syntax (Exp (LitE), Lit (StringL), Loc (loc_module), qLocation)
 import qualified PlutusLedgerApi.V3 as V3
 import qualified PlutusLedgerApi.V3.Contexts as V3
@@ -21,7 +20,7 @@ script :: PlutusBenchScript
 script = mkPlutusBenchScriptFromCompiled
            PlutusScriptV3
            $(LitE . StringL . loc_module <$> qLocation)
-           supplementalDatumBs
+           $$(PlutusTx.compile [|| untypedValidator ||])
 
 
 -- | Write to disk with: cabal run plutus-scripts-bench -- print SupplementalDatum -o supplemental-datum.plutus
@@ -46,5 +45,3 @@ untypedValidator :: BuiltinData -> BuiltinUnit
 untypedValidator ctx =
   PlutusTx.check (typedValidator (PlutusTx.unsafeFromBuiltinData ctx) )
 
-supplementalDatumBs :: SBS.ShortByteString
-supplementalDatumBs = V3.serialiseCompiledCode $$(PlutusTx.compile [|| untypedValidator ||])
diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/ScriptAPI.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/ScriptAPI.hs
@@ -13,7 +13,8 @@ import           Data.Maybe (fromMaybe)
 import           System.FilePath (splitExtension, stripExtension, takeFileName)
 import           Cardano.Api (ScriptInAnyLang, IsPlutusScriptLanguage, PlutusScriptVersion,
                    PlutusScript (..), Script (..), toScriptInAnyLang)
-import qualified Data.ByteString.Short as SBS
+import qualified PlutusLedgerApi.Common as Plutus (serialiseCompiledCode)
+import qualified PlutusTx (CompiledCode)
 
 data PlutusBenchScript
   = PlutusBenchScript
@@ -41,16 +42,18 @@ prepareScriptName script
 
 -- | Create a PlutusBenchScript from a compiled PlutusCore script.
 -- This eliminates boilerplate by handling script name extraction,
--- serialization wrapping, and version-polymorphic script construction.
+-- serialization, and version-polymorphic script construction.
+-- The serialization is version-agnostic and works for V1, V2, and V3.
 mkPlutusBenchScriptFromCompiled ::
      IsPlutusScriptLanguage lang
   => PlutusScriptVersion lang        -- ^ Plutus script version (V1, V2, or V3)
   -> String                          -- ^ Module name (from Template Haskell)
-  -> SBS.ShortByteString             -- ^ Compiled PlutusCore script
+  -> PlutusTx.CompiledCode a         -- ^ Compiled Plutus code
   -> PlutusBenchScript
-mkPlutusBenchScriptFromCompiled version moduleName compiledScript =
+mkPlutusBenchScriptFromCompiled version moduleName compiledCode =
   PlutusBenchScript scriptName scriptInAnyLang
   where
     scriptName = prepareScriptName moduleName
-    scriptSerialized = PlutusScriptSerialised compiledScript
+    serializedScript = Plutus.serialiseCompiledCode compiledCode
+    scriptSerialized = PlutusScriptSerialised serializedScript
     scriptInAnyLang = toScriptInAnyLang (PlutusScript version scriptSerialized)
