Skip to content

Commit 6f2577c

Browse files
committed
Fix building with newer plutus-core
1 parent 513857a commit 6f2577c

File tree

11 files changed

+19
-23
lines changed

11 files changed

+19
-23
lines changed

cabal.project

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ index-state:
1414
-- Bump this if you need newer packages from Hackage
1515
, hackage.haskell.org 2023-07-17T00:00:00Z
1616
-- Bump this if you need newer packages from CHaP
17-
, cardano-haskell-packages 2023-08-26T00:00:00Z
17+
, cardano-haskell-packages 2023-09-18T17:20:55Z
18+
1819

1920
packages:
2021
eras/allegra/impl

eras/alonzo/impl/cardano-ledger-alonzo.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ library
8181
mtl,
8282
microlens,
8383
nothunks,
84-
plutus-ledger-api ^>=1.11,
85-
plutus-core ^>=1.11,
84+
plutus-ledger-api ^>=1.13,
85+
plutus-core ^>=1.13,
8686
prettyprinter,
8787
serialise,
8888
set-algebra >=1.0,

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ import qualified Data.Map.Strict as Map
130130
import Data.Measure (BoundedMeasure, Measure)
131131
import Data.Scientific (fromRationalRepetendLimited)
132132
import Data.Semigroup (All (..))
133-
import Data.Text as T (Text, pack)
133+
import Data.Text as T (Text)
134134
import Data.Word (Word64, Word8)
135135
import GHC.Generics (Generic)
136136
import NoThunks.Class (NoThunks (..), allNoThunks)
@@ -412,9 +412,9 @@ plutusV1ParamNames =
412412
]
413413

414414
plutusVXParamNames :: Language -> [Text]
415-
plutusVXParamNames PlutusV1 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV1.ParamName]
416-
plutusVXParamNames PlutusV2 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV2.ParamName]
417-
plutusVXParamNames PlutusV3 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV3.ParamName]
415+
plutusVXParamNames PlutusV1 = Plutus.showParamName <$> [minBound .. maxBound :: PV1.ParamName]
416+
plutusVXParamNames PlutusV2 = Plutus.showParamName <$> [minBound .. maxBound :: PV2.ParamName]
417+
plutusVXParamNames PlutusV3 = Plutus.showParamName <$> [minBound .. maxBound :: PV3.ParamName]
418418

419419
validateCostModel :: MonadFail m => Language -> [Integer] -> m CostModel
420420
validateCostModel lang cmps =

eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ library
6666
data-default-class,
6767
microlens,
6868
plutus-tx,
69-
plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.11,
69+
plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.13,
7070
QuickCheck,
7171
random,
7272
serialise,

eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ import Cardano.Ledger.Alonzo.Language (BinaryPlutus (..), Language (..), Plutus
55
import Cardano.Ledger.Alonzo.Scripts (AlonzoScript (PlutusScript), CostModel, mkCostModel)
66
import Data.ByteString.Short (pack)
77
import Data.Either (fromRight)
8-
import qualified Data.Map as Map
9-
import PlutusLedgerApi.Test.EvaluationContext (costModelParamsForTesting)
8+
import PlutusLedgerApi.Test.V3.EvaluationContext (costModelParamsForTesting)
109

1110
testingCostModelV1 :: CostModel
1211
testingCostModelV1 =
1312
fromRight (error "testingCostModelV1 is not well-formed") $
14-
mkCostModel PlutusV1 (0 <$ Map.elems costModelParamsForTesting)
13+
mkCostModel PlutusV1 (0 <$ costModelParamsForTesting)
1514

1615
testingCostModelV2 :: CostModel
1716
testingCostModelV2 =
1817
fromRight (error "testingCostModelV2 is not well-formed") $
19-
mkCostModel PlutusV2 (0 <$ Map.elems costModelParamsForTesting)
18+
mkCostModel PlutusV2 (0 <$ costModelParamsForTesting)
2019

2120
{- Preproceesed Plutus Script
2221
guessTheNumber'2_0 :: PlutusTx.Builtins.Internal.BuiltinData ->

eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import qualified PlutusLedgerApi.V3 as PV3
5050
-- FIXME: remove following line after plutus patch
5151

5252
import Cardano.Ledger.Alonzo.TxInfo (VersionedTxInfo)
53-
import qualified PlutusLedgerApi.V3.Contexts as PV3
5453
import PlutusTx.Ratio as PlutusTx
5554

5655
import Data.Typeable (Typeable)
@@ -113,9 +112,6 @@ instance Cborg.Serialise a => Cborg.Serialise (PV3.Interval a)
113112
instance Cborg.Serialise a => Cborg.Serialise (PV3.LowerBound a)
114113
instance Cborg.Serialise a => Cborg.Serialise (PV3.UpperBound a)
115114

116-
-- FIXME: remove following line after plutus patch
117-
deriving instance Generic PV3.BuiltinData
118-
119115
-- FIXME: fix following after plutus patch
120116
instance Cborg.Serialise PlutusTx.Rational where
121117
encode = error "fixme rational"

eras/babbage/impl/cardano-ledger-babbage.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ library
7171
deepseq,
7272
microlens,
7373
nothunks,
74-
plutus-ledger-api ^>=1.11,
74+
plutus-ledger-api ^>=1.13,
7575
set-algebra,
7676
small-steps,
7777
text,

eras/conway/impl/cardano-ledger-conway.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ library
8383
deepseq,
8484
microlens,
8585
nothunks,
86-
plutus-ledger-api ^>=1.11,
86+
plutus-ledger-api ^>=1.13,
8787
set-algebra,
8888
small-steps,
8989
text,

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libs/cardano-ledger-binary/cardano-ledger-binary.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ library
6767
network,
6868
nothunks,
6969
primitive,
70-
plutus-ledger-api ^>=1.11,
70+
plutus-ledger-api ^>=1.13,
7171
recursion-schemes,
7272
serialise,
7373
tagged,

libs/cardano-ledger-test/cardano-ledger-test.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ library
124124
nothunks,
125125
plutus-core,
126126
hspec,
127-
plutus-ledger-api ^>=1.11,
127+
plutus-ledger-api ^>=1.13,
128128
prettyprinter,
129129
QuickCheck,
130130
small-steps,

0 commit comments

Comments
 (0)