Fix IPV6 parser

Author: marcusbfs

src/Internal/QueryM/Ogmios.purs

@@ -724,25 +724,37 @@ parseIpv6String str = do
     padded = String.replaceAll (Pattern " ") (Replacement "0") $ fold $
       partsFixed
         <#> StringUtils.padStart 4
-  decodeCbor <<< wrap =<< hexToByteArray padded
+  decodeCbor <<< wrap =<< hexToByteArray ("50" <> padded)
 
 decodeRelay :: Aeson -> Either JsonDecodeError Relay
 decodeRelay aeson = do
   obj <- decodeAeson aeson
   let
+    guardType :: String -> String -> Either JsonDecodeError Unit
+    guardType fname expectedType = do
+      otype <- obj .: "type"
+      when (otype /= expectedType) $ do
+        Left $ TypeMismatch $ fname <> ": expected '" <> expectedType
+          <> "', got: '"
+          <> otype
+          <> "' for "
+          <> Aeson.stringifyAeson aeson
     decodeSingleHostAddr = do
+      guardType "SingleHostAddr" "ipAddress"
       port <- obj .:? "port"
       ipv4 <- obj .:? "ipv4" >>= traverse decodeIpv4
       ipv6 <- obj .:? "ipv6" >>= traverse decodeIpv6
       pure $ SingleHostAddr { port, ipv4, ipv6 }
     decodeSingleHostName = do
+      guardType "SingleHostName" "hostname"
       port <- obj .: "port"
       dnsName <- obj .: "hostname"
       pure $ SingleHostName { port, dnsName }
     decodeMultiHostName = do
+      guardType "MultiHostName" "hostname"
       dnsName <- obj .: "hostname"
       pure $ MultiHostName { dnsName }
-  decodeSingleHostName <|> decodeSingleHostAddr <|> decodeMultiHostName
+  decodeSingleHostName <|> decodeMultiHostName <|> decodeSingleHostAddr
 
 decodePoolMetadata :: Aeson -> Either JsonDecodeError PoolMetadata
 decodePoolMetadata aeson = do

test/Types/Ipv6.purs

@@ -7,25 +7,28 @@ import Prelude
 import Cardano.AsCbor (decodeCbor)
 import Ctl.Internal.QueryM.Ogmios (parseIpv6String)
 import Data.ByteArray (hexToByteArrayUnsafe)
+import Data.Maybe (Maybe(Nothing))
 import Data.Newtype (wrap)
 import Effect.Aff (Aff)
 import Mote (group, test)
 import Mote.TestPlanM (TestPlanM)
-import Test.Spec.Assertions (shouldEqual)
+import Test.Spec.Assertions (shouldEqual, shouldNotEqual)
 
 suite :: TestPlanM (Aff Unit) Unit
 suite = do
   group "Ipv6 type (parsing)" do
     testIpv6 "2345:425:2CA1:0000:0000:567:5673:23b5"
-      "234504252CA1000000000567567323b5"
+      "50234504252CA1000000000567567323b5"
     testIpv6 "2345:0425:2CA1:0:0:0567:5673:23b5"
-      "234504252CA1000000000567567323b5"
-    testIpv6 "2345:0425:2CA1::0567:5673:23b5" "234504252CA1000000000567567323b5"
-    testIpv6 "2345:0425:2CA1::5673:23b5" "234504252CA1000000000000567323b5"
-    testIpv6 "2345:0425:2CA1::23b5" "234504252CA1000000000000000023b5"
+      "50234504252CA1000000000567567323b5"
+    testIpv6 "2345:0425:2CA1::0567:5673:23b5"
+      "50234504252CA1000000000567567323b5"
+    testIpv6 "2345:0425:2CA1::5673:23b5" "50234504252CA1000000000000567323b5"
+    testIpv6 "2345:0425:2CA1::23b5" "50234504252CA1000000000000000023b5"
 
 testIpv6 :: String -> String -> TestPlanM (Aff Unit) Unit
 testIpv6 str expected =
   test str do
-    parseIpv6String str `shouldEqual`
-      (decodeCbor (wrap $ hexToByteArrayUnsafe expected))
+    let ipv6 = parseIpv6String str
+    ipv6 `shouldNotEqual` Nothing
+    ipv6 `shouldEqual` (decodeCbor (wrap $ hexToByteArrayUnsafe expected))