Point to ledger specs PR fix

IntersectMBO · May 27, 2021 · 9241270 · 9241270
1 parent 40010bb
commit 9241270
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/cabal.project b/cabal.project
@@ -125,8 +125,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: c559e8e28c804c386d637de06710e8f733817d17
-  --sha256: 0w70wr9sch3ahp26paa2lf7syyd8y67dxxxsd63jrixax3j8h6zk
+  tag: a0a25a19a60632612e8d5c195f7d87444cd83f71
   subdir:
     alonzo/impl
     alonzo/test
@@ -203,8 +202,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/plutus
-  tag: 4fa9e0874ae1ed7d64e6a62008e54a31d368cbf2
-  --sha256: 0lmldmj3rfb80nb30njwzv7p1mi9n5avxllypx3p7j8afk3rb34z
+  tag: ece86104c6ed590daa3249e4154dd7b62ebf0f05
+  --sha256: 0z59lxbw20afb80wnz8kspl83gb1i3m50a32jfm8jdfndvwwj3wg
   subdir:
     plutus-core
     plutus-ledger-api

diff --git a/cardano-api/src/Cardano/Api/Orphans.hs b/cardano-api/src/Cardano/Api/Orphans.hs
@@ -3,8 +3,8 @@
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
@@ -18,14 +18,14 @@ import           Prelude
 
 import           Cardano.Prelude (panic)
 import           Control.Iterate.SetAlgebra (BiMap (..), Bimap)
-import           Data.Aeson (FromJSON (..), ToJSON (..), object, (.=), (.:), (.:?))
+import           Data.Aeson (FromJSON (..), ToJSON (..), object, (.:), (.:?), (.=))
 import qualified Data.Aeson as Aeson
 import           Data.Aeson.Types (FromJSONKey (..), ToJSONKey (..), toJSONKeyText)
 import qualified Data.ByteString.Base16 as B16
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString.Short as SBS
-import qualified Data.Map.Strict as Map
 import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import           Data.MemoBytes (MemoBytes)
 import           Data.Scientific
 import           Data.Text (Text)
@@ -51,8 +51,8 @@ import qualified Shelley.Spec.Ledger.Delegation.Certificates as Shelley
 import qualified Shelley.Spec.Ledger.EpochBoundary as ShelleyEpoch
 import qualified Shelley.Spec.Ledger.LedgerState as ShelleyLedger
 import           Shelley.Spec.Ledger.PParams (PParamsUpdate)
-import qualified Shelley.Spec.Ledger.Rewards as Shelley
 import qualified Shelley.Spec.Ledger.RewardUpdate as Shelley
+import qualified Shelley.Spec.Ledger.Rewards as Shelley
 
 -- Orphan instances involved in the JSON output of the API queries.
 -- We will remove/replace these as we provide more API wrapper types
@@ -351,7 +351,7 @@ instance FromJSON Alonzo.AlonzoGenesis where
     collateralPercentage <- o .:  "collateralPercentage"
     maxCollateralInputs  <- o .:  "maxCollateralInputs"
     case cModels of
-      Nothing -> case Plutus.defaultCostModelParams of
+      Nothing -> case Plutus.defaultCekCostModelParams of
         Just m -> return Alonzo.AlonzoGenesis
           { Alonzo.adaPerUTxOWord
           , Alonzo.costmdls = Map.singleton Alonzo.PlutusV1 (Alonzo.CostModel m)

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -799,3 +799,5 @@ obtainLedgerEraClassConstraints ShelleyBasedEraMary    f = f
 obtainLedgerEraClassConstraints ShelleyBasedEraAlonzo  _ =
   panic "obtainLedgerEraClassConstraints: Alonzo era not implemented yet"
 
+-- addr_test1vqdxts5qkeh29tkelxlthgkpxwns77lf92p2sz6a0vgfc7cv3y49w
+-- 2f6bbe07dd4586aa549196ba3e1bef925390a81f49466de55e6e8459423da482
diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
@@ -842,7 +842,7 @@ instance ToObject (UpecPredicateFailure era) where
 
 
 instance ToObject (Alonzo.UtxoPredicateFailure (Alonzo.AlonzoEra StandardCrypto)) where
-  toObject _ _ = panic "ToJSON: UtxoPredicateFailure not implemented yet"
+  toObject _verb predFail = mkObject [ "UtxoPredicateFailure" .= Aeson.String (show predFail)]
 
 instance ToObject (AlonzoBbodyPredFail (Alonzo.AlonzoEra StandardCrypto)) where
   toObject _ _ = panic "ToJSON: AlonzoBbodyPredFail not implemented yet"