create-testnet-data: add option to create constitutional committee members #961
+158
−21
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,9 +24,7 @@ where | |
| import Cardano.Api hiding (ConwayEra) | ||
| import Cardano.Api.Ledger (StrictMaybe (SNothing)) | ||
| import qualified Cardano.Api.Ledger as L | ||
| import Cardano.Api.Shelley (Hash (..), KESPeriod (KESPeriod), | ||
| OperationalCertificateIssueCounter (OperationalCertificateIssueCounter), | ||
| ShelleyGenesis (ShelleyGenesis, sgGenDelegs, sgInitialFunds, sgMaxLovelaceSupply, sgNetworkMagic, sgProtocolParams, sgStaking, sgSystemStart), | ||
| StakeCredential (StakeCredentialByKey), VerificationKey (VrfVerificationKey), | ||
|
|
@@ -35,8 +33,10 @@ import Cardano.Api.Shelley | |
|
|
||
| import qualified Cardano.CLI.Commands.Node as Cmd | ||
| import Cardano.CLI.EraBased.Commands.Genesis as Cmd | ||
| import qualified Cardano.CLI.EraBased.Commands.Governance.Committee as CC | ||
| import qualified Cardano.CLI.EraBased.Commands.Governance.DRep as DRep | ||
| import Cardano.CLI.EraBased.Run.Genesis.Common | ||
| import qualified Cardano.CLI.EraBased.Run.Governance.Committee as CC | ||
| import qualified Cardano.CLI.EraBased.Run.Governance.DRep as DRep | ||
| import Cardano.CLI.EraBased.Run.StakeAddress (runStakeAddressKeyGenCmd) | ||
| import qualified Cardano.CLI.IO.Lazy as Lazy | ||
|
|
@@ -56,6 +56,7 @@ import Control.Monad (forM, forM_, unless, void, when) | |
| import qualified Data.Aeson as Aeson | ||
| import Data.Bifunctor (Bifunctor (..)) | ||
| import qualified Data.ByteString.Lazy.Char8 as LBS | ||
| import Data.Function ((&)) | ||
| import Data.ListMap (ListMap (..)) | ||
| import Data.Map.Strict (Map) | ||
| import qualified Data.Map.Strict as Map | ||
|
|
@@ -181,6 +182,7 @@ runGenesisCreateTestNetDataCmd | |
| { stakeDelegatorsGenerationMode | ||
| , numOfStakeDelegators | ||
| } | ||
| , numCommitteeKeys | ||
| , numDRepKeys = | ||
| DRepCredentials | ||
| { dRepCredentialGenerationMode | ||
|
|
@@ -253,6 +255,26 @@ runGenesisCreateTestNetDataCmd | |
|
|
||
| when (0 < numPools) $ writeREADME poolsDir poolsREADME | ||
|
|
||
| -- CC members | ||
| ccColdKeys <- forM [1 .. numCommitteeKeys] $ \index -> do | ||
| let committeeDir = committeesDir </> "cc" <> show index | ||
| vkeyHotFile = File @(VerificationKey ()) $ committeeDir </> "cc.hot.vkey" | ||
| skeyHotFile = File @(SigningKey ()) $ committeeDir </> "cc.hot.skey" | ||
| vkeyColdFile = File @(VerificationKey ()) $ committeeDir </> "cc.cold.vkey" | ||
| skeyColdFile = File @(SigningKey ()) $ committeeDir </> "cc.cold.skey" | ||
| hotArgs = CC.GovernanceCommitteeKeyGenHotCmdArgs ConwayEraOnwardsConway vkeyHotFile skeyHotFile | ||
| coldArgs = CC.GovernanceCommitteeKeyGenColdCmdArgs ConwayEraOnwardsConway vkeyColdFile skeyColdFile | ||
|
Comment on lines
+265
to
+266
There was a problem hiding this comment. Can we not hardcode the era here? There was a problem hiding this comment. Yes we can if we make @Jimbo4350> what do you think about making There was a problem hiding this comment. I would parameterize it on There was a problem hiding this comment. I created a follow-up issue to avoid mixing this change in this PR: #962 |
||
| liftIO $ createDirectoryIfMissing True committeeDir | ||
| void $ | ||
| withExceptT GenesisCmdGovernanceCommitteeError $ | ||
| CC.runGovernanceCommitteeKeyGenHot hotArgs | ||
| (vColdKey, _) <- | ||
| withExceptT GenesisCmdGovernanceCommitteeError $ | ||
| CC.runGovernanceCommitteeKeyGenCold coldArgs | ||
| return vColdKey | ||
|
|
||
| when (0 < numCommitteeKeys) $ writeREADME committeesDir committeeREADME | ||
|
|
||
| -- DReps | ||
| g <- Random.getStdGen | ||
|
|
||
|
|
@@ -302,7 +324,9 @@ runGenesisCreateTestNetDataCmd | |
| stuffedUtxoAddrs <- | ||
| liftIO $ Lazy.replicateM (fromIntegral numStuffedUtxo) $ genStuffedAddress network | ||
|
|
||
| let conwayGenesis' = | ||
| addDRepsToConwayGenesis dRepKeys (map snd delegatorKeys) conwayGenesis | ||
| & addCommitteeToConwayGenesis ccColdKeys | ||
|
|
||
| let stake = second L.ppId . mkDelegationMapEntry <$> delegations | ||
| stakePools = [(L.ppId poolParams', poolParams') | poolParams' <- snd . mkDelegationMapEntry <$> delegations] | ||
|
|
@@ -328,6 +352,7 @@ runGenesisCreateTestNetDataCmd | |
| where | ||
| genesisDir = outputDir </> "genesis-keys" | ||
| delegateDir = outputDir </> "delegate-keys" | ||
| committeesDir = outputDir </> "cc-keys" | ||
| drepsDir = outputDir </> "drep-keys" | ||
| utxoKeysDir = outputDir </> "utxo-keys" | ||
| poolsDir = outputDir </> "pools-keys" | ||
|
|
@@ -336,6 +361,28 @@ runGenesisCreateTestNetDataCmd | |
| :: Delegation -> (L.KeyHash L.Staking L.StandardCrypto, L.PoolParams L.StandardCrypto) | ||
| mkDelegationMapEntry d = (dDelegStaking d, dPoolParams d) | ||
|
|
||
| addCommitteeToConwayGenesis | ||
| :: [VerificationKey CommitteeColdKey] | ||
| -> L.ConwayGenesis L.StandardCrypto | ||
| -> L.ConwayGenesis L.StandardCrypto | ||
| addCommitteeToConwayGenesis ccColdKeys conwayGenesis = | ||
| conwayGenesis | ||
| { L.cgCommittee = | ||
| L.Committee | ||
| { L.committeeMembers = | ||
| Map.fromList $ map ((,EpochNo maxBound) . toCommitteeColdCredential) ccColdKeys | ||
| , L.committeeThreshold = zeroUnitInterval -- Taken from cardano-testnet at the time of writing. Change to 0.5 in the future? | ||
| } | ||
| } | ||
| where | ||
| zeroUnitInterval = unsafeBoundedRational @L.UnitInterval 0 | ||
| toCommitteeColdCredential | ||
| :: VerificationKey CommitteeColdKey -> L.Credential L.ColdCommitteeRole L.StandardCrypto | ||
| toCommitteeColdCredential vk = toCredential (verificationKeyHash vk) | ||
| where | ||
| toCredential :: Hash CommitteeColdKey -> L.Credential L.ColdCommitteeRole L.StandardCrypto | ||
| toCredential (CommitteeColdKeyHash v) = L.KeyHashObj v | ||
|
|
||
| addDRepsToConwayGenesis | ||
| :: [VerificationKey DRepKey] | ||
| -> [VerificationKey StakeKey] | ||
|
|
@@ -434,6 +481,14 @@ genesisREADME = | |
| , "With the introduction of Conway, these keys should become useless" | ||
| ] | ||
|
|
||
| committeeREADME :: Text.Text | ||
| committeeREADME = | ||
| Text.intercalate | ||
| "\n" | ||
| [ "Keys generated by the --committee-keys flag. These keys are used to run the constitutional committee." | ||
| , "A pair of both cold keys and hot keys are generated for each committee member." | ||
| ] | ||
|
|
||
| delegatesREADME :: Text.Text | ||
| delegatesREADME = | ||
| Text.intercalate | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we not missing a transient vs on disk distinction here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Jimbo4350> Yes we do miss the distinction. I thought the transient case was not worth the extra effort for the constitutional committee, because I think having a committee with millions of members is not a case we likely want to spend resource testing.
WDYT? Do you want me to add a on-disk/transient distinction?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would check with @mgmeier
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given the optional nature of creating constitutional committee keys, and the expected number of keys being vastly lower than for instance for DReps, there's no need for a transient mode from Performance & Tracing.