Move Redeemer type to Write.Tx.Redeemers module

lib/wallet/api/http/Cardano/Wallet/Api/Http/Shelley/Server.hs

@@ -500,8 +500,6 @@ import Cardano.Wallet.Primitive.Types.Credentials
     ( ClearCredentials, RootCredentials (..) )
 import Cardano.Wallet.Primitive.Types.Hash
     ( Hash (..) )
-import Cardano.Wallet.Primitive.Types.Redeemer
-    ( Redeemer (..) )
 import Cardano.Wallet.Primitive.Types.TokenBundle
     ( TokenBundle (..) )
 import Cardano.Wallet.Primitive.Types.TokenMap
@@ -558,7 +556,7 @@ import Cardano.Wallet.Unsafe
 import Cardano.Wallet.Write.Tx
     ( AnyRecentEra (..) )
 import Cardano.Wallet.Write.Tx.Balance
-    ( UTxOAssumptions (..) )
+    ( Redeemer (..), UTxOAssumptions (..) )
 import Control.Arrow
     ( second, (&&&) )
 import Control.DeepSeq

lib/wallet/cardano-wallet.cabal

@@ -322,7 +322,6 @@ library
     Cardano.Wallet.Primitive.Types.MinimumUTxO
     Cardano.Wallet.Primitive.Types.MinimumUTxO.Gen
     Cardano.Wallet.Primitive.Types.ProtocolMagic
-    Cardano.Wallet.Primitive.Types.Redeemer
     Cardano.Wallet.Primitive.Types.RewardAccount
     Cardano.Wallet.Primitive.Types.RewardAccount.Gen
     Cardano.Wallet.Primitive.Types.StateDeltaSeq

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

@@ -91,7 +91,6 @@ module Cardano.Wallet.Shelley.Compatibility
     , toLedgerExUnits
     , fromCardanoAddress
     , toSystemStart
-    , toScriptPurpose
     , fromShelleyTxIn
     , toCostModelsAsArray
     , toCardanoPolicyId
@@ -379,7 +378,6 @@ import qualified Cardano.Ledger.Allegra as Allegra
 import qualified Cardano.Ledger.Alonzo as Alonzo
 import qualified Cardano.Ledger.Alonzo.Language as Alonzo
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
-import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import qualified Cardano.Ledger.Alonzo.TxSeq as Alonzo
 import qualified Cardano.Ledger.Api as Ledger
 import qualified Cardano.Ledger.Babbage as Babbage
@@ -390,8 +388,6 @@ import qualified Cardano.Ledger.Credential as SL
 import qualified Cardano.Ledger.Crypto as SL
 import qualified Cardano.Ledger.Keys as Ledger
 import qualified Cardano.Ledger.Mary as Mary
-import qualified Cardano.Ledger.Mary.Value as SL
-import qualified Cardano.Ledger.SafeHash as SafeHash
 import qualified Cardano.Ledger.Shelley as Shelley
 import qualified Cardano.Ledger.Shelley.API as SL
 import qualified Cardano.Ledger.Shelley.API as SLAPI
@@ -402,7 +398,6 @@ import qualified Cardano.Wallet.Primitive.Types.Address as W
 import qualified Cardano.Wallet.Primitive.Types.Coin as Coin
 import qualified Cardano.Wallet.Primitive.Types.Coin as W
 import qualified Cardano.Wallet.Primitive.Types.Hash as W
-import qualified Cardano.Wallet.Primitive.Types.Redeemer as W
 import qualified Cardano.Wallet.Primitive.Types.RewardAccount as W
 import qualified Cardano.Wallet.Primitive.Types.TokenBundle as TokenBundle
 import qualified Cardano.Wallet.Primitive.Types.TokenPolicy as W
@@ -1354,34 +1349,13 @@ fromUnitInterval x =
 toSystemStart :: W.StartTime -> SystemStart
 toSystemStart (W.StartTime t) = SystemStart t
 
-toScriptPurpose :: W.Redeemer -> Alonzo.ScriptPurpose StandardCrypto
-toScriptPurpose = \case
-    W.RedeemerSpending _ txin ->
-        Alonzo.Spending (toTxIn txin)
-    W.RedeemerMinting _ pid ->
-        Alonzo.Minting (toPolicyID pid)
-    W.RedeemerRewarding _ (Cardano.StakeAddress ntwrk acct) ->
-        Alonzo.Rewarding (SL.RewardAcnt ntwrk acct)
-
 toCardanoTxId :: W.Hash "Tx" -> Cardano.TxId
 toCardanoTxId (W.Hash h) = Cardano.TxId $ UnsafeHash $ toShort h
 
 toCardanoTxIn :: W.TxIn -> Cardano.TxIn
 toCardanoTxIn (W.TxIn tid ix) =
     Cardano.TxIn (toCardanoTxId tid) (Cardano.TxIx (fromIntegral ix))
 
