Skip to content

Commit e250c6a

Browse files
Soupstrawlehins
Soupstraw
and
lehins
committed
Change the type of psDeposits to CompactForm Coin
Co-authored-by: Alexey Kuleshevich <alexey.kuleshevich@iohk.io>
1 parent 1a163db commit e250c6a

File tree

31 files changed

+154
-97
lines changed

31 files changed

+154
-97
lines changed

‎eras/allegra/impl/src/Cardano/Ledger/Allegra/PParams.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ instance EraPParams AllegraEra where
2828
hkdMaxTxSizeL = lens sppMaxTxSize $ \pp x -> pp {sppMaxTxSize = x}
2929
hkdMaxBHSizeL = lens sppMaxBHSize $ \pp x -> pp {sppMaxBHSize = x}
3030
hkdKeyDepositL = lens sppKeyDeposit $ \pp x -> pp {sppKeyDeposit = x}
31-
hkdPoolDepositL = lens sppPoolDeposit $ \pp x -> pp {sppPoolDeposit = x}
31+
hkdPoolDepositCompactL = lens sppPoolDeposit $ \pp x -> pp {sppPoolDeposit = x}
3232
hkdEMaxL = lens sppEMax $ \pp x -> pp {sppEMax = x}
3333
hkdNOptL = lens sppNOpt $ \pp x -> pp {sppNOpt = x}
3434
hkdA0L = lens sppA0 $ \pp x -> pp {sppA0 = x}

‎eras/alonzo/impl/golden/pparams-update.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"monetaryExpansion": 0.7810966919969065,
2323
"poolPledgeInfluence": 8.319022570290014789e16,
2424
"poolRetireMaxEpoch": 1843493333,
25-
"stakePoolDeposit": 855059,
25+
"stakePoolDeposit": 3827864344574364691,
2626
"stakePoolTargetNum": 10900,
2727
"treasuryCut": 0.234167131785253734
2828
}

‎eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import Cardano.Ledger.Binary (
8686
encodePreEncoded,
8787
serialize',
8888
)
89-
import Cardano.Ledger.Coin (Coin (..))
89+
import Cardano.Ledger.Coin (Coin (..), CompactForm (..))
9090
import Cardano.Ledger.Core (EraPParams (..))
9191
import Cardano.Ledger.HKD (HKDFunctor (..))
9292
import Cardano.Ledger.Mary.Core
@@ -237,7 +237,7 @@ data AlonzoPParams f era = AlonzoPParams
237237
-- ^ Maximal block header size
238238
, appKeyDeposit :: !(HKD f Coin)
239239
-- ^ The amount of a key registration deposit
240-
, appPoolDeposit :: !(HKD f Coin)
240+
, appPoolDeposit :: !(HKD f (CompactForm Coin))
241241
-- ^ The amount of a pool registration deposit
242242
, appEMax :: !(HKD f EpochInterval)
243243
-- ^ Maximum number of epochs in the future a pool retirement is allowed to
@@ -319,7 +319,7 @@ instance EraPParams AlonzoEra where
319319
hkdMaxTxSizeL = lens appMaxTxSize $ \pp x -> pp {appMaxTxSize = x}
320320
hkdMaxBHSizeL = lens appMaxBHSize $ \pp x -> pp {appMaxBHSize = x}
321321
hkdKeyDepositL = lens appKeyDeposit $ \pp x -> pp {appKeyDeposit = x}
322-
hkdPoolDepositL = lens appPoolDeposit $ \pp x -> pp {appPoolDeposit = x}
322+
hkdPoolDepositCompactL = lens appPoolDeposit $ \pp x -> pp {appPoolDeposit = x}
323323
hkdEMaxL = lens appEMax $ \pp x -> pp {appEMax = x}
324324
hkdNOptL = lens appNOpt $ \pp x -> pp {appNOpt = x}
325325
hkdA0L = lens appA0 $ \pp x -> pp {appA0 = x}
@@ -465,7 +465,7 @@ emptyAlonzoPParams =
465465
, appMaxTxSize = 2048
466466
, appMaxBHSize = 0
467467
, appKeyDeposit = Coin 0
468-
, appPoolDeposit = Coin 0
468+
, appPoolDeposit = CompactCoin 0
469469
, appEMax = EpochInterval 0
470470
, appNOpt = 100
471471
, appA0 = minBound

