sneaking purpose in postAccountKey

cardano-foundation · Jun 8, 2021 · 708dc97 · 708dc97
1 parent 856f43c
commit 708dc97
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api.hs b/lib/core/src/Cardano/Wallet/Api.hs
@@ -173,6 +173,7 @@ import Cardano.Wallet.Api.Types
     , ApiNetworkParameters
     , ApiPoolId
     , ApiPostAccountKeyData
+    , ApiPostAccountKeyDataWithPurpose
     , ApiPostRandomAddressData
     , ApiPutAddressesDataT
     , ApiSelectCoinsDataT
@@ -396,7 +397,7 @@ type PostAccountKey = "wallets"
     :> Capture "walletId" (ApiT WalletId)
     :> "keys"
     :> Capture "index" (ApiT DerivationIndex)
-    :> ReqBody '[JSON] ApiPostAccountKeyData
+    :> ReqBody '[JSON] ApiPostAccountKeyDataWithPurpose
     :> PostAccepted '[JSON] ApiAccountKey
 
 -- | https://input-output-hk.github.io/cardano-wallet/api/#operation/getAccountKey

diff --git a/lib/core/src/Cardano/Wallet/Api/Server.hs b/lib/core/src/Cardano/Wallet/Api/Server.hs
@@ -207,7 +207,7 @@ import Cardano.Wallet.Api.Types
     , ApiOurStakeKey (..)
     , ApiPendingSharedWallet (..)
     , ApiPoolId (..)
-    , ApiPostAccountKeyData (..)
+    , ApiPostAccountKeyDataWithPurpose (..)
     , ApiPostRandomAddressData (..)
     , ApiPutAddressesData (..)
     , ApiRawMetadata (..)
@@ -2488,9 +2488,9 @@ postAccountPublicKey
     -> (ByteString -> KeyFormat -> account)
     -> ApiT WalletId
     -> ApiT DerivationIndex
-    -> ApiPostAccountKeyData
+    -> ApiPostAccountKeyDataWithPurpose
     -> Handler account
-postAccountPublicKey ctx mkAccount (ApiT wid) (ApiT ix) (ApiPostAccountKeyData (ApiT pwd) extd) = do
+postAccountPublicKey ctx mkAccount (ApiT wid) (ApiT ix) (ApiPostAccountKeyDataWithPurpose (ApiT pwd) extd _purposeM) = do
     withWorkerCtx @_ @s @k ctx wid liftE liftE $ \wrk -> do
         k <- liftHandler $ W.getAccountPublicKeyAtIndex @_ @s @k wrk wid pwd ix
         pure $ mkAccount (publicKeyToBytes' extd $ getRawKey k) extd

diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -139,6 +139,7 @@ module Cardano.Wallet.Api.Types
     , ApiAccountKeyShared (..)
     , KeyFormat (..)
     , ApiPostAccountKeyData (..)
+    , ApiPostAccountKeyDataWithPurpose (..)
 
     -- * API Types (Byron)
     , ApiByronWallet (..)
@@ -1140,6 +1141,13 @@ data ApiPostAccountKeyData = ApiPostAccountKeyData
     } deriving (Eq, Generic, Show)
       deriving anyclass NFData
 
+data ApiPostAccountKeyDataWithPurpose = ApiPostAccountKeyDataWithPurpose
+    { passphrase :: ApiT (Passphrase "raw")
+    , format :: KeyFormat
+    , purpose :: Maybe (ApiT DerivationIndex)
+    } deriving (Eq, Generic, Show)
+      deriving anyclass NFData
+
 data ApiAccountKey = ApiAccountKey
     { getApiAccountKey :: ByteString
     , format :: KeyFormat
@@ -1783,6 +1791,11 @@ instance FromJSON ApiPostAccountKeyData where
 instance ToJSON ApiPostAccountKeyData where
     toJSON = genericToJSON defaultRecordTypeOptions
 
+instance FromJSON ApiPostAccountKeyDataWithPurpose where
+    parseJSON = genericParseJSON defaultRecordTypeOptions
+instance ToJSON ApiPostAccountKeyDataWithPurpose where
+    toJSON = genericToJSON defaultRecordTypeOptions
+
 instance FromJSON ApiEpochInfo where
     parseJSON = genericParseJSON defaultRecordTypeOptions
 instance ToJSON ApiEpochInfo where

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Api/Server.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Api/Server.hs
@@ -132,6 +132,8 @@ import Cardano.Wallet.Api.Types
     , ApiHealthCheck (..)
     , ApiMaintenanceAction (..)
     , ApiMaintenanceActionPostData (..)
+    , ApiPostAccountKeyData (..)
+    , ApiPostAccountKeyDataWithPurpose (..)
     , ApiSelectCoinsAction (..)
     , ApiSelectCoinsData (..)
     , ApiStakePool
@@ -524,8 +526,12 @@ server byron icarus shelley multisig spl ntp =
         :: ApiLayer (SharedState n SharedKey) SharedKey
         -> Server SharedWalletKeys
     sharedWalletKeys apilayer = derivePublicKey apilayer ApiVerificationKeyShared
-        :<|> postAccountPublicKey apilayer ApiAccountKeyShared
+        :<|> (\wid ix p -> postAccountPublicKey apilayer ApiAccountKeyShared wid ix (toKeyDataPurpose p) )
         :<|> getAccountPublicKey apilayer ApiAccountKeyShared
+      where
+          toKeyDataPurpose :: ApiPostAccountKeyData -> ApiPostAccountKeyDataWithPurpose
+          toKeyDataPurpose (ApiPostAccountKeyData p f) =
+              ApiPostAccountKeyDataWithPurpose p f Nothing
 
     sharedAddresses
         :: ApiLayer (SharedState n SharedKey) SharedKey