NOT MERGE: Leios prototype remake

.github/CODEOWNERS

@@ -1,7 +1,8 @@
 # Note: later rules override earlier rules.
 
 # Default
-*                  @intersectmbo/ouroboros-network-maintainers
+# FIXME: disabled codeowners for leios-prototype
+# *                  @intersectmbo/ouroboros-network-maintainers
 
 # CICD
 nix/               @intersectmbo/core-tech-release-1 @intersectmbo/ouroboros-network-maintainers

.github/workflows/benchmarks.yml

@@ -44,7 +44,7 @@ jobs:
           libtool
           make
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         ref: ${{ github.head_ref }}
 
@@ -67,14 +67,14 @@ jobs:
         cabal build all --dry-run
         cat dist-newstyle/cache/plan.json | jq -L .github/workflows/jq-install-plan | sort | uniq > dependencies.txt
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       name: "Restore cache: `cabal store`"
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}
         restore-keys: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       name: "Cache `dist-newstyle`"
       with:
         path: |
@@ -86,7 +86,7 @@ jobs:
     - name: Build dependencies
       run: cabal build --only-dependencies all -j
 
-    - uses: actions/cache/save@v4
+    - uses: actions/cache/save@v5
       name: "Save cache: `cabal store`"
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}

.github/workflows/build.yml

@@ -9,6 +9,7 @@ on:
   merge_group:
   push:
     branches:
+      - main
       - "release/*"
 
 jobs:
@@ -18,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.6", "9.8", "9.10"]
+        ghc: ["9.6", "9.8", "9.10", "9.12", "9.14"]
         os: [windows-latest]
 
     env:
@@ -44,7 +45,7 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: "3.12.1.0"
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: "Configure cabal.project.local"
       run: |
@@ -65,15 +66,15 @@ jobs:
         cabal build all --dry-run
         cat dist-newstyle/cache/plan.json | jq -L .github/workflows/jq-install-plan | sort | uniq > dependencies.txt
 
-    - uses: actions/cache/restore@v4
+    - uses: actions/cache/restore@v5
       name: "Restore cache: `cabal store`"
       id: cache-dependencies
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}
         restore-keys: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       name: "Cache `dist-newstyle`"
       with:
         path: |
@@ -85,14 +86,14 @@ jobs:
     - name: Build dependencies
       run: cabal build --only-dependencies all -j
 
-    - uses: actions/cache/save@v4
+    - uses: actions/cache/save@v5
       name: "Save cache: `cabal store`"
       if: always() && steps.cache-dependencies.outputs.cache-hit != 'true'
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: ${{ steps.cache-dependencies.outputs.cache-primary-key }}
 
-    - name: Build projects [build]
+    - name: Build all packages
       run: cabal build all -j
 
     # Test network packages
@@ -107,26 +108,45 @@ jobs:
       # TODO: issue #4635 to enable `+RTS -N`
       run: cabal run network-mux:test
 
-    - name: ourobors-network-testing [test]
-      run: cabal run ouroboros-network-testing:test -- +RTS -maxN2 -RTS
+    - name: ouroboros-network [api-tests]
+      run: cabal run ouroboros-network:api-tests
 
-    - name: ourobors-network-framework [io-tests]
+    - name: ourobors-network [tests-lib-tests]
+      run: cabal run ouroboros-network:tests-lib-tests -- +RTS -maxN2 -RTS
+
+    - name: ourobors-network [framework-io-tests]
       # TODO: enable `+RTS -N`
-      run: cabal run ouroboros-network-framework:io-tests
+      run: cabal run ouroboros-network:framework-io-tests
 
-    - name: ourobors-network-framework [sim-tests]
+    - name: ourobors-network [framework-sim-tests]
       if: runner.os != 'Windows'
-      run: cabal run ouroboros-network-framework:sim-tests -- +RTS -maxN2 -RTS
+      run: cabal run ouroboros-network:framework-sim-tests -- +RTS -maxN2 -RTS
+
+    - name: ouroboros-network [protocols-tests]
+      run: cabal run ouroboros-network:protocols-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network-protocols [test]
-      run: cabal run ouroboros-network-protocols:test -- +RTS -maxN2 -RTS
+    - name: ouroboros-network [ouroboros-network-io-tests]
+      run: cabal run ouroboros-network:ouroboros-network-io-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network [io-tests]
-      run: cabal run ouroboros-network:io-tests -- +RTS -maxN2 -RTS
+    - name: ouroboros-network [ouroboros-network-sim-tests]
+      if: runner.os != 'Windows'
+      run: cabal run ouroboros-network:ouroboros-network-sim-tests -- +RTS -maxN2 -RTS
+
+    - name: cardano-diffusion [protocols-tests]
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:protocols-tests -- +RTS -maxN2 -RTS
+
+    - name: cardano-diffusion [api-tests]
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:api-tests -- +RTS -maxN2 -RTS
+
+    - name: cardano-diffusion:protocols-tests
+      if: runner.os != 'Windows'
+      run: cabal run cardano-diffusion:protocols-tests -- +RTS -maxN2 -RTS
 
-    - name: ouroboros-network [sim-tests]
+    - name: cardano-diffusion [cardano-diffusion-sim-test]
       if: runner.os != 'Windows'
-      run: cabal run ouroboros-network:sim-tests -- +RTS -maxN2 -RTS
+      run: cabal run cardano-diffusion:cardano-diffusion-sim-tests -- +RTS -maxN2 -RTS
 
     # Uncomment the following back in for debugging. Remember to launch a `pwsh` from
     # the tmux session to debug `pwsh` issues. And be reminded that the `/msys2` and

.github/workflows/checks.yml

@@ -20,7 +20,9 @@ jobs:
     - name: Install dependencies
       run: sudo apt install -y fd-find
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
 
     - name: Check changelogs
       run: ./scripts/ci/check-changelogs.sh

.github/workflows/github-page.yml

@@ -31,11 +31,11 @@ jobs:
 
     steps:
     - name: Checkout ouroboros-network repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
       # we need nix to later build the spec documents
     - name: Install Nix
-      uses: cachix/install-nix-action@v30
+      uses: cachix/install-nix-action@v31
       with:
         nix_path: nixpkgs=channel:nixos-unstable
         extra_nix_config: |
@@ -44,13 +44,18 @@ jobs:
           experimental-features = nix-command flakes
 
     - name: Install Haskell
-      uses: haskell-actions/setup@v2
+      uses: input-output-hk/actions/haskell@latest
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: 'head'
+        cabal-version: '3.14.1.1'
 
-    - uses: actions/cache@v4
+    - name: Install base libraries
+      uses: input-output-hk/actions/base@latest
+      with:
+        use-sodium-vrf: false
+
+    - uses: actions/cache@v5
       name: Cache cabal store
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
@@ -85,7 +90,7 @@ jobs:
         done
 
     - name: Upload artifacts
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@v4
       with:
         path: ./haddocks
 

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10", "9.8"]
+        ghc: ["9.6", "9.8"]
         os: [ubuntu-latest]
 
     env:
@@ -57,7 +57,12 @@ jobs:
       run: |
         gem install cddl -v 0.8.27
 
-    - uses: actions/checkout@v4
+    - name: Install cddlc
+      if: runner.os == 'Linux'
+      run: |
+        gem install cddlc
+
+    - uses: actions/checkout@v6
 
     - name: "Configure cabal.project.local"
       run: |
@@ -83,15 +88,15 @@ jobs:
         cabal build all --dry-run
         cat dist-newstyle/cache/plan.json | jq -L .github/workflows/jq-install-plan | sort | uniq > dependencies.txt
 
-    - uses: actions/cache/restore@v4
+    - uses: actions/cache/restore@v5
       name: "Restore cache: `cabal store`"
       id: restore-cabal-store
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}
         restore-keys: cache-dependencies-${{ env.CABAL_CACHE_VERSION }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       name: "Cache `dist-newstyle`"
       with:
         path: |
@@ -103,7 +108,7 @@ jobs:
     - name: Build dependencies
       run: cabal build --only-dependencies all -j
 
-    - uses: actions/cache/save@v4
+    - uses: actions/cache/save@v5
       name: "Save cache: `cabal store`"
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
@@ -114,39 +119,8 @@ jobs:
 
     # Test network packages
 
-    - name: ntp-client [test]
-      run: cabal run ntp-client:test -- +RTS -maxN2 -RTS
-
-    - name: monoidal-synchronisation [test]
-      run: cabal run monoidal-synchronisation:test -- +RTS -maxN2 -RTS
-
-    - name: network-mux [test]
-      # TODO: issue #4635 to enable `+RTS -N`
-      run: cabal run network-mux:test
-
-    - name: ourobors-network-testing [test]
-      run: cabal run ouroboros-network-testing:test -- +RTS -maxN2 -RTS
-
-    - name: ourobors-network-framework [sim-tests]
-      # TODO: enable `+RTS -N`
-      run: cabal run ouroboros-network-framework:sim-tests
-
-    - name: ourobors-network-framework [io-tests]
-      # TODO: enable `+RTS -N`
-      run: cabal run ouroboros-network-framework:io-tests
-
-    - name: ouroboros-network-protocols [test]
-      run: cabal run ouroboros-network-protocols:test -- +RTS -maxN2 -RTS
-
-    - name: ouroboros-netowrk-protocols [cddl]
-      if: runner.os == 'Linux'
-      run: cabal run ouroboros-network-protocols:cddl -- +RTS -maxN2 -RTS
-
-    - name: ouroboros-network [io-tests]
-      run: cabal run ouroboros-network:io-tests -- +RTS -maxN2 -RTS
-
-    - name: ouroboros-network [sim-tests]
-      run: cabal run ouroboros-network:sim-tests -- +RTS -maxN2 -RTS
+    - name: test all components
+      run: cabal test all
 
     # Uncomment the following back in for debugging. Remember to launch a `pwsh` from
     # the tmux session to debug `pwsh` issues. And be reminded that the `/msys2` and

.gitignore

@@ -77,3 +77,8 @@ cabal.project.consensus
 /*.html
 /*.eventlog
 /*.prof
+
+# neovim Session
+*.vim
+
+/mux-leios-tmp-dir

CONTRIBUTING.md

@@ -56,7 +56,7 @@ To build all the required jobs (which are necessary to pass through CI), you can
 nix build -j auto .\#hydraJobs.required
 ```
 
-To inspect what can be build use `nix repl` , for example:
+To inspect what can be built use `nix repl` , for example:
 ```
 nix-repl> :lf .
 nix-repl> hydraJobs.<TAB>
@@ -189,7 +189,7 @@ comes with [`io-sim`]: `io-classes` expose a very similar API that the `base`,
   They all use `DiffTime` rather than `Int`, so you can use fractional values
   if needed.
 
-  Failing to notice this, might lead to bugs where delays which supposed to
+  Failing to notice this, might lead to bugs where delays which are supposed to
   be in the order of seconds will be measured in months (`3*10^6` seconds ~ one
   month)!
 
@@ -294,19 +294,22 @@ need to delete branch created in `cardano-haskell-packages`.
 
 ### Release from master or release/* branch
 
-* First run `./script/release-to-chap.sh -r` to see which changes can be
+* First run `./scripts/release-to-chap.sh -r` to see which changes can be
   published.
-* Update versions in `*.cabal` files according to changes in `CHANGELOG.md`
-  files.
-* Update `CHANGELOG.md` files.
-* Run `./script/release-to-chap.sh` which will create a branch in
+* Update versions in `*.cabal` files according to changelog fragments in `changelog.d` directory
+  (using `scriv print` might be helpful to see the changes):
+  - for a breaking release from `main` branch, bump `x` in `x.y.z.w`
+  - for a breaking release from a `release/*` branch, bump `y` in `x.y.z.w`
+  This policy allows us to introduce breaking changes in already released packages.
+* Collect `CHANGELOG.md` using `scriv collect` (available in `nix develop`)
+* Run `./scripts/release-to-chap.sh` which will create a branch in
   `cardano-haskell-packages` repo (pointed by `CARDANO_HASKELL_PACKAGES_DIR`
   environment variable or `/tmp/chap` if it's not defined).
   * To enable pushing this branch, cd to the chap repo and execute:
     `git remote set-url origin git@github.com:IntersectMBO/cardano-haskell-packages.git`
     then return to the previous repo (`cd -`)
-* Before merging that branch, run `./script/build-with-chap.sh`.  It will use the new branch in
-  `cardano-haskell-packages` to restore the `ourobors-network` repository to the
+* Before merging that branch, run `./scripts/build-with-chap.sh`.  It will use the new branch in
+  `cardano-haskell-packages` to restore the `ouroboros-network` repository to the
   state published in `CHaP`.
   * If you need to re-run this script after fixing errors, you will need to delete the tags created
     by the previous run. You can do so with the following command:

NOTICE

@@ -1,4 +1,4 @@
-Copyright 2019-2023 Input Output Global Inc (IOG), 2023-2024 Intersect
+Copyright 2019-2023 Input Output Global Inc (IOG), 2023-2025 Intersect
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.