Skip to content

Add support for new ledger state query GetDRepDelegations in NodeToClientV_23 #1717

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for new ledger state query GetDRepDelegations in NodeToClientV_23 #1717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...ros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module Ouroboros.Consensus.Cardano.Node
, pattern CardanoNodeToClientVersion16
, pattern CardanoNodeToClientVersion17
, pattern CardanoNodeToClientVersion18
, pattern CardanoNodeToClientVersion19
, pattern CardanoNodeToNodeVersion1
, pattern CardanoNodeToNodeVersion2
) where
Expand Down Expand Up @@ -422,6 +423,21 @@ pattern CardanoNodeToClientVersion18 =
:* Nil
)

pattern CardanoNodeToClientVersion19 :: BlockNodeToClientVersion (CardanoBlock c)
pattern CardanoNodeToClientVersion19 =
HardForkNodeToClientEnabled
HardForkSpecificNodeToClientVersion3
( EraNodeToClientEnabled ByronNodeToClientVersion1
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* EraNodeToClientEnabled ShelleyNodeToClientVersion15
:* Nil
)

instance
CardanoHardForkConstraints c =>
SupportedNetworkProtocolVersion (CardanoBlock c)
Expand All @@ -441,9 +457,10 @@ instance
, (NodeToClientV_20, CardanoNodeToClientVersion16)
, (NodeToClientV_21, CardanoNodeToClientVersion17)
, (NodeToClientV_22, CardanoNodeToClientVersion18)
, (NodeToClientV_23, CardanoNodeToClientVersion19)
]

latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_22)
latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_23)

{-------------------------------------------------------------------------------
ProtocolInfo
Expand Down
3 changes: 3 additions & 0 deletions ...onsensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ data ShelleyNodeToClientVersion
ShelleyNodeToClientVersion13
| -- | Support SRV in GetBigLedgerPeerSnapshot
ShelleyNodeToClientVersion14
-- | New queries introduced: QueryDRepsDelegations
| ShelleyNodeToClientVersion15
deriving (Show, Eq, Ord, Enum, Bounded)

ledgerPeerSnapshotSupportsSRV :: ShelleyNodeToClientVersion -> LedgerPeerSnapshotSRVSupport
Expand Down Expand Up @@ -58,6 +60,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
, (NodeToClientV_20, ShelleyNodeToClientVersion12)
, (NodeToClientV_21, ShelleyNodeToClientVersion13)
, (NodeToClientV_22, ShelleyNodeToClientVersion14)
, (NodeToClientV_23, ShelleyNodeToClientVersion15)
]