-toTxIn :: SL.Crypto crypto => W.TxIn -> SL.TxIn crypto
-toTxIn (W.TxIn tid ix) =
-    SL.TxIn (toTxId tid) (SL.mkTxIxPartial $ fromIntegral ix)
-
-toTxId :: Crypto.HashAlgorithm (SL.HASH crypto) => W.Hash "Tx" -> SL.TxId crypto
-toTxId (W.Hash h) =
-    (SL.TxId (SafeHash.unsafeMakeSafeHash $ UnsafeHash $ toShort h))
-
-toPolicyID :: SL.Crypto crypto => W.TokenPolicyId -> SL.PolicyID crypto
-toPolicyID (W.UnsafeTokenPolicyId (W.Hash bytes)) =
-    SL.PolicyID (SL.ScriptHash (unsafeHashFromBytes bytes))
-
 toCardanoStakeCredential :: W.RewardAccount -> Cardano.StakeCredential
 toCardanoStakeCredential = \case
     W.FromKeyHash bs ->

lib/wallet/src/Cardano/Wallet/Write/Tx.hs

@@ -88,6 +88,9 @@ module Cardano.Wallet.Write.Tx
     , modifyLedgerBody
     , emptyTx
 
+    -- * TxId
+    , Ledger.TxId
+
     -- * TxOut
     , Core.TxOut
     , BabbageTxOut (..)

lib/wallet/src/Cardano/Wallet/Write/Tx/Balance.hs

@@ -39,6 +39,7 @@ module Cardano.Wallet.Write.Tx.Balance
 
     -- * Partial transactions
     , PartialTx (..)
+    , Redeemer (..)
 
     -- * UTxO assumptions
     , UTxOAssumptions (..)
@@ -105,8 +106,6 @@ import Cardano.Tx.Balance.Internal.CoinSelection
     )
 import Cardano.Wallet.Primitive.Types
     ( TokenBundleMaxSize (TokenBundleMaxSize) )
-import Cardano.Wallet.Primitive.Types.Redeemer
-    ( Redeemer )
 import Cardano.Wallet.Primitive.Types.TokenBundle
     ( TokenBundle (..) )
 import Cardano.Wallet.Primitive.Types.Tx
@@ -147,7 +146,7 @@ import Cardano.Wallet.Write.Tx
     , withConstraints
     )
 import Cardano.Wallet.Write.Tx.Redeemers
-    ( ErrAssignRedeemers (..), assignScriptRedeemers )
+    ( ErrAssignRedeemers (..), Redeemer (..), assignScriptRedeemers )
 import Cardano.Wallet.Write.Tx.Sign
     ( estimateKeyWitnessCount, estimateSignedTxSize )
 import Cardano.Wallet.Write.Tx.SizeEstimation

lib/wallet/src/Cardano/Wallet/Write/Tx/Redeemers.hs

@@ -1,6 +1,8 @@
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
@@ -15,22 +17,29 @@
 module Cardano.Wallet.Write.Tx.Redeemers
     ( assignScriptRedeemers
     , ErrAssignRedeemers (..)
+    , Redeemer (..)
     ) where
 
 import Prelude
 
+import Cardano.Api
+    ( StakeAddress, serialiseToBech32 )
+import Cardano.Crypto.Hash.Class
+    ( Hash )
 import Cardano.Ledger.Alonzo.TxInfo
     ( TranslationError )
 import Cardano.Ledger.Api
     ( Tx, bodyTxL, rdmrsTxWitsL, scriptIntegrityHashTxBodyL, witsTxL )
+import Cardano.Ledger.Mary.Value
+    ( PolicyID (..) )
 import Cardano.Ledger.Shelley.API
-    ( StrictMaybe (..) )
+    ( ScriptHash (..), StrictMaybe (..) )
 import Cardano.Slotting.EpochInfo
     ( EpochInfo, hoistEpochInfo )
