PR review changes

cardano-scaling · Oct 8, 2024 · b1b7989 · b1b7989
1 parent e90f532
commit b1b7989
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,6 @@ changes.
       - Remove Commit client input since it is unused
       - Revisit types related to observations/posting transactions and make sure the fields are named appropriatelly
 
-- Fix the **BUG** where commit endpoint drops withdraw redeemers [#1643](https://github.com/cardano-scaling/hydra/issues/1643)
 
 - Tested with `cardano-node 9.2.0` and `cardano-cli 9.4.1.0`.
 
@@ -30,6 +29,8 @@ changes.
     in a new maximum number of head participants being `8`.
   - Changes script hashes in `hydra-plutus`
 
+- Fix the bug where commit endpoint drops withdraw redeemers [#1643](https://github.com/cardano-scaling/hydra/issues/1643)
+
 ## [0.19.0] - 2024-09-13
 
 - Tested with `cardano-node 9.1.1` and `cardano-cli 9.2.1.0`

diff --git a/hydra-cardano-api/hydra-cardano-api.cabal b/hydra-cardano-api/hydra-cardano-api.cabal
@@ -61,6 +61,7 @@ library
     Hydra.Cardano.Api.ScriptData
     Hydra.Cardano.Api.ScriptDatum
     Hydra.Cardano.Api.ScriptHash
+    Hydra.Cardano.Api.StakeAddress
     Hydra.Cardano.Api.Tx
     Hydra.Cardano.Api.TxBody
     Hydra.Cardano.Api.TxId

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs
@@ -141,6 +141,7 @@ import Hydra.Cardano.Api.ReferenceScript as Extras
 import Hydra.Cardano.Api.ScriptData as Extras
 import Hydra.Cardano.Api.ScriptDatum as Extras
 import Hydra.Cardano.Api.ScriptHash as Extras
+import Hydra.Cardano.Api.StakeAddress as Extras
 import Hydra.Cardano.Api.Tx as Extras hiding (Tx)
 import Hydra.Cardano.Api.TxBody as Extras
 import Hydra.Cardano.Api.TxId as Extras

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/AddressInEra.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/AddressInEra.hs
@@ -58,18 +58,6 @@ mkScriptAddress networkId script =
  where
   version = plutusScriptVersion @lang
 
--- | Construct a stake address from a Plutus script.
-mkStakeScriptAddress ::
-  forall lang.
-  IsPlutusScriptLanguage lang =>
-  NetworkId ->
-  PlutusScript lang ->
-  StakeAddress
-mkStakeScriptAddress networkId script =
-  makeStakeAddress networkId $ StakeCredentialByScript $ hashScript $ PlutusScript version script
- where
-  version = plutusScriptVersion @lang
-
 -- * Type Conversions
 
 -- | From a ledger 'Addr' to an api 'AddressInEra'

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/StakeAddress.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/StakeAddress.hs
@@ -0,0 +1,15 @@
+module Hydra.Cardano.Api.StakeAddress where
+
+import Hydra.Cardano.Api.Prelude
+
+-- | Construct a stake address from a Plutus script.
+mkScriptStakeAddress ::
+  forall lang.
+  IsPlutusScriptLanguage lang =>
+  NetworkId ->
+  PlutusScript lang ->
+  StakeAddress
+mkScriptStakeAddress networkId script =
+  makeStakeAddress networkId $ StakeCredentialByScript $ hashScript $ PlutusScript version script
+ where
+  version = plutusScriptVersion @lang
diff --git a/hydra-node/test/Hydra/Chain/Direct/TxSpec.hs b/hydra-node/test/Hydra/Chain/Direct/TxSpec.hs
@@ -300,7 +300,7 @@ genBlueprintTxWithUTxO =
           let scriptWitness = mkScriptWitness alwaysSucceedingScript NoScriptDatumForStake redeemer
               alwaysSucceedingScript = PlutusScriptSerialised $ Plutus.alwaysSucceedingNAryFunction 2
               redeemer = toScriptData (123 :: Integer)
-              stakeAddress = mkStakeScriptAddress testNetworkId alwaysSucceedingScript
+              stakeAddress = mkScriptStakeAddress testNetworkId alwaysSucceedingScript
           pure
             ( utxo
             , txbody

diff --git a/hydra-tx/src/Hydra/Tx/Commit.hs b/hydra-tx/src/Hydra/Tx/Commit.hs
@@ -77,7 +77,7 @@ commitTx networkId scriptRegistry headId party commitBlueprintTx (initialInput,
           & bodyTxL . inputsTxBodyL .~ newInputs
           & bodyTxL . referenceInputsTxBodyL <>~ Set.singleton (toLedgerTxIn initialScriptRef)
           & witsTxL . rdmrsTxWitsL
-            .~ Redeemers (fromList $ resolveNonSpendingRedeemers tx)
+            .~ Redeemers (fromList $ nonSpendingRedeemers tx)
               <> Redeemers (fromList $ mkRedeemers newRedeemers newInputs)
 
   -- Make redeemers (with zeroed units) from a TxIn -> Data map and a set of transaction inputs
@@ -104,7 +104,7 @@ commitTx networkId scriptRegistry headId party commitBlueprintTx (initialInput,
       )
       (unRedeemers $ tx ^. witsTxL . rdmrsTxWitsL)
 
-  resolveNonSpendingRedeemers tx =
+  nonSpendingRedeemers tx =
     Map.foldMapWithKey
       ( \p (d, ex) ->
           case redeemerPointerInverse (tx ^. bodyTxL) p of