Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a single set of credentials for all Shelley-based eras #2753

Merged
merged 7 commits into from
Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import Ouroboros.Consensus.NodeId
import Ouroboros.Consensus.Protocol.PBFT
import qualified Ouroboros.Consensus.Protocol.PBFT.State as S
import Ouroboros.Consensus.Storage.ChainDB.Init (InitChainDB (..))
import Ouroboros.Consensus.Util ((.....:))
import Ouroboros.Consensus.Util ((.....:), (.:))

import Ouroboros.Consensus.Byron.Ledger
import Ouroboros.Consensus.Byron.Node
Expand All @@ -69,7 +69,8 @@ dualByronBlockForging
dualByronBlockForging creds = BlockForging {
forgeLabel = forgeLabel
, canBeLeader = canBeLeader
, updateForgeState = fmap castForgeStateUpdateInfo . updateForgeState
, updateForgeState = \cfg ->
fmap castForgeStateUpdateInfo .: updateForgeState (dualTopLevelConfigMain cfg)
, checkCanForge = checkCanForge . dualTopLevelConfigMain
, forgeBlock = return .....: forgeDualByronBlock
}
Expand Down Expand Up @@ -119,8 +120,7 @@ protocolInfoDualByron abstractGenesis@ByronSpecGenesis{..} params credss =
, headerState = genesisHeaderState S.empty
}
, pInfoBlockForging =
return . dualByronBlockForging . byronLeaderCredentials
<$> credss
return $ dualByronBlockForging . byronLeaderCredentials <$> credss
}
where
initUtxo :: Impl.UTxO
Expand Down
28 changes: 15 additions & 13 deletions ouroboros-consensus-byron-test/test/Test/ThreadNet/Byron.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module Test.ThreadNet.Byron (
import Control.Monad (join)
import qualified Data.ByteString as BS
import Data.Coerce (coerce)
import Data.Functor ((<&>))
import qualified Data.Map.Strict as Map
import Data.Maybe (listToMaybe, mapMaybe)
import qualified Data.Set as Set
Expand Down Expand Up @@ -1291,20 +1292,21 @@ mkRekeyUpd
-> ProtocolInfo m ByronBlock
-> EpochNo
-> Crypto.SignKeyDSIGN Crypto.ByronDSIGN
-> Maybe (TestNodeInitialization m ByronBlock)
-> m (Maybe (TestNodeInitialization m ByronBlock))
mkRekeyUpd genesisConfig genesisSecrets cid pInfo eno newSK =
case listToMaybe (pInfoBlockForging pInfo) of
Nothing -> Nothing
Just _ ->
let genSK = genesisSecretFor genesisConfig genesisSecrets cid
creds' = updSignKey genSK bcfg cid (coerce eno) newSK
blockForging' = byronBlockForging creds'
pInfo' = pInfo { pInfoBlockForging = [return blockForging'] }

in Just TestNodeInitialization
{ tniCrucialTxs = [dlgTx (blcDlgCert creds')]
, tniProtocolInfo = pInfo'
}
pInfoBlockForging pInfo <&> \blockForging ->
case listToMaybe blockForging of
Nothing -> Nothing
Just _ ->
let genSK = genesisSecretFor genesisConfig genesisSecrets cid
creds' = updSignKey genSK bcfg cid (coerce eno) newSK
blockForging' = byronBlockForging creds'
pInfo' = pInfo { pInfoBlockForging = return [blockForging'] }

in Just TestNodeInitialization
{ tniCrucialTxs = [dlgTx (blcDlgCert creds')]
, tniProtocolInfo = pInfo'
}
where
bcfg = configBlock (pInfoConfig pInfo)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ byronBlockForging
byronBlockForging creds = BlockForging {
forgeLabel = blcLabel creds
, canBeLeader
, updateForgeState = \_ -> return $ ForgeStateUpdateInfo $ Unchanged ()
, updateForgeState = \_ _ _ -> return $ ForgeStateUpdateInfo $ Unchanged ()
, checkCanForge = \cfg slot tickedPBftState _isLeader () ->
pbftCheckCanForge
(configConsensus cfg)
Expand Down Expand Up @@ -196,7 +196,7 @@ protocolInfoByron ProtocolParamsByron {
, headerState = genesisHeaderState S.empty
}
, pInfoBlockForging =
return . byronBlockForging <$> maybeToList mLeaderCreds
return $ byronBlockForging <$> maybeToList mLeaderCreds
}
where
compactedGenesisConfig = compactGenesisConfig genesisConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ combineEras = mconcat . hcollapse . hap eraInjections

injExamples ::
String
-> Index blk (CardanoEras Crypto)
-> Index (CardanoEras Crypto) blk
-> Examples blk
-> Examples (CardanoBlock Crypto)
injExamples eraName idx =
Expand All @@ -107,7 +107,7 @@ instance Inject SomeResult where
SomeResult (QueryIfCurrent (injectQuery idx q)) (Right r)

instance Inject Examples where
inject startBounds (idx :: Index x xs) Golden.Examples {..} = Golden.Examples {
inject startBounds (idx :: Index xs x) Golden.Examples {..} = Golden.Examples {
exampleBlock = inj (Proxy @I) exampleBlock
, exampleSerialisedBlock = inj (Proxy @Serialised) exampleSerialisedBlock
, exampleHeader = inj (Proxy @Header) exampleHeader
Expand Down
20 changes: 10 additions & 10 deletions ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs
Original file line number Diff line number Diff line change
Expand Up @@ -751,26 +751,26 @@ mkProtocolCardanoAndHardForkTxs
, byronSoftwareVersion = softVerByron
, byronLeaderCredentials = Just leaderCredentialsByron
}
ProtocolParamsShelleyBased {
shelleyBasedGenesis = genesisShelley
, shelleyBasedInitialNonce = initialNonce
, shelleyBasedLeaderCredentials = Just leaderCredentialsShelley
}
ProtocolParamsShelley {
shelleyGenesis = genesisShelley
, shelleyInitialNonce = initialNonce
, shelleyProtVer = SL.ProtVer shelleyMajorVersion 0
, shelleyLeaderCredentials = Just leaderCredentialsShelley
shelleyProtVer = SL.ProtVer shelleyMajorVersion 0
}
ProtocolParamsAllegra {
allegraProtVer = SL.ProtVer allegraMajorVersion 0
, allegraLeaderCredentials = Nothing
allegraProtVer = SL.ProtVer allegraMajorVersion 0
}
ProtocolParamsMary {
maryProtVer = SL.ProtVer maryMajorVersion 0
, maryLeaderCredentials = Nothing
maryProtVer = SL.ProtVer maryMajorVersion 0
}
protocolParamsByronShelley
ProtocolParamsTransition {
transitionTrigger = TriggerHardForkAtVersion allegraMajorVersion
transitionTrigger = TriggerHardForkAtVersion allegraMajorVersion
}
ProtocolParamsTransition {
transitionTrigger = TriggerHardForkAtVersion maryMajorVersion
transitionTrigger = TriggerHardForkAtVersion maryMajorVersion
}

-- Byron
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderFutureEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Mary"})
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Shelley"})
HardForkEncoderDisabledEra (SingleEraInfo {singleEraName = "Allegra"})