Merge remote-tracking branch 'upstream/master'

Author: NanuIjaz

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
   - name: Cardano CLI Issues
-    url: https://github.com/input-output-hk/cardano-cli/issues
+    url: https://github.com/IntersectMBO/cardano-cli/issues
     about: Report CLI related issues here
   - name: Cardano API Issues
-    url: https://github.com/input-output-hk/cardano-api/issues
+    url: https://github.com/IntersectMBO/cardano-api/issues
     about: Report API related issues here

.github/workflows/release-ghcr.yaml

@@ -71,15 +71,15 @@ jobs:
         echo "::endgroup::"
 
         echo "::group::Uploading to registry"
-        skopeo copy docker-archive:./result docker://ghcr.io/input-output-hk/cardano-node:$GITHUB_REF_NAME
+        skopeo copy docker-archive:./result docker://ghcr.io/intersectmbo/cardano-node:$GITHUB_REF_NAME
         echo "::endgroup::"
 
-    - name: Uploading input-output-hk/cardano-submit-api
+    - name: Uploading intersectmbo/cardano-submit-api
       run: |
         echo "::group::Downloading from cache"
         nix build --accept-flake-config --print-out-paths --builders "" --max-jobs 0 ${{ steps.flake-metadata.outputs.LOCKED_URL }}#dockerImage/submit-api
         echo "::endgroup::"
 
         echo "::group::Uploading to registry"
-        skopeo copy docker-archive:./result docker://ghcr.io/input-output-hk/cardano-submit-api:$GITHUB_REF_NAME
+        skopeo copy docker-archive:./result docker://ghcr.io/intersectmbo/cardano-submit-api:$GITHUB_REF_NAME
         echo "::endgroup::"

.github/workflows/release-upload.yaml

@@ -46,7 +46,9 @@ jobs:
     needs: [wait-for-hydra]
     strategy:
       matrix:
-        arch: [linux, macos, win64]
+        # Disable windows until libblst works for windows cross compilation builds 
+        # arch: [linux, macos, win64]
+        arch: [linux, macos]
     name: "Download Asset from the Cache"
     runs-on: ubuntu-latest
     steps:
@@ -95,14 +97,16 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: ${{ github.sha }}-macos
-      - uses: actions/download-artifact@v3
-        with:
-          name: ${{ github.sha }}-win64
+      # Disable windows until libblst works for windows cross compilation builds 
+      # - uses: actions/download-artifact@v3
+      #   with:
+      #     name: ${{ github.sha }}-win64
       - name: Release
         uses: input-output-hk/action-gh-release@v1
         with:
           draft: true
           files: |
-            cardano-node-*-win64.zip
+            # Disable windows until libblst works for windows cross compilation builds 
+            # cardano-node-*-win64.zip
             cardano-node-*-macos.tar.gz
             cardano-node-*-linux.tar.gz

bench/tx-generator/tx-generator.cabal

@@ -100,7 +100,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-02-06T15:14:59Z
-  , cardano-haskell-packages 2024-02-07T07:51:35Z
+  , cardano-haskell-packages 2024-02-20T15:00:00Z
 
 packages:
   cardano-git-rev

cardano-node/cardano-node.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.8.0
+version:                8.8.1
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,

cardano-submit-api/cardano-submit-api.cabal

@@ -41,7 +41,7 @@ library
                       , bytestring
                       , cardano-api ^>= 8.38
                       , cardano-binary
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring

cardano-testnet/cardano-testnet.cabal

@@ -35,7 +35,7 @@ library
                       , ansi-terminal
                       , bytestring
                       , cardano-api ^>= 8.38
-                      , cardano-cli ^>= 8.20.0.0
+                      , cardano-cli ^>= 8.20.1.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-ledger-alonzo
@@ -170,6 +170,7 @@ test-suite cardano-testnet-test
   other-modules:        Cardano.Testnet.Test.Cli.Babbage.LeadershipSchedule
                         Cardano.Testnet.Test.Cli.Babbage.StakeSnapshot
                         Cardano.Testnet.Test.Cli.Babbage.Transaction
+                        Cardano.Testnet.Test.Cli.Conway.DRepRetirement
                         Cardano.Testnet.Test.Cli.Conway.StakeSnapshot
                         Cardano.Testnet.Test.Cli.KesPeriodInfo
                         Cardano.Testnet.Test.Cli.QuerySlotNumber
@@ -199,6 +200,7 @@ test-suite cardano-testnet-test
                       , cardano-testnet
                       , containers
                       , directory
+                      , exceptions
                       , filepath
                       , hedgehog
                       , hedgehog-extras

cardano-testnet/src/Parsers/Cardano.hs

@@ -26,8 +26,8 @@ optsTestnet envCli = CardanoTestnetOptions
   <*> pLegacyCardanoEra envCli
   <*> OA.option auto
       (   OA.long "epoch-length"
-      <>  OA.help "Epoch length"
-      <>  OA.metavar "MILLISECONDS"
+      <>  OA.help "Epoch length, in number of slots"
+      <>  OA.metavar "SLOTS"
       <>  OA.showDefault
       <>  OA.value (cardanoEpochLength cardanoDefaultTestnetOptions)
       )

cardano-testnet/src/Testnet/Start/Types.hs

@@ -37,9 +37,9 @@ data CardanoTestnetOptions = CardanoTestnetOptions
   { -- | List of node options. Each option will result in a single node being
     -- created.
     cardanoNodes :: [TestnetNodeOptions]
-  , cardanoNodeEra :: AnyCardanoEra
-  , cardanoEpochLength :: Int
-  , cardanoSlotLength :: Double
+  , cardanoNodeEra :: AnyCardanoEra -- ^ The era to start at
+  , cardanoEpochLength :: Int -- ^ An epoch's duration, in number of slots
+  , cardanoSlotLength :: Double -- ^ Slot length, in seconds
   , cardanoTestnetMagic :: Int
   , cardanoActiveSlotsCoeff :: Double
   , cardanoMaxSupply :: Word64 -- ^ The amount of ADA you are starting your testnet with