Correct the Sapling vk call

src/ZGoBackend.hs

@@ -1176,19 +1176,20 @@ routes pipe config = do
         case cast' . Doc =<< u of
           Nothing -> status unauthorized401
           Just u' -> do
-            if isValidSaplingViewingKey qBytes
-              then if matchSaplingAddress
-                        qBytes
-                        (bytes . decodeBech32 . C.pack . T.unpack $ uaddress u')
-                     then do
-                       owner <- liftAndCatchIO $ run (findOwner $ uaddress u')
-                       case cast' . Doc =<< owner of
-                         Nothing -> status badRequest400
-                         Just o' -> do
-                           unless (oviewkey o' /= "") $ do
-                             liftAndCatchIO $ run (upsertViewingKey o' q)
-                             status created201
-                     else status forbidden403
+            if isValidSaplingViewingKey $ C.pack q
+              then do
+                if matchSaplingAddress
+                     qBytes
+                     (bytes . decodeBech32 . C.pack . T.unpack $ uaddress u')
+                  then do
+                    owner <- liftAndCatchIO $ run (findOwner $ uaddress u')
+                    case cast' . Doc =<< owner of
+                      Nothing -> status badRequest400
+                      Just o' -> do
+                        unless (oviewkey o' /= "") $ do
+                          liftAndCatchIO $ run (upsertViewingKey o' q)
+                          status created201
+                  else status forbidden403
               else case decodeUfvk (C.pack q) of
                      Nothing -> status badRequest400
                      Just fvk ->

src/ZGoTx.hs

@@ -157,7 +157,7 @@ pMsg = do
 pMemo :: Parser MemoToken
 pMemo = do
   optional $ some spaceChar
-  t <- pSession <|> pSaplingAddress <|> pMsg
+  t <- pSession <|> pSaplingAddress <|> pUnifiedAddress <|> pMsg
   optional $ some spaceChar
   return t
 

test/Spec.hs

@@ -101,8 +101,9 @@ main = do
           case m of
             Left e -> putStrLn $ errorBundlePretty e
             Right m' ->
-              m_session m' `shouldBe`
-              U.fromString "5d3d4494-51c0-432d-8495-050419957aea"
+              m_address m' `shouldBe`
+              Just
+                "u17n7hpwaujyq7ux8f9jpyymtnk5urw7pyrf60smp5mawy7jgz325hfvz3jn3zsfya8yxryf9q7ldk8nu8df0emra5wne28zq9d9nm2pu4x6qwjha565av9aze0xgujgslz74ufkj0c0cylqwjyrh9msjfh7jzal6d3qzrnhkkqy3pqm8j63y07jxj7txqeac982778rmt64f32aum94x"
         it "parse YWallet memo - Orchard" $ do
           let m =
                 runParser
@@ -112,8 +113,9 @@ main = do
           case m of
             Left e -> putStrLn $ errorBundlePretty e
             Right m' ->
-              m_session m' `shouldBe`
-              U.fromString "ad8477d3-4fdd-4c97-90b2-76630b5f77e1"
+              m_address m' `shouldBe`
+              Just
+                "u17n7hpwaujyq7ux8f9jpyymtnk5urw7pyrf60smp5mawy7jgz325hfvz3jn3zsfya8yxryf9q7ldk8nu8df0emra5wne28zq9d9nm2pu4x6qwjha565av9aze0xgujgslz74ufkj0c0cylqwjyrh9msjfh7jzal6d3qzrnhkkqy3pqm8j63y07jxj7txqeac982778rmt64f32aum94x"
         it "parse Zingo memo - Orchard" $ do
           let m =
                 runParser
@@ -123,8 +125,9 @@ main = do
           case m of
             Left e -> putStrLn $ errorBundlePretty e
             Right m' ->
-              m_session m' `shouldBe`
-              U.fromString "5d3d4494-51c0-432d-8495-050419957aea"
+              m_address m' `shouldBe`
+              Just
+                "u17n7hpwaujyq7ux8f9jpyymtnk5urw7pyrf60smp5mawy7jgz325hfvz3jn3zsfya8yxryf9q7ldk8nu8df0emra5wne28zq9d9nm2pu4x6qwjha565av9aze0xgujgslz74ufkj0c0cylqwjyrh9msjfh7jzal6d3qzrnhkkqy3pqm8j63y07jxj7txqeac982778rmt64f32aum94x"
       describe "PIN generator" $ do
         it "should give a 7 digit" $ do
           pin <- generatePin