-import Cardano.Wallet.Primitive.Types.Redeemer
-    ( Redeemer, redeemerData )
-import Cardano.Wallet.Shelley.Compatibility
-    ( toScriptPurpose )
+import Cardano.Wallet.Primitive.Types.TokenPolicy
+    ( TokenPolicyId )
+import Cardano.Wallet.Shelley.Compatibility.Ledger
+    ( Convert (..) )
 import Cardano.Wallet.Write.Tx
     ( IsRecentEra (recentEra)
     , PParams
@@ -59,6 +68,8 @@ import Control.Monad.Trans.State.Strict
     ( StateT (..), execStateT, get, modify', put )
 import Data.Bifunctor
     ( bimap )
+import Data.ByteString
+    ( ByteString )
 import Data.Function
     ( (&) )
 import Data.Generics.Internal.VL.Lens
@@ -67,17 +78,25 @@ import Data.Generics.Labels
     ()
 import Data.Map.Strict
     ( Map, (!) )
+import Data.Maybe
+    ( fromMaybe )
+import Fmt
+    ( Buildable (..) )
 import GHC.Generics
     ( Generic )
 
 import qualified Cardano.Api as Cardano
 import qualified Cardano.Api.Shelley as Cardano
+import qualified Cardano.Crypto.Hash as Crypto
 import qualified Cardano.Ledger.Alonzo.PlutusScriptApi as Alonzo
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
 import qualified Cardano.Ledger.Alonzo.Scripts.Data as Alonzo
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import qualified Cardano.Ledger.Alonzo.TxWits as Alonzo
 import qualified Cardano.Ledger.Api as Ledger
+import qualified Cardano.Wallet.Primitive.Types.Hash as W
+import qualified Cardano.Wallet.Primitive.Types.TokenPolicy as W
+import qualified Cardano.Wallet.Primitive.Types.Tx.TxIn as W
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.Map as Map
 import qualified Data.Map.Merge.Strict as Map
@@ -223,6 +242,50 @@ assignScriptRedeemers pparams timeTranslation utxo redeemers tx =
             , Just l <- [Alonzo.language script]
             ]
 
+--
+-- The 'Redeemer' type
+-- TODO: Move back to the wallet and/or retire
+--
+
+data Redeemer
+    = RedeemerSpending ByteString W.TxIn
+    | RedeemerMinting ByteString TokenPolicyId
+    | RedeemerRewarding ByteString StakeAddress
+    deriving (Eq, Generic, Show)
+
+instance Buildable Redeemer where
+    build = \case
+        RedeemerSpending _ input ->
+            "spending(" <> build input <> ")"
+        RedeemerMinting _ pid ->
+            "minting(" <> build pid <> ")"
+        RedeemerRewarding _ addr ->
+            "rewarding(" <> build (serialiseToBech32 addr) <> ")"
+
+redeemerData :: Redeemer -> ByteString
+redeemerData = \case
+    RedeemerSpending  bytes _ -> bytes
+    RedeemerMinting   bytes _ -> bytes
+    RedeemerRewarding bytes _ -> bytes
+
+toScriptPurpose :: Redeemer -> Alonzo.ScriptPurpose StandardCrypto
+toScriptPurpose = \case
+    RedeemerSpending _ txin ->
+        Alonzo.Spending (toLedger txin)
+    RedeemerMinting _ pid ->
+        Alonzo.Minting (toPolicyID pid)
+    RedeemerRewarding _ (Cardano.StakeAddress ntwrk acct) ->
+        Alonzo.Rewarding (Ledger.RewardAcnt ntwrk acct)
+
+toPolicyID :: W.TokenPolicyId -> PolicyID StandardCrypto
+toPolicyID (W.UnsafeTokenPolicyId (W.Hash bytes)) =
+    PolicyID (ScriptHash (unsafeHashFromBytes bytes))
+  where
+    unsafeHashFromBytes :: Crypto.HashAlgorithm h => ByteString -> Hash h a
+    unsafeHashFromBytes =
+        fromMaybe (error "unsafeHashFromBytes: wrong length")
+        . Crypto.hashFromBytes
+
 --------------------------------------------------------------------------------
 -- Utils
 --------------------------------------------------------------------------------

lib/wallet/test/unit/Cardano/Wallet/Shelley/TransactionSpec.hs

@@ -179,8 +179,6 @@ import Cardano.Wallet.Primitive.Types.MinimumUTxO.Gen
     ( testParameter_coinsPerUTxOByte_Babbage
     , testParameter_coinsPerUTxOWord_Alonzo
     )
-import Cardano.Wallet.Primitive.Types.Redeemer
-    ( Redeemer (..) )
 import Cardano.Wallet.Primitive.Types.TokenBundle
     ( AssetId, TokenBundle )
 import Cardano.Wallet.Primitive.Types.TokenBundle.Gen
@@ -265,6 +263,7 @@ import Cardano.Wallet.Write.Tx.Balance
     , ErrSelectAssets (..)
     , ErrUpdateSealedTx (..)
     , PartialTx (..)
+    , Redeemer (..)
     , TxFeeAndChange (..)
     , TxFeeUpdate (..)
     , TxUpdate (..)