Merge pull request #2715 from IntersectMBO/main

hotfix: handle type mismatch between haskell and sql result

Author: MSzalowski

CHANGELOG.md

@@ -38,6 +38,7 @@ changes.
 
 - Fix usage of trim on missing label
 - Fix blank screen when registering as a DRep [Issue 2408](https://github.com/IntersectMBO/govtool/issues/2408)
+- Fix type mismatch between sql and haskell code for stake key address
 
 ### Changed
 

govtool/backend/app/Main.hs

@@ -144,10 +144,6 @@ startApp vvaConfig sentryService = do
 
 exceptionHandler :: VVAConfig -> SentryService -> Maybe Request -> SomeException -> IO ()
 exceptionHandler vvaConfig sentryService mRequest exception = do
-  print exception
-  -- These are not considered application errors
-  -- They represent the client closing the connection prematurely
-  -- or the timeout thread being killed by WARP
   let isNotTimeoutThread x = case fromException x of
         Just TimeoutThread -> False
         _                  -> True
@@ -160,13 +156,18 @@ exceptionHandler vvaConfig sentryService mRequest exception = do
           Nothing  -> True
       isNotThreadKilledByTimeoutManager x =
           "Thread killed by timeout manager" `notElem` lines (show x)
-      shouldSkipError =
+      isNotUserErrorMzero x = case fromException x of
+        Just ioe -> not ("user error (mzero)" `isInfixOf` show (ioe :: IOException))
+        _        -> True
+
+      isGuardException =
         isNotTimeoutThread exception &&
         isNotConnectionClosedByPeer exception &&
         isNotClientClosedConnection exception &&
-        isNotThreadKilledByTimeoutManager exception
+        isNotThreadKilledByTimeoutManager exception &&
+        isNotUserErrorMzero exception
 
-  guard shouldSkipError
+  guard isGuardException
 
   let env = sentryEnv vvaConfig
   case mRequest of

govtool/backend/sql/get-stake-key-voting-power.sql

@@ -30,7 +30,7 @@ Balance AS (
 )
 SELECT
   (COALESCE(rr.amount, 0) + COALESCE(r.amount, 0) + COALESCE(b.amount, 0)) AS total_balance,
-  b.addr_raw
+  b.addr_raw::text AS stake_address
 FROM
   Balance b
 LEFT JOIN

govtool/backend/src/VVA/AdaHolder.hs

@@ -51,7 +51,7 @@ getStakeKeyVotingPower ::
   Text ->
   m Integer
 getStakeKeyVotingPower stakeKey = withPool $ \conn -> do
-  result <- liftIO $ SQL.query @_ @(Scientific, Text) conn getVotingPowerSql (SQL.Only stakeKey)
+  result <- liftIO $ SQL.query @_ @(Scientific, ByteString) conn getVotingPowerSql (SQL.Only stakeKey)
   case result of
     [(votingPower,_)] -> return $ floor votingPower
     _ -> do