Merge #2253

2253: Update fromShelleyAddr to also require a ShelleyBasedEra parameter r=Jimbo4350 a=Jimbo4350 Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
IntersectMBO · Apr 6, 2021 · 3f4dbcc · 3f4dbcc
2 parents 476db29 + e195e9a
commit 3f4dbcc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/cardano-api/src/Cardano/Api/Address.hs b/cardano-api/src/Cardano/Api/Address.hs
@@ -81,8 +81,8 @@ import qualified Shelley.Spec.Ledger.BaseTypes as Shelley
 import qualified Shelley.Spec.Ledger.Credential as Shelley
 
 import           Cardano.Api.Eras
-import           Cardano.Api.Hash
 import           Cardano.Api.HasTypeProxy
+import           Cardano.Api.Hash
 import           Cardano.Api.Key
 import           Cardano.Api.KeysByron
 import           Cardano.Api.KeysShelley
@@ -528,14 +528,16 @@ toShelleyStakeReference  NoStakeAddress =
     Shelley.StakeRefNull
 
 
-fromShelleyAddr :: IsShelleyBasedEra era
-                => Shelley.Addr StandardCrypto -> AddressInEra era
-fromShelleyAddr (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
+fromShelleyAddr
+  :: ShelleyBasedEra era
+  -> Shelley.Addr StandardCrypto
+  -> AddressInEra era
+fromShelleyAddr _ (Shelley.AddrBootstrap (Shelley.BootstrapAddress addr)) =
     AddressInEra ByronAddressInAnyEra (ByronAddress addr)
 
-fromShelleyAddr (Shelley.Addr nw pc scr) =
+fromShelleyAddr sBasedEra (Shelley.Addr nw pc scr) =
     AddressInEra
-      (ShelleyAddressInEra shelleyBasedEra)
+      (ShelleyAddressInEra sBasedEra)
       (ShelleyAddress nw pc scr)
 
 fromShelleyStakeAddr :: Shelley.RewardAcnt StandardCrypto -> StakeAddress

diff --git a/cardano-api/src/Cardano/Api/TxBody.hs b/cardano-api/src/Cardano/Api/TxBody.hs
@@ -353,15 +353,15 @@ fromTxOut
 fromTxOut shelleyBasedEra' ledgerTxOut =
   case shelleyBasedEra' of
     ShelleyBasedEraShelley -> let (Shelley.TxOut addr value) = ledgerTxOut
-                              in TxOut (fromShelleyAddr addr)
+                              in TxOut (fromShelleyAddr ShelleyBasedEraShelley addr)
                                        (TxOutAdaOnly AdaOnlyInShelleyEra
                                                       (fromShelleyLovelace value))
     ShelleyBasedEraAllegra -> let (Shelley.TxOut addr value) = ledgerTxOut
-                              in TxOut (fromShelleyAddr addr)
+                              in TxOut (fromShelleyAddr ShelleyBasedEraAllegra addr)
                                         (TxOutAdaOnly AdaOnlyInAllegraEra
                                                       (fromShelleyLovelace value))
     ShelleyBasedEraMary    -> let (Shelley.TxOut addr value) = ledgerTxOut
-                              in TxOut (fromShelleyAddr addr)
+                              in TxOut (fromShelleyAddr ShelleyBasedEraMary addr)
                                         (TxOutValue MultiAssetInMaryEra
                                                       (fromMaryValue value))