diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs index 024afeeccc6..9029d4f918c 100644 --- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs +++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs @@ -7,6 +7,9 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} +-- PlutusV2 must be compiled using plc 1.0 +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-} + module Cardano.Benchmarking.PlutusScripts.CustomCall (script) where import Language.Haskell.TH diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs index d96d5f82875..cf25ce4ae94 100644 --- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs +++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs @@ -4,6 +4,9 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} +-- PlutusV2 must be compiled using plc 1.0 +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-} + module Cardano.Benchmarking.PlutusScripts.EcdsaSecp256k1Loop (script) where import Language.Haskell.TH diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop.hs index 013004d0007..903ade09ef0 100644 --- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop.hs +++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop.hs @@ -4,6 +4,9 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} +-- PlutusV1 must be compiled using plc 1.0 +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-} + module Cardano.Benchmarking.PlutusScripts.Loop (script) where import Language.Haskell.TH @@ -14,7 +17,7 @@ import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV1, Script( import Cardano.Benchmarking.ScriptAPI import qualified Data.ByteString.Short as SBS -import qualified PlutusLedgerApi.V2 as PlutusV2 +import qualified PlutusLedgerApi.V1 as PlutusV1 import PlutusTx import PlutusTx.Builtins (unsafeDataAsI) import PlutusTx.Prelude hiding (Semigroup (..), unless, (.), (<$>)) @@ -39,7 +42,7 @@ mkValidator _datum redeemer _txContext loop i = if i == 1000000 then () else loop $ pred i loopScriptShortBs :: SBS.ShortByteString -loopScriptShortBs = PlutusV2.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||]) +loopScriptShortBs = PlutusV1.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||]) scriptSerialized :: PlutusScript PlutusScriptV1 scriptSerialized = PlutusScriptSerialised loopScriptShortBs diff --git a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs index dbce7df920c..83f89698beb 100644 --- a/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs +++ b/bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs @@ -4,6 +4,9 @@ {-# LANGUAGE TypeApplications #-} {-# LANGUAGE TypeFamilies #-} +-- PlutusV2 must be compiled using plc 1.0 +{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-} + module Cardano.Benchmarking.PlutusScripts.SchnorrSecp256k1Loop (script) where import Language.Haskell.TH diff --git a/bench/tx-generator/data/protocol-parameters-v8.json b/bench/tx-generator/data/protocol-parameters-v8.json index 916f39da480..c6e563e7fed 100644 --- a/bench/tx-generator/data/protocol-parameters-v8.json +++ b/bench/tx-generator/data/protocol-parameters-v8.json @@ -1,351 +1,351 @@ { "collateralPercentage": 150, "costModels": { - "PlutusScriptV1": { - "addInteger-cpu-arguments-intercept": 205665, - "addInteger-cpu-arguments-slope": 812, - "addInteger-memory-arguments-intercept": 1, - "addInteger-memory-arguments-slope": 1, - "appendByteString-cpu-arguments-intercept": 1000, - "appendByteString-cpu-arguments-slope": 571, - "appendByteString-memory-arguments-intercept": 0, - "appendByteString-memory-arguments-slope": 1, - "appendString-cpu-arguments-intercept": 1000, - "appendString-cpu-arguments-slope": 24177, - "appendString-memory-arguments-intercept": 4, - "appendString-memory-arguments-slope": 1, - "bData-cpu-arguments": 1000, - "bData-memory-arguments": 32, - "blake2b_256-cpu-arguments-intercept": 117366, - "blake2b_256-cpu-arguments-slope": 10475, - "blake2b_256-memory-arguments": 4, - "cekApplyCost-exBudgetCPU": 23000, - "cekApplyCost-exBudgetMemory": 100, - "cekBuiltinCost-exBudgetCPU": 23000, - "cekBuiltinCost-exBudgetMemory": 100, - "cekConstCost-exBudgetCPU": 23000, - "cekConstCost-exBudgetMemory": 100, - "cekDelayCost-exBudgetCPU": 23000, - "cekDelayCost-exBudgetMemory": 100, - "cekForceCost-exBudgetCPU": 23000, - "cekForceCost-exBudgetMemory": 100, - "cekLamCost-exBudgetCPU": 23000, - "cekLamCost-exBudgetMemory": 100, - "cekStartupCost-exBudgetCPU": 100, - "cekStartupCost-exBudgetMemory": 100, - "cekVarCost-exBudgetCPU": 23000, - "cekVarCost-exBudgetMemory": 100, - "chooseData-cpu-arguments": 19537, - "chooseData-memory-arguments": 32, - "chooseList-cpu-arguments": 175354, - "chooseList-memory-arguments": 32, - "chooseUnit-cpu-arguments": 46417, - "chooseUnit-memory-arguments": 4, - "consByteString-cpu-arguments-intercept": 221973, - "consByteString-cpu-arguments-slope": 511, - "consByteString-memory-arguments-intercept": 0, - "consByteString-memory-arguments-slope": 1, - "constrData-cpu-arguments": 89141, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 497525, - "decodeUtf8-cpu-arguments-slope": 14068, - "decodeUtf8-memory-arguments-intercept": 4, - "decodeUtf8-memory-arguments-slope": 2, - "divideInteger-cpu-arguments-constant": 196500, - "divideInteger-cpu-arguments-model-arguments-intercept": 453240, - "divideInteger-cpu-arguments-model-arguments-slope": 220, - "divideInteger-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-minimum": 1, - "divideInteger-memory-arguments-slope": 1, - "encodeUtf8-cpu-arguments-intercept": 1000, - "encodeUtf8-cpu-arguments-slope": 28662, - "encodeUtf8-memory-arguments-intercept": 4, - "encodeUtf8-memory-arguments-slope": 2, - "equalsByteString-cpu-arguments-constant": 245000, - "equalsByteString-cpu-arguments-intercept": 216773, - "equalsByteString-cpu-arguments-slope": 62, - "equalsByteString-memory-arguments": 1, - "equalsData-cpu-arguments-intercept": 1060367, - "equalsData-cpu-arguments-slope": 12586, - "equalsData-memory-arguments": 1, - "equalsInteger-cpu-arguments-intercept": 208512, - "equalsInteger-cpu-arguments-slope": 421, - "equalsInteger-memory-arguments": 1, - "equalsString-cpu-arguments-constant": 187000, - "equalsString-cpu-arguments-intercept": 1000, - "equalsString-cpu-arguments-slope": 52998, - "equalsString-memory-arguments": 1, - "fstPair-cpu-arguments": 80436, - "fstPair-memory-arguments": 32, - "headList-cpu-arguments": 43249, - "headList-memory-arguments": 32, - "iData-cpu-arguments": 1000, - "iData-memory-arguments": 32, - "ifThenElse-cpu-arguments": 80556, - "ifThenElse-memory-arguments": 1, - "indexByteString-cpu-arguments": 57667, - "indexByteString-memory-arguments": 4, - "lengthOfByteString-cpu-arguments": 1000, - "lengthOfByteString-memory-arguments": 10, - "lessThanByteString-cpu-arguments-intercept": 197145, - "lessThanByteString-cpu-arguments-slope": 156, - "lessThanByteString-memory-arguments": 1, - "lessThanEqualsByteString-cpu-arguments-intercept": 197145, - "lessThanEqualsByteString-cpu-arguments-slope": 156, - "lessThanEqualsByteString-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-intercept": 204924, - "lessThanEqualsInteger-cpu-arguments-slope": 473, - "lessThanEqualsInteger-memory-arguments": 1, - "lessThanInteger-cpu-arguments-intercept": 208896, - "lessThanInteger-cpu-arguments-slope": 511, - "lessThanInteger-memory-arguments": 1, - "listData-cpu-arguments": 52467, - "listData-memory-arguments": 32, - "mapData-cpu-arguments": 64832, - "mapData-memory-arguments": 32, - "mkCons-cpu-arguments": 65493, - "mkCons-memory-arguments": 32, - "mkNilData-cpu-arguments": 22558, - "mkNilData-memory-arguments": 32, - "mkNilPairData-cpu-arguments": 16563, - "mkNilPairData-memory-arguments": 32, - "mkPairData-cpu-arguments": 76511, - "mkPairData-memory-arguments": 32, - "modInteger-cpu-arguments-constant": 196500, - "modInteger-cpu-arguments-model-arguments-intercept": 453240, - "modInteger-cpu-arguments-model-arguments-slope": 220, - "modInteger-memory-arguments-intercept": 0, - "modInteger-memory-arguments-minimum": 1, - "modInteger-memory-arguments-slope": 1, - "multiplyInteger-cpu-arguments-intercept": 69522, - "multiplyInteger-cpu-arguments-slope": 11687, - "multiplyInteger-memory-arguments-intercept": 0, - "multiplyInteger-memory-arguments-slope": 1, - "nullList-cpu-arguments": 60091, - "nullList-memory-arguments": 32, - "quotientInteger-cpu-arguments-constant": 196500, - "quotientInteger-cpu-arguments-model-arguments-intercept": 453240, - "quotientInteger-cpu-arguments-model-arguments-slope": 220, - "quotientInteger-memory-arguments-intercept": 0, - "quotientInteger-memory-arguments-minimum": 1, - "quotientInteger-memory-arguments-slope": 1, - "remainderInteger-cpu-arguments-constant": 196500, - "remainderInteger-cpu-arguments-model-arguments-intercept": 453240, - "remainderInteger-cpu-arguments-model-arguments-slope": 220, - "remainderInteger-memory-arguments-intercept": 0, - "remainderInteger-memory-arguments-minimum": 1, - "remainderInteger-memory-arguments-slope": 1, - "sha2_256-cpu-arguments-intercept": 806990, - "sha2_256-cpu-arguments-slope": 30482, - "sha2_256-memory-arguments": 4, - "sha3_256-cpu-arguments-intercept": 1927926, - "sha3_256-cpu-arguments-slope": 82523, - "sha3_256-memory-arguments": 4, - "sliceByteString-cpu-arguments-intercept": 265318, - "sliceByteString-cpu-arguments-slope": 0, - "sliceByteString-memory-arguments-intercept": 4, - "sliceByteString-memory-arguments-slope": 0, - "sndPair-cpu-arguments": 85931, - "sndPair-memory-arguments": 32, - "subtractInteger-cpu-arguments-intercept": 205665, - "subtractInteger-cpu-arguments-slope": 812, - "subtractInteger-memory-arguments-intercept": 1, - "subtractInteger-memory-arguments-slope": 1, - "tailList-cpu-arguments": 41182, - "tailList-memory-arguments": 32, - "trace-cpu-arguments": 212342, - "trace-memory-arguments": 32, - "unBData-cpu-arguments": 31220, - "unBData-memory-arguments": 32, - "unConstrData-cpu-arguments": 32696, - "unConstrData-memory-arguments": 32, - "unIData-cpu-arguments": 43357, - "unIData-memory-arguments": 32, - "unListData-cpu-arguments": 32247, - "unListData-memory-arguments": 32, - "unMapData-cpu-arguments": 38314, - "unMapData-memory-arguments": 32, - "verifyEd25519Signature-cpu-arguments-intercept": 9462713, - "verifyEd25519Signature-cpu-arguments-slope": 1021, - "verifyEd25519Signature-memory-arguments": 10 - }, - "PlutusScriptV2": { - "addInteger-cpu-arguments-intercept": 205665, - "addInteger-cpu-arguments-slope": 812, - "addInteger-memory-arguments-intercept": 1, - "addInteger-memory-arguments-slope": 1, - "appendByteString-cpu-arguments-intercept": 1000, - "appendByteString-cpu-arguments-slope": 571, - "appendByteString-memory-arguments-intercept": 0, - "appendByteString-memory-arguments-slope": 1, - "appendString-cpu-arguments-intercept": 1000, - "appendString-cpu-arguments-slope": 24177, - "appendString-memory-arguments-intercept": 4, - "appendString-memory-arguments-slope": 1, - "bData-cpu-arguments": 1000, - "bData-memory-arguments": 32, - "blake2b_256-cpu-arguments-intercept": 117366, - "blake2b_256-cpu-arguments-slope": 10475, - "blake2b_256-memory-arguments": 4, - "cekApplyCost-exBudgetCPU": 23000, - "cekApplyCost-exBudgetMemory": 100, - "cekBuiltinCost-exBudgetCPU": 23000, - "cekBuiltinCost-exBudgetMemory": 100, - "cekConstCost-exBudgetCPU": 23000, - "cekConstCost-exBudgetMemory": 100, - "cekDelayCost-exBudgetCPU": 23000, - "cekDelayCost-exBudgetMemory": 100, - "cekForceCost-exBudgetCPU": 23000, - "cekForceCost-exBudgetMemory": 100, - "cekLamCost-exBudgetCPU": 23000, - "cekLamCost-exBudgetMemory": 100, - "cekStartupCost-exBudgetCPU": 100, - "cekStartupCost-exBudgetMemory": 100, - "cekVarCost-exBudgetCPU": 23000, - "cekVarCost-exBudgetMemory": 100, - "chooseData-cpu-arguments": 19537, - "chooseData-memory-arguments": 32, - "chooseList-cpu-arguments": 175354, - "chooseList-memory-arguments": 32, - "chooseUnit-cpu-arguments": 46417, - "chooseUnit-memory-arguments": 4, - "consByteString-cpu-arguments-intercept": 221973, - "consByteString-cpu-arguments-slope": 511, - "consByteString-memory-arguments-intercept": 0, - "consByteString-memory-arguments-slope": 1, - "constrData-cpu-arguments": 89141, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 497525, - "decodeUtf8-cpu-arguments-slope": 14068, - "decodeUtf8-memory-arguments-intercept": 4, - "decodeUtf8-memory-arguments-slope": 2, - "divideInteger-cpu-arguments-constant": 196500, - "divideInteger-cpu-arguments-model-arguments-intercept": 453240, - "divideInteger-cpu-arguments-model-arguments-slope": 220, - "divideInteger-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-minimum": 1, - "divideInteger-memory-arguments-slope": 1, - "encodeUtf8-cpu-arguments-intercept": 1000, - "encodeUtf8-cpu-arguments-slope": 28662, - "encodeUtf8-memory-arguments-intercept": 4, - "encodeUtf8-memory-arguments-slope": 2, - "equalsByteString-cpu-arguments-constant": 245000, - "equalsByteString-cpu-arguments-intercept": 216773, - "equalsByteString-cpu-arguments-slope": 62, - "equalsByteString-memory-arguments": 1, - "equalsData-cpu-arguments-intercept": 1060367, - "equalsData-cpu-arguments-slope": 12586, - "equalsData-memory-arguments": 1, - "equalsInteger-cpu-arguments-intercept": 208512, - "equalsInteger-cpu-arguments-slope": 421, - "equalsInteger-memory-arguments": 1, - "equalsString-cpu-arguments-constant": 187000, - "equalsString-cpu-arguments-intercept": 1000, - "equalsString-cpu-arguments-slope": 52998, - "equalsString-memory-arguments": 1, - "fstPair-cpu-arguments": 80436, - "fstPair-memory-arguments": 32, - "headList-cpu-arguments": 43249, - "headList-memory-arguments": 32, - "iData-cpu-arguments": 1000, - "iData-memory-arguments": 32, - "ifThenElse-cpu-arguments": 80556, - "ifThenElse-memory-arguments": 1, - "indexByteString-cpu-arguments": 57667, - "indexByteString-memory-arguments": 4, - "lengthOfByteString-cpu-arguments": 1000, - "lengthOfByteString-memory-arguments": 10, - "lessThanByteString-cpu-arguments-intercept": 197145, - "lessThanByteString-cpu-arguments-slope": 156, - "lessThanByteString-memory-arguments": 1, - "lessThanEqualsByteString-cpu-arguments-intercept": 197145, - "lessThanEqualsByteString-cpu-arguments-slope": 156, - "lessThanEqualsByteString-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-intercept": 204924, - "lessThanEqualsInteger-cpu-arguments-slope": 473, - "lessThanEqualsInteger-memory-arguments": 1, - "lessThanInteger-cpu-arguments-intercept": 208896, - "lessThanInteger-cpu-arguments-slope": 511, - "lessThanInteger-memory-arguments": 1, - "listData-cpu-arguments": 52467, - "listData-memory-arguments": 32, - "mapData-cpu-arguments": 64832, - "mapData-memory-arguments": 32, - "mkCons-cpu-arguments": 65493, - "mkCons-memory-arguments": 32, - "mkNilData-cpu-arguments": 22558, - "mkNilData-memory-arguments": 32, - "mkNilPairData-cpu-arguments": 16563, - "mkNilPairData-memory-arguments": 32, - "mkPairData-cpu-arguments": 76511, - "mkPairData-memory-arguments": 32, - "modInteger-cpu-arguments-constant": 196500, - "modInteger-cpu-arguments-model-arguments-intercept": 453240, - "modInteger-cpu-arguments-model-arguments-slope": 220, - "modInteger-memory-arguments-intercept": 0, - "modInteger-memory-arguments-minimum": 1, - "modInteger-memory-arguments-slope": 1, - "multiplyInteger-cpu-arguments-intercept": 69522, - "multiplyInteger-cpu-arguments-slope": 11687, - "multiplyInteger-memory-arguments-intercept": 0, - "multiplyInteger-memory-arguments-slope": 1, - "nullList-cpu-arguments": 60091, - "nullList-memory-arguments": 32, - "quotientInteger-cpu-arguments-constant": 196500, - "quotientInteger-cpu-arguments-model-arguments-intercept": 453240, - "quotientInteger-cpu-arguments-model-arguments-slope": 220, - "quotientInteger-memory-arguments-intercept": 0, - "quotientInteger-memory-arguments-minimum": 1, - "quotientInteger-memory-arguments-slope": 1, - "remainderInteger-cpu-arguments-constant": 196500, - "remainderInteger-cpu-arguments-model-arguments-intercept": 453240, - "remainderInteger-cpu-arguments-model-arguments-slope": 220, - "remainderInteger-memory-arguments-intercept": 0, - "remainderInteger-memory-arguments-minimum": 1, - "remainderInteger-memory-arguments-slope": 1, - "serialiseData-cpu-arguments-intercept": 1159724, - "serialiseData-cpu-arguments-slope": 392670, - "serialiseData-memory-arguments-intercept": 0, - "serialiseData-memory-arguments-slope": 2, - "sha2_256-cpu-arguments-intercept": 806990, - "sha2_256-cpu-arguments-slope": 30482, - "sha2_256-memory-arguments": 4, - "sha3_256-cpu-arguments-intercept": 1927926, - "sha3_256-cpu-arguments-slope": 82523, - "sha3_256-memory-arguments": 4, - "sliceByteString-cpu-arguments-intercept": 265318, - "sliceByteString-cpu-arguments-slope": 0, - "sliceByteString-memory-arguments-intercept": 4, - "sliceByteString-memory-arguments-slope": 0, - "sndPair-cpu-arguments": 85931, - "sndPair-memory-arguments": 32, - "subtractInteger-cpu-arguments-intercept": 205665, - "subtractInteger-cpu-arguments-slope": 812, - "subtractInteger-memory-arguments-intercept": 1, - "subtractInteger-memory-arguments-slope": 1, - "tailList-cpu-arguments": 41182, - "tailList-memory-arguments": 32, - "trace-cpu-arguments": 212342, - "trace-memory-arguments": 32, - "unBData-cpu-arguments": 31220, - "unBData-memory-arguments": 32, - "unConstrData-cpu-arguments": 32696, - "unConstrData-memory-arguments": 32, - "unIData-cpu-arguments": 43357, - "unIData-memory-arguments": 32, - "unListData-cpu-arguments": 32247, - "unListData-memory-arguments": 32, - "unMapData-cpu-arguments": 38314, - "unMapData-memory-arguments": 32, - "verifyEcdsaSecp256k1Signature-cpu-arguments": 35892428, - "verifyEcdsaSecp256k1Signature-memory-arguments": 10, - "verifyEd25519Signature-cpu-arguments-intercept": 9462713, - "verifyEd25519Signature-cpu-arguments-slope": 1021, - "verifyEd25519Signature-memory-arguments": 10, - "verifySchnorrSecp256k1Signature-cpu-arguments-intercept": 38887044, - "verifySchnorrSecp256k1Signature-cpu-arguments-slope": 32947, - "verifySchnorrSecp256k1Signature-memory-arguments": 10 - } + "PlutusV1": [ + 205665, + 812, + 1, + 1, + 1000, + 571, + 0, + 1, + 1000, + 24177, + 4, + 1, + 1000, + 32, + 117366, + 10475, + 4, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 100, + 100, + 23000, + 100, + 19537, + 32, + 175354, + 32, + 46417, + 4, + 221973, + 511, + 0, + 1, + 89141, + 32, + 497525, + 14068, + 4, + 2, + 196500, + 453240, + 220, + 0, + 1, + 1, + 1000, + 28662, + 4, + 2, + 245000, + 216773, + 62, + 1, + 1060367, + 12586, + 1, + 208512, + 421, + 1, + 187000, + 1000, + 52998, + 1, + 80436, + 32, + 43249, + 32, + 1000, + 32, + 80556, + 1, + 57667, + 4, + 1000, + 10, + 197145, + 156, + 1, + 197145, + 156, + 1, + 204924, + 473, + 1, + 208896, + 511, + 1, + 52467, + 32, + 64832, + 32, + 65493, + 32, + 22558, + 32, + 16563, + 32, + 76511, + 32, + 196500, + 453240, + 220, + 0, + 1, + 1, + 69522, + 11687, + 0, + 1, + 60091, + 32, + 196500, + 453240, + 220, + 0, + 1, + 1, + 196500, + 453240, + 220, + 0, + 1, + 1, + 806990, + 30482, + 4, + 1927926, + 82523, + 4, + 265318, + 0, + 4, + 0, + 85931, + 32, + 205665, + 812, + 1, + 1, + 41182, + 32, + 212342, + 32, + 31220, + 32, + 32696, + 32, + 43357, + 32, + 32247, + 32, + 38314, + 32, + 3345831, + 1, + 1 + ], + "PlutusV2": [ + 205665, + 812, + 1, + 1, + 1000, + 571, + 0, + 1, + 1000, + 24177, + 4, + 1, + 1000, + 32, + 117366, + 10475, + 4, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 23000, + 100, + 100, + 100, + 23000, + 100, + 19537, + 32, + 175354, + 32, + 46417, + 4, + 221973, + 511, + 0, + 1, + 89141, + 32, + 497525, + 14068, + 4, + 2, + 196500, + 453240, + 220, + 0, + 1, + 1, + 1000, + 28662, + 4, + 2, + 245000, + 216773, + 62, + 1, + 1060367, + 12586, + 1, + 208512, + 421, + 1, + 187000, + 1000, + 52998, + 1, + 80436, + 32, + 43249, + 32, + 1000, + 32, + 80556, + 1, + 57667, + 4, + 1000, + 10, + 197145, + 156, + 1, + 197145, + 156, + 1, + 204924, + 473, + 1, + 208896, + 511, + 1, + 52467, + 32, + 64832, + 32, + 65493, + 32, + 22558, + 32, + 16563, + 32, + 76511, + 32, + 196500, + 453240, + 220, + 0, + 1, + 1, + 69522, + 11687, + 0, + 1, + 60091, + 32, + 196500, + 453240, + 220, + 0, + 1, + 1, + 196500, + 453240, + 220, + 0, + 1, + 1, + 1159724, + 392670, + 0, + 2, + 806990, + 30482, + 4, + 1927926, + 82523, + 4, + 265318, + 0, + 4, + 0, + 85931, + 32, + 205665, + 812, + 1, + 1, + 41182, + 32, + 212342, + 32, + 31220, + 32, + 32696, + 32, + 43357, + 32, + 32247, + 32, + 38314, + 32, + 35892428, + 10, + 9462713, + 1021, + 10, + 38887044, + 32947, + 10 + ] }, "decentralization": null, "executionUnitPrices": { @@ -353,17 +353,17 @@ "priceSteps": 7.21e-05 }, "extraPraosEntropy": null, - "maxBlockBodySize": 90112, - "maxBlockExecutionUnits": { - "memory": 62000000, - "steps": 40000000000 - }, - "maxBlockHeaderSize": 1100, - "maxCollateralInputs": 3, - "maxTxExecutionUnits": { - "memory": 14000000, - "steps": 10000000000 - }, + "maxBlockBodySize": 90112, + "maxBlockExecutionUnits": { + "memory": 62000000, + "steps": 40000000000 + }, + "maxBlockHeaderSize": 1100, + "maxCollateralInputs": 3, + "maxTxExecutionUnits": { + "memory": 14000000, + "steps": 10000000000 + }, "maxTxSize": 16384, "maxValueSize": 5000, "minPoolCost": 340000000, @@ -377,10 +377,10 @@ }, "stakeAddressDeposit": 2000000, "stakePoolDeposit": 500000000, - "stakePoolTargetNum": 150, + "stakePoolTargetNum": 500, "treasuryCut": 0.2, "txFeeFixed": 155381, "txFeePerByte": 44, - "utxoCostPerByte": 4310, + "utxoCostPerByte": 538, "utxoCostPerWord": null } diff --git a/bench/tx-generator/data/protocol-parameters.json b/bench/tx-generator/data/protocol-parameters.json index 8d433c12685..e4e63ab3d20 100644 --- a/bench/tx-generator/data/protocol-parameters.json +++ b/bench/tx-generator/data/protocol-parameters.json @@ -1,208 +1,209 @@ { - "txFeePerByte": 44, - "minUTxOValue": null, - "decentralization": 0, - "utxoCostPerWord": 34482, - "stakePoolDeposit": 500000000, - "poolRetireMaxEpoch": 18, - "extraPraosEntropy": null, - "collateralPercentage": 150, - "stakePoolTargetNum": 500, - "maxBlockBodySize": 65536, - "minPoolCost": 340000000, - "maxTxSize": 16384, - "treasuryCut": 0.2, - "maxBlockExecutionUnits": { - "memory": 50000000, - "steps": 40000000000 - }, - "maxCollateralInputs": 3, - "maxValueSize": 5000, - "maxBlockHeaderSize": 1100, - "maxTxExecutionUnits": { - "memory": 10000000, - "steps": 10000000000 - }, - "costModels": { - "PlutusScriptV1": { - "cekConstCost-exBudgetMemory": 100, - "unBData-cpu-arguments": 150000, - "divideInteger-memory-arguments-minimum": 1, - "nullList-cpu-arguments": 150000, - "cekDelayCost-exBudgetMemory": 100, - "appendByteString-cpu-arguments-slope": 621, - "sha2_256-memory-arguments": 4, - "multiplyInteger-cpu-arguments-intercept": 61516, - "iData-cpu-arguments": 150000, - "equalsString-cpu-arguments-intercept": 150000, - "trace-cpu-arguments": 150000, - "lessThanEqualsByteString-cpu-arguments-intercept": 103599, - "encodeUtf8-cpu-arguments-slope": 1000, - "equalsString-cpu-arguments-constant": 1000, - "blake2b_256-cpu-arguments-slope": 29175, - "consByteString-memory-arguments-intercept": 0, - "headList-cpu-arguments": 150000, - "listData-cpu-arguments": 150000, - "divideInteger-cpu-arguments-model-arguments-slope": 118, - "divideInteger-memory-arguments-slope": 1, - "bData-cpu-arguments": 150000, - "chooseData-memory-arguments": 32, - "cekBuiltinCost-exBudgetCPU": 29773, - "mkNilData-memory-arguments": 32, - "equalsInteger-cpu-arguments-intercept": 136542, - "lengthOfByteString-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-slope": 0, - "unIData-cpu-arguments": 150000, - "sliceByteString-cpu-arguments-slope": 5000, - "unMapData-cpu-arguments": 150000, - "modInteger-cpu-arguments-model-arguments-slope": 118, - "lessThanInteger-cpu-arguments-intercept": 179690, - "appendString-memory-arguments-intercept": 0, - "mkCons-cpu-arguments": 150000, - "sha3_256-cpu-arguments-slope": 82363, - "ifThenElse-cpu-arguments": 1, - "mkNilPairData-cpu-arguments": 150000, - "constrData-memory-arguments": 32, - "lessThanEqualsInteger-cpu-arguments-intercept": 145276, - "addInteger-memory-arguments-slope": 1, - "chooseList-memory-arguments": 32, - "equalsData-memory-arguments": 1, - "decodeUtf8-cpu-arguments-intercept": 150000, - "bData-memory-arguments": 32, - "lessThanByteString-cpu-arguments-slope": 248, - "listData-memory-arguments": 32, - "consByteString-cpu-arguments-intercept": 150000, - "headList-memory-arguments": 32, - "subtractInteger-memory-arguments-slope": 1, - "appendByteString-memory-arguments-intercept": 0, - "unIData-memory-arguments": 32, - "remainderInteger-memory-arguments-minimum": 1, - "lengthOfByteString-memory-arguments": 4, - "encodeUtf8-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetCPU": 100, - "remainderInteger-memory-arguments-slope": 1, - "multiplyInteger-memory-arguments-intercept": 0, - "cekForceCost-exBudgetCPU": 29773, - "unListData-memory-arguments": 32, - "sha2_256-cpu-arguments-slope": 29175, - "indexByteString-memory-arguments": 1, - "equalsInteger-memory-arguments": 1, - "remainderInteger-cpu-arguments-model-arguments-slope": 118, - "cekVarCost-exBudgetCPU": 29773, - "lessThanEqualsInteger-cpu-arguments-slope": 1366, - "addInteger-memory-arguments-intercept": 1, - "sndPair-cpu-arguments": 150000, - "lessThanInteger-memory-arguments": 1, - "cekLamCost-exBudgetCPU": 29773, - "chooseUnit-cpu-arguments": 150000, - "decodeUtf8-cpu-arguments-slope": 1000, - "fstPair-cpu-arguments": 150000, - "quotientInteger-memory-arguments-minimum": 1, - "lessThanEqualsInteger-memory-arguments": 1, - "chooseUnit-memory-arguments": 32, - "fstPair-memory-arguments": 32, - "quotientInteger-cpu-arguments-constant": 148000, - "mapData-cpu-arguments": 150000, - "unConstrData-cpu-arguments": 150000, - "mkPairData-cpu-arguments": 150000, - "sndPair-memory-arguments": 32, - "decodeUtf8-memory-arguments-slope": 8, - "equalsData-cpu-arguments-intercept": 150000, - "addInteger-cpu-arguments-intercept": 197209, - "modInteger-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetMemory": 100, - "divideInteger-cpu-arguments-model-arguments-intercept": 425507, - "divideInteger-memory-arguments-intercept": 0, - "cekVarCost-exBudgetMemory": 100, - "consByteString-memory-arguments-slope": 1, - "cekForceCost-exBudgetMemory": 100, - "unListData-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-intercept": 197209, - "indexByteString-cpu-arguments": 150000, - "equalsInteger-cpu-arguments-slope": 1326, - "lessThanByteString-memory-arguments": 1, - "blake2b_256-cpu-arguments-intercept": 2477736, - "encodeUtf8-cpu-arguments-intercept": 150000, - "multiplyInteger-cpu-arguments-slope": 11218, - "tailList-cpu-arguments": 150000, - "appendByteString-cpu-arguments-intercept": 396231, - "equalsString-cpu-arguments-slope": 1000, - "lessThanEqualsByteString-cpu-arguments-slope": 248, - "remainderInteger-cpu-arguments-constant": 148000, - "chooseList-cpu-arguments": 150000, - "equalsByteString-memory-arguments": 1, - "constrData-cpu-arguments": 150000, - "cekApplyCost-exBudgetCPU": 29773, - "equalsData-cpu-arguments-slope": 10000, - "decodeUtf8-memory-arguments-intercept": 0, - "modInteger-memory-arguments-slope": 1, - "addInteger-cpu-arguments-slope": 0, - "appendString-cpu-arguments-intercept": 150000, - "quotientInteger-cpu-arguments-model-arguments-slope": 118, - "unMapData-memory-arguments": 32, - "cekApplyCost-exBudgetMemory": 100, - "quotientInteger-memory-arguments-slope": 1, - "mkNilPairData-memory-arguments": 32, - "ifThenElse-memory-arguments": 1, - "equalsByteString-cpu-arguments-slope": 247, - "sliceByteString-memory-arguments-slope": 1, - "sha3_256-memory-arguments": 4, - "mkCons-memory-arguments": 32, - "verifyEd25519Signature-cpu-arguments-intercept": 3345831, - "cekBuiltinCost-exBudgetMemory": 100, - "remainderInteger-memory-arguments-intercept": 0, - "lessThanEqualsByteString-memory-arguments": 1, - "mkNilData-cpu-arguments": 150000, - "equalsString-memory-arguments": 1, - "chooseData-cpu-arguments": 150000, - "remainderInteger-cpu-arguments-model-arguments-intercept": 425507, - "tailList-memory-arguments": 32, - "sha2_256-cpu-arguments-intercept": 2477736, - "multiplyInteger-memory-arguments-slope": 1, - "iData-memory-arguments": 32, - "divideInteger-cpu-arguments-constant": 148000, - "cekDelayCost-exBudgetCPU": 29773, - "encodeUtf8-memory-arguments-slope": 8, - "subtractInteger-memory-arguments-intercept": 1, - "nullList-memory-arguments": 32, - "lessThanByteString-cpu-arguments-intercept": 103599, - "appendByteString-memory-arguments-slope": 1, - "blake2b_256-memory-arguments": 4, - "unBData-memory-arguments": 32, - "cekConstCost-exBudgetCPU": 29773, - "consByteString-cpu-arguments-slope": 1000, - "trace-memory-arguments": 32, - "quotientInteger-memory-arguments-intercept": 0, - "mapData-memory-arguments": 32, - "verifyEd25519Signature-cpu-arguments-slope": 1, - "quotientInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-cpu-arguments-constant": 148000, - "appendString-cpu-arguments-slope": 1000, - "unConstrData-memory-arguments": 32, - "mkPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-constant": 150000, - "equalsByteString-cpu-arguments-intercept": 112536, - "sliceByteString-memory-arguments-intercept": 0, - "lessThanInteger-cpu-arguments-slope": 497, - "verifyEd25519Signature-memory-arguments": 1, - "cekLamCost-exBudgetMemory": 100, - "sliceByteString-cpu-arguments-intercept": 150000, - "modInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-memory-arguments-minimum": 1, - "appendString-memory-arguments-slope": 1, - "sha3_256-cpu-arguments-intercept": 0 - } - }, - "protocolVersion": { - "minor": 0, - "major": 5 - }, - "txFeeFixed": 155381, - "stakeAddressDeposit": 2000000, - "monetaryExpansion": 3.0e-3, - "poolPledgeInfluence": 0.3, - "executionUnitPrices": { - "priceSteps": 7.21e-5, - "priceMemory": 5.77e-2 - } + "collateralPercentage": 150, + "costModels": { + "PlutusV1": [ + 197209, + 0, + 1, + 1, + 396231, + 621, + 0, + 1, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 2477736, + 29175, + 4, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 100, + 100, + 29773, + 100, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 150000, + 1000, + 0, + 8, + 148000, + 425507, + 118, + 0, + 1, + 1, + 150000, + 1000, + 0, + 8, + 150000, + 112536, + 247, + 1, + 150000, + 10000, + 1, + 136542, + 1326, + 1, + 1000, + 150000, + 1000, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 1, + 1, + 150000, + 1, + 150000, + 4, + 103599, + 248, + 1, + 103599, + 248, + 1, + 145276, + 1366, + 1, + 179690, + 497, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 61516, + 11218, + 0, + 1, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 148000, + 425507, + 118, + 0, + 1, + 1, + 2477736, + 29175, + 4, + 0, + 82363, + 4, + 150000, + 5000, + 0, + 1, + 150000, + 32, + 197209, + 0, + 1, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 3345831, + 1, + 1 + ] + }, + "decentralization": null, + "executionUnitPrices": { + "priceMemory": 0.0577, + "priceSteps": 7.21e-05 + }, + "extraPraosEntropy": null, + "maxBlockBodySize": 65536, + "maxBlockExecutionUnits": { + "memory": 50000000, + "steps": 40000000000 + }, + "maxBlockHeaderSize": 1100, + "maxCollateralInputs": 3, + "maxTxExecutionUnits": { + "memory": 10000000, + "steps": 10000000000 + }, + "maxTxSize": 16384, + "maxValueSize": 5000, + "minPoolCost": 340000000, + "minUTxOValue": null, + "monetaryExpansion": 0.003, + "poolPledgeInfluence": 0.3, + "poolRetireMaxEpoch": 18, + "protocolVersion": { + "major": 6, + "minor": 0 + }, + "stakeAddressDeposit": 2000000, + "stakePoolDeposit": 500000000, + "stakePoolTargetNum": 500, + "treasuryCut": 0.2, + "txFeeFixed": 155381, + "txFeePerByte": 44, + "utxoCostPerByte": 4310, + "utxoCostPerWord": null } diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index 6d9980c4541..beeb92d2700 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -26,7 +26,7 @@ common project-config buildable: False common with-library - if impl(ghc >= 9) + if impl(ghc >= 10) build-depends: plutus-scripts-bench cpp-options: -DWITH_LIBRARY diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index f522be8d55f..71c5823d92f 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -183,7 +183,7 @@ library , ouroboros-network-api , ouroboros-network ^>= 0.9.1 , ouroboros-network-framework - , ouroboros-network-protocols + , ouroboros-network-protocols < 0.5.3 , prettyprinter , prettyprinter-ansi-terminal , psqueues diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index 071f9de240a..d52a153e701 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -52,7 +52,7 @@ library , optparse-applicative-fork , ouroboros-consensus-cardano , ouroboros-network ^>= 0.9.1 - , ouroboros-network-protocols + , ouroboros-network-protocols < 0.5.3 , prometheus >= 2.2.4 , servant , servant-server diff --git a/nix/haskell.nix b/nix/haskell.nix index 51a955820a3..3a74be05025 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -20,9 +20,9 @@ let { src = ../.; name = "cardano-node"; - compiler-nix-name = lib.mkDefault "ghc8107"; + compiler-nix-name = lib.mkDefault "ghc963"; # extra-compilers - flake.variants = lib.genAttrs ["ghc928" "ghc963"] (x: {compiler-nix-name = x;}); + flake.variants = lib.genAttrs ["ghc8107" "ghc928"] (x: {compiler-nix-name = x;}); cabalProjectLocal = '' repository cardano-haskell-packages-local url: file:${CHaP}