1 files changed, 12 insertions, 6 deletions

diff --git a/src/Data/Tox.hs b/src/Data/Tox.hs
index 888ca3b6..b9df7582 100644
--- a/src/Data/Tox.hs
+++ b/src/Data/Tox.hs
@@ -1,3 +1,6 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE DeriveDataTypeable    #-}
 {-# LANGUAGE DeriveFunctor         #-}
 {-# LANGUAGE DeriveGeneric         #-}
@@ -10,23 +13,23 @@
 {-# LANGUAGE UnboxedTuples         #-}
 module Data.Tox where
 
+import Data.Bits
 import Data.ByteString (ByteString)
 import Data.Data (Data)
 import Data.Word
 import Data.LargeWord
 import Data.IP
 import Data.Serialize
-import Network.BitTorrent.Address (NodeInfo(..)) -- Serialize IP
+-- import Network.BitTorrent.Address (NodeInfo(..)) -- Serialize IP
 import GHC.Generics (Generic)
 import Network.Socket
-import Network.RPC hiding (NodeId)
+import Network.RPC
 import qualified Network.RPC as Envelope (NodeId)
 import Crypto.PubKey.ECC.Types
 
 type Key32   = Word256 -- 32 byte key
 type Nonce8  = Word64  -- 8 bytes
 type Nonce24 = Word192 -- 24 bytes
-type NodeId  = Word256 -- 32 bytes (mainline uses only 20-byte node IDs)
 
 
 data NodeFormat  = NodeFormat
@@ -91,12 +94,14 @@ instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
 -- | Use with 'PingPayload', 'GetNodesPayload', or 'SendNodesPayload'
 data Message a = Message
     { msgType    :: MessageType
-    , msgClient  :: NodeId
+    , msgClient  :: NodeId Message
     , msgNonce   :: Nonce24
     , msgPayload :: a
     }
  deriving (Show, Generic, Functor, Foldable, Traversable)
 
+deriving instance Show (NodeId Message) -- TODO: print as hex
+
 isQuery :: Message a -> Bool
 isQuery (Message { msgType = SendNodes })                  = False
 isQuery (Message { msgType = MessageType typ }) | even typ = True
@@ -114,7 +119,7 @@ data PingPayload = PingPayload
     }
 
 data GetNodesPayload = GetNodesPayload
-    { nodesForWho :: NodeId
+    { nodesForWho :: NodeId Message
     , nodesNonce :: Nonce8
     }
 
@@ -249,7 +254,8 @@ curve25519 = CurveFP (CurvePrime prime curvecommon)
 
 instance Envelope Message where
     type TransactionID Message = Nonce24
-    type NodeId Message = NodeId
+    newtype NodeId Message = NodeId Word256
+        deriving (Serialize, Eq, Ord, Bits, FiniteBits)
 
     envelopePayload = msgPayload