3 files changed, 19 insertions, 13 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index fbd17397..8db80f50 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -159,6 +159,7 @@ library
                      , data-default-class
 --                     , data-dword
                      , intset       >= 0.1
+-- patched build:    , intset       == 0.1.1.10000
                      , PSQueue      >= 1.1
                      , split        >= 0.2
                      , text         >= 0.11.0
@@ -342,7 +343,7 @@ executable dht
   hs-source-dirs:      examples
   main-is:             dht.hs
   default-language:    Haskell2010
-  build-depends:       base, haskeline, network, bytestring
+  build-depends:       base, haskeline, network, bytestring, transformers
 
 executable dhtd
   hs-source-dirs:      examples
@@ -380,11 +381,12 @@ executable mktorrent
                      , filepath
                      , optparse-applicative
                      , hslogger
-  if flag(network-uri)
-    Build-depends:     network      >= 2.6
+--  if flag(network-uri)
+--    Build-depends:
+                     , network      >= 2.6
                      , network-uri  >= 2.6
-  else
-    Build-depends:     network      >= 2.4 && < 2.6
+--  else
+--    Build-depends:     network      >= 2.4 && < 2.6
   ghc-options:         -Wall -O2 -threaded
 
 -- nonfunctioning example of very basic bittorrent client
diff --git a/src/Data/BEncode/Pretty.hs b/src/Data/BEncode/Pretty.hs
index 63efc61c..89fcb489 100644
--- a/src/Data/BEncode/Pretty.hs
+++ b/src/Data/BEncode/Pretty.hs
@@ -7,6 +7,9 @@ import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Lazy.Char8 as BL8
 import Data.Text (Text)
 import qualified Data.Text as T
+import Data.Text.Encoding
+import Text.Printf
+import qualified Data.ByteString.Base16 as Base16
 #ifdef BENCODE_AESON
 import Data.BEncode.BDict hiding (map)
 import Data.Aeson.Types hiding (parse)
@@ -14,12 +17,9 @@ import Data.Aeson.Encode.Pretty
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.Vector as Vector
 import Data.Foldable as Foldable
-import Data.Text.Encoding
-import Text.Printf
 #endif
 
-#ifdef BENCODE_AESON
-
+{-
 unhex :: Text -> BS.ByteString
 unhex t = BS.pack $ map unhex1 [0 .. BS.length nibs `div` 2]
  where
@@ -31,6 +31,9 @@ unhex t = BS.pack $ map unhex1 [0 .. BS.length nibs `div` 2]
 
 hex :: BS.ByteString -> Text
 hex bs = T.concat $ map (T.pack . printf "%02X") $ BS.unpack bs
+-}
+
+#ifdef BENCODE_AESON
 
 quote_chr :: Char
 quote_chr = ' '
@@ -39,12 +42,12 @@ quote :: Text -> Text
 quote t = quote_chr `T.cons` t `T.snoc` quote_chr
 
 encodeByteString :: BS.ByteString -> Text
-encodeByteString s = either (const $ hex s) quote $ decodeUtf8' s
+encodeByteString s = either (const . decodeUtf8 $ Base16.encode s) quote $ decodeUtf8' s
 
 decodeByteString :: Text -> BS.ByteString
 decodeByteString s
         | T.head s==quote_chr = encodeUtf8 (T.takeWhile (/=quote_chr) $ T.drop 1 s)
-        | otherwise           = unhex s
+        | otherwise           = fst (Base16.decode (encodeUtf8 s))
 
 instance ToJSON BValue where
     toJSON (BInteger x) = Number $ fromIntegral x
diff --git a/src/Network/KRPC/Manager.hs b/src/Network/KRPC/Manager.hs
index 7a2120cb..4852eb38 100644
--- a/src/Network/KRPC/Manager.hs
+++ b/src/Network/KRPC/Manager.hs
@@ -52,7 +52,8 @@ import Control.Monad.Reader
 import Control.Monad.Trans.Control
 import Data.BEncode as BE
 import Data.BEncode.Internal as BE
-import Data.BEncode.Pretty (showBEncode, hex)
+import Data.BEncode.Pretty (showBEncode)
+import qualified Data.ByteString.Base16 as Base16
 import Data.ByteString as BS
 import Data.ByteString.Char8 as BC
 import Data.ByteString.Lazy as BL
@@ -218,7 +219,7 @@ withManager opts addr hs = bracket (newManager opts addr hs) closeManager
 querySignature :: MethodName -> TransactionId -> SockAddr -> Text
 querySignature name transaction addr = T.concat
   [  "&", T.decodeUtf8 name
-  , " #", hex transaction -- T.decodeUtf8 transaction
+  , " #", T.decodeUtf8 (Base16.encode transaction) -- T.decodeUtf8 transaction
   , " @", T.pack (show addr)
   ]