‎eras/babbage/impl/golden/pparams-update.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"poolPledgeInfluence": 6.790200579626650307,
2121
"poolRetireMaxEpoch": 1676560372,
2222
"stakeAddressDeposit": 664860,
23-
"stakePoolDeposit": 763288,
23+
"stakePoolDeposit": 1.7453986152646146491e19,
2424
"stakePoolTargetNum": 40749,
2525
"treasuryCut": 0.34109,
2626
"txFeeFixed": 321937

‎eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import Cardano.Ledger.Binary (
6060
DecCBOR (..),
6161
EncCBOR (..),
6262
)
63-
import Cardano.Ledger.Coin (Coin (..))
63+
import Cardano.Ledger.Coin (Coin (..), CompactForm (..))
6464
import Cardano.Ledger.Core (EraPParams (..))
6565
import Cardano.Ledger.HKD (HKDFunctor (..))
6666
import Cardano.Ledger.Orphans ()
@@ -113,7 +113,7 @@ data BabbagePParams f era = BabbagePParams
113113
-- ^ Maximal block header size
114114
, bppKeyDeposit :: !(HKD f Coin)
115115
-- ^ The amount of a key registration deposit
116-
, bppPoolDeposit :: !(HKD f Coin)
116+
, bppPoolDeposit :: !(HKD f (CompactForm Coin))
117117
-- ^ The amount of a pool registration deposit
118118
, bppEMax :: !(HKD f EpochInterval)
119119
-- ^ Maximum number of epochs in the future a pool retirement is allowed to
@@ -192,7 +192,7 @@ instance EraPParams BabbageEra where
192192
hkdMaxTxSizeL = lens bppMaxTxSize $ \pp x -> pp {bppMaxTxSize = x}
193193
hkdMaxBHSizeL = lens bppMaxBHSize $ \pp x -> pp {bppMaxBHSize = x}
194194
hkdKeyDepositL = lens bppKeyDeposit $ \pp x -> pp {bppKeyDeposit = x}
195-
hkdPoolDepositL = lens bppPoolDeposit $ \pp x -> pp {bppPoolDeposit = x}
195+
hkdPoolDepositCompactL = lens bppPoolDeposit $ \pp x -> pp {bppPoolDeposit = x}
196196
hkdEMaxL = lens bppEMax $ \pp x -> pp {bppEMax = x}
197197
hkdNOptL = lens bppNOpt $ \pp x -> pp {bppNOpt = x}
198198
hkdA0L = lens bppA0 $ \pp x -> pp {bppA0 = x}
@@ -274,7 +274,7 @@ emptyBabbagePParams =
274274
, bppMaxTxSize = 2048
275275
, bppMaxBHSize = 0
276276
, bppKeyDeposit = Coin 0
277-
, bppPoolDeposit = Coin 0
277+
, bppPoolDeposit = CompactCoin 0
278278
, bppEMax = EpochInterval 0
279279
, bppNOpt = 100
280280
, bppA0 = minBound

‎eras/conway/impl/golden/pparams-update.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@
832832
"ppSecurityGroup": 0.4
833833
},
834834
"stakeAddressDeposit": 479647,
835-
"stakePoolDeposit": 569,
835+
"stakePoolDeposit": 1.2522864161500168761e19,
836836
"treasuryCut": 0.5,
837837
"txFeeFixed": 203771,
838838
"txFeePerByte": 379061,

‎eras/conway/impl/src/Cardano/Ledger/Conway/PParams.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ import Cardano.Ledger.Binary (
113113
encodeListLen,
114114
)
115115
import Cardano.Ledger.Binary.Coders
116-
import Cardano.Ledger.Coin (Coin (Coin))
116+
import Cardano.Ledger.Coin (Coin (Coin), CompactForm (..))
117117
import Cardano.Ledger.Conway.Era (ConwayEra, hardforkConwayBootstrapPhase)
118118
import Cardano.Ledger.Core (EraPParams (..))
119119
import Cardano.Ledger.HKD (
@@ -612,7 +612,7 @@ data ConwayPParams f era = ConwayPParams
612612
-- ^ Maximal block header size
613613
, cppKeyDeposit :: !(THKD ('PPGroups 'EconomicGroup 'NoStakePoolGroup) f Coin)
614614
-- ^ The amount of a key registration deposit
615-
, cppPoolDeposit :: !(THKD ('PPGroups 'EconomicGroup 'NoStakePoolGroup) f Coin)
615+
, cppPoolDeposit :: !(THKD ('PPGroups 'EconomicGroup 'NoStakePoolGroup) f (CompactForm Coin))
616616
-- ^ The amount of a pool registration deposit
617617
, cppEMax :: !(THKD ('PPGroups 'TechnicalGroup 'NoStakePoolGroup) f EpochInterval)
618618
-- ^ Maximum number of epochs in the future a pool retirement is allowed to
@@ -788,7 +788,7 @@ instance EraPParams ConwayEra where
788788
hkdMaxTxSizeL = lens (unTHKD . cppMaxTxSize) $ \pp x -> pp {cppMaxTxSize = THKD x}
789789
hkdMaxBHSizeL = lens (unTHKD . cppMaxBHSize) $ \pp x -> pp {cppMaxBHSize = THKD x}
790790
hkdKeyDepositL = lens (unTHKD . cppKeyDeposit) $ \pp x -> pp {cppKeyDeposit = THKD x}
791-
hkdPoolDepositL = lens (unTHKD . cppPoolDeposit) $ \pp x -> pp {cppPoolDeposit = THKD x}
791+
hkdPoolDepositCompactL = lens (unTHKD . cppPoolDeposit) $ \pp x -> pp {cppPoolDeposit = THKD x}
792792
hkdEMaxL = lens (unTHKD . cppEMax) $ \pp x -> pp {cppEMax = THKD x}
793793
hkdNOptL = lens (unTHKD . cppNOpt) $ \pp x -> pp {cppNOpt = THKD x}
794794
hkdA0L = lens (unTHKD . cppA0) $ \pp x -> pp {cppA0 = THKD x}
@@ -883,7 +883,7 @@ instance ConwayEraPParams ConwayEra where
883883
, isValid (/= EpochInterval 0) ppuCommitteeMaxTermLengthL
884884
, isValid (/= EpochInterval 0) ppuGovActionLifetimeL
885885
, -- Coins
886-
isValid (/= zero) ppuPoolDepositL
886+
isValid (/= CompactCoin 0) ppuPoolDepositCompactL
887887
, isValid (/= zero) ppuGovActionDepositL
888888
, isValid (/= zero) ppuDRepDepositL
889889
, hardforkConwayBootstrapPhase pv
@@ -929,7 +929,7 @@ emptyConwayPParams =
929929
, cppMaxTxSize = THKD 2048
930930
, cppMaxBHSize = THKD 0
931931
, cppKeyDeposit = THKD (Coin 0)
932-
, cppPoolDeposit = THKD (Coin 0)
932+
, cppPoolDeposit = THKD (CompactCoin 0)
933933
, cppEMax = THKD (EpochInterval 0)
934934
, cppNOpt = THKD 100
935935
, cppA0 = THKD minBound

‎eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/GovSpec.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module Test.Cardano.Ledger.Conway.Imp.GovSpec (spec) where
1313

1414
import Cardano.Ledger.Address (RewardAccount (..))
1515
import Cardano.Ledger.BaseTypes
16-
import Cardano.Ledger.Coin (Coin (Coin))
16+
import Cardano.Ledger.Coin (Coin (..))
1717
import Cardano.Ledger.Conway (hardforkConwayDisallowUnelectedCommitteeFromVoting)
1818
import Cardano.Ledger.Conway.Core
1919
import Cardano.Ledger.Conway.Governance
@@ -223,7 +223,7 @@ pparamUpdateSpec =
223223
testMalformedProposal
224224
"ppuPoolDepositL cannot be 0"
225225
ppuPoolDepositL
226-
zero
226+
$ Coin 0
227227
testMalformedProposal
228228
"ppuGovActionDepositL cannot be 0"
229229
ppuGovActionDepositL

‎eras/dijkstra/src/Cardano/Ledger/Dijkstra/PParams.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ instance EraPParams DijkstraEra where
4545
hkdMaxTxSizeL = lens (unTHKD . cppMaxTxSize) $ \pp x -> pp {cppMaxTxSize = THKD x}
4646
hkdMaxBHSizeL = lens (unTHKD . cppMaxBHSize) $ \pp x -> pp {cppMaxBHSize = THKD x}
4747
hkdKeyDepositL = lens (unTHKD . cppKeyDeposit) $ \pp x -> pp {cppKeyDeposit = THKD x}
48-
hkdPoolDepositL = lens (unTHKD . cppPoolDeposit) $ \pp x -> pp {cppPoolDeposit = THKD x}
48+
hkdPoolDepositCompactL = lens (unTHKD . cppPoolDeposit) $ \pp x -> pp {cppPoolDeposit = THKD x}
4949
hkdEMaxL = lens (unTHKD . cppEMax) $ \pp x -> pp {cppEMax = THKD x}
5050
hkdNOptL = lens (unTHKD . cppNOpt) $ \pp x -> pp {cppNOpt = THKD x}
5151
hkdA0L = lens (unTHKD . cppA0) $ \pp x -> pp {cppA0 = THKD x}
@@ -139,7 +139,7 @@ instance ConwayEraPParams DijkstraEra where
139139
, isValid (/= EpochInterval 0) ppuCommitteeMaxTermLengthL
140140
, isValid (/= EpochInterval 0) ppuGovActionLifetimeL
141141
, -- Coins
142-
isValid (/= zero) ppuPoolDepositL
142+
isValid (/= mempty) ppuPoolDepositL
143143
, isValid (/= zero) ppuGovActionDepositL
144144
, isValid (/= zero) ppuDRepDepositL
145145
, isValid ((/= zero) . unCoinPerByte) ppuCoinsPerUTxOByteL

‎eras/mary/impl/src/Cardano/Ledger/Mary/PParams.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instance EraPParams MaryEra where
3535
hkdMaxTxSizeL = lens sppMaxTxSize $ \pp x -> pp {sppMaxTxSize = x}
3636
hkdMaxBHSizeL = lens sppMaxBHSize $ \pp x -> pp {sppMaxBHSize = x}
3737
hkdKeyDepositL = lens sppKeyDeposit $ \pp x -> pp {sppKeyDeposit = x}
38-
hkdPoolDepositL = lens sppPoolDeposit $ \pp x -> pp {sppPoolDeposit = x}
38+
hkdPoolDepositCompactL = lens sppPoolDeposit $ \pp x -> pp {sppPoolDeposit = x}
3939
hkdEMaxL = lens sppEMax $ \pp x -> pp {sppEMax = x}
4040
hkdNOptL = lens sppNOpt $ \pp x -> pp {sppNOpt = x}
4141
hkdA0L = lens sppA0 $ \pp x -> pp {sppA0 = x}

0 commit comments

Comments
 (0)