cardano-lib: update for cardano-node 8.5

input-output-hk · Oct 4, 2023 · a761343 · a761343
1 parent 4ba9d49
commit a761343
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 141 deletions.
diff --git a/cardano-lib/mainnet-config.nix b/cardano-lib/mainnet-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./mainnet + "/alonzo-genesis.json";
   AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874";
   ConwayGenesisFile = ./mainnet + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ##### Core protocol parameters #####
 

diff --git a/cardano-lib/mainnet/conway-genesis.json b/cardano-lib/mainnet/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/p2p-config.nix b/cardano-lib/p2p-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./p2p + "/alonzo-genesis.json";
   AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874";
   ConwayGenesisFile = ./p2p + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ##### Core protocol parameters #####
 

diff --git a/cardano-lib/p2p/conway-genesis.json b/cardano-lib/p2p/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/preprod-config.nix b/cardano-lib/preprod-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./preprod + "/alonzo-genesis.json";
   AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874";
   ConwayGenesisFile = ./preprod + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ##### Core protocol parameters #####
 

diff --git a/cardano-lib/preprod/conway-genesis.json b/cardano-lib/preprod/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/preview-config.nix b/cardano-lib/preview-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./preview + "/alonzo-genesis.json";
   AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874";
   ConwayGenesisFile = ./preview + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ### Core protocol parameters #####
   Protocol = "Cardano";

diff --git a/cardano-lib/preview/conway-genesis.json b/cardano-lib/preview/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/private-config.nix b/cardano-lib/private-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./private + "/alonzo-genesis.json";
   AlonzoGenesisHash = "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874";
   ConwayGenesisFile = ./private + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ### Core protocol parameters #####
   Protocol = "Cardano";

diff --git a/cardano-lib/private/conway-genesis.json b/cardano-lib/private/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/sanchonet-config.nix b/cardano-lib/sanchonet-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./sanchonet + "/alonzo-genesis.json";
   AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec";
   ConwayGenesisFile = ./sanchonet + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ### Core protocol parameters #####
   Protocol = "Cardano";

diff --git a/cardano-lib/sanchonet/conway-genesis.json b/cardano-lib/sanchonet/conway-genesis.json
@@ -1,25 +1,25 @@
 {
   "poolVotingThresholds": {
-    "pvtCommitteeNormal": 0,
-    "pvtCommitteeNoConfidence": 0,
-    "pvtHardForkInitiation": 0,
-    "pvtMotionNoConfidence": 0
+    "pvtCommitteeNormal": 0.51,
+    "pvtCommitteeNoConfidence": 0.51,
+    "pvtHardForkInitiation": 0.51,
+    "pvtMotionNoConfidence": 0.51
   },
   "dRepVotingThresholds": {
-    "dvtMotionNoConfidence": 0,
-    "dvtCommitteeNormal": 0,
-    "dvtCommitteeNoConfidence": 0,
-    "dvtUpdateToConstitution": 0,
-    "dvtHardForkInitiation": 0,
-    "dvtPPNetworkGroup": 0,
-    "dvtPPEconomicGroup": 0,
-    "dvtPPTechnicalGroup": 0,
-    "dvtPPGovGroup": 0,
-    "dvtTreasuryWithdrawal": 0
+    "dvtMotionNoConfidence": 0.51,
+    "dvtCommitteeNormal": 0.51,
+    "dvtCommitteeNoConfidence": 0.51,
+    "dvtUpdateToConstitution": 0.51,
+    "dvtHardForkInitiation": 0.51,
+    "dvtPPNetworkGroup": 0.51,
+    "dvtPPEconomicGroup": 0.51,
+    "dvtPPTechnicalGroup": 0.51,
+    "dvtPPGovGroup": 0.51,
+    "dvtTreasuryWithdrawal": 0.51
   },
   "committeeMinSize": 0,
-  "committeeMaxTermLength": 0,
-  "govActionLifetime": 0,
+  "committeeMaxTermLength": 60,
+  "govActionLifetime": 14,
   "govActionDeposit": 0,
   "dRepDeposit": 0,
   "dRepActivity": 0,
@@ -31,9 +31,7 @@
   },
   "committee": {
     "members": {
-      "keyHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 1,
-      "scriptHash-4e88cc2d27c364aaf90648a87dfb95f8ee103ba67fa1f12f5e86c42a": 2
     },
-    "quorum": 0.5
+    "quorum": 0.51
   }
 }
diff --git a/cardano-lib/shelley_qa-config.nix b/cardano-lib/shelley_qa-config.nix
@@ -13,7 +13,7 @@
   AlonzoGenesisFile = ./shelley_qa + "/alonzo-genesis.json";
   AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec";
   ConwayGenesisFile = ./shelley_qa + "/conway-genesis.json";
-  ConwayGenesisHash = "4b813b659801ac25e4722b06bf558c1f4eede2eb6e8317e3af7a50d1bf202a09";
+  ConwayGenesisHash = "1c6e6f5d2c84f4cfe70b4a55515b77e7ace747ade03279b0785fdaf759691100";
 
   ##### Core protocol parameters #####
   Protocol = "Cardano";