Try to fix the build

Author: vrom911

hydra-cardano-api/hydra-cardano-api.cabal

@@ -50,6 +50,7 @@ library
     Hydra.Cardano.Api.Hash
     Hydra.Cardano.Api.NetworkId
     Hydra.Cardano.Api.NetworkMagic
+    Hydra.Cardano.Api.PolicyAssets
     Hydra.Cardano.Api.PolicyId
     Hydra.Cardano.Api.Prelude
     Hydra.Cardano.Api.Pretty

hydra-cardano-api/src/Hydra/Cardano/Api.hs

@@ -129,6 +129,7 @@ import Hydra.Cardano.Api.ExecutionUnits as Extras
 import Hydra.Cardano.Api.Hash as Extras
 import Hydra.Cardano.Api.NetworkId ()
 import Hydra.Cardano.Api.NetworkMagic ()
+import Hydra.Cardano.Api.PolicyAssets ()
 import Hydra.Cardano.Api.PolicyId as Extras
 import Hydra.Cardano.Api.ReferenceScript as Extras
 import Hydra.Cardano.Api.ScriptData as Extras

hydra-cardano-api/src/Hydra/Cardano/Api/PolicyAssets.hs

@@ -0,0 +1,13 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Hydra.Cardano.Api.PolicyAssets where
+
+import Hydra.Cardano.Api.Prelude
+
+-- * Orphans
+
+instance ToJSON PolicyAssets where
+  toJSON (PolicyAssets assets) = toJSON assets
+
+instance FromJSON PolicyAssets where
+  parseJSON v = PolicyAssets <$> parseJSON v

hydra-cardano-api/src/Hydra/Cardano/Api/PolicyId.hs

@@ -6,13 +6,17 @@ import Hydra.Cardano.Api.Prelude
 
 import Cardano.Ledger.Alonzo.Plutus.TxInfo qualified as Ledger
 import Cardano.Ledger.Mary.Value qualified as Ledger
+import Data.Aeson (FromJSONKey (..), ToJSONKey (..))
 import Hydra.Cardano.Api.ScriptHash ()
 import PlutusLedgerApi.V3 (CurrencySymbol, fromBuiltin, unCurrencySymbol)
 import Test.Gen.Cardano.Api.Typed (genPolicyId)
 import Test.QuickCheck.Hedgehog (hedgehog)
 
 -- * Orphans
 
+instance ToJSONKey PolicyId
+instance FromJSONKey PolicyId
+
 instance Arbitrary PolicyId where
   arbitrary = hedgehog genPolicyId
 

hydra-cluster/src/HydraNode.hs

@@ -202,7 +202,7 @@ requestCommitTx' HydraClient{apiHost = Host{hostname, port}} utxos amount =
     Req.req
       POST
       (Req.http hostname /: "commit")
-      (ReqBodyJson $ SimpleCommitRequest @Tx utxos amount)
+      (ReqBodyJson $ SimpleCommitRequest @Tx utxos amount mempty)
       (Proxy :: Proxy (JsonResponse (DraftCommitTxResponse Tx)))
       (Req.port (fromInteger . toInteger $ port))
 

hydra-node/golden/ReasonablySized (DraftCommitTxRequest (Tx ConwayEra)).json

@@ -8,6 +8,7 @@
                 "txId": "1fa9e36c69db7285e6179979c23332062085743af5cbf2b41c85461ca00f4d97",
                 "type": "Tx ConwayEra"
             },
+            "tokens": null,
             "utxo": {
                 "0206070403000305070403040207020401080205070508080702040400060503#7": {
                     "address": "addr_test1yrg0h9r48kll4c97rnvsrnxva5jewvvjy25t0rsfana27l4k5tl0asswrudpvy903ywnuhd2k527q2h3d4n8wr7k4k9s9k0l23",
@@ -108,6 +109,7 @@
         },
         {
             "amount": 221173,
+            "tokens": null,
             "utxoToCommit": {
                 "0002040408040406020703010001070100050703070302060205050001050308#21": {
                     "address": "addr_test1xr0pdat5t5we9t36k8jfucs3v6xqslp25ks2820pcg724mh8rkcvlnc2d4x382zeftrh7r6m5hyex54egznpd8cxqxwqlsf5ku",
@@ -216,6 +218,7 @@
                 "txId": "c5b55dc364ce3da7c2f67822e56f8e3b51ffef7906c0403d146080b5b8231b1c",
                 "type": "Tx ConwayEra"
             },
+            "tokens": null,
             "utxo": {
                 "0004070708010805010603070102010100040502020807000605030703050205#68": {
                     "address": "addr_test1zrkf2ndcnjzzdras426sggfal9jl5ly2vh3z7ve0fys29wdwtad6t769ylc4xdhynylnctqudl9d7yydlt4whm6vwjzq5wvnh6",
@@ -430,6 +433,7 @@
         },
         {
             "amount": 459359,
+            "tokens": null,
             "utxoToCommit": {
                 "0401000402070206070405030800070702060400020206080800010703000802#88": {
                     "address": "addr_test1wr5xkxd7u2y0rlgzxewfftla6efmqcvzd90kdftgxhl2djslw3a0t",
@@ -569,6 +573,7 @@
                 "txId": "9b71e3586eb6d0b468d483c6e152c8e8288f569bb2982a35f64dea3d90e5733f",
                 "type": "Tx ConwayEra"
             },
+            "tokens": null,
             "utxo": {
                 "0200080201080508080103030208080100040601020408030201010004020501#50": {
                     "address": "addr_test1wpp2cj3qeccas857m0aq5ry8cjegk2rnzcv7wzdukm4p7dc0uc8fx",

hydra-tui/src/Hydra/Client.hs

@@ -126,7 +126,7 @@ withClient Options{hydraNodeHost = Host{hostname, port}, cardanoSigningKey, card
       Req.req
         Req.POST
         (Req.http hostname Req./: "commit")
-        (Req.ReqBodyJson $ SimpleCommitRequest @Tx payload Nothing)
+        (Req.ReqBodyJson $ SimpleCommitRequest @Tx payload Nothing mempty)
         Req.jsonResponse
         (Req.port $ fromIntegral port)
 

hydra-tx/exe/Main.hs

@@ -20,7 +20,7 @@ main =
         Right (utxo :: UTxO) -> do
           writeFileLBS outFile
             . textEnvelopeToJSON Nothing
-            $ depositTx networkId headId (mkSimpleBlueprintTx utxo) depositSlotNo depositDeadline Nothing
+            $ depositTx networkId headId (mkSimpleBlueprintTx utxo) depositSlotNo depositDeadline Nothing mempty
           putStrLn $ "Wrote deposit transaction to " <> outFile
     Recover RecoverOptions{networkId, outFile, recoverTxId, utxoFilePath, recoverSlotNo} -> do
       -- XXX: Only requires network discriminator / not networkId

hydra-tx/src/Hydra/Tx/Deposit.hs

@@ -35,7 +35,7 @@ depositTx ::
   Maybe Coin ->
   Map PolicyId PolicyAssets ->
   Tx
-depositTx networkId headId commitBlueprintTx upperSlot deadline amount tokens =
+depositTx networkId headId commitBlueprintTx upperSlot deadline amount _tokens =
   fromLedgerTx $
     toLedgerTx blueprintTx
       & addDepositInputs