From 4cea234b38ee51bbdc633bcfbe57a76e105168c5 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Tue, 19 Sep 2023 14:21:18 +0200 Subject: [PATCH] Fix building with newer plutus-core --- cabal.project | 3 ++- eras/alonzo/impl/cardano-ledger-alonzo.cabal | 4 ++-- eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs | 8 ++++---- eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal | 2 +- .../src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs | 7 +++---- .../Ledger/Alonzo/Translation/TranslationInstance.hs | 4 ---- .../Test/Cardano/Ledger/Alonzo/PlutusScriptExamples.hs | 2 +- eras/babbage/impl/cardano-ledger-babbage.cabal | 2 +- eras/conway/impl/cardano-ledger-conway.cabal | 2 +- flake.lock | 6 +++--- libs/cardano-ledger-binary/cardano-ledger-binary.cabal | 2 +- libs/cardano-ledger-test/cardano-ledger-test.cabal | 2 +- 12 files changed, 20 insertions(+), 24 deletions(-) diff --git a/cabal.project b/cabal.project index 1aa39f67a83..91a7631273c 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,8 @@ index-state: -- Bump this if you need newer packages from Hackage , hackage.haskell.org 2023-07-17T00:00:00Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2023-08-26T00:00:00Z + , cardano-haskell-packages 2023-09-18T17:20:55Z + packages: eras/allegra/impl diff --git a/eras/alonzo/impl/cardano-ledger-alonzo.cabal b/eras/alonzo/impl/cardano-ledger-alonzo.cabal index 6aa0331d34f..09998a06c40 100644 --- a/eras/alonzo/impl/cardano-ledger-alonzo.cabal +++ b/eras/alonzo/impl/cardano-ledger-alonzo.cabal @@ -81,8 +81,8 @@ library mtl, microlens, nothunks, - plutus-ledger-api ^>=1.11, - plutus-core ^>=1.11, + plutus-ledger-api ^>=1.13, + plutus-core ^>=1.13, prettyprinter, serialise, set-algebra >=1.0, diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs index 362bd462f4b..9e8ad56b1fb 100644 --- a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs +++ b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs @@ -130,7 +130,7 @@ import qualified Data.Map.Strict as Map import Data.Measure (BoundedMeasure, Measure) import Data.Scientific (fromRationalRepetendLimited) import Data.Semigroup (All (..)) -import Data.Text as T (Text, pack) +import Data.Text as T (Text) import Data.Word (Word64, Word8) import GHC.Generics (Generic) import NoThunks.Class (NoThunks (..), allNoThunks) @@ -412,9 +412,9 @@ plutusV1ParamNames = ] plutusVXParamNames :: Language -> [Text] -plutusVXParamNames PlutusV1 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV1.ParamName] -plutusVXParamNames PlutusV2 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV2.ParamName] -plutusVXParamNames PlutusV3 = T.pack . Plutus.showParamName <$> [minBound .. maxBound :: PV3.ParamName] +plutusVXParamNames PlutusV1 = Plutus.showParamName <$> [minBound .. maxBound :: PV1.ParamName] +plutusVXParamNames PlutusV2 = Plutus.showParamName <$> [minBound .. maxBound :: PV2.ParamName] +plutusVXParamNames PlutusV3 = Plutus.showParamName <$> [minBound .. maxBound :: PV3.ParamName] validateCostModel :: MonadFail m => Language -> [Integer] -> m CostModel validateCostModel lang cmps = diff --git a/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal b/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal index c0fd8859026..64c80304d18 100644 --- a/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal +++ b/eras/alonzo/test-suite/cardano-ledger-alonzo-test.cabal @@ -66,7 +66,7 @@ library data-default-class, microlens, plutus-tx, - plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.11, + plutus-ledger-api:{plutus-ledger-api, plutus-ledger-api-testlib} ^>=1.13, QuickCheck, random, serialise, diff --git a/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs b/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs index 474746e60d8..5f92ee83fad 100644 --- a/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs +++ b/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/PlutusScripts.hs @@ -5,18 +5,17 @@ import Cardano.Ledger.Alonzo.Language (BinaryPlutus (..), Language (..), Plutus import Cardano.Ledger.Alonzo.Scripts (AlonzoScript (PlutusScript), CostModel, mkCostModel) import Data.ByteString.Short (pack) import Data.Either (fromRight) -import qualified Data.Map as Map -import PlutusLedgerApi.Test.EvaluationContext (costModelParamsForTesting) +import PlutusLedgerApi.Test.V3.EvaluationContext (costModelParamsForTesting) testingCostModelV1 :: CostModel testingCostModelV1 = fromRight (error "testingCostModelV1 is not well-formed") $ - mkCostModel PlutusV1 (0 <$ Map.elems costModelParamsForTesting) + mkCostModel PlutusV1 (0 <$ costModelParamsForTesting) testingCostModelV2 :: CostModel testingCostModelV2 = fromRight (error "testingCostModelV2 is not well-formed") $ - mkCostModel PlutusV2 (0 <$ Map.elems costModelParamsForTesting) + mkCostModel PlutusV2 (0 <$ costModelParamsForTesting) {- Preproceesed Plutus Script guessTheNumber'2_0 :: PlutusTx.Builtins.Internal.BuiltinData -> diff --git a/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs b/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs index 99d7a035641..effe271bb7e 100644 --- a/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs +++ b/eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Translation/TranslationInstance.hs @@ -50,7 +50,6 @@ import qualified PlutusLedgerApi.V3 as PV3 -- FIXME: remove following line after plutus patch import Cardano.Ledger.Alonzo.TxInfo (VersionedTxInfo) -import qualified PlutusLedgerApi.V3.Contexts as PV3 import PlutusTx.Ratio as PlutusTx import Data.Typeable (Typeable) @@ -113,9 +112,6 @@ instance Cborg.Serialise a => Cborg.Serialise (PV3.Interval a) instance Cborg.Serialise a => Cborg.Serialise (PV3.LowerBound a) instance Cborg.Serialise a => Cborg.Serialise (PV3.UpperBound a) --- FIXME: remove following line after plutus patch -deriving instance Generic PV3.BuiltinData - -- FIXME: fix following after plutus patch instance Cborg.Serialise PlutusTx.Rational where encode = error "fixme rational" diff --git a/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/PlutusScriptExamples.hs b/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/PlutusScriptExamples.hs index 3e29a0073bf..448c113839f 100644 --- a/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/PlutusScriptExamples.hs +++ b/eras/alonzo/test-suite/test/Test/Cardano/Ledger/Alonzo/PlutusScriptExamples.hs @@ -23,11 +23,11 @@ import Cardano.Ledger.Alonzo.TxInfo ( import Cardano.Ledger.BaseTypes (ProtVer (..), natVersion) import Cardano.Ledger.Language (BinaryPlutus (..), Language (..), Plutus (..)) import Data.ByteString.Short (ShortByteString) -import PlutusLedgerApi.Test.EvaluationContext import PlutusLedgerApi.Test.Examples ( alwaysFailingNAryFunction, alwaysSucceedingNAryFunction, ) +import PlutusLedgerApi.Test.V3.EvaluationContext import qualified PlutusLedgerApi.V1 as PV1 import Test.Cardano.Ledger.Alonzo.PlutusScripts (testingCostModelV1) import qualified Test.Cardano.Ledger.Alonzo.PlutusScripts as Generated ( diff --git a/eras/babbage/impl/cardano-ledger-babbage.cabal b/eras/babbage/impl/cardano-ledger-babbage.cabal index b32a8241d55..cddfe3c8c11 100644 --- a/eras/babbage/impl/cardano-ledger-babbage.cabal +++ b/eras/babbage/impl/cardano-ledger-babbage.cabal @@ -71,7 +71,7 @@ library deepseq, microlens, nothunks, - plutus-ledger-api ^>=1.11, + plutus-ledger-api ^>=1.13, set-algebra, small-steps, text, diff --git a/eras/conway/impl/cardano-ledger-conway.cabal b/eras/conway/impl/cardano-ledger-conway.cabal index 2bebfb3a1f4..3fed4a1df0c 100644 --- a/eras/conway/impl/cardano-ledger-conway.cabal +++ b/eras/conway/impl/cardano-ledger-conway.cabal @@ -83,7 +83,7 @@ library deepseq, microlens, nothunks, - plutus-ledger-api ^>=1.11, + plutus-ledger-api ^>=1.13, set-algebra, small-steps, text, diff --git a/flake.lock b/flake.lock index 0f7160b5ecd..c60de8bb1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1692973747, - "narHash": "sha256-mTlxhYzPUYJ/LggHQzsPomhqslCfTbjq8vqAhMaQN/o=", + "lastModified": 1695160702, + "narHash": "sha256-+Mfc6eGA1ZwQ/ZjKzMoMWkHzd+sgR1JbxY0i849HjEU=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "1f0aed302bafbf897d3deefd9fc5de8229d04e1a", + "rev": "9932690af3713ef034c928850252eb1b88450ee6", "type": "github" }, "original": { diff --git a/libs/cardano-ledger-binary/cardano-ledger-binary.cabal b/libs/cardano-ledger-binary/cardano-ledger-binary.cabal index d44adce2261..ba98bc5c494 100644 --- a/libs/cardano-ledger-binary/cardano-ledger-binary.cabal +++ b/libs/cardano-ledger-binary/cardano-ledger-binary.cabal @@ -67,7 +67,7 @@ library network, nothunks, primitive, - plutus-ledger-api ^>=1.11, + plutus-ledger-api ^>=1.13, recursion-schemes, serialise, tagged, diff --git a/libs/cardano-ledger-test/cardano-ledger-test.cabal b/libs/cardano-ledger-test/cardano-ledger-test.cabal index 5bd99695339..1ea997f2026 100644 --- a/libs/cardano-ledger-test/cardano-ledger-test.cabal +++ b/libs/cardano-ledger-test/cardano-ledger-test.cabal @@ -124,7 +124,7 @@ library nothunks, plutus-core, hspec, - plutus-ledger-api ^>=1.11, + plutus-ledger-api ^>=1.13, prettyprinter, QuickCheck, small-steps,