Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit e3e442a

Browse files
committed
Fix various CardanoConfiguration types to align with cardano-ledger
1 parent 132f96c commit e3e442a

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/Cardano/Shell/Constants/Types.hs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,35 +126,35 @@ data ModuleAutoRestart
126126
deriving (Eq, Show)
127127

128128
data BlockVersionData = BlockVersionData
129-
{ bvdScriptVersion :: !Int
129+
{ bvdScriptVersion :: !Word16
130130
, bvdSlotDuration :: !Int
131-
, bvdMaxBlockSize :: !Int
132-
, bvdMaxHeaderSize :: !Int
133-
, bvdMaxTxSize :: !Int
134-
, bvdMaxProposalSize :: !Int
135-
, bvdMpcThd :: !Float
136-
, bvdHeavyDelThd :: !Float
137-
, bvdUpdateVoteThd :: !Float
138-
, bvdUpdateProposalThd :: !Float
139-
, bvdUpdateImplicit :: !Int
131+
, bvdMaxBlockSize :: !Natural
132+
, bvdMaxHeaderSize :: !Natural
133+
, bvdMaxTxSize :: !Natural
134+
, bvdMaxProposalSize :: !Natural
135+
, bvdMpcThd :: !Word64
136+
, bvdHeavyDelThd :: !Word64
137+
, bvdUpdateVoteThd :: !Word64
138+
, bvdUpdateProposalThd :: !Word64
139+
, bvdUpdateImplicit :: !Word64
140140
, bvdSoftforkRule :: !SoftForkRule
141141
, bvdTXFeePolicy :: !TxFeePolicy
142-
, bvdUnlockStakeEpoch :: !Integer
142+
, bvdUnlockStakeEpoch :: !Word64
143143
} deriving (Eq, Show)
144144

145145
data SoftForkRule = SoftForkRule
146-
{ sfrInitThd :: !Float
147-
, sfrMinThd :: !Float
148-
, sfrThdDecrement :: !Float
146+
{ sfrInitThd :: !Word64
147+
, sfrMinThd :: !Word64
148+
, sfrThdDecrement :: !Word64
149149
} deriving (Eq, Show)
150150

151151
data TxFeePolicy = TxFeePolicy
152152
{ txfTXSizeLinear :: !TxSizeLinear
153153
} deriving (Eq, Show)
154154

155155
data TxSizeLinear = TxSizeLinear
156-
{ txsA :: !Int
157-
, txsB :: !Float
156+
{ txsA :: !Word64
157+
, txsB :: !Word64
158158
} deriving (Eq, Show)
159159

160160
data ProtocolConstants = ProtocolConstants

src/Cardano/Shell/Presets.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ mainnetConfiguration =
101101
, geSrc = "mainnet-genesis.json"
102102
, geFileHash = "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb"
103103
}
104-
, coRequiresNetworkMagic = "NetworkMainOrStage"
104+
, coRequiresNetworkMagic = "RequiresNoMagic"
105105
, coDBSerializeVersion = 0
106106
}
107107
, ccNTP =

0 commit comments

Comments
 (0)