Skip to content

Commit 62190e1

Browse files
authored
Merge pull request #6575 from IntersectMBO/mgalazyn/feature/update-cardano-rpc-11.0
Bump cardano-api 11.3, cardano-cli 11.1, cardano-rpc 11.0, plutus 1.65 and CHaP
2 parents 3902732 + 0e48d61 commit 62190e1

34 files changed

Lines changed: 873 additions & 112 deletions

File tree

.github/workflows/actionlint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
extra-substituters = https://cache.iog.io/
2424
# Make the Nix environment available to next steps
2525
- uses: rrbutani/use-nix-shell-action@f97339023a09121113e5a58ad88fe0e9fde3406b # v1
26+
with:
27+
flakes: nixpkgs#shellcheck,nixpkgs#actionlint
2628

2729
- name: actionlint
2830
run: |

.github/workflows/check-changelog.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ jobs:
4242
extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
4343
extra-substituters = https://cache.iog.io/
4444
45-
- name: Check scriv fragments are correct
45+
- uses: rrbutani/use-nix-shell-action@f97339023a09121113e5a58ad88fe0e9fde3406b # v1
4646
if: steps.filter.outputs.cardano == 'true'
47-
uses: rrbutani/use-nix-shell-action@f97339023a09121113e5a58ad88fe0e9fde3406b # v1
4847
with:
49-
script: cd cardano-testnet && scriv collect --version "CI-CHECK" --keep
48+
flakes: nixpkgs#scriv
49+
- name: Check scriv fragments are correct
50+
if: steps.filter.outputs.cardano == 'true'
51+
run: cd cardano-testnet && scriv collect --version "CI-CHECK" --keep
5052

.github/workflows/shellcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
uses: cachix/install-nix-action@b97f05dcb019ddea06450a50ef6203d2fdc19fee # v31
2222
with:
2323
extra_nix_config: |
24-
extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
25-
extra-substituters = https://cache.iog.io/
26-
# Make the Nix environment available to next steps
24+
accept-flake-config = true
2725
- uses: rrbutani/use-nix-shell-action@f97339023a09121113e5a58ad88fe0e9fde3406b # v1
26+
with:
27+
flakes: nixpkgs#shellcheck
2828
- name: shellcheck
2929
run: |
3030
for file in $(git ls-files "*.sh")

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=11.0
86-
, plutus-ledger-api ^>=1.63
87-
, plutus-tx ^>=1.63
88-
, plutus-tx-plugin ^>=1.63
85+
, cardano-api ^>=11.3
86+
, plutus-ledger-api ^>=1.65
87+
, plutus-tx ^>=1.65
88+
, plutus-tx-plugin ^>=1.65
8989

9090
------------------------
9191
-- Non-IOG dependencies

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-deprecations #-}
12
{- HLINT ignore "Use camelCase" -}
23
{- HLINT ignore "Use uncurry" -}
34
{-# LANGUAGE GADTs #-}
@@ -53,7 +54,7 @@ prop_mapCostsMary = measureMapCosts AsMaryEra == assumeMapCosts AsMaryE
5354
prop_mapCostsAlonzo = measureMapCosts AsAlonzoEra == assumeMapCosts AsAlonzoEra
5455
prop_mapCostsBabbage = measureMapCosts AsBabbageEra == assumeMapCosts AsBabbageEra
5556
prop_mapCostsConway = measureMapCosts AsConwayEra == assumeMapCosts AsConwayEra
56-
prop_mapCostsDijkstra = measureMapCosts AsDijkstraEra == assumeMapCosts AsDijkstraEra
57+
prop_mapCostsDijkstra = measureMapCosts AsDijkstraEra == assumeMapCosts AsDijkstraEra
5758

5859
assumeMapCosts :: forall era . IsShelleyBasedEra era => AsType era -> [Int]
5960
assumeMapCosts _proxy = stepFunction [

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SubmissionClient.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-deprecations #-}
12
{-# LANGUAGE CPP #-}
23
{-# LANGUAGE ConstraintKinds #-}
34
{-# LANGUAGE DataKinds #-}

bench/tx-generator/src/Cardano/Benchmarking/Script/Core.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-deprecations #-}
12
{- HLINT ignore "Reduce duplication" -}
23
{- HLINT ignore "Use uncurry" -}
34

bench/tx-generator/src/Cardano/TxGenerator/Genesis.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-deprecations #-}
12
{-# LANGUAGE DerivingStrategies #-}
23
{-# LANGUAGE NamedFieldPuns #-}
34
{-# LANGUAGE RankNTypes #-}

bench/tx-generator/src/Cardano/TxGenerator/Tx.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# OPTIONS_GHC -Wno-deprecations #-}
12
{-# LANGUAGE GADTs #-}
23
{-# LANGUAGE RankNTypes #-}
34
{-# LANGUAGE ScopedTypeVariables #-}

bench/tx-generator/tx-generator.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ library
109109
, attoparsec-aeson
110110
, base16-bytestring
111111
, bytestring
112-
, cardano-api ^>= 11.0
112+
, cardano-api ^>= 11.3
113113
, cardano-binary
114-
, cardano-cli ^>= 11.0
114+
, cardano-cli ^>= 11.1
115115
, cardano-crypto-class
116116
, cardano-crypto-wrapper
117117
, cardano-data

0 commit comments

Comments
 (0)