From cfc8ceac8cf5b31f028586f819b8c34e50aa9e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Thu, 12 Dec 2024 10:25:00 +0100 Subject: [PATCH 1/2] Revert "Export HasKeyRole's coerceKeyRole function" This reverts commit 450fc00392a1c580d691c9adc448ecc517b84e4d. --- cardano-api/internal/Cardano/Api/Certificate.hs | 1 + cardano-api/internal/Cardano/Api/ReexposeLedger.hs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cardano-api/internal/Cardano/Api/Certificate.hs b/cardano-api/internal/Cardano/Api/Certificate.hs index efc485a92..b31ab1113 100644 --- a/cardano-api/internal/Cardano/Api/Certificate.hs +++ b/cardano-api/internal/Cardano/Api/Certificate.hs @@ -100,6 +100,7 @@ import Cardano.Api.Value import Cardano.Ledger.BaseTypes (strictMaybe) import qualified Cardano.Ledger.Coin as L +import qualified Cardano.Ledger.Keys as Ledger import Control.Monad.Except (MonadError (..)) import Data.ByteString (ByteString) diff --git a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs index 8df2aba34..a1a5c7b56 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs @@ -18,7 +18,7 @@ module Cardano.Api.ReexposeLedger , hashVerKeyVRF , hashWithSerialiser , PoolParams (..) - , HasKeyRole (..) + , HasKeyRole , MIRPot (..) , MIRTarget (..) , MIRCert (..) @@ -221,7 +221,7 @@ import Cardano.Ledger.Core (Era (..), EraPParams (..), EraTxOut, PPara import Cardano.Ledger.Credential (Credential (..), credToText) import Cardano.Ledger.Crypto (ADDRHASH, Crypto, StandardCrypto) import Cardano.Ledger.DRep (DRep (..), drepAnchorL, drepDepositL, drepExpiryL) -import Cardano.Ledger.Keys (HasKeyRole (..), KeyHash (..), KeyRole (..), VKey (..), +import Cardano.Ledger.Keys (HasKeyRole, KeyHash (..), KeyRole (..), VKey (..), hashWithSerialiser) import Cardano.Ledger.Plutus.Data (Data (..), unData) import Cardano.Ledger.Plutus.Language (Language, Plutus, languageToText, plutusBinary) From 359017665e9dbdb3b48a03ad79a64a5ab2b03584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Mon, 9 Dec 2024 23:08:42 +0100 Subject: [PATCH 2/2] Expose the ledger's RewardAccount --- cardano-api/internal/Cardano/Api/ReexposeLedger.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs index a1a5c7b56..e56352c04 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeLedger.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeLedger.hs @@ -175,10 +175,13 @@ module Cardano.Api.ReexposeLedger , SafeHash , unsafeMakeSafeHash , extractHash + -- Reward + , RewardAccount (..) ) where import Cardano.Crypto.Hash.Class (hashFromBytes, hashToBytes) +import Cardano.Ledger.Address (RewardAccount (..)) import Cardano.Ledger.Allegra.Scripts (showTimelock) import Cardano.Ledger.Alonzo.Core (AlonzoEraScript (..), AlonzoEraTxBody (..), AlonzoEraTxWits (..), AsIx (..), AsIxItem (AsIxItem), CoinPerWord (..), EraGov,