Skip to content

Restore Package Sanity #4600

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

Closed
wants to merge 8 commits into from
Closed

Restore Package Sanity #4600

wants to merge 8 commits into from

Conversation

angerman
Copy link
Contributor

@angerman angerman commented Nov 3, 2022

This is DRAFT.

A second part that "reverts" 9d729d8 and properly add ledger/1.1.0, as well as some proper network release are still missing.

@angerman angerman changed the title Restore Sanity Restore Package Sanity Nov 3, 2022
@angerman
Copy link
Contributor Author

angerman commented Nov 3, 2022

This is DRAFT.

A second part that "reverts" 9d729d8 and properly add ledger/1.1.0, as well as some proper network release are still missing.

@@ -26,7 +26,7 @@ genesisFunds :: forall era. IsShelleyBasedEra era
=> NetworkId -> ShelleyGenesis StandardShelley -> [(AddressInEra era, Lovelace)]
genesisFunds networkId g
= map (castAddr *** fromShelleyLovelace)
$ ListMap.toList
$ Map.toList
Copy link
Contributor

Choose a reason for hiding this comment

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

This removes an optimization. Do you intend to merge this PR into master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Jimbo4350 it does. It's basically going back to ledger/1.0.0.

My tentative plan is to next bump ledger to the 1.1.0 release, (and have a proper CHaP release) for it.
Then bump network to some release, though the situation there looks much less clear to me.

And then revert 9d729d8, at which point this is hopefully much closer to where we are today with master.

If we can re-arrange the imports in a way to get ListMap from ledger/1.0.0, that would help reduce the carnage introduced in 9d729d8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That being said, if we can come to an agreement that we revert to ledger/1.0.0 and the network as per 1.35.4 for now in master. And then have a second PR to try and bring in new released dependencies of ledger and network, that would certainy help. But it does mean we'll go back in time a bit.

@deepfire
Copy link
Contributor

deepfire commented Nov 4, 2022

bors r-

@angerman
Copy link
Contributor Author

angerman commented Nov 5, 2022

@deepfire please do not try to merge this PR.

This uses CHaP as per the 1.35.4 release. This is meant to be the
basis from which we add (proper) leder
and network releases, to rever the commit that made this one barely compile.
This temporarily restores sanity by removing any dependency on ledger
past 1.0.0 (what is in CHaP right now).

It therefore also reverts the network bump.

! This commit is meant to be temporary. And to be reverted ontop of a
sane CHaP'ified master.
Soupstraw added a commit that referenced this pull request Nov 9, 2022
angerman pushed a commit that referenced this pull request Nov 11, 2022
Soupstraw added a commit that referenced this pull request Nov 15, 2022
erikd pushed a commit that referenced this pull request Nov 16, 2022
Soupstraw added a commit that referenced this pull request Nov 16, 2022
Soupstraw added a commit that referenced this pull request Nov 16, 2022
Soupstraw added a commit that referenced this pull request Nov 18, 2022
erikd pushed a commit that referenced this pull request Nov 22, 2022
Soupstraw added a commit that referenced this pull request Nov 29, 2022
erikd pushed a commit that referenced this pull request Dec 1, 2022
Soupstraw added a commit that referenced this pull request Dec 2, 2022
fmaste pushed a commit that referenced this pull request Dec 5, 2022
erikd pushed a commit that referenced this pull request Dec 8, 2022
erikd pushed a commit that referenced this pull request Dec 9, 2022
erikd pushed a commit that referenced this pull request Dec 14, 2022
newhoggy pushed a commit that referenced this pull request Dec 21, 2022
newhoggy pushed a commit that referenced this pull request Jan 6, 2023
newhoggy pushed a commit that referenced this pull request Jan 7, 2023
newhoggy pushed a commit that referenced this pull request Jan 9, 2023
erikd pushed a commit that referenced this pull request Jan 15, 2023
erikd pushed a commit that referenced this pull request Jan 17, 2023
erikd pushed a commit that referenced this pull request Jan 17, 2023
erikd pushed a commit that referenced this pull request Jan 18, 2023
erikd pushed a commit that referenced this pull request Jan 18, 2023
angerman pushed a commit that referenced this pull request Jan 26, 2023
jbgi pushed a commit that referenced this pull request Jan 26, 2023
erikd pushed a commit that referenced this pull request Jan 29, 2023
erikd pushed a commit that referenced this pull request Feb 1, 2023
erikd pushed a commit that referenced this pull request Feb 6, 2023
newhoggy pushed a commit that referenced this pull request Mar 10, 2023
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