Fix

Author: vrom911

hydra-node/src/Hydra/Ledger/Simple.hs

@@ -86,7 +86,6 @@ instance IsTx SimpleTx where
   type TxOutType SimpleTx = SimpleTxOut
   type UTxOType SimpleTx = Set SimpleTxOut
   type ValueType SimpleTx = Int
-  type UTxOPairType SimpleTx = (SimpleTxOut, SimpleTxOut)
 
   txId (SimpleTx tid _ _) = tid
   balance = Set.size

hydra-node/test/Hydra/Model/Payment.hs

@@ -78,7 +78,6 @@ instance IsTx Payment where
   type TxOutType Payment = (CardanoSigningKey, Value)
   type UTxOType Payment = [(CardanoSigningKey, Value)]
   type ValueType Payment = Value
-  type UTxOPairType Payment = (CardanoSigningKey, Value)
 
   txId = error "undefined"
   balance = foldMap snd

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

@@ -76,9 +76,6 @@ class
   -- | Type representing a value on the ledger.
   type ValueType tx
 
-  -- | Type for (input, output) pairs used in accumulator operations.
-  type UTxOPairType tx = pair | pair -> tx
-
   -- XXX(SN): this name easily conflicts
   txId :: tx -> TxIdType tx
 
@@ -163,7 +160,6 @@ instance IsTx Tx where
   type TxOutType Tx = TxOut CtxUTxO
   type UTxOType Tx = UTxO
   type ValueType Tx = Value
-  type UTxOPairType Tx = (TxIn, TxOut CtxUTxO)
 
   txId = getTxId . getTxBody
   balance = UTxO.totalValue

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

@@ -69,12 +69,13 @@ deriving stock instance IsTx tx => Eq (Snapshot tx)
 deriving stock instance IsTx tx => Show (Snapshot tx)
 
 -- | Binary representation of snapshot signatures. That is, concatenated CBOR for
--- 'headId', 'version', 'number', 'utxoToCommitHash', 'utxoToDecommitHash',
+-- 'headId', 'version', 'number', 'utxoHash', 'utxoToCommitHash', 'utxoToDecommitHash',
 -- and 'accumulator' according to CDDL schemata:
 --
 -- headId = bytes .size 16
 -- version = uint
 -- number = uint
+-- utxoHash = bytes
 -- utxoToCommitHash = bytes
 -- utxoToDecommitHash = bytes
 -- accumulator = bytes  ; serialized HydraAccumulator

sample-node-config/aws/docker/docker-compose.yaml

@@ -27,7 +27,7 @@ services:
       ]
 
   hydra-node:
-    image: ghcr.io/cardano-scaling/hydra-node:1.1.0
+    image: ghcr.io/cardano-scaling/hydra-node:0.22.4
     restart: always
     container_name: hydra-node
     logging:
@@ -51,8 +51,8 @@ services:
     command:
       [ "--node-id", "${KEY_NAME}"
       , "--api-host", "0.0.0.0"
-      , "--listen", "0.0.0.0:5001"
-      , "--advertise", "63.177.91.204:5001"
+      , "--listen", "0.0.0.0:6000"
+      # , "--advertise", ""
       , "--monitoring-port", "6000"
       , "--hydra-scripts-tx-id", "${HYDRA_SCRIPTS_TX_ID}"
       , "--hydra-signing-key", "/credentials/hydra-key.sk"
@@ -63,6 +63,18 @@ services:
       , "--node-socket", "/network/node.socket"
       , "--persistence-dir", "/data"
       # hardcoded peers
+      ## Arnaud
+      # , "--peer", "35.233.17.169:5001"
+      # , "--hydra-verification-key", "/members/arnaud.hydra.vk"
+      # , "--cardano-verification-key", "/members/arnaud.cardano.vk"
+      # Sebastian
+      , "--peer", "fk.ncoding.at:5101"
+      , "--hydra-verification-key", "/members/sebastian.hydra.vk"
+      , "--cardano-verification-key", "/members/sebastian.cardano.vk"
+      ## Pascal
+      # , "--peer", "13.37.15.211:5001"
+      # , "--hydra-verification-key", "/members/pascal.hydra.vk"
+      # , "--cardano-verification-key", "/members/pascal.cardano.vk"
       # Sasha
       , "--peer", "13.37.150.125:5001"
       , "--hydra-verification-key", "/members/sasha.hydra.vk"
@@ -71,18 +83,10 @@ services:
       , "--peer", "hydra.horizon-haskell.net:5005"
       , "--hydra-verification-key", "/members/dan.hydra.vk"
       , "--cardano-verification-key", "/members/dan.cardano.vk"
-      # Franco
-      , "--peer", "13.39.44.251:5001"
-      , "--hydra-verification-key", "/members/franco.hydra.vk"
-      , "--cardano-verification-key", "/members/franco.cardano.vk"
-      # Noon
-      , "--peer", "35.214.9.104:5005"
-      , "--hydra-verification-key", "/members/noon.hydra.vk"
-      , "--cardano-verification-key", "/members/noon.cardano.vk"
-      # Sharan
-      , "--peer", "35.181.137.127:5001"
-      , "--hydra-verification-key", "/members/sharan.hydra.vk"
-      , "--cardano-verification-key", "/members/sharan.cardano.vk"
+      # Veronika
+      , "--peer", "63.177.91.204:5001"
+      , "--hydra-verification-key", "/members/veronika.hydra.vk"
+      , "--cardano-verification-key", "/members/veronika.cardano.vk"
       ]
 
   hydra-tui:
@@ -95,7 +99,7 @@ services:
       "--connect", "hydra-node:4001"
       , "--node-socket", "/network/node.socket"
       , "--testnet-magic", "${NETWORK_MAGIC}"
-      , "--cardano-signing-key", "/credentials/cardano-key.sk"
+      , "--cardano-signing-key", "/credentials/external.sk"
       ]
     volumes:
       - ~/credentials:/credentials:ro