diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..dac4b4baf88 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cardano-blueprint"] + path = cardano-blueprint + url = git@github.com:cardano-scaling/cardano-blueprint diff --git a/cardano-blueprint b/cardano-blueprint new file mode 160000 index 00000000000..064795c99fd --- /dev/null +++ b/cardano-blueprint @@ -0,0 +1 @@ +Subproject commit 064795c99fda68643636258747917c6d06d2d7b1 diff --git a/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl b/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl deleted file mode 100644 index 08ef8c9ecfb..00000000000 --- a/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl +++ /dev/null @@ -1,37 +0,0 @@ -; -; NodeToClient Handshake -; - -handshakeMessage - = msgProposeVersions - / msgAcceptVersion - / msgRefuse - / msgQueryReply - -msgProposeVersions = [0, versionTable] -msgAcceptVersion = [1, versionNumber, nodeToClientVersionData] -msgRefuse = [2, refuseReason] -msgQueryReply = [3, versionTable] - -; Entries must be sorted by version number. For testing, this is handled in `handshakeFix`. -versionTable = { * versionNumber => nodeToClientVersionData } - - -; as of version 2 (which is no longer supported) we set 15th bit to 1 -; 16 / 17 / 18 / 19 -versionNumber = 32784 / 32785 / 32786 / 32787 - -; As of version 15 and higher -nodeToClientVersionData = [networkMagic, query] - -networkMagic = uint -query = bool - -refuseReason - = refuseReasonVersionMismatch - / refuseReasonHandshakeDecodeError - / refuseReasonRefused - -refuseReasonVersionMismatch = [0, [ *versionNumber ] ] -refuseReasonHandshakeDecodeError = [1, versionNumber, tstr] -refuseReasonRefused = [2, versionNumber, tstr] diff --git a/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl b/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl new file mode 120000 index 00000000000..b03a1fc8450 --- /dev/null +++ b/ouroboros-network-protocols/cddl/specs/handshake-node-to-client.cddl @@ -0,0 +1 @@ +../../../cardano-blueprint/src/network/specs/handshake-node-to-client.cddl \ No newline at end of file diff --git a/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl b/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl deleted file mode 100644 index e452cd46e0e..00000000000 --- a/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl +++ /dev/null @@ -1,35 +0,0 @@ -; -; NodeToNode Handshake (>=v13) -; -handshakeMessage - = msgProposeVersions - / msgAcceptVersion - / msgRefuse - / msgQueryReply - -msgProposeVersions = [0, versionTable] -msgAcceptVersion = [1, versionNumber, nodeToNodeVersionData] -msgRefuse = [2, refuseReason] -msgQueryReply = [3, versionTable] - -versionTable = { * versionNumber => nodeToNodeVersionData } - -versionNumber = 13 / 14 - -nodeToNodeVersionData = [ networkMagic, initiatorOnlyDiffusionMode, peerSharing, query ] - -; range between 0 and 0xffffffff -networkMagic = 0..4294967295 -initiatorOnlyDiffusionMode = bool -; range between 0 and 1 -peerSharing = 0..1 -query = bool - -refuseReason - = refuseReasonVersionMismatch - / refuseReasonHandshakeDecodeError - / refuseReasonRefused - -refuseReasonVersionMismatch = [0, [ *versionNumber ] ] -refuseReasonHandshakeDecodeError = [1, versionNumber, tstr] -refuseReasonRefused = [2, versionNumber, tstr] diff --git a/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl b/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl new file mode 120000 index 00000000000..221127084dc --- /dev/null +++ b/ouroboros-network-protocols/cddl/specs/handshake-node-to-node-v13.cddl @@ -0,0 +1 @@ +../../../cardano-blueprint/src/network/specs/handshake-node-to-node-v13.cddl \ No newline at end of file diff --git a/ouroboros-network-protocols/cddl/specs/handshake-node-to-node.cddl b/ouroboros-network-protocols/cddl/specs/handshake-node-to-node.cddl deleted file mode 100644 index bb0c34d8c10..00000000000 --- a/ouroboros-network-protocols/cddl/specs/handshake-node-to-node.cddl +++ /dev/null @@ -1,31 +0,0 @@ -; -; NodeToNode Handshake, v7 to v10 -; - -handshakeMessage - = msgProposeVersions - / msgAcceptVersion - / msgRefuse - -msgProposeVersions = [0, versionTable] -msgAcceptVersion = [1, versionNumber, nodeToNodeVersionData] -msgRefuse = [2, refuseReason] - -versionTable = { * versionNumber => nodeToNodeVersionData } - -versionNumber = 7 / 8 / 9 / 10 - -nodeToNodeVersionData = [ networkMagic, initiatorOnlyDiffusionMode ] - -; range between 0 and 0xffffffff -networkMagic = 0..4294967295 -initiatorOnlyDiffusionMode = bool - -refuseReason - = refuseReasonVersionMismatch - / refuseReasonHandshakeDecodeError - / refuseReasonRefused - -refuseReasonVersionMismatch = [0, [ *versionNumber ] ] -refuseReasonHandshakeDecodeError = [1, versionNumber, tstr] -refuseReasonRefused = [2, versionNumber, tstr]