Skip to content

Commit 1d8a0d7

Browse files
committed
Fix Conway trigger hard fork
1 parent 0da6f8a commit 1d8a0d7

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

cardano-db-sync/src/Cardano/DbSync/Config.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ coalesceConfig pcfg ncfg adjustGenesisPath = do
9292
, dncMaryHardFork = ncMaryHardFork ncfg
9393
, dncAlonzoHardFork = ncAlonzoHardFork ncfg
9494
, dncBabbageHardFork = ncBabbageHardFork ncfg
95+
, dncConwayHardFork = ncConwayHardFork ncfg
9596
}
9697

9798
mkAdjustPath :: SyncPreConfig -> (FilePath -> FilePath)

cardano-db-sync/src/Cardano/DbSync/Config/Cardano.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import Cardano.Ledger.Conway.Genesis
3030
import Cardano.Ledger.Keys
3131
import Cardano.Ledger.Shelley.Translation (emptyFromByronTranslationContext)
3232
import Cardano.Prelude (panic)
33-
import Cardano.Slotting.Slot
3433
import Control.Monad.Trans.Except (ExceptT)
3534
import Data.Word (Word64)
3635
import Ouroboros.Consensus.Block.Forging
@@ -133,7 +132,7 @@ mkProtocolInfoCardano ge shelleyCred =
133132
(Consensus.ProtocolTransitionParamsShelleyBased () $ dncMaryHardFork dnc)
134133
(Consensus.ProtocolTransitionParamsShelleyBased alonzoGenesis $ dncAlonzoHardFork dnc)
135134
(Consensus.ProtocolTransitionParamsShelleyBased () $ dncBabbageHardFork dnc)
136-
(Consensus.ProtocolTransitionParamsShelleyBased (ConwayGenesis (GenDelegs mempty)) (Consensus.TriggerHardForkAtEpoch (EpochNo 34))) -- TODO: Conway Fix
135+
(Consensus.ProtocolTransitionParamsShelleyBased (ConwayGenesis (GenDelegs mempty)) $ dncConwayHardFork dnc) -- TODO: Conway Fix
137136

138137
shelleyPraosNonce :: ShelleyConfig -> Nonce
139138
shelleyPraosNonce sCfg = Nonce (Crypto.castHash . unGenesisHashShelley $ scGenesisHash sCfg)

cardano-db-sync/src/Cardano/DbSync/Config/Node.hs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ data NodeConfig = NodeConfig
4545
ncAlonzoHardFork :: !Shelley.TriggerHardFork
4646
, -- Babbage hardfok parameters
4747
ncBabbageHardFork :: !Shelley.TriggerHardFork
48+
, -- Conway hardfok parameters
49+
ncConwayHardFork :: !Shelley.TriggerHardFork
4850
}
4951

5052
parseNodeConfig :: ByteString -> NodeConfig
@@ -77,6 +79,7 @@ instance FromJSON NodeConfig where
7779
<*> parseMaryHardForkEpoch o
7880
<*> parseAlonzoHardForkEpoch o
7981
<*> parseBabbageHardForkEpoch o
82+
<*> parseConwayHardForkEpoch o
8083

8184
parseByronProtocolVersion :: Object -> Parser Byron.ProtocolVersion
8285
parseByronProtocolVersion o =
@@ -119,3 +122,10 @@ instance FromJSON NodeConfig where
119122
[ Shelley.TriggerHardForkAtEpoch <$> o .: "TestBabbageHardForkAtEpoch"
120123
, pure $ Shelley.TriggerHardForkAtVersion 7 -- Mainnet default
121124
]
125+
126+
parseConwayHardForkEpoch :: Object -> Parser Shelley.TriggerHardFork
127+
parseConwayHardForkEpoch o =
128+
asum
129+
[ Shelley.TriggerHardForkAtEpoch <$> o .: "TestConwayHardForkAtEpoch"
130+
, pure $ Shelley.TriggerHardForkAtVersion 9 -- Mainnet default
131+
]

cardano-db-sync/src/Cardano/DbSync/Config/Types.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ data SyncNodeConfig = SyncNodeConfig
105105
, dncMaryHardFork :: !TriggerHardFork
106106
, dncAlonzoHardFork :: !TriggerHardFork
107107
, dncBabbageHardFork :: !TriggerHardFork
108+
, dncConwayHardFork :: !TriggerHardFork
108109
}
109110

110111
data SyncPreConfig = SyncPreConfig

0 commit comments

Comments
 (0)