diff --git a/agent_docs/multi_index_array.md b/agent_docs/multi_index_array.md index 38f899d61..be1da27ae 100644 --- a/agent_docs/multi_index_array.md +++ b/agent_docs/multi_index_array.md @@ -73,20 +73,20 @@ The batch7 modules use the common generator, updated to Plutus 1.72 by [PR #30](https://github.com/mkoura/plutus-scripts-e2e/pull/30). Keep builtin evaluation disabled in the compiler so the tested operation survives optimization. -For PlutusV3, `cost_models_list_355_v3_v4.json` preserves the existing 350 +For PlutusV3, `cost_models_list_369_v3_v4.json` preserves the existing 350 parameters from `cost_models_list_332_350_v2_v3.json` and appends the five -`multiIndexArray` parameters in ledger `V3.ParamName` order: CPU c0/c1/c2 +`multiIndexArray` parameters followed by 14 Value builtin parameters. The +`multiIndexArray` parameters follow ledger `V3.ParamName` order: CPU c0/c1/c2 `326163/12304/2`, memory intercept/slope `4/3`, from Plutus's -`plutus-core/cost-model/data/builtinCostModelE.json`. Other language models are -unchanged by the proposal. These are test parameters, not proposed mainnet pricing. +`plutus-core/cost-model/data/builtinCostModelE.json`. PlutusV1 and PlutusV2 models +are unchanged by the proposal. These are test parameters, not proposed mainnet pricing. -The file gives PlutusV4 the same 355 values. At PV12 the PlutusV4 parameters have +The file gives PlutusV4 the same 369 values. At PV12 the PlutusV4 parameters have the same names and order as the PlutusV3 ones, and both languages use the same builtin semantics variant. The genesis from cardonnay gives PlutusV4 only 251 parameters. Plutus sets the missing parameters to `maxBound`, so a PlutusV4 -policy that uses `multiIndexArray` exceeds any budget without this update. The -shared setup now uses `cost_models_list_369_v3_v4.json`, which preserves those -355 parameters and adds Value builtin costing. It proposes and checks both languages +policy that uses `multiIndexArray` exceeds any budget without this update. +The shared setup proposes and checks both languages at PV12+, or V3 alone at PV10/PV11, once for all builtin groups in the same test. At PV10/PV11 the test installs all 369 V3 parameters, then requires batch7 protocol rejection: updated costing must not activate the builtins. PV9 keeps diff --git a/cardano_node_tests/tests/data/cost_models_list_185_297_v2_v3.json b/cardano_node_tests/tests/data/cost_models_list_185_297_v2_v3.json deleted file mode 100644 index 21895b520..000000000 --- a/cardano_node_tests/tests/data/cost_models_list_185_297_v2_v3.json +++ /dev/null @@ -1,656 +0,0 @@ -{ - "PlutusV1": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 228465, - 122, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, - 4, - 22100, - 10, - 28999, - 74, - 1, - 28999, - 74, - 1, - 43285, - 552, - 1, - 44749, - 541, - 1, - 33852, - 32, - 68246, - 32, - 72362, - 32, - 7243, - 32, - 7391, - 32, - 11546, - 32, - 85848, - 228465, - 122, - 0, - 1, - 1, - 90434, - 519, - 0, - 1, - 74433, - 32, - 85848, - 228465, - 122, - 0, - 1, - 1, - 85848, - 228465, - 122, - 0, - 1, - 1, - 270652, - 22588, - 4, - 1457325, - 64566, - 4, - 20467, - 1, - 4, - 0, - 141992, - 32, - 100788, - 420, - 1, - 1, - 81663, - 32, - 59498, - 32, - 20142, - 32, - 24588, - 32, - 20744, - 32, - 25933, - 32, - 24623, - 32, - 53384111, - 14333, - 10 - ], - "PlutusV2": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 228465, - 122, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, - 4, - 22100, - 10, - 28999, - 74, - 1, - 28999, - 74, - 1, - 43285, - 552, - 1, - 44749, - 541, - 1, - 33852, - 32, - 68246, - 32, - 72362, - 32, - 7243, - 32, - 7391, - 32, - 11546, - 32, - 85848, - 228465, - 122, - 0, - 1, - 1, - 90434, - 519, - 0, - 1, - 74433, - 32, - 85848, - 228465, - 122, - 0, - 1, - 1, - 85848, - 228465, - 122, - 0, - 1, - 1, - 955506, - 213312, - 0, - 2, - 270652, - 22588, - 4, - 1457325, - 64566, - 4, - 20467, - 1, - 4, - 0, - 141992, - 32, - 100788, - 420, - 1, - 1, - 81663, - 32, - 59498, - 32, - 20142, - 32, - 24588, - 32, - 20744, - 32, - 25933, - 32, - 24623, - 32, - 43053543, - 10, - 53384111, - 14333, - 10, - 43574283, - 26308, - 10, - 1293828, - 28716, - 63, - 0, - 1, - 1006041, - 43623, - 251, - 0, - 1 - ], - "PlutusV3": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, - 4, - 22100, - 10, - 28999, - 74, - 1, - 28999, - 74, - 1, - 43285, - 552, - 1, - 44749, - 541, - 1, - 33852, - 32, - 68246, - 32, - 72362, - 32, - 7243, - 32, - 7391, - 32, - 11546, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 90434, - 519, - 0, - 1, - 74433, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 955506, - 213312, - 0, - 2, - 270652, - 22588, - 4, - 1457325, - 64566, - 4, - 20467, - 1, - 4, - 0, - 141992, - 32, - 100788, - 420, - 1, - 1, - 81663, - 32, - 59498, - 32, - 20142, - 32, - 24588, - 32, - 20744, - 32, - 25933, - 32, - 24623, - 32, - 43053543, - 10, - 53384111, - 14333, - 10, - 43574283, - 26308, - 10, - 16000, - 100, - 16000, - 100, - 962335, - 18, - 2780678, - 6, - 442008, - 1, - 52538055, - 3756, - 18, - 267929, - 18, - 76433006, - 8868, - 18, - 52948122, - 18, - 1995836, - 36, - 3227919, - 12, - 901022, - 1, - 166917843, - 4307, - 36, - 284546, - 36, - 158221314, - 26549, - 36, - 74698472, - 36, - 333849714, - 1, - 254006273, - 72, - 2174038, - 72, - 2261318, - 64571, - 4, - 207616, - 8310, - 4, - 1293828, - 28716, - 63, - 0, - 1, - 1006041, - 43623, - 251, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 107878, - 680, - 0, - 1, - 95336, - 1, - 281145, - 18848, - 0, - 1, - 180194, - 159, - 1, - 1, - 158519, - 8942, - 0, - 1, - 159378, - 8813, - 0, - 1, - 107490, - 3298, - 1, - 106057, - 655, - 1, - 1964219, - 24520, - 3 - ] -} diff --git a/cardano_node_tests/tests/data/cost_models_list_355_v3_v4.json b/cardano_node_tests/tests/data/cost_models_list_355_v3_v4.json deleted file mode 100644 index a66653c3d..000000000 --- a/cardano_node_tests/tests/data/cost_models_list_355_v3_v4.json +++ /dev/null @@ -1,716 +0,0 @@ -{ - "PlutusV3": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, - 4, - 22100, - 10, - 28999, - 74, - 1, - 28999, - 74, - 1, - 43285, - 552, - 1, - 44749, - 541, - 1, - 33852, - 32, - 68246, - 32, - 72362, - 32, - 7243, - 32, - 7391, - 32, - 11546, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 90434, - 519, - 0, - 1, - 74433, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 955506, - 213312, - 0, - 2, - 270652, - 22588, - 4, - 1457325, - 64566, - 4, - 20467, - 1, - 4, - 0, - 141992, - 32, - 100788, - 420, - 1, - 1, - 81663, - 32, - 59498, - 32, - 20142, - 32, - 24588, - 32, - 20744, - 32, - 25933, - 32, - 24623, - 32, - 43053543, - 10, - 53384111, - 14333, - 10, - 43574283, - 26308, - 10, - 16000, - 100, - 16000, - 100, - 962335, - 18, - 2780678, - 6, - 442008, - 1, - 52538055, - 3756, - 18, - 267929, - 18, - 76433006, - 8868, - 18, - 52948122, - 18, - 1995836, - 36, - 3227919, - 12, - 901022, - 1, - 166917843, - 4307, - 36, - 284546, - 36, - 158221314, - 26549, - 36, - 74698472, - 36, - 333849714, - 1, - 254006273, - 72, - 2174038, - 72, - 2261318, - 64571, - 4, - 207616, - 8310, - 4, - 1293828, - 28716, - 63, - 0, - 1, - 1006041, - 43623, - 251, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 107878, - 680, - 0, - 1, - 95336, - 1, - 281145, - 18848, - 0, - 1, - 180194, - 159, - 1, - 1, - 158519, - 8942, - 0, - 1, - 159378, - 8813, - 0, - 1, - 107490, - 3298, - 1, - 106057, - 655, - 1, - 1964219, - 24520, - 3, - 607153, - 231697, - 53144, - 0, - 1, - 116711, - 1957, - 4, - 231883, - 10, - 1000, - 24838, - 7, - 1, - 232010, - 32, - 321837444, - 25087669, - 18, - 617887431, - 67302824, - 36, - 356924, - 18413, - 45, - 21, - 219951, - 9444, - 1, - 1000, - 172116, - 183150, - 6, - 24, - 21, - 213283, - 618401, - 1998, - 28258, - 1, - 1000, - 38159, - 2, - 22, - 1000, - 95933, - 1, - 1, - 11, - 1000, - 277577, - 12, - 21, - 326163, - 12304, - 2, - 4, - 3 - ], - "PlutusV4": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, - 4, - 22100, - 10, - 28999, - 74, - 1, - 28999, - 74, - 1, - 43285, - 552, - 1, - 44749, - 541, - 1, - 33852, - 32, - 68246, - 32, - 72362, - 32, - 7243, - 32, - 7391, - 32, - 11546, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 90434, - 519, - 0, - 1, - 74433, - 32, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 955506, - 213312, - 0, - 2, - 270652, - 22588, - 4, - 1457325, - 64566, - 4, - 20467, - 1, - 4, - 0, - 141992, - 32, - 100788, - 420, - 1, - 1, - 81663, - 32, - 59498, - 32, - 20142, - 32, - 24588, - 32, - 20744, - 32, - 25933, - 32, - 24623, - 32, - 43053543, - 10, - 53384111, - 14333, - 10, - 43574283, - 26308, - 10, - 16000, - 100, - 16000, - 100, - 962335, - 18, - 2780678, - 6, - 442008, - 1, - 52538055, - 3756, - 18, - 267929, - 18, - 76433006, - 8868, - 18, - 52948122, - 18, - 1995836, - 36, - 3227919, - 12, - 901022, - 1, - 166917843, - 4307, - 36, - 284546, - 36, - 158221314, - 26549, - 36, - 74698472, - 36, - 333849714, - 1, - 254006273, - 72, - 2174038, - 72, - 2261318, - 64571, - 4, - 207616, - 8310, - 4, - 1293828, - 28716, - 63, - 0, - 1, - 1006041, - 43623, - 251, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 100181, - 726, - 719, - 0, - 1, - 107878, - 680, - 0, - 1, - 95336, - 1, - 281145, - 18848, - 0, - 1, - 180194, - 159, - 1, - 1, - 158519, - 8942, - 0, - 1, - 159378, - 8813, - 0, - 1, - 107490, - 3298, - 1, - 106057, - 655, - 1, - 1964219, - 24520, - 3, - 607153, - 231697, - 53144, - 0, - 1, - 116711, - 1957, - 4, - 231883, - 10, - 1000, - 24838, - 7, - 1, - 232010, - 32, - 321837444, - 25087669, - 18, - 617887431, - 67302824, - 36, - 356924, - 18413, - 45, - 21, - 219951, - 9444, - 1, - 1000, - 172116, - 183150, - 6, - 24, - 21, - 213283, - 618401, - 1998, - 28258, - 1, - 1000, - 38159, - 2, - 22, - 1000, - 95933, - 1, - 1, - 11, - 1000, - 277577, - 12, - 21, - 326163, - 12304, - 2, - 4, - 3 - ] -}