From cf57d5a1eb6673c87211403fa62cde433f1f852a Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 5 Jul 2023 11:57:06 -0400 Subject: [PATCH 1/2] Add CastVerificationKeyRole StakePoolKey StakeKey instance --- cardano-api/internal/Cardano/Api/Keys/Shelley.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/Keys/Shelley.hs b/cardano-api/internal/Cardano/Api/Keys/Shelley.hs index dbb4799cd6..91f42a912b 100644 --- a/cardano-api/internal/Cardano/Api/Keys/Shelley.hs +++ b/cardano-api/internal/Cardano/Api/Keys/Shelley.hs @@ -1104,6 +1104,9 @@ instance CastSigningKeyRole GenesisDelegateKey StakePoolKey where castSigningKey (GenesisDelegateSigningKey skey) = StakePoolSigningKey skey +instance CastVerificationKeyRole StakePoolKey StakeKey where + castVerificationKey (StakePoolVerificationKey (Shelley.VKey vkey)) = + StakeVerificationKey (Shelley.VKey vkey) -- -- Shelley genesis delegate extended ed25519 keys From 4646ce4abf232a5fec95ffca16edd9639359f05d Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 5 Jul 2023 12:25:35 -0400 Subject: [PATCH 2/2] Update cddlTypeToEra with Conway txs --- cardano-api/internal/Cardano/Api/SerialiseLedgerCddl.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/SerialiseLedgerCddl.hs b/cardano-api/internal/Cardano/Api/SerialiseLedgerCddl.hs index 017eac3bdb..53c096176f 100644 --- a/cardano-api/internal/Cardano/Api/SerialiseLedgerCddl.hs +++ b/cardano-api/internal/Cardano/Api/SerialiseLedgerCddl.hs @@ -297,17 +297,20 @@ cddlTypeToEra "Witnessed Tx AllegraEra" = return $ AnyCardanoEra AllegraEra cddlTypeToEra "Witnessed Tx MaryEra" = return $ AnyCardanoEra MaryEra cddlTypeToEra "Witnessed Tx AlonzoEra" = return $ AnyCardanoEra AlonzoEra cddlTypeToEra "Witnessed Tx BabbageEra" = return $ AnyCardanoEra BabbageEra +cddlTypeToEra "Witnessed Tx ConwayEra" = return $ AnyCardanoEra ConwayEra cddlTypeToEra "Unwitnessed Tx ByronEra" = return $ AnyCardanoEra ByronEra cddlTypeToEra "Unwitnessed Tx ShelleyEra" = return $ AnyCardanoEra ShelleyEra cddlTypeToEra "Unwitnessed Tx AllegraEra" = return $ AnyCardanoEra AllegraEra cddlTypeToEra "Unwitnessed Tx MaryEra" = return $ AnyCardanoEra MaryEra cddlTypeToEra "Unwitnessed Tx AlonzoEra" = return $ AnyCardanoEra AlonzoEra cddlTypeToEra "Unwitnessed Tx BabbageEra" = return $ AnyCardanoEra BabbageEra +cddlTypeToEra "Unwitnessed Tx ConwayEra" = return $ AnyCardanoEra ConwayEra cddlTypeToEra "TxWitness ShelleyEra" = return $ AnyCardanoEra ShelleyEra cddlTypeToEra "TxWitness AllegraEra" = return $ AnyCardanoEra AllegraEra cddlTypeToEra "TxWitness MaryEra" = return $ AnyCardanoEra MaryEra cddlTypeToEra "TxWitness AlonzoEra" = return $ AnyCardanoEra AlonzoEra cddlTypeToEra "TxWitness BabbageEra" = return $ AnyCardanoEra BabbageEra +cddlTypeToEra "TxWitness ConwayEra" = return $ AnyCardanoEra ConwayEra cddlTypeToEra unknownCddlType = Left $ TextEnvelopeCddlErrUnknownType unknownCddlType readFileTextEnvelopeCddlAnyOf