Merge #2309

2309: Fix parsing of SMASHPoolId r=hasufell a=hasufell follow-up fix of #2249 found by @piotr-iohk https://smash.shelley-qa.dev.cardano.org/api/v1/delisted vs https://smash.cardano-mainnet.iohk.io/api/v1/delisted Co-authored-by: Julian Ospald <[email protected]>
cardano-foundation · Nov 10, 2020 · 88cbce1 · 88cbce1
2 parents 6cdad95 + b24e2a5
commit 88cbce1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -68,13 +68,13 @@ See **Installation Instructions** for each available [release](https://github.co
 
 > ### Latest releases
 >
-> | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions)
-> | --- | --- | ---
-> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1)
-> | [v2020-11-03](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-11-03) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1)
-> | [v2020-10-13](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-10-13) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1)
-> | [v2020-09-30](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-09-30) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.20.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.20.0)
-> | [v2020-09-22](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-09-22) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.19.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.19.1) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.20.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.20.0)
+> | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions) | SMASH (compatible versions)
+> | --- | --- | --- | ---
+> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
+> | [v2020-11-03](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-11-03) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
+> | [v2020-10-13](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-10-13) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.21.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
+> | [v2020-09-30](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-09-30) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.20.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.20.0) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
+> | [v2020-09-22](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-09-22) | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [1.19.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.19.1) | [1.2.0](https://github.com/input-output-hk/smash/releases/tag/1.2.0)
 
 
 ## How to build from sources

diff --git a/lib/core/src/Cardano/Pool/Metadata.hs b/lib/core/src/Cardano/Pool/Metadata.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NumericUnderscores #-}
@@ -34,13 +35,16 @@ import Cardano.BM.Data.Severity
     ( Severity (..) )
 import Cardano.BM.Data.Tracer
     ( HasPrivacyAnnotation (..), HasSeverityAnnotation (..) )
+import Cardano.Wallet.Api.Types
+    ( defaultRecordTypeOptions )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( hex )
 import Cardano.Wallet.Primitive.Types
     ( PoolId
     , StakePoolMetadata (..)
     , StakePoolMetadataHash (..)
     , StakePoolMetadataUrl (..)
+    , decodePoolIdBech32
     )
 import Control.Exception
     ( IOException, handle )
@@ -58,10 +62,9 @@ import Data.Aeson
     ( FromJSON (..)
     , ToJSON (..)
     , eitherDecodeStrict
-    , object
-    , withObject
-    , (.:)
-    , (.=)
+    , fieldLabelModifier
+    , genericParseJSON
+    , genericToJSON
     )
 import Data.Bifunctor
     ( first )
@@ -77,6 +80,8 @@ import Data.Text.Class
     ( TextDecodingError (..), ToText (..), fromText )
 import Fmt
     ( pretty )
+import GHC.Generics
+    ( Generic )
 import Network.HTTP.Client
     ( HttpException (..)
     , Manager
@@ -112,22 +117,22 @@ metadaFetchEp pid (StakePoolMetadataHash bytes)
     pidStr  = T.unpack $ toText pid
 
 -- | TODO: import SMASH types
-newtype SMASHPoolId = SMASHPoolId T.Text
-  deriving stock (Eq, Show, Ord)
-
-instance ToJSON SMASHPoolId where
-    toJSON (SMASHPoolId poolId) =
-        object
-            [ "poolId" .= poolId
-            ]
+newtype SMASHPoolId = SMASHPoolId
+    { poolId :: T.Text
+    } deriving stock (Eq, Show, Ord)
+      deriving (Generic)
 
 instance FromJSON SMASHPoolId where
-    parseJSON = withObject "SMASHPoolId" $ \o -> do
-        poolId <- o .: "poolId"
-        return $ SMASHPoolId poolId
+    parseJSON = genericParseJSON defaultRecordTypeOptions
+        { fieldLabelModifier = id }
+
+instance ToJSON SMASHPoolId where
+    toJSON = genericToJSON defaultRecordTypeOptions
+        { fieldLabelModifier = id }
 
 toPoolId :: SMASHPoolId -> Either TextDecodingError PoolId
-toPoolId (SMASHPoolId pid) = fromText pid
+toPoolId (SMASHPoolId pid) =
+    either (\_ -> decodePoolIdBech32 pid) Right (fromText @PoolId pid)
 
 -- | Some default settings, overriding some of the library's default with
 -- stricter values.

diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -147,6 +147,9 @@ module Cardano.Wallet.Api.Types
     , PostTransactionDataT
     , PostTransactionFeeDataT
     , ApiWalletMigrationPostDataT
+
+    -- * other
+    , defaultRecordTypeOptions
     ) where
 
 import Prelude