Merge and include changes from master

IntersectMBO · Jul 22, 2024 · 55dcf7d · 55dcf7d
2 parents 3a55a69 + a5f2b4f
commit 55dcf7d
Show file tree

Hide file tree

Showing 33 changed files with 3,305 additions and 99 deletions.
diff --git a/.github/env_nightly_conway_bootstrap b/.github/env_nightly_conway_bootstrap
@@ -1,3 +1,4 @@
 CLUSTER_ERA=conway
 COMMAND_ERA=conway
 ENABLE_P2P=true
+CARDANO_CLI_REV=release/cardano-cli-9.0.0.1
diff --git a/.github/env_nightly_conway_cc b/.github/env_nightly_conway_cc
@@ -2,3 +2,4 @@ CLUSTER_ERA=conway
 COMMAND_ERA=conway
 PV10=true
 ENABLE_P2P=true
+CARDANO_CLI_REV=release/cardano-cli-9.0.0.1
diff --git a/.github/env_nightly_conway_nocc b/.github/env_nightly_conway_nocc
@@ -3,3 +3,4 @@ COMMAND_ERA=conway
 NO_CC=true
 PV10=true
 ENABLE_P2P=true
+CARDANO_CLI_REV=release/cardano-cli-9.0.0.1
diff --git a/cardano_node_tests/cluster_scripts/babbage/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/babbage/genesis.conway.spec.json
@@ -25,7 +25,259 @@
   "dRepDeposit": 2000000,
   "dRepActivity": 100,
   "minFeeRefScriptCostPerByte": 0,
-  "plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+  "plutusV3CostModel": [
+    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,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    1,
+    1000,
+    42921,
+    4,
+    2,
+    24548,
+    29498,
+    38,
+    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,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    90434,
+    519,
+    0,
+    1,
+    74433,
+    32,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    1,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    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
+  ],
   "constitution": {
     "anchor": {
       "url": "",