Bump to NodeToClientV_23

Supports block hash in cbor encoding of ledger peer snapshot

Author: crocodile-dentist

cardano-diffusion/api/lib/Cardano/Network/NodeToClient/Version.hs

@@ -56,8 +56,11 @@ data NodeToClientVersion
     -- ^ new codecs for @PParams@ and @CompactGenesis@
     | NodeToClientV_22
     -- ^ support SRV records in @GetBigLedgerPeerSnapshot@ query
+    -- TODO: remove CBOR instances from LedgerPeers.Type when V22 support
+    --       is removed!
     | NodeToClientV_23
     -- ^ added @QueryDRepsDelegations@,
+    -- LedgerPeerSnapshot CBOR encoding contains block hash
   deriving (Eq, Ord, Enum, Bounded, Show, Generic, NFData)
 
 -- | We set 16ths bit to distinguish `NodeToNodeVersion` and

cardano-diffusion/protocols/cddl/specs/handshake-node-to-client.cddl

@@ -19,7 +19,7 @@ versionTable = { * versionNumber => nodeToClientVersionData }
 
 
 ; as of version 2 (which is no longer supported) we set 16th bit to 1
-;               16    / 17    / 18    / 19    / 20    / 21    / 22     / 23
+;               16    / 17    / 18    / 19    / 20    / 21    / 22    / 23
 versionNumber = 32784 / 32785 / 32786 / 32787 / 32788 / 32789 / 32790 / 32791
 
 ; As of version 15 and higher

cardano-ping/src/Cardano/Network/Ping.hs

@@ -154,6 +154,7 @@ supportedNodeToClientVersions magic =
   , NodeToClientVersionV20 magic
   , NodeToClientVersionV21 magic
   , NodeToClientVersionV22 magic
+  , NodeToClientVersionV33 magic
   ]
 
 data InitiatorOnly = InitiatorOnly | InitiatorAndResponder
@@ -193,6 +194,7 @@ data NodeVersion
   | NodeToClientVersionV20 Word32
   | NodeToClientVersionV21 Word32
   | NodeToClientVersionV22 Word32
+  | NodeToClientVersionV23 Word32
   | NodeToNodeVersionV1    Word32
   | NodeToNodeVersionV2    Word32
   | NodeToNodeVersionV3    Word32
@@ -226,6 +228,7 @@ instance ToJSON NodeVersion where
       NodeToClientVersionV20 m -> go2 "NodeToClientVersionV20" m
       NodeToClientVersionV21 m -> go2 "NodeToClientVersionV21" m
       NodeToClientVersionV22 m -> go2 "NodeToClientVersionV22" m
+      NodeToClientVersionV23 m -> go2 "NodeToClientVersionV23" m
       NodeToNodeVersionV1    m -> go2 "NodeToNodeVersionV1" m
       NodeToNodeVersionV2    m -> go2 "NodeToNodeVersionV2" m
       NodeToNodeVersionV3    m -> go2 "NodeToNodeVersionV3" m
@@ -377,6 +380,9 @@ handshakeReqEnc versions query =
     encodeVersion (NodeToClientVersionV22 magic) =
           CBOR.encodeWord (22 `setBit` nodeToClientVersionBit)
       <>  nodeToClientDataWithQuery magic
+    encodeVersion (NodeToClientVersionV23 magic) =
+          CBOR.encodeWord (23 `setBit` nodeToClientVersionBit)
+      <>  nodeToClientDataWithQuery magic
 
     -- node-to-node
     encodeVersion (NodeToNodeVersionV1 magic) =
@@ -528,6 +534,7 @@ handshakeDec = do
         (20, True)  -> Right . NodeToClientVersionV20 <$> (CBOR.decodeListLen *> CBOR.decodeWord32 <* (modeFromBool <$> CBOR.decodeBool))
         (21, True)  -> Right . NodeToClientVersionV21 <$> (CBOR.decodeListLen *> CBOR.decodeWord32 <* (modeFromBool <$> CBOR.decodeBool))
         (22, True)  -> Right . NodeToClientVersionV22 <$> (CBOR.decodeListLen *> CBOR.decodeWord32 <* (modeFromBool <$> CBOR.decodeBool))
+        (23, True)  -> Right . NodeToClientVersionV23 <$> (CBOR.decodeListLen *> CBOR.decodeWord32 <* (modeFromBool <$> CBOR.decodeBool))
         _           -> return $ Left $ UnknownVersionInRsp version
 
     decodeWithMode :: (Word32 -> InitiatorOnly -> NodeVersion) -> CBOR.Decoder s (Either HandshakeFailure NodeVersion)
@@ -853,6 +860,7 @@ isSameVersionAndMagic v1 v2 = extract v1 == extract v2
         extract (NodeToClientVersionV20 m) = (-20, m)
         extract (NodeToClientVersionV21 m) = (-21, m)
         extract (NodeToClientVersionV22 m) = (-22, m)
+        extract (NodeToClientVersionV23 m) = (-23, m)
         extract (NodeToNodeVersionV1 m)    = (1, m)
         extract (NodeToNodeVersionV2 m)    = (2, m)
         extract (NodeToNodeVersionV3 m)    = (3, m)