Respin mainnet_candidate_2, update mainnet_candidate_3 params

input-output-hk · Jul 23, 2020 · ed4f93c · ed4f93c
1 parent 981cb5f
commit ed4f93c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 34 deletions.
diff --git a/cardano-lib/mainnet_candidate_2-byron-genesis.json b/cardano-lib/mainnet_candidate_2-byron-genesis.json
@@ -32,14 +32,10 @@
             "62bebade1f68f2bfc1c897e247eb1195828cf2647a6cf0ef62877365c94c9ae692f7af6e097d063082b19f30c690828965a777d47fdeada2815d1f552c3b5b02"
         }
     }
-, "startTime": 1595430000
+, "startTime": 1595473200
 , "nonAvvmBalances":
-    { "2657WMsDfac6aHut7ZybVQgaLsWUt4cFQ7VLzHzZJAj1X2YnURFR5ZHJntNgqtkcV":
-        "15000000000000000"
-    , "2657WMsDfac79E4a5saL3G6qzjv7UA6V1vYM8vW1kqKq3CpthmhuX6JBY72EWgSFV":
-        "15000000000000000"
-    , "2657WMsDfac7FUVFh5Rm6tZZLW3Y9jYbuuFo1Thkj8snmS6fZykwCdFLjFwreDJZs":
-        "15000000000000000"
+    { "Ae2tdPwUPEZD2tYyf8794Fvjy9sUFbeumjiwKd65xs2fgR22RnSa9Tjg4zS":
+        "33000000000000000"
     }
 , "blockVersionData":
     { "scriptVersion": 0
@@ -62,6 +58,6 @@
         { "summand": "155381000000000" , "multiplier": "43946000000" }
     , "unlockStakeEpoch": "18446744073709551615"
     }
-, "protocolConsts": { "k": 108 , "protocolMagic": 42 }
+, "protocolConsts": { "k": 36 , "protocolMagic": 42 }
 , "avvmDistr": {}
-}
+}
diff --git a/cardano-lib/mainnet_candidate_2-config.nix b/cardano-lib/mainnet_candidate_2-config.nix
@@ -7,9 +7,9 @@
   ##### Locations #####
 
   ByronGenesisFile = ./mainnet_candidate_2-byron-genesis.json;
-  ByronGenesisHash = "7e5a9acd813b0bbc059ab50a33fc7441efb1fc887bf8d84ee87d84c58e3d4636";
+  ByronGenesisHash = "df8e9d99b1044e4f43b75f584436e1981b7abd824f3203ec8613e7aa66591dbe";
   ShelleyGenesisFile = ./mainnet_candidate_2-shelley-genesis.json;
-  ShelleyGenesisHash = "d1738667a9f7ca6ceb28889e4a713bf146b98123dc06937438c3bb7c64a391e7";
+  ShelleyGenesisHash = "f7245ec099eada149bf3b9ecc60827df07fa446522bb37944219bba116e33a63";
 
 
   ##### Core protocol parameters #####
@@ -32,7 +32,7 @@
 
   # This protocol version number gets used by by block producing nodes as part
   # part of the system for agreeing on and synchronising protocol updates.
-  LastKnownBlockVersion-Major = 1;
+  LastKnownBlockVersion-Major = 0;
   LastKnownBlockVersion-Minor = 0;
   LastKnownBlockVersion-Alt = 0;
 

diff --git a/cardano-lib/mainnet_candidate_2-shelley-genesis.json b/cardano-lib/mainnet_candidate_2-shelley-genesis.json
@@ -9,7 +9,7 @@
         "minUTxOValue": 1000000,
         "decentralisationParam": 1,
         "maxTxSize": 16384,
-        "minPoolCost": 228000000,
+        "minPoolCost": 340000000,
         "minFeeA": 44,
         "maxBlockBodySize": 65536,
         "minFeeB": 155381,
@@ -18,13 +18,12 @@
             "tag": "NeutralNonce"
         },
         "maxBlockHeaderSize": 1100,
-        "keyDeposit": 400000,
+        "keyDeposit": 2000000,
         "nOpt": 150,
         "rho": 0.0022,
         "tau": 0.05,
         "a0": 0.3
     },
-    "protocolMagicId": 42,
     "genDelegs": {
         "7862443207c96d21454c853b5fe6a33a559752a06086e09adae611a9": {
             "delegate": "39d5a6578c3793a07321c14477dd15a060de17a49d3c30004ce8ccd7",
@@ -44,14 +43,10 @@
     "initialFunds": {},
     "maxLovelaceSupply": 45000000000000000,
     "networkMagic": 42,
-    "epochLength": 21600,
-    "staking": {
-        "pools": {},
-        "stake": {}
-    },
-    "systemStart": "2020-07-22T15:00:00Z",
-    "slotsPerKESPeriod": 3600,
+    "epochLength": 7200,
+    "systemStart": "2020-07-23T03:00:00Z",
+    "slotsPerKESPeriod": 7200,
     "slotLength": 1,
-    "maxKESEvolutions": 120,
-    "securityParam": 108
+    "maxKESEvolutions": 60,
+    "securityParam": 36
 }
diff --git a/cardano-lib/mainnet_candidate_3-config.nix b/cardano-lib/mainnet_candidate_3-config.nix
@@ -9,7 +9,7 @@
   ByronGenesisFile = ./mainnet_candidate_3-byron-genesis.json;
   ByronGenesisHash = "56dccc51d1c42eba9383aeb9463dfadbe90d2913fe3d0d72010f40288163ffad";
   ShelleyGenesisFile = ./mainnet_candidate_3-shelley-genesis.json;
-  ShelleyGenesisHash = "5c34446998f47242f7f1ab39c81be56c60ab324aac2b0665b68e6ea78943bffd";
+  ShelleyGenesisHash = "0319fc22b752664188106bcc124a0f6e624de94a24b22d3aa2f1ec858c4901f0";
 
   ##### Core protocol parameters #####
 

diff --git a/cardano-lib/mainnet_candidate_3-shelley-genesis.json b/cardano-lib/mainnet_candidate_3-shelley-genesis.json
@@ -9,7 +9,7 @@
         "minUTxOValue": 1000000,
         "decentralisationParam": 1,
         "maxTxSize": 16384,
-        "minPoolCost": 228000000,
+        "minPoolCost": 340000000,
         "minFeeA": 44,
         "maxBlockBodySize": 65536,
         "minFeeB": 155381,
@@ -18,13 +18,12 @@
             "tag": "NeutralNonce"
         },
         "maxBlockHeaderSize": 1100,
-        "keyDeposit": 400000,
+        "keyDeposit": 2000000,
         "nOpt": 150,
         "rho": 0.0022,
         "tau": 0.05,
         "a0": 0.3
     },
-    "protocolMagicId": 42,
     "genDelegs": {
         "42d339844d4593edc456d1c80b256fa57e9b4b4dccda5b587ea7a958": {
             "delegate": "53465dff1bf47517a5b354888b32972647d208cac07907aa8efa5a03",
@@ -45,13 +44,9 @@
     "maxLovelaceSupply": 45000000000000000,
     "networkMagic": 42,
     "epochLength": 21600,
-    "staking": {
-        "pools": {},
-        "stake": {}
-    },
     "systemStart": "2020-07-23T01:00:00Z",
-    "slotsPerKESPeriod": 3600,
+    "slotsPerKESPeriod": 7200,
     "slotLength": 1,
-    "maxKESEvolutions": 120,
+    "maxKESEvolutions": 60,
     "securityParam": 108
 }