tx-generator: integrate new scripts

mgmeier · mgmeier · commit 0f150d3a7690 · 2026-07-01T10:44:28.000+02:00
diff --git a/bench/tx-generator/app/calibrate-script.hs b/bench/tx-generator/app/calibrate-script.hs
@@ -14,9 +14,6 @@ import           Cardano.Api
 
 import           Cardano.Benchmarking.Compiler (keyBenchmarkInputs)
 import           Cardano.Benchmarking.GeneratorTx.SizedMetadata (mkMetadata)
-#ifdef WITH_LIBRARY
-import           Cardano.Benchmarking.PlutusScripts (listPlutusScripts)
-#endif
 import           Cardano.TxGenerator.Calibrate.Utils
 import           Cardano.TxGenerator.PlutusContext
 import           Cardano.TxGenerator.ProtocolParameters ( ProtocolParameters (..), convertToLedgerProtocolParameters, 
@@ -45,8 +42,11 @@ import           System.Directory
 import           System.FilePath
 import           Text.Read (readMaybe)
 
+#ifdef WITH_LIBRARY
+import           Cardano.Benchmarking.PlutusScripts (listPlutusScripts)
+#else
 import           Paths_tx_generator hiding (version)
-
+#endif
 
 data CommandLine
     = CLIList
diff --git a/bench/tx-generator/data/EcdsaSecp256k1LoopV3.redeemer.json b/bench/tx-generator/data/EcdsaSecp256k1LoopV3.redeemer.json
@@ -0,0 +1,17 @@
+{
+  "constructor": 0,
+  "fields": [
+    {
+      "int": 1000000
+    },
+    {
+      "bytes": "0392d7b94bc6a11c335a043ee1ff326b6eacee6230d3685861cd62bce350a172e0"
+    },
+    {
+      "bytes": "16e0bf1f85594a11e75030981c0b670370b3ad83a43f49ae58a2fd6f6513cde9"
+    },
+    {
+      "bytes": "5fb12954b28be6456feb080cfb8467b6f5677f62eb9ad231de7a575f4b6857512754fb5ef7e0e60e270832e7bb0e2f0dc271012fa9c46c02504aa0e798be6295"
+    }
+  ]
+}
diff --git a/bench/tx-generator/data/SchnorrSecp256k1LoopV3.redeemer.json b/bench/tx-generator/data/SchnorrSecp256k1LoopV3.redeemer.json
@@ -0,0 +1,17 @@
+{
+  "constructor": 0,
+  "fields": [
+    {
+      "int": 1000000
+    },
+    {
+      "bytes": "599de3e582e2a3779208a210dfeae8f330b9af00a47a7fb22e9bb8ef596f301b"
+    },
+    {
+      "bytes": "30303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030"
+    },
+    {
+      "bytes": "5a56da88e6fd8419181dec4d3dd6997bab953d2fc71ab65e23cfc9e7e3d1a310613454a60f6703819a39fdac2a410a094442afd1fc083354443e8d8bb4461a9b"
+    }
+  ]
+}
diff --git a/bench/tx-generator/scripts-fallback/EcdsaSecp256k1LoopV3.plutus b/bench/tx-generator/scripts-fallback/EcdsaSecp256k1LoopV3.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV3",
     "description": "",
-    "cborHex": "59013c0101003232232325333573466e200052080897a1300549011572656465656d6572206973203c2031303030303030001333300400190029111001a400a444400490029111000a400644440083233223325333573466e2000d2000130074910350543600133001003801919194004dd69aba10039bae35742005375c6ae840066eb8d5d09aba20011aba2001357440038000c8c00400488a4006601292010350543700912999ab9a3370e9000002080109991980300300099b81004480080040026aae74004d55cf0009baa357426ae88d55cf1baa001323001001222225333573466e1d2080897a004149854ccd5cd199bb40030020011333323300600600133702008900100180100089803249245472616365206572726f723a2045434453412076616c69646174696f6e206661696c656400232633573800300001"
+    "cborHex": "5901100101009800aab9daba2ab9aaab9eaba1ab9c4888888c8c88c8c96600266e200052080897a89802a4811572656465656d6572206973203c2031303030303030008cc004007200522220036400a4444004c8014888800480210094800c88880106464646b30013370e9000001448c8ca0026eb4c02c00e6eb8c02c00a6eb8c02c0066eb8c02cc038004601a0026018003164028002601000460140026ea8c014c020c018dd5000991800800911112cc004cdc3a410112f4009149a2b30019800801c00a002bb444ca600200d001802400e0048030cdc080224005130064901245472616365206572726f723a2045434453412076616c69646174696f6e206661696c656400402880508c98cc0080060001"
 }
diff --git a/bench/tx-generator/scripts-fallback/LoopV3.plutus b/bench/tx-generator/scripts-fallback/LoopV3.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV3",
     "description": "",
-    "cborHex": "58650101003225325333573466e200052080897a113263357389211572656465656d6572206973203c2031303030303030008000898018009bad357426ae88d55cf1baa0013230010012255333573466e1d2080897a0011149844c8cc00c00c004cdc0800a4005"
+    "cborHex": "58720101009800aba2ab9aaab9eaba1ab9c488888c88c96600266e200052080897a89931980224811572656465656d6572206973203c20313030303030300080044c00c0050071bad300430073005375400264600200244b30013370e904044bd000c5268991980180180099b810014800900601"
 }
diff --git a/bench/tx-generator/scripts-fallback/SchnorrSecp256k1LoopV3.plutus b/bench/tx-generator/scripts-fallback/SchnorrSecp256k1LoopV3.plutus
@@ -1,5 +1,5 @@
 {
     "type": "PlutusScriptV3",
     "description": "",
-    "cborHex": "59013e0101003232232325333573466e200052080897a1300549011572656465656d6572206973203c2031303030303030001333300400190029111001a400a444400490029111000a400644440083233223325333573466e2000d2000130074910350543600133001003801919194004dd69aba10039bae35742005375c6ae840066eb8d5d09aba20011aba2001357440038000c8c00400488a4006601292010350543700912999ab9a3370e9000002080109991980300300099b81004480080040026aae74004d55cf0009baa357426ae88d55cf1baa001323001001222225333573466e1d2080897a004149854ccd5cd199bb50030020011333323300600600133702008900100180100089803249265472616365206572726f723a205363686e6f72722076616c69646174696f6e206661696c656400232633573800300001"
+    "cborHex": "5901120101009800aab9daba2ab9aaab9eaba1ab9c4888888c8c88c8c96600266e200052080897a89802a4811572656465656d6572206973203c2031303030303030008cc004007200522220036400a4444004c8014888800480210094800c88880106464646b30013370e9000001448c8ca0026eb4c02c00e6eb8c02c00a6eb8c02c0066eb8c02cc038004601a0026018003164028002601000460140026ea8c014c020c018dd5000991800800911112cc004cdc3a410112f4009149a2b30019800801c00a002bb544ca600200d001802400e0048030cdc080224005130064901265472616365206572726f723a205363686e6f72722076616c69646174696f6e206661696c656400402880508c98cc0080060001"
 }
diff --git a/bench/tx-generator/scripts-legacy/EcdsaSecp256k1Loop_2023.plutus b/bench/tx-generator/scripts-legacy/EcdsaSecp256k1Loop_2023.plutus
diff --git a/bench/tx-generator/scripts-legacy/SchnorrSecp256k1Loop_2023.plutus b/bench/tx-generator/scripts-legacy/SchnorrSecp256k1Loop_2023.plutus

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PlutusScriptV3",`
`3`	`3`	`"description": "",`
`4`		- "cborHex": "59013c0101003232232325333573466e200052080897a1300549011572656465656d6572206973203c2031303030303030001333300400190029111001a400a444400490029111000a400644440083233223325333573466e2000d2000130074910350543600133001003801919194004dd69aba10039bae35742005375c6ae840066eb8d5d09aba20011aba2001357440038000c8c00400488a4006601292010350543700912999ab9a3370e9000002080109991980300300099b81004480080040026aae74004d55cf0009baa357426ae88d55cf1baa001323001001222225333573466e1d2080897a004149854ccd5cd199bb40030020011333323300600600133702008900100180100089803249245472616365206572726f723a2045434453412076616c69646174696f6e206661696c656400232633573800300001"
	`4`	+ "cborHex": "5901100101009800aab9daba2ab9aaab9eaba1ab9c4888888c8c88c8c96600266e200052080897a89802a4811572656465656d6572206973203c2031303030303030008cc004007200522220036400a4444004c8014888800480210094800c88880106464646b30013370e9000001448c8ca0026eb4c02c00e6eb8c02c00a6eb8c02c0066eb8c02cc038004601a0026018003164028002601000460140026ea8c014c020c018dd5000991800800911112cc004cdc3a410112f4009149a2b30019800801c00a002bb444ca600200d001802400e0048030cdc080224005130064901245472616365206572726f723a2045434453412076616c69646174696f6e206661696c656400402880508c98cc0080060001"
`5`	`5`	`}`