Merge #4501

4501: Fix 4493 bug r=Jimbo4350 a=Jimbo4350 Resolves: #4493 Co-authored-by: Jordan Millar <[email protected]>
IntersectMBO · Oct 5, 2022 · 8fa420b · 8fa420b
2 parents 4375bf7 + 76beb9a
commit 8fa420b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cardano-api/src/Cardano/Api/Tx.hs b/cardano-api/src/Cardano/Api/Tx.hs
@@ -439,7 +439,7 @@ instance IsCardanoEra era => HasTextEnvelope (KeyWitness era) where
     textEnvelopeType _ =
       case cardanoEra :: CardanoEra era of
         ByronEra   -> "TxWitnessByron"
-        ShelleyEra -> "TxWitnessShelley"
+        ShelleyEra -> "TxWitness ShelleyEra"
         AllegraEra -> "TxWitness AllegraEra"
         MaryEra    -> "TxWitness MaryEra"
         AlonzoEra  -> "TxWitness AlonzoEra"

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -1759,7 +1759,7 @@ acceptKeyWitnessCDDLSerialisation err =
     firstExceptT (ShelleyTxCmdTextEnvCddlError tEnvErr)
           $ newExceptT $ readFileTextEnvelopeCddlAnyOf teTypes fp
 
-  teTypes = [ FromCDDLWitness "TxWitness Shelley" CddlWitness
+  teTypes = [ FromCDDLWitness "TxWitness ShelleyEra" CddlWitness
             , FromCDDLWitness "TxWitness AllegraEra" CddlWitness
             , FromCDDLWitness "TxWitness MaryEra" CddlWitness
             , FromCDDLWitness "TxWitness AlonzoEra" CddlWitness