Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADP-3368] Bump to support node version 8.9.3 #4617

Merged
merged 4 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 46 additions & 13 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ repository cardano-haskell-packages
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- repeating the index-state for hackage to work around hackage.nix parsing limitation
index-state: 2024-03-19T15:29:53Z
index-state: 2024-06-04T00:00:00Z

index-state:
, hackage.haskell.org 2024-03-19T15:29:53Z
, cardano-haskell-packages 2024-03-15T17:07:52Z
, hackage.haskell.org 2024-06-04T00:00:00Z
, cardano-haskell-packages 2024-05-29T10:15:00Z

packages:
lib/address-derivation-discovery
Expand Down Expand Up @@ -175,6 +175,7 @@ allow-newer:
, cardano-addresses-cli:mtl
, servant-openapi3:*


constraints:
base == 4.18.2.0
, bimap >= 0.4.0
Expand All @@ -201,16 +202,48 @@ constraints:
, bech32 == 1.1.3

-- Cardano Node dependencies:
, cardano-node == 8.9.2
, cardano-api ^>=8.39.2.0
, cardano-crypto-class >=2.1.4.0
, cardano-crypto-class +secp256k1-support
paolino marked this conversation as resolved.
Show resolved Hide resolved
, cardano-slotting ^>= 0.1.2
, optparse-applicative-fork >= 0.18.1
, ouroboros-network ^>= 0.12
, plutus-core ==1.21.0.0
, plutus-core -with-cert -with-inline-r
, plutus-ledger-api ==1.21.0.0
, any.cardano-api ==8.39.3.0
paolino marked this conversation as resolved.
Show resolved Hide resolved
, any.cardano-binary ==1.7.1.0
, any.cardano-cli ==8.20.3.0
, any.cardano-crypto ==1.1.2
, any.cardano-crypto-class ==2.1.4.0
, any.cardano-crypto-praos ==2.1.2.0
, any.cardano-crypto-wrapper ==1.5.1.1
, any.cardano-data ==1.2.1.0
, any.cardano-ledger-allegra ==1.3.0.0
, any.cardano-ledger-alonzo ==1.6.0.0
, any.cardano-ledger-api ==1.8.0.0
, any.cardano-ledger-babbage ==1.6.0.0
, any.cardano-ledger-binary ==1.3.0.0
, any.cardano-ledger-byron ==1.0.0.4
, any.cardano-ledger-conway ==1.12.0.0
, any.cardano-ledger-core ==1.10.0.0
, any.cardano-ledger-mary ==1.5.0.0
, any.cardano-ledger-shelley ==1.9.0.0
, cardano-node +systemd -unexpected_thunks
paolino marked this conversation as resolved.
Show resolved Hide resolved
, any.cardano-ping ==0.2.0.13
, any.cardano-prelude ==0.1.0.4
, any.cardano-protocol-tpraos ==1.1.0.0
, any.cardano-slotting ==0.1.2.0
, any.cardano-strict-containers ==0.1.3.0
, any.ouroboros-consensus ==0.16.0.0
, any.ouroboros-consensus-cardano ==0.14.1.0
, any.ouroboros-consensus-diffusion ==0.14.0.0
, any.ouroboros-consensus-protocol ==0.7.0.0
, any.ouroboros-network ==0.15.0.0
, any.ouroboros-network-api ==0.7.1.0
, any.ouroboros-network-framework ==0.13.0.0
, any.ouroboros-network-mock ==0.1.1.1
, any.ouroboros-network-protocols ==0.8.1.0
, any.ouroboros-network-testing ==0.6.0.1
, any.plutus-core ==1.21.0.0
, any.plutus-ledger-api ==1.21.0.0
, plutus-scripts-bench -defer-plugin-errors -unexpected_thunks
, any.plutus-tx ==1.21.0.0
, any.io-classes ==1.4.1.0
, any.io-classes-mtl ==0.1.1.0



-- TH Name shadowing warnings need to be addressed when bumping to 2.13.3.5
, persistent ^>= 2.14.6.0
Expand Down
34 changes: 17 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@
flake = false;
};
customConfig.url = "github:input-output-hk/empty-flake";
cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=8.9.2";

cardano-node-runtime.url = "github:IntersectMBO/cardano-node?ref=8.9.3";
};

outputs = { self, nixpkgs, nixpkgs-unstable, hostNixpkgs, flake-utils,
Expand Down
24 changes: 18 additions & 6 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,21 @@ local-cluster:
unit-tests-cabal-match match:
LOCAL_CLUSTER_CONFIGS=../../lib/local-cluster/test/data/cluster-configs \
cabal test \
local-cluster:test \
cardano-wallet-unit:unit \
cardano-balance-tx:test \
cardano-numeric:unit \
cardano-wallet-launcher:unit \
cardano-wallet-network-layer:unit \
cardano-wallet-primitive:test \
cardano-wallet-read:test \
cardano-wallet-secrets:test \
cardano-wallet-test-utils:unit \
cardano-wallet-unit:unit \
delta-store:unit \
delta-table:unit \
delta-types:unit \
std-gen-seed:unit \
text-class:unit \
wai-middleware-logging:unit \
-O0 -v0 \
--test-options '--match="{{match}}"'

Expand Down Expand Up @@ -122,17 +134,17 @@ integration-tests match:
babbage-integration-tests-match match:
LOCAL_CLUSTER_ERA=babbage \
nix shell \
'github:IntersectMBO/cardano-node?ref=8.9.2#cardano-node' \
'github:IntersectMBO/cardano-node?ref=8.9.2#cardano-cli' \
'github:IntersectMBO/cardano-node?ref=8.9.3#cardano-node' \
'github:IntersectMBO/cardano-node?ref=8.9.3#cardano-cli' \
--accept-flake-config \
-c just integration-tests "{{match}}"

# run conway integration tests matching the given pattern via nix
conway-integration-tests-match match:
LOCAL_CLUSTER_ERA=conway \
nix shell \
'github:IntersectMBO/cardano-node?ref=8.9.2#cardano-node' \
'github:IntersectMBO/cardano-node?ref=8.9.2#cardano-cli' \
'github:IntersectMBO/cardano-node?ref=8.9.3#cardano-node' \
'github:IntersectMBO/cardano-node?ref=8.9.3#cardano-cli' \
--accept-flake-config \
-c just integration-tests "{{match}}"

Expand Down
2 changes: 1 addition & 1 deletion lib/api/cardano-wallet-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ library
, http-types
, int-cast
, iohk-monitoring
, iohk-monitoring-extra ^>=0.1
, iohk-monitoring-extra
, memory
, mtl
, network
Expand Down
16 changes: 8 additions & 8 deletions lib/application-extras/cardano-wallet-application-extras.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ library
hs-source-dirs: lib
build-depends:
, base
, network ^>=3.1.4.0
, network-uri ^>=2.6.4.2
, random-shuffle ^>=0.0.4
, safe ^>=0.3.19
, streaming-commons ^>=0.2.2.6
, text ^>=2.0.2
, text-class ^>=2024.5.5
, unliftio ^>=0.2.24
, network
, network-uri
, random-shuffle
, safe
, streaming-commons
, text
, text-class
, unliftio
4 changes: 2 additions & 2 deletions lib/crypto-primitives/crypto-primitives.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ library
build-depends:
, base >= 4.14.3 && < 4.19
, bytestring >= 0.10.12 && < 0.13
, cryptonite ^>=0.30
, cryptonite
, extra
, memory ^>=0.18
, memory
, monoid-subclasses

test-suite test
Expand Down
8 changes: 4 additions & 4 deletions lib/customer-deposit-wallet/customer-deposit-wallet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ library
, delta-store
, delta-types
, io-classes
, iohk-monitoring-extra ^>=0.1
, persistent >= 2.13 && < 2.15
, sqlite-simple >= 0.4.19.0 && < 0.5
, iohk-monitoring-extra
, persistent
, sqlite-simple
, text
, transformers
, time
Expand Down Expand Up @@ -105,7 +105,7 @@ test-suite scenario
build-tool-depends:
markdown-unlit:markdown-unlit
ghc-options:
-pgmL markdown-unlit
-pgmL markdown-unlit
build-depends:
, base
, cardano-crypto
Expand Down
8 changes: 4 additions & 4 deletions lib/faucet/faucet.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ library
, extra
, filepath
, http-media
, insert-ordered-containers ^>=0.2.5.2
, insert-ordered-containers
, lens
, memory
, mtl
, openapi3 ^>=3.2.2
, openapi3
, servant >= 0.19.1 && < 0.21
, servant-client >= 0.19 && < 0.21
, servant-openapi3 ^>=2.0.1.4
, servant-openapi3
, servant-server >= 0.19.2 && < 0.21
, stm
, text
Expand All @@ -87,4 +87,4 @@ executable faucet
build-depends:
, base
, faucet
, with-utf8 ^>=1.0.2.4
, with-utf8
2 changes: 1 addition & 1 deletion lib/secrets/cardano-wallet-secrets.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ library
, crypto-primitives
, deepseq
, generic-arbitrary
, memory ^>=0.18
, memory
, text
, text-class
, time
Expand Down
10 changes: 5 additions & 5 deletions lib/temporary-extra/temporary-extra.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ library
exposed-modules: System.IO.Temp.Extra
build-depends:
, base
, iohk-monitoring ^>=0.1.11.3
, iohk-monitoring-extra ^>=0.1
, temporary ^>=1.3
, iohk-monitoring
, iohk-monitoring-extra
, temporary
, text >= 1.2.4.1 && <2.2
, text-class ^>=2024.5.5
, unliftio ^>=0.2.24
, text-class
, unliftio
2 changes: 1 addition & 1 deletion lib/unit/cardano-wallet-unit.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ test-suite unit
, network-uri
, nothunks
, OddWord
, openapi3 ==3.2.3
, openapi3
, optparse-applicative
, ouroboros-consensus
, ouroboros-network
Expand Down
Loading
Loading