latestReleasedNodeVersion = latestReleasedNodeVersionDefault
22 changes: 22 additions & 0 deletions ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@ data instance BlockQuery (ShelleyBlock proto era) fp result where
BlockQuery (ShelleyBlock proto era) QFNoTables SL.PoolDistr
GetMaxMajorProtocolVersion ::
BlockQuery (ShelleyBlock proto era) QFNoTables MaxMajorProtVer
GetDRepDelegations ::
Set SL.DRep ->
BlockQuery
(ShelleyBlock proto era)
QFNoTables
(Map SL.DRep (Set (SL.Credential 'SL.Staking)))

-- WARNING: please add new queries to the end of the list and stick to this
-- order in all other pattern matches on queries. This helps in particular
Expand Down Expand Up @@ -533,6 +539,8 @@ instance
. configConsensus
. getExtLedgerCfg
$ cfg
GetDRepDelegations dreps ->
SL.queryDRepDelegations st dreps
where
lcfg = configLedger $ getExtLedgerCfg cfg
globals = shelleyLedgerGlobals lcfg
Expand Down Expand Up @@ -592,6 +600,7 @@ instance
GetPoolDistr2{} -> (>= v13)
GetStakeDistribution2{} -> (>= v13)
GetMaxMajorProtocolVersion -> (>= v13)
GetDRepDelegations {} -> (>= v15)
where
-- WARNING: when adding a new query, a new @ShelleyNodeToClientVersionX@
-- must be added. See #2830 for a template on how to do this.
Expand All @@ -602,6 +611,7 @@ instance
v11 = ShelleyNodeToClientVersion11
v12 = ShelleyNodeToClientVersion12
v13 = ShelleyNodeToClientVersion13
v15 = ShelleyNodeToClientVersion15

instance SameDepIndex2 (BlockQuery (ShelleyBlock proto era)) where
sameDepIndex2 GetLedgerTip GetLedgerTip =
Expand Down Expand Up @@ -761,6 +771,12 @@ instance SameDepIndex2 (BlockQuery (ShelleyBlock proto era)) where
sameDepIndex2 GetStakeDistribution2{} _ = Nothing
sameDepIndex2 GetMaxMajorProtocolVersion{} GetMaxMajorProtocolVersion{} = Just Refl
sameDepIndex2 GetMaxMajorProtocolVersion{} _ = Nothing
sameDepIndex2 (GetDRepDelegations dreps) (GetDRepDelegations dreps')
| dreps == dreps' =
Just Refl
| otherwise =
Nothing
sameDepIndex2 GetDRepDelegations{} _ = Nothing

deriving instance Eq (BlockQuery (ShelleyBlock proto era) fp result)
deriving instance Show (BlockQuery (ShelleyBlock proto era) fp result)
Expand Down Expand Up @@ -806,6 +822,7 @@ instance ShelleyCompatible proto era => ShowQuery (BlockQuery (ShelleyBlock prot
GetPoolDistr2{} -> show
GetStakeDistribution2{} -> show
GetMaxMajorProtocolVersion{} -> show
GetDRepDelegations {} -> show

{-------------------------------------------------------------------------------
Auxiliary
Expand Down Expand Up @@ -930,6 +947,8 @@ encodeShelleyQuery query = case query of
CBOR.encodeListLen 1 <> CBOR.encodeWord8 37
GetMaxMajorProtocolVersion ->
CBOR.encodeListLen 1 <> CBOR.encodeWord8 38
GetDRepDelegations dreps ->
CBOR.encodeListLen 2 <> CBOR.encodeWord8 39 <> LC.toEraCBOR @era dreps

decodeShelleyQuery ::
forall era proto.
Expand Down Expand Up @@ -1004,6 +1023,7 @@ decodeShelleyQuery = do
(2, 36) -> SomeBlockQuery . GetPoolDistr2 <$> fromCBOR
(1, 37) -> return $ SomeBlockQuery GetStakeDistribution2
(1, 38) -> return $ SomeBlockQuery GetMaxMajorProtocolVersion
(2, 39) -> SomeBlockQuery . GetDRepDelegations <$> LC.fromEraCBOR @era
_ -> failmsg "invalid"

encodeShelleyResult ::
Expand Down Expand Up @@ -1053,6 +1073,7 @@ encodeShelleyResult v query = case query of
GetPoolDistr2{} -> LC.toEraCBOR @era
GetStakeDistribution2{} -> LC.toEraCBOR @era
GetMaxMajorProtocolVersion -> toCBOR
GetDRepDelegations {} -> LC.toEraCBOR @era

decodeShelleyResult ::
forall proto era fp result.
Expand Down Expand Up @@ -1101,6 +1122,7 @@ decodeShelleyResult v query = case query of
GetPoolDistr2{} -> LC.fromEraCBOR @era
GetStakeDistribution2 -> LC.fromEraCBOR @era
GetMaxMajorProtocolVersion -> fromCBOR
GetDRepDelegations {} -> LC.fromEraCBOR @era

currentPParamsEnDecoding ::
forall era s.
Expand Down
1 change: 1 addition & 0 deletions ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Query/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ nodeToClientVersionToQueryVersion x = case x of
NodeToClientV_20 -> QueryVersion3
NodeToClientV_21 -> QueryVersion3
NodeToClientV_22 -> QueryVersion3
NodeToClientV_23 -> QueryVersion3
Loading