move network discriminant conversion to Compatibility module

Author: KtorZ

lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs

@@ -77,6 +77,7 @@ module Cardano.Wallet.Shelley.Compatibility
     , fromTip
     , fromTip'
     , fromPParams
+    , fromNetworkDiscriminant
 
       -- * Internal Conversions
     , decentralizationLevelFromPParams
@@ -132,12 +133,16 @@ import Data.Map.Strict
     ( Map )
 import Data.Maybe
     ( fromMaybe, isJust, mapMaybe )
+import Data.Proxy
+    ( Proxy )
 import Data.Quantity
     ( Percentage, Quantity (..), mkPercentage )
 import Data.Text
     ( Text )
 import Data.Text.Class
     ( TextDecodingError (..) )
+import Data.Type.Equality
+    ( testEquality )
 import Data.Word
     ( Word16, Word32, Word64 )
 import Fmt
@@ -175,6 +180,8 @@ import Ouroboros.Network.Point
     ( WithOrigin (..) )
 import Shelley.Spec.Ledger.BaseTypes
     ( strictMaybeToMaybe, urlToText )
+import Type.Reflection
+    ( Typeable, typeRep )
 
 import qualified Cardano.Api as Cardano
 import qualified Cardano.Byron.Codec.Cbor as CBOR
@@ -741,6 +748,15 @@ fromUnitInterval x =
         , show x
         ]
 
+fromNetworkDiscriminant
+    :: forall (n :: NetworkDiscriminant). (Typeable n)
+    => Proxy n
+    -> SL.Network
+fromNetworkDiscriminant _ =
+    case testEquality (typeRep @n) (typeRep @'Mainnet) of
+        Just{}  -> SL.Mainnet
+        Nothing -> SL.Testnet
+
 -- NOTE: Arguably breaks naming conventions. Perhaps fromCardanoSignedTx instead
 toSealed :: SL.Tx TPraosStandardCrypto -> (W.Tx, W.SealedTx)
 toSealed tx =

lib/shelley/src/Cardano/Wallet/Shelley/Transaction.hs

@@ -73,6 +73,7 @@ import Cardano.Wallet.Primitive.Types
 import Cardano.Wallet.Shelley.Compatibility
     ( Shelley
     , TPraosStandardCrypto
+    , fromNetworkDiscriminant
     , toCardanoLovelace
     , toCardanoTxIn
     , toCardanoTxOut
@@ -105,16 +106,14 @@ import Data.Proxy
     ( Proxy (..) )
 import Data.Quantity
     ( Quantity (..) )
-import Data.Type.Equality
-    ( testEquality )
 import Data.Word
     ( Word16, Word64, Word8 )
 import Ouroboros.Consensus.Shelley.Protocol.Crypto
     ( Crypto (..) )
 import Ouroboros.Network.Block
     ( SlotNo )
 import Type.Reflection
-    ( Typeable, typeRep )
+    ( Typeable )
 
 import qualified Cardano.Api as Cardano
 import qualified Cardano.Byron.Codec.Cbor as CBOR
@@ -478,19 +477,15 @@ mkWithdrawals
     -> ChimericAccount
     -> Word64
     -> Map (SL.RewardAcnt TPraosStandardCrypto) SL.Coin
-mkWithdrawals _ (ChimericAccount keyHash) amount
+mkWithdrawals proxy (ChimericAccount keyHash) amount
     | amount == 0 = mempty
     | otherwise = Map.fromList
-        [ ( SL.RewardAcnt network keyHashObj
+        [ ( SL.RewardAcnt (fromNetworkDiscriminant proxy) keyHashObj
           , SL.Coin $ fromIntegral amount
           )
         ]
   where
     keyHashObj = SL.KeyHashObj $ SL.KeyHash $ Hash.UnsafeHash keyHash
-    network =
-        case testEquality (typeRep @n) (typeRep @'Mainnet) of
-            Just{}  -> SL.Mainnet
-            Nothing -> SL.Testnet
 
 -- TODO: The SlotId-SlotNo conversion based on epoch length would not
 -- work if the epoch length changed in a hard fork.