Switch to babbage era .. and all kinds of stuff

.dockerignore

@@ -11,3 +11,4 @@
 /test-results.xml
 devnet/
 testnet/
+vasil-testnet/

.github/workflows/ci.yaml

@@ -34,11 +34,10 @@ jobs:
         fetch-depth: 0
 
     - name: Prepare nix
-      uses: cachix/install-nix-action@v13
+      uses: cachix/install-nix-action@v17
       with:
-        skip_adding_nixpkgs_channel: true
         extra_nix_config: |
-          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.iog.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
           substituters = https://cache.nixos.org https://cache.iog.io https://iohk.cachix.org
 
     - name: Cachix cache of nix derivations
@@ -132,11 +131,10 @@ jobs:
         token: ${{ secrets.MY_TOKEN || github.token }}
 
     - name: Prepare nix
-      uses: cachix/install-nix-action@v13
+      uses: cachix/install-nix-action@v17
       with:
-        skip_adding_nixpkgs_channel: true
         extra_nix_config: |
-          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.iog.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+          trusted-public-keys = iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
           substituters = https://cache.nixos.org https://cache.iog.io https://iohk.cachix.org
 
     - name: Cachix cache of nix derivations

.gitignore

@@ -30,4 +30,3 @@ test-results.xml
 
 # Getting started / demo instructions
 devnet/
-testnet/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "testnet/cardano-configurations"]
+	path = testnet/cardano-configurations
+	url = [email protected]:input-output-hk/cardano-configurations.git

CHANGELOG.md

@@ -8,6 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
+## [0.7.0] - UNRELEASED
+
+#### Changed
+
+- **BREAKING** Switch to `BabbageEra` and `PlutusV2`
+  + `hydra-cardano-api` now uses `Era = BabbageEra` and constructs `PlutusV2` scripts
+  + `hydra-plutus` scripts now use the `serialiseData` builtin to CBOR encode data on-chain
+  + `hydra-node` now expects `BabbageEra` blocks and produces `BabbageEra` transactions
+  + `hydra-cluster` now spins up a stake pool instead of a BFT node (not possible in `Praos` anymore)
+
+#### Fixed
+
+- Head contract check UTxO hash upon closing the head [#338](https://github.com/input-output-hk/hydra-poc/pull/338). This prevents closing the head with arbitrary UTxO.
+
 ## [0.6.0] - 2022-06-22
 
 #### Added

cabal.project

@@ -42,39 +42,44 @@ test-show-details: direct
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-node.git
-  tag: 1.34.1
-  --sha256: 1hh53whcj5y9kw4qpkiza7rmkniz18r493vv4dzl1a8r5fy3b2bv
+  location: https://github.com/abailly-iohk/cardano-node
+  tag: b96c6b075718b2c9e9d17761d16b7ca601937c10
+  --sha256: 1i3bxc12lsdr9l88l1w75844gwf43y8k6ysz5kx15pybkz1r1i5m
   subdir:
     cardano-api
-    cardano-git-rev
-    cardano-node
-    trace-dispatcher
-    trace-resources
-    trace-forward
 
 -- NOTE(SN): These source-repository-package tags are copied from the
 -- 'cardano-node' repository cabal.project at the revision given above. Make
 -- sure to update 'tag' and 'sha256' entries when you do an upgrade. Or just
 -- copy the whole thing and drop not-required packages and constraints.
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/optparse-applicative
   tag: 7497a29cb998721a9068d5725d49461f2bba0e7a
   --sha256: 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r
 
+-- Tracking cardano-node
+source-repository-package
+  type: git
+  location: https://github.com/vshabanov/ekg-json
+  tag: 00ebe7211c981686e65730b7144fbf5350462608
+  --sha256: 1zvjm3pb38w0ijig5wk5mdkzcszpmlp5d4zxvks2jk1rkypi8gsm
+
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/hedgehog-extras
-  tag: edf6945007177a638fbeb8802397f3a6f4e47c14
-  --sha256: 0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9
+  tag: 967d79533c21e33387d0227a5f6cc185203fe658
+  --sha256: 0rbqb7a64aya1qizlr3im06hdydg9zr6sl3i8bvqqlf7kpa647sd
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 41545ba3ac6b3095966316a99883d678b5ab8da8
-  --sha256: 0icq9y3nnl42fz536da84414av36g37894qnyw4rk3qkalksqwir
+  tag: 0f3a867493059e650cda69e20a5cbf1ace289a57
+  --sha256: 0p0az3sbkhb7njji8xxdrfb0yx2gc8fmrh872ffm8sfip1w29gg1
   subdir:
     base-deriving-via
     binary
@@ -87,20 +92,24 @@ source-repository-package
     slotting
     strict-containers
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-crypto
   tag: f73079303f663e028288f9f4a9e08bcca39a923e
   --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger
-  tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
-  --sha256: 0avzyiqq0m8njd41ck9kpn992yq676b1az9xs77977h7cf85y4wm
+  tag: ce3057e0863304ccb3f79d78c77136219dc786c6
+  --sha256: 19ijcy1sl1iqa7diy5nsydnjsn3281kp75i2i42qv0fpn58238s9
   subdir:
     eras/alonzo/impl
     eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
     eras/byron/chain/executable-spec
     eras/byron/crypto
     eras/byron/crypto/test
@@ -116,12 +125,13 @@ source-repository-package
     libs/cardano-ledger-test
     libs/cardano-protocol-tpraos
     libs/cardano-data
-    libs/compact-map
+    libs/vector-map
     libs/set-algebra
     libs/small-steps
     libs/small-steps-test
     libs/non-integral
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
@@ -131,91 +141,112 @@ source-repository-package
     cardano-prelude
     cardano-prelude-test
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/goblins
   tag: cde90a2b27f79187ca8310b6549331e59595e7ba
   --sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
-  --sha256: 0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz
+  tag: 066f7002aac5a0efc20e49643fea45454f226caa
+  --sha256: 0s6x4in11k5ba7nl7la896g28sznf9185xlqg9c604jqz58vj9nj
   subdir:
     contra-tracer
     iohk-monitoring
-    plugins/backend-aggregation
-    plugins/backend-ekg
-    plugins/backend-monitoring
-    plugins/backend-trace-forwarder
     tracer-transformers
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/Win32-network
   tag: 3825d3abf75f83f406c1f7161883c438dac7277d
   --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 4fac197b6f0d2ff60dc3486c593b68dc00969fbf
-  --sha256: 1b43vbdsr9m3ry1kgag2p2ixpv54gw7a4vvmndxl6knqg8qbsb8b
+  tag: a65c29b6a85e90d430c7f58d362b7eb097fd4949
+  --sha256: 1fmab5hmi1y8lss97xh6hhikmyhsx9x31yhvg6zpr2kcq7kc6qkf
   subdir:
-    io-sim
-    io-classes
     monoidal-synchronisation
     network-mux
     ouroboros-consensus
     ouroboros-consensus-byron
+    ouroboros-consensus-byronspec
+    ouroboros-consensus-byron-test
     ouroboros-consensus-cardano
+    ouroboros-consensus-cardano-test
     ouroboros-consensus-protocol
     ouroboros-consensus-shelley
+    ouroboros-consensus-shelley-test
+    ouroboros-consensus-test
     ouroboros-network
     ouroboros-network-framework
     ouroboros-network-testing
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/io-sim
+  tag: f4183f274d88d0ad15817c7052df3a6a8b40e6dc
+  --sha256: 0vb2pd9hl89v2y5hrhrsm69yx0jf98vppjmfncj2fraxr3p3lldw
+  subdir:
+    io-classes
+    io-sim
     strict-stm
-    typed-protocols
-    typed-protocols-cborg
-    typed-protocols-examples
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/plutus
-  tag: fc5fe94d3d9525d032bcbc79ff0e1ebcfd8ef143
-  --sha256: 1gnzhns44rzvf9cw84jaqajqqbi9xdcpyy2sapa890vwf796nigv
+  location: https://github.com/input-output-hk/typed-protocols
+  tag: 181601bc3d9e9d21a671ce01e0b481348b3ca104
+  --sha256: 1lr97b2z7l0rpsmmz92rsv27qzd5vavz10cf7n25svya4kkiysp5
   subdir:
-    plutus-core
-    plutus-ledger-api
-    plutus-tx
-    plutus-tx-plugin
-    prettyprinter-configurable
-    stubs/plutus-ghc-stub
-    word-array
+    typed-protocols
+    typed-protocols-cborg
+    typed-protocols-examples
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ekg-forward
   tag: 297cd9db5074339a2fb2e5ae7d0780debb670c63
   --sha256: 1zcwry3y5rmd9lgxy89wsb3k4kpffqji35dc7ghzbz603y1gy24g
 
+-- Tracking cardano-node
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/flat
   tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
   --sha256: 1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm
 
--- Most constraints are from cardano-node + some from plutus-apps
+-- Tracking cardano-node
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/plutus
+  tag: f680ac6979e069fcc013e4389ee607ff5fa6672f
+  --sha256: 180jq8hd0jlg48ya7b5yw3bnd2d5czy0b1agy9ng3mgnzpyq747i
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
+    plutus-tx-plugin
+    prettyprinter-configurable
+    stubs/plutus-ghc-stub
+    word-array
+
 constraints:
-  -- cardano-ledger-byron-test fails with too new hedgehog
-    hedgehog >= 1.0 && < 1.1
+    hedgehog >= 1.0
   , bimap >= 0.4.0
   , libsystemd-journal >= 1.4.4
   , systemd >= 2.3.0
   , network >= 3.1.1.0
 
 allow-newer:
+  *:aeson,
   monoidal-containers:aeson,
   size-based:template-haskell
 

default.nix

@@ -1,51 +1,46 @@
 { compiler ? "ghc8107"
+
 , system ? builtins.currentSystem
+
 , haskellNix ? import
     (builtins.fetchTarball
       "https://github.com/input-output-hk/haskell.nix/archive/28dbf2f4bd32a4fbd1a2e9de45d02ad977b062d9.tar.gz")
     { }
+
 , iohkNix ? import
     (builtins.fetchTarball
-      "https://github.com/input-output-hk/iohk-nix/archive/62d853d3216083ecadc8e7f192498bebad4eee76.tar.gz")
+      "https://github.com/input-output-hk/iohk-nix/archive/5e667b374153327c7bdfdbfab8ef19b1f27d4aac.tar.gz")
     { }
-, nixpkgsSrc ? haskellNix.sources.nixpkgs-2111
-, nixpkgsArgs ? haskellNix.nixpkgsArgs
+
+  # nixpkgs-unstable as also used by cardano-node, cardano-ledger et al
+, nixpkgsSrc ? builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/1882c6b7368fd284ad01b0a5b5601ef136321292.tar.gz"
 }:
 let
-  pkgs = import nixpkgsSrc (nixpkgsArgs // {
+  pkgs = import nixpkgsSrc (haskellNix.nixpkgsArgs // {
     overlays =
       # Haskell.nix (https://github.com/input-output-hk/haskell.nix)
       haskellNix.overlays
-      # needed for cardano-api which uses a patched libsodium
-      ++ iohkNix.overlays.crypto;
+        # needed for cardano-crypto-class which uses a patched libsodium
+        ++ iohkNix.overlays.crypto;
   });
-in
-pkgs.haskell-nix.project {
-  src = pkgs.haskell-nix.haskellLib.cleanGit {
-    name = "hydra-poc";
-    src = ./.;
-  };
-  projectFileName = "cabal.project";
-  compiler-nix-name = compiler;
-
-  modules = [{
-    packages = {
-      eventful-sql-common = {
-        # This is needed so evenful-sql-common will build with a newer version of persistent.
-        ghcOptions = [ "-XDerivingStrategies -XStandaloneDeriving -XUndecidableInstances -XDataKinds -XFlexibleInstances -XMultiParamTypeClasses" ];
-        doHaddock = false;
-      };
-
-      # Broken due to haddock errors. Refer to https://github.com/input-output-hk/plutus/blob/master/nix/pkgs/haskell/haskell.nix
-      plutus-ledger.doHaddock = false;
-      plutus-use-cases.doHaddock = false;
+  hsPkgs = pkgs.haskell-nix.project {
+    src = pkgs.haskell-nix.haskellLib.cleanGit {
+      name = "hydra-poc";
+      src = ./.;
     };
+    projectFileName = "cabal.project";
+    compiler-nix-name = compiler;
 
-    # https://github.com/input-output-hk/cardano-wallet/commit/ced95e1b84ce8d9faa53268be45e96701ccc16e9
-    packages.cardano-config.components.library.build-tools = [ pkgs.buildPackages.buildPackages.gitMinimal ];
+    modules = [{
+      # https://github.com/input-output-hk/cardano-wallet/commit/ced95e1b84ce8d9faa53268be45e96701ccc16e9
+      packages.cardano-config.components.library.build-tools = [ pkgs.buildPackages.buildPackages.gitMinimal ];
 
-    # https://github.com/input-output-hk/iohk-nix/pull/488
-    packages.cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
-    packages.cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
-  }];
+      # https://github.com/input-output-hk/iohk-nix/pull/488
+      packages.cardano-crypto-class.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ];
+      packages.cardano-crypto-praos.components.library.pkgconfig = pkgs.lib.mkForce [ [ pkgs.libsodium-vrf ] ];
+    }];
+  };
+in
+{
+  inherit pkgs hsPkgs compiler;
 }

demo/docker-compose.yaml

@@ -14,9 +14,11 @@ services:
       , "--config", "/data/cardano-node.json"
       , "--topology", "/data/topology.json"
       , "--database-path", "/data/db"
-      , "--shelley-operational-certificate", "/data/credentials/opcert1.cert"
-      , "--shelley-kes-key", "/data/credentials/delegate1.kes.skey"
-      , "--shelley-vrf-key", "/data/credentials/delegate1.vrf.skey"
+      , "--shelley-kes-key", "/data/credentials/stake-pool-1/kes.skey"
+      , "--shelley-vrf-key", "/data/credentials/stake-pool-1/vrf.skey"
+      , "--shelley-operational-certificate", "/data/credentials/stake-pool-1/opcert.cert"
+      , "--byron-delegation-certificate", "/data/credentials/stake-pool-1/byron-delegation.cert"
+      , "--byron-signing-key", "/data/credentials/stake-pool-1/byron-delegate.key"
       ]
 
   hydra-node-1: