diff --git a/cardano-lib/sanchonet-config-bp.nix b/cardano-lib/sanchonet-config-bp.nix index 8b5b4771..130caa41 100644 --- a/cardano-lib/sanchonet-config-bp.nix +++ b/cardano-lib/sanchonet-config-bp.nix @@ -13,7 +13,7 @@ AlonzoGenesisFile = ./sanchonet + "/alonzo-genesis.json"; AlonzoGenesisHash = "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec"; ConwayGenesisFile = ./sanchonet + "/conway-genesis.json"; - ConwayGenesisHash = "7c2006fa6be472c3a04b693810f89bfbefe99625b12b9d400d17a7072e5961d6"; + ConwayGenesisHash = "8c529c677a5c1068872ffd55dd0b362d2b9a2a7b60941c403595d934bcdb4753"; ### Core protocol parameters ##### Protocol = "Cardano"; diff --git a/cardano-lib/sanchonet-config.nix b/cardano-lib/sanchonet-config.nix index 63e6f6b4..f0e8dc95 100644 --- 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 = "7c2006fa6be472c3a04b693810f89bfbefe99625b12b9d400d17a7072e5961d6"; + ConwayGenesisHash = "8c529c677a5c1068872ffd55dd0b362d2b9a2a7b60941c403595d934bcdb4753"; ### Core protocol parameters ##### Protocol = "Cardano"; diff --git a/cardano-lib/sanchonet/conway-genesis.json b/cardano-lib/sanchonet/conway-genesis.json index d4ec0111..ddb188a5 100644 --- a/cardano-lib/sanchonet/conway-genesis.json +++ b/cardano-lib/sanchonet/conway-genesis.json @@ -1,7 +1,7 @@ { "poolVotingThresholds": { - "committeeNormal": 0.6, - "committeeNoConfidence": 0.51, + "committeeNormal": 0.65, + "committeeNoConfidence": 0.65, "hardForkInitiation": 0.51, "motionNoConfidence": 0.6, "ppSecurityGroup": 0.6 @@ -18,13 +18,13 @@ "ppGovGroup": 0.75, "treasuryWithdrawal": 0.67 }, - "committeeMinSize": 3, - "committeeMaxTermLength": 73, + "committeeMinSize": 5, + "committeeMaxTermLength": 146, "govActionLifetime": 8, - "govActionDeposit": 50000000000, + "govActionDeposit": 100000000000, "dRepDeposit": 500000000, "dRepActivity": 20, - "minFeeRefScriptCostPerByte": 44, + "minFeeRefScriptCostPerByte": 15, "plutusV3CostModel": [ 100788, 420, @@ -40,59 +40,9 @@ 1, 11183, 32, - 207616, - 8310, - 4, 201305, 8356, 4, - 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, - 1006041, - 43623, - 251, - 0, - 1, - 16000, - 100, - 16000, - 100, 16000, 100, 16000, @@ -164,14 +114,6 @@ 1, 13169, 4, - 1293828, - 28716, - 63, - 0, - 1, - 2261318, - 64571, - 4, 22100, 10, 28999, @@ -276,21 +218,81 @@ 10, 43574283, 26308, - 10 + 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": "https://raw.githubusercontent.com/carloslodelar/proposals/main/constitution.txt", - "dataHash": "f89cc2469ce31c3dfda2f3e0b56c5c8b4ee4f0e5f66c30a3f12a95298b01179e" - } + "url": "ipfs://QmQq5hWDNzvDR1ForEktAHrdCQmfSL2u5yctNpzDwoSBu4", + "dataHash": "23b43bebac48a4acc39e578715aa06635d6d900fa3ea7441dfffd6e43b914f7b" + }, + "script": "edcd84c10e36ae810dc50847477083069db796219b39ccde790484e0" }, "committee": { "members": { - "scriptHash-8fc13431159fdda66347a38c55105d50d77d67abc1c368b876d52ad1": 336, - "scriptHash-921e1ccb4812c4280510c9ccab81c561f3d413e7d744d48d61215d1f": 400, - "scriptHash-d5d09d9380cf9dcde1f3c6cd88b08ca9e00a3d550022ca7ee4026342": 400, - "scriptHash-2c698e41831684b16477fb50082b0c0e396d436504e39037d5366582": 400 + "scriptHash-7ceede7d6a89e006408e6b7c6acb3dd094b3f6817e43b4a36d01535b": 500, + "scriptHash-6095e643ea6f1cccb6e463ec34349026b3a48621aac5d512655ab1bf": 500, + "scriptHash-27999ed757d6dac217471ae61d69b1b067b8b240d9e3ff36eb66b5d0": 500, + "scriptHash-87f867a31c0f81360d4d7dcddb6b025ba8383db9bf77a2af7797799d": 500, + "scriptHash-a19a7ba1caede8f3ab3e5e2a928b3798d7d011af18fbd577f7aeb0ec": 500 }, - "threshold": 0.66 + "threshold": 0.67 } }