Skip to content

Commit 848b874

Browse files
committed
fix: Hardcode Byron software version
Cardano Node no longer provides this as configuration
1 parent 5487b98 commit 848b874

File tree

10 files changed

+9
-23
lines changed

10 files changed

+9
-23
lines changed

cardano-chain-gen/test/testfiles/config-alonzo/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
86
"LastKnownBlockVersion-Alt": 0,

cardano-chain-gen/test/testfiles/config-hf-epoch1/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
86
"LastKnownBlockVersion-Alt": 0,

cardano-chain-gen/test/testfiles/config-shelley/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "462bb9869a5a6e4325cc294ca659d68607e8a6f37b5be96ea663fdedfe2b5949",
86
"LastKnownBlockVersion-Alt": 0,

cardano-chain-gen/test/testfiles/config/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "865a9da19944fc00cefe5a0cdcb6dc9d3964a74681d9488ab79967f13a6400b3",
86
"LastKnownBlockVersion-Alt": 0,

cardano-chain-gen/test/testfiles/config2/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "d004b9e1a42b7329e52a112c8c006e6261e887013309afeca611f049f96cecd4",
86
"LastKnownBlockVersion-Alt": 0,

cardano-chain-gen/test/testfiles/config3/test-config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"AlonzoGenesisFile": "genesis.alonzo.json",
33
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4-
"ApplicationName": "cardano-sl",
5-
"ApplicationVersion": 0,
64
"ByronGenesisFile": "genesis.byron.json",
75
"ByronGenesisHash": "d004b9e1a42b7329e52a112c8c006e6261e887013309afeca611f049f96cecd4",
86
"LastKnownBlockVersion-Alt": 0,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ coalesceConfig pcfg ncfg adjustGenesisPath = do
8686
, dncShelleyGenesisHash = ncShelleyGenesisHash ncfg
8787
, dncAlonzoGenesisFile = adjustGenesisFilePath adjustGenesisPath (ncAlonzoGenesisFile ncfg)
8888
, dncAlonzoGenesisHash = ncAlonzoGenesisHash ncfg
89-
, dncByronSoftwareVersion = ncByronSotfwareVersion ncfg
9089
, dncByronProtocolVersion = ncByronProtocolVersion ncfg
9190
, dncShelleyHardFork = ncShelleyHardFork ncfg
9291
, dncAllegraHardFork = ncAllegraHardFork ncfg

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module Cardano.DbSync.Config.Cardano (
1414
) where
1515

1616
import qualified Cardano.Chain.Genesis as Byron
17+
import Cardano.Chain.Update (ApplicationName (..), SoftwareVersion (..))
1718
import qualified Cardano.Crypto.Hash.Class as Crypto
1819
import Cardano.Crypto.ProtocolMagic (ProtocolMagicId (..))
1920
import Cardano.Db (textShow)
@@ -92,7 +93,7 @@ mkProtocolInfoCardano ge shelleyCred =
9293
{ Consensus.byronGenesis = byronGenesis
9394
, Consensus.byronPbftSignatureThreshold = Consensus.PBftSignatureThreshold <$> dncPBftSignatureThreshold dnc
9495
, Consensus.byronProtocolVersion = dncByronProtocolVersion dnc
95-
, Consensus.byronSoftwareVersion = dncByronSoftwareVersion dnc
96+
, Consensus.byronSoftwareVersion = mkByronSoftwareVersion
9697
, Consensus.byronLeaderCredentials = Nothing
9798
, Consensus.byronMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
9899
}
@@ -140,3 +141,10 @@ mkProtVer a b =
140141
case mkVersion64 a of
141142
Nothing -> panic $ "Impossible: Invalid version generated: " <> textShow a
142143
Just v -> ProtVer v (fromIntegral b)
144+
145+
mkByronSoftwareVersion :: SoftwareVersion
146+
mkByronSoftwareVersion =
147+
SoftwareVersion name ver
148+
where
149+
name = ApplicationName "cardano-sl"
150+
ver = 1

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ data NodeConfig = NodeConfig
3434
, ncAlonzoGenesisFile :: !GenesisFile
3535
, ncAlonzoGenesisHash :: !GenesisHashAlonzo
3636
, ncRequiresNetworkMagic :: !RequiresNetworkMagic
37-
, ncByronSotfwareVersion :: !Byron.SoftwareVersion
3837
, ncByronProtocolVersion :: !Byron.ProtocolVersion
3938
, -- Shelley hardfok parameters
4039
ncShelleyHardFork :: !Shelley.TriggerHardFork
@@ -72,7 +71,6 @@ instance FromJSON NodeConfig where
7271
<*> fmap GenesisFile (o .: "AlonzoGenesisFile")
7372
<*> fmap GenesisHashAlonzo (o .: "AlonzoGenesisHash")
7473
<*> o .: "RequiresNetworkMagic"
75-
<*> parseByronSoftwareVersion o
7674
<*> parseByronProtocolVersion o
7775
<*> parseShelleyHardForkEpoch o
7876
<*> parseAllegraHardForkEpoch o
@@ -87,12 +85,6 @@ instance FromJSON NodeConfig where
8785
<*> o .: "LastKnownBlockVersion-Minor"
8886
<*> o .: "LastKnownBlockVersion-Alt"
8987

90-
parseByronSoftwareVersion :: Object -> Parser Byron.SoftwareVersion
91-
parseByronSoftwareVersion o =
92-
Byron.SoftwareVersion
93-
<$> fmap Byron.ApplicationName (o .: "ApplicationName")
94-
<*> o .: "ApplicationVersion"
95-
9688
parseShelleyHardForkEpoch :: Object -> Parser Shelley.TriggerHardFork
9789
parseShelleyHardForkEpoch o =
9890
asum

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ data SyncNodeConfig = SyncNodeConfig
9999
, dncShelleyGenesisHash :: !GenesisHashShelley
100100
, dncAlonzoGenesisFile :: !GenesisFile
101101
, dncAlonzoGenesisHash :: !GenesisHashAlonzo
102-
, dncByronSoftwareVersion :: !Byron.SoftwareVersion
103102
, dncByronProtocolVersion :: !Byron.ProtocolVersion
104103
, dncShelleyHardFork :: !TriggerHardFork
105104
, dncAllegraHardFork :: !TriggerHardFork

0 commit comments

Comments
 (0)