Update ouroboros-network and cardano-ledger dependencies #4392
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes input-output-hk/ouroboros-network#3691
Co-author: John Ky (via fcb84da)
|
|
Soupstraw
force-pushed
the
coot/update-dependencies-26082022
branch
7 times, most recently
from
46fa27d to
8962180
Compare
Soupstraw
force-pushed
the
coot/update-dependencies-26082022
branch
from
8962180 to
4a12a05
Compare
Jimbo4350
requested changes
Oct 6, 2022
| @@ -52,6 +45,12 @@ import Ouroboros.Consensus.Ledger.Basics (AuxLedgerEvent) | |||
| import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock, | |||
| ShelleyLedgerEvent (ShelleyLedgerEventTICK)) | |||
| import Ouroboros.Consensus.TypeFamilyWrappers | |||
| import Cardano.Ledger.Shelley.Rules.Tick (ShelleyTickEvent(..)) | |||
There was a problem hiding this comment.
These imports do not follow the style convention
| @@ -167,6 +167,8 @@ import qualified Ouroboros.Network.Block | |||
| import qualified Ouroboros.Network.Protocol.ChainSync.Client as CS | |||
| import qualified Ouroboros.Network.Protocol.ChainSync.ClientPipelined as CSP | |||
| import Ouroboros.Network.Protocol.ChainSync.PipelineDecision | |||
| import qualified Cardano.Ledger.Shelley.API as ShelleyAPI | |||
There was a problem hiding this comment.
These imports do not follow the style convention
| import qualified Cardano.Binary as CBOR | ||
| import qualified Cardano.Crypto.Hash.Class as Crypto | ||
| import qualified Cardano.Ledger.Alonzo.Data as Alonzo | ||
| import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo | ||
| import Cardano.Ledger.Babbage (BabbageTxOut) |
There was a problem hiding this comment.
These imports do not follow the style convention
| , ToJSON (Core.PParamsDelta era) | ||
| ) => ToJSON (Shelley.EpochState era) where | ||
| instance | ||
| forall era. |
There was a problem hiding this comment.
Why have you modified the style here?
| toJSON = object . toEpochStatePairs | ||
| toEncoding = Aeson.pairs . mconcat . toEpochStatePairs | ||
|
|
||
| toEpochStatePairs :: | ||
| ( Consensus.ShelleyBasedEra era | ||
| , ToJSON (Core.TxOut era) | ||
| , ToJSON (Core.PParamsDelta era) |
There was a problem hiding this comment.
Why have you modified the style here?
| toEpochStatePairs eState = | ||
| let !esAccountState = Shelley.esAccountState eState | ||
| !esSnapshots = Shelley.esSnapshots eState | ||
| !esLState = Shelley.esLState eState | ||
| !esPrevPp = Shelley.esPrevPp eState | ||
| !esPp = Shelley.esPp eState | ||
| !esNonMyopic = Shelley.esNonMyopic eState | ||
| in [ "esAccountState" .= esAccountState | ||
| , "esSnapshots" .= esSnapshots |
There was a problem hiding this comment.
Why have you modified the style here?
| ] | ||
|
|
||
|
|
||
| instance ( Consensus.ShelleyBasedEra era | ||
| , ToJSON (Core.TxOut era) |
There was a problem hiding this comment.
Why have you modified the style here?
| toJSON = object . toLedgerStatePairs | ||
| toEncoding = Aeson.pairs . mconcat . toLedgerStatePairs | ||
|
|
||
| toLedgerStatePairs :: | ||
| ( Consensus.ShelleyBasedEra era | ||
| , ToJSON (Core.TxOut era) |
There was a problem hiding this comment.
Why have you modified the style here?
|
closed in favor of #4608 |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR is supposed to update
cardano-nodewith a newer version ofouroboros-network(andcardano-ledger).The networking team decided to not release P2P on
NodeToNodeV_10and to avoid brokencardano-node(which would happen ifConwaywas released with incompatible version ofNodeToNodeV_10).This PR subsumes #4359.