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-2956] Upgrade cardano-node to 8.1.1 and ghc to 9.2.8 #4003

Merged
merged 1 commit into from
Jun 29, 2023

Conversation

Unisay
Copy link
Contributor

@Unisay Unisay commented Jun 26, 2023

  • bump run time node dependency to 8.1.1
  • bump compile time cardano node API dependency to ^>=8.2
  • remove compile time constraints coming from cardano-node
  • bump ghc to 9.2.8
  • bump all tools to latest version
  • bump index state of hackage.haskell.org to 2023-06-06T00:00:00Z
  • bump index-state of cardano-haskell-packages to 2023-06-05T06:39:32Z
  • move stylish-haskell out of tools, to compile old 0.11.0.3 version with old ghc 8.10.7

Comments

This PR builds on top of 2 other PRs:

The #3959 is superseded by this one.

This is the squashed version of this PR: #3996

This PR introduced a huge regression in the restoration benchmark, which was solved by removing heap profiling. Doing so we have lost the nice memory usage graphs.

Issue Number

ADP-2956

@Unisay Unisay self-assigned this Jun 27, 2023
@paolino paolino marked this pull request as ready for review June 27, 2023 07:41
@paolino paolino changed the title [SQUASHED] Upgrade cardano-node to 8.1.1 and ghc to 9.2.8 [ADP-2956] Upgrade cardano-node to 8.1.1 and ghc to 9.2.8 Jun 27, 2023
docker-compose.yml Outdated Show resolved Hide resolved
lib/wallet/exe/mock-token-metadata-server.hs Outdated Show resolved Hide resolved
lib/wallet/src/Cardano/Api/Gen.hs Show resolved Hide resolved
lib/wallet/src/Cardano/Api/Gen.hs Outdated Show resolved Hide resolved
lib/wallet/src/Cardano/Wallet/Pools.hs Show resolved Hide resolved
lib/wallet/src/Cardano/Wallet/Shelley/Transaction.hs Outdated Show resolved Hide resolved
scripts/make_release.sh Outdated Show resolved Hide resolved
, _extraEntropy = Ledger.NeutralNonce

let pparams =
Ledger.emptyPParams
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now won't be notified if a new field is added which we need to provide a more sensible value for what emptyPParams does. Looking at emptyPParams it does seem some values are more sensible than just "0" though, so hopefully this isn't a problem we're going to run into in the future.

https://github.com/input-output-hk/cardano-ledger/blob/2a03a3ee0b8b401552e985b7035c3dc382ff2f29/eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs#L317-L335

Copy link
Member

@Anviking Anviking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Lgtm modulo CI passing

, C.protocolParamCostModels =
mempty
-- TODO: Include a Plutus cost model here.
, C.protocolParamPrices =
Just $ C.ExecutionUnitPrices
{ C.priceExecutionSteps = 7.21e-5
, C.priceExecutionMemory = 0.0577
, C.priceExecutionMemory = 0.057_7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH, not sure I find this more readable

Comment on lines +57 to +61
setGitRevPostInstall' = gitrev: '' '';
# The following is commented out because it causes error with
# 'packages.cardano-node.package.identifier.name' not being defined.
# setGitRevPostInstall' = gitrev: ''
# ${pkgs.buildPackages.haskellBuildUtils}/bin/set-git-rev "${gitrev}" $out/bin/*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🆗

in {
name = "cardano-wallet";
compiler-nix-name = "ghc8107";
compiler-nix-name = "ghc928";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@Unisay Unisay force-pushed the yura/ADP-2956/ghc928node811 branch from 6a73756 to ced54e6 Compare June 27, 2023 16:06
import qualified Cardano.Wallet.Primitive.Types.Coin as W
import qualified Cardano.Wallet.Primitive.Types.Coin as Coin
import qualified Cardano.Wallet.Shelley.Compatibility.Ledger as Ledger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The plan was to inline *.Compatibility into these more specialized modules — but this is still good enough for merging.

@@ -8,6 +8,7 @@
{-# LANGUAGE TypeApplications #-}

{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this warning is somewhat out of scope for this pull request. 😅 But it's done now.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's for the specs to use partial functions ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. (I'm not fond of that warning.) What I meant was that the specs worked before without this GHC_OPTIONS pragma, but now they seem to need it, and this particular change seems out of scope to me as it touches a lot of modules.

But they have been touched now, I'm fine with proceeding.

Copy link
Contributor

@HeinrichApfelmus HeinrichApfelmus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me — I can find no obvious defects! 😊

Copy link
Contributor

@HeinrichApfelmus HeinrichApfelmus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a fix to the serialization issue to me. 😊

@Unisay Unisay force-pushed the yura/ADP-2956/ghc928node811 branch from cec0d1f to b3c9299 Compare June 29, 2023 07:31
@Unisay Unisay merged commit 828b7dd into master Jun 29, 2023
2 checks passed
@Unisay Unisay deleted the yura/ADP-2956/ghc928node811 branch June 29, 2023 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants