Skip to content

Commit

Permalink
Bump cardano-api, cardano-node
Browse files Browse the repository at this point in the history
* Use node 8.1.1 and cardano-api 8.8.0.0
  • Loading branch information
j-mueller committed Jul 28, 2023
1 parent bee26a7 commit 3ef535a
Show file tree
Hide file tree
Showing 38 changed files with 880 additions and 1,300 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ jobs:

- uses: haskell/actions/setup@v1
with:
ghc-version: '8.10' # Resolves to the latest point release of GHC 8.10
cabal-version: '3.6.0.0' # Exact version of Cabal
ghc-version: '9.2.8'
cabal-version: '3.10.1.0'

- uses: actions/checkout@v2

Expand All @@ -101,7 +101,8 @@ jobs:
- name: Build dependencies for integration test
run: |
cabal update
cabal install -j cardano-node cardano-cli --overwrite-policy=always
cabal install -j cardano-node --overwrite-policy=always
cabal install -j cardano-cli-8.4.0.0 --overwrite-policy=always
echo "/home/runner/.cabal/bin" >> $GITHUB_PATH
- name: build & test
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ cabal.project.local~
.ghc.environment.*
result
.vscode
work/
work/
nohup.out
171 changes: 13 additions & 158 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -13,169 +13,24 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state:
2022-09-27T00:00:00Z
, cardano-haskell-packages 2022-10-25T20:00:00Z
index-state:
, hackage.haskell.org 2023-07-22T22:41:49Z
, cardano-haskell-packages 2023-07-26T01:36:26Z

with-compiler: ghc-8.10.7

with-compiler: ghc-9.2.8

packages:
src/base
src/coin-selection
src/devnet
src/mockchain
src/node-client
src/wallet
src/un-ada

source-repository-package
type: git
location: https://github.com/input-output-hk/bech32
tag: ab61914443e5f53624d3b2995767761b3f68e576
--sha256: 0isqh5s6rdhmqa3jhvc32zb3kvzy149hmzddx1ld9f9jhls4f3wg
subdir: bech32
bech32-th

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-crypto
tag: f73079303f663e028288f9f4a9e08bcca39a923e
--sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q

source-repository-package
type: git
location: https://github.com/input-output-hk/ekg-forward
tag: 297cd9db5074339a2fb2e5ae7d0780debb670c63
--sha256: 1zcwry3y5rmd9lgxy89wsb3k4kpffqji35dc7ghzbz603y1gy24g

-- It seems that if we remove this source-repository-package to rely on CHaP,
-- for some reason, we're unable to retrieve the cardano-node executables in
-- our nix/haskell.nix file.

-- Without this source-repository-package:
-- config.hsPkgs.cardano-node.components.exes
-- => []
--
-- With:
-- config.hsPkgs.cardano-node.components.exes
-- => [ "cardano-node" ]
--
-- TODO [ADP-2447] See if the situation has improved and try to remove this source-repository-package.
source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-node
tag: ebc7be471b30e5931b35f9bbc236d21c375b91bb
--sha256: 1j01m2cp2vdcl26zx9xmipr551v3b2rz9kfn9ik8byfwj1z7652r
subdir:
cardano-api
cardano-git-rev
cardano-cli
cardano-node
cardano-node-chairman
trace-dispatcher
trace-resources
trace-forward

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl-x509
tag: a91add165152fa36f08e95fafe7da24f1dba4690
--sha256: 1ia8vlqghis92cla8qmqa6kh8f3jn29b01fshyk5hmgy5373s684

-- Different version than from CHaP to include the ReaderT fix.
-- TODO [ADP-2447] This source-repository-package should be removable with next node bump.
source-repository-package
type: git
location: https://github.com/input-output-hk/io-sim
tag: 57e888b1894829056cb00b7b5785fdf6a74c3271
--sha256: 1kv8lwmrw1c0g03jy3i3fgk3c8d47ihjcslg295djqj442y95y2f
subdir:
io-classes
io-sim
strict-stm

source-repository-package
type: git
location: https://github.com/j-mueller/annealing
tag: ea8e9ec8cf63796205372cedb265836cb8e526b2

source-repository-package
type: git
location: https://github.com/j-mueller/csv
tag: b2f00d7819ff62cb80532adfbc28dbc1046d3d96

-- -------------------------------------------------------------------------
-- Constraints tweaking

-- cardano-addresses unit tests bring in some version constraint conflicts.
--
-- 1. hjsonschema and hjsonpointer deps have overly strict bounds.
-- 2. it has strict aeson < 1.5 dep - this will be fixed in the next release.
allow-newer:
hjsonschema:*
, hjsonpointer:*
, cardano-sl-x509:ip
, *:aeson
, size-based:template-haskell

-- Copied from (copied from cardano-node/cabal.project)
allow-newer:
*:aeson,
monoidal-containers:aeson,
size-based:template-haskell

allow-newer:
async-timer:unliftio-core
constraints:
bimap >= 0.4.0
, openapi3 >= 3.2.0
, libsystemd-journal >= 1.4.4
, systemd >= 2.3.0
-- dependency of systemd-2.3.0
, network >= 3.1.1.1
-- choose versions that work with base >= 4.12
, hjsonpointer >= 1.5.0
, hjsonschema >= 1.10.0
, Cabal >= 3.4.0.0
, async-timer >= 0.2.0.0
, unliftio-core >= 0.2.0.1
, cardano-api == 1.35.4
, cardano-node == 1.35.4
, generic-arbitrary == 0.2.2
, iohk-monitoring >= 0.1.11

-- Could probably be bumped with minor work in the wallet
, resource-pool == 0.2.3.2
src/mockchain
src/coin-selection
src/devnet

-- TH Name shadowing warnings need to be addressed when bumping to 2.13.3.5
, persistent == 2.13.3.3
-- https://github.com/obsidiansystems/dependent-sum-template/issues/5
-- requires cabal 3.10
if impl(ghc >= 9.2)
constraints :
dependent-sum-template < 0.1.2

-- Copied from cardano-node's cabal.project:
, bimap >= 0.4.0
, libsystemd-journal >= 1.4.4
, systemd >= 2.3.0
-- systemd-2.3.0 requires at least network 3.1.1.0 but it doesn't declare
-- that dependency
, network >= 3.1.1.0
, HSOpenSSL >= 0.11.7.2
, algebraic-graphs < 0.7
, protolude < 0.3.1
, cardano-prelude == 0.1.0.0
, base-deriving-via == 0.1.0.0
, cardano-binary == 1.5.0
, cardano-binary-test == 1.3.0
, cardano-crypto-class == 2.0.0.0.1
, cardano-crypto-praos == 2.0.0.0.1
, cardano-crypto-tests == 2.0.0.0.1
, cardano-slotting == 0.1.0.0
, measures == 0.1.0.0
, orphans-deriving-via == 0.1.0.0
, strict-containers == 0.1.0.0
, plutus-core == 1.0.0.1
, plutus-ledger-api == 1.0.0.1
, plutus-tx == 1.0.0.0
, plutus-tx-plugin == 1.0.0.0
, prettyprinter-configurable == 0.1.0.0
, plutus-ghc-stub == 8.6.5
, word-array == 0.1.0.0
, word-array == 0.1.0.0
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions node-config/mainnet/conway-genesis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"genDelegs": {}
}
Loading

0 comments on commit 3ef535a

Please sign in to comment.