Merge pull request #422 from blinklabs-io/feat/handshake-version-data-types

feat: types for handshake version data

Author: agaffney

protocol/handshake/client.go

@@ -74,18 +74,24 @@ func (c *Client) Start() {
 			if c.Mode() == protocol.ProtocolModeNodeToNode {
 				if version >= 11 {
 					// TODO: make peer sharing mode configurable once it actually works
-					versionMap[version] = []interface{}{
-						c.config.NetworkMagic,
-						diffusionMode,
-						PeerSharingModeNoPeerSharing,
-						QueryModeDisabled,
+					versionMap[version] = NtNVersionDataPeerSharingQuery{
+						NetworkMagic:                       c.config.NetworkMagic,
+						InitiatorAndResponderDiffusionMode: diffusionMode,
+						PeerSharing:                        PeerSharingModeNoPeerSharing,
+						Query:                              QueryModeDisabled,
 					}
 				} else {
-					versionMap[version] = []interface{}{c.config.NetworkMagic, diffusionMode}
+					versionMap[version] = NtNVersionDataLegacy{
+						NetworkMagic:                       c.config.NetworkMagic,
+						InitiatorAndResponderDiffusionMode: diffusionMode,
+					}
 				}
 			} else {
 				if (version - NodeToClientVersionOffset) >= 15 {
-					versionMap[version] = []any{c.config.NetworkMagic, QueryModeDisabled}
+					versionMap[version] = NtCVersionData{
+						NetworkMagic: c.config.NetworkMagic,
+						Query:        QueryModeDisabled,
+					}
 				} else {
 					versionMap[version] = c.config.NetworkMagic
 				}
@@ -122,6 +128,8 @@ func (c *Client) handleAcceptVersion(msgGeneric protocol.Message) error {
 	msg := msgGeneric.(*MsgAcceptVersion)
 	fullDuplex := false
 	if c.Mode() == protocol.ProtocolModeNodeToNode {
+		// TODO: switch to using the VersionData types
+		// this is more annoying than it would seem until we fix some other things
 		versionData := msg.VersionData.([]interface{})
 		//nolint:gosimple
 		if versionData[1].(bool) == DiffusionModeInitiatorAndResponder {

protocol/handshake/versiondata.go

@@ -0,0 +1,25 @@
+package handshake
+
+import "github.com/blinklabs-io/gouroboros/cbor"
+
+type NtCVersionDataLegacy uint32
+
+type NtCVersionData struct {
+	cbor.StructAsArray
+	NetworkMagic uint32
+	Query        bool
+}
+
+type NtNVersionDataLegacy struct {
+	cbor.StructAsArray
+	NetworkMagic                       uint32
+	InitiatorAndResponderDiffusionMode bool
+}
+
+type NtNVersionDataPeerSharingQuery struct {
+	cbor.StructAsArray
+	NetworkMagic                       uint32
+	InitiatorAndResponderDiffusionMode bool
+	PeerSharing                        uint
+	Query                              bool
+}