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

Take all dependencies from Hackage or CHaP #4921

Merged
merged 2 commits into from
Mar 10, 2023
Merged

Take all dependencies from Hackage or CHaP #4921

merged 2 commits into from
Mar 10, 2023

Conversation

erikd
Copy link
Contributor

@erikd erikd commented Feb 28, 2023

No description provided.

@newhoggy
Copy link
Contributor

newhoggy commented Mar 2, 2023

Needs rebase, and seems like there is a Conway related configuration error that's failing the tests.

@erikd erikd force-pushed the erikd/chap branch 3 times, most recently from d6aa0e2 to 9a91794 Compare March 5, 2023 21:49
@angerman
Copy link
Contributor

angerman commented Mar 6, 2023

This PR needs #4871 to be merged first to support CHaP revisions :-/

@erikd erikd force-pushed the erikd/chap branch 2 times, most recently from b6944e0 to a1e7039 Compare March 9, 2023 06:25
@@ -66,7 +66,8 @@ import Data.Aeson.Types (Parser)
import Data.Bifunctor
import Data.ByteArray (ByteArrayAccess)
import qualified Data.ByteArray
import Data.ByteString as BS
Copy link
Contributor Author

Choose a reason for hiding this comment

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

😵‍💫

This also updates the version of `ledger` for repliminary support for
the Conway era. The `network` and `consensus` dependencies are also
updated.
@newhoggy newhoggy changed the title Take all dependecies from Hackage or CHaP Take all dependencies from Hackage or CHaP Mar 9, 2023
@erikd erikd merged commit 84a871e into master Mar 10, 2023
@iohk-bors iohk-bors bot deleted the erikd/chap branch March 10, 2023 00:20
where
reconcile
reconcileBabbage
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

-- version that this node will declare that it understands, when it
-- is in the Babbage era. Since Babbage is currently the last known
-- protocol version then this is also the Babbage protocol version.
Praos.conwayProtVer = ProtVer 9 0,
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't we be hiding this behind the TestEnableDevelopmentHardForkEras flag: e424031#diff-8c649864fe4b96d142cfd4c2bb9e32a9510fe737c6ad4e13e04b585ee15a6b74R210

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.

4 participants