Merge branch 'master' into rezabaram-patch-1

cardano-scaling · May 28, 2024 · bc96a7c · bc96a7c
2 parents 7d7660f + aeb17ef
commit bc96a7c
Show file tree

Hide file tree

Showing 30 changed files with 175 additions and 179 deletions.
diff --git a/.github/workflows/binaries.yaml b/.github/workflows/binaries.yaml
@@ -22,14 +22,14 @@ jobs:
         fetch-depth: 0
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
@@ -60,14 +60,14 @@ jobs:
         fetch-depth: 0
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'

diff --git a/.github/workflows/cardano-node.yaml b/.github/workflows/cardano-node.yaml
@@ -18,7 +18,7 @@ jobs:
         ref: 8.7.2
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
@@ -50,7 +50,7 @@ jobs:
         ref: 170817f5ba3f7838ffd9bd181bc30504906a6506
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true

diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml
@@ -33,14 +33,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
@@ -115,14 +115,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
@@ -162,14 +162,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
@@ -241,14 +241,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'
@@ -266,14 +266,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -33,14 +33,14 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'

diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
@@ -12,14 +12,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true
           log-lines = 1000
 
     - name: ❄ Cachix cache of nix derivations
-      uses: cachix/cachix-action@v14
+      uses: cachix/cachix-action@v15
       with:
         name: cardano-scaling
         authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}'

diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml
@@ -35,7 +35,7 @@ jobs:
         submodules: true
 
     - name: ❄ Prepare nix
-      uses: cachix/install-nix-action@v26
+      uses: cachix/install-nix-action@V27
       with:
         extra_nix_config: |
           accept-flake-config = true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ 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.18.0] - Unreleased
+
+- **DO NOT RELEASE** as the tested `cardano-node` version is not intended to be used on `mainnet` yet.
+- Tested with `cardano-node 8.11.0` and `cardano-cli 8.23.1.0`.
+
 ## [0.17.0] - 2024-05-20
 
 - **BREAKING** Change `hydra-node` API `/commit` endpoint for committing from scripts [#1380](https://github.com/input-output-hk/hydra/pull/1380):

diff --git a/cardano-api-classy/cardano-api-classy.cabal b/cardano-api-classy/cardano-api-classy.cabal
@@ -50,9 +50,11 @@ library
     Cardano.Api.Class.ToAlonzoScript
     Cardano.Api.Classy
 
+  -- NOTE: We only use an upper bound on cardano-api and have the other
+  -- dependencies on cardano-ledger* follow.
   build-depends:
     , base                   >=4.16
-    , cardano-api            >=8.42.0 && <8.43
-    , cardano-ledger-alonzo  >=1.6    && <1.7
-    , cardano-ledger-conway  >=1.12   && <1.13
-    , cardano-ledger-core    >=1.10   && <1.11
+    , cardano-api            ^>=8.46
+    , cardano-ledger-alonzo
+    , cardano-ledger-conway
+    , cardano-ledger-core
diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md
@@ -40,7 +40,7 @@ mkdir -p bin
 version=0.17.0
 curl -L -O https://github.com/input-output-hk/hydra/releases/download/${version}/hydra-x86_64-linux-${version}.zip
 unzip -d bin hydra-x86_64-linux-${version}.zip
-curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.9.0/cardano-node-8.9.0-linux.tar.gz \
+curl -L -o - https://github.com/IntersectMBO/cardano-node/releases/download/8.11.0/cardano-node-8.11.0-linux.tar.gz \
   | tar xz ./bin/cardano-node ./bin/cardano-cli
 curl -L -o - https://github.com/input-output-hk/mithril/releases/download/2412.0/mithril-2412.0-linux-x64.tar.gz \
   | tar xz -C bin mithril-client
@@ -55,7 +55,7 @@ mkdir -p bin
 version=0.17.0
 curl -L -O https://github.com/input-output-hk/hydra/releases/download/${version}/hydra-aarch64-darwin-${version}.zip
 unzip -d bin hydra-aarch64-darwin-${version}.zip
-curl -L -o - https://github.com/input-output-hk/cardano-node/releases/download/8.9.0/cardano-node-8.9.0-macos.tar.gz \
+curl -L -o - https://github.com/IntersectMBO/cardano-node/releases/download/8.11.0/cardano-node-8.11.0-macos.tar.gz \
   | tar xz --wildcards ./bin/cardano-node ./bin/cardano-cli './bin/*.dylib'
 curl -L -o - https://github.com/input-output-hk/mithril/releases/download/2412.0/mithril-2412.0-macos-x64.tar.gz \
   | tar xz -C bin