Encrypt metadata spec and types

lib/wallet/api/http/Cardano/Wallet/Api.hs

@@ -198,6 +198,7 @@ import Cardano.Wallet.Api.Types
     , ApiCoinSelectionT
     , ApiConstructTransactionDataT
     , ApiConstructTransactionT
+    , ApiDecodeTransactionPostData
     , ApiDecodedTransactionT
     , ApiFee
     , ApiHealthCheck
@@ -674,7 +675,7 @@ type BalanceTransaction n = "wallets"
 type DecodeTransaction n = "wallets"
     :> Capture "walletId" (ApiT WalletId)
     :> "transactions-decode"
-    :> ReqBody '[JSON] ApiSerialisedTransaction
+    :> ReqBody '[JSON] ApiDecodeTransactionPostData
     :> PostAccepted '[JSON] (ApiDecodedTransactionT n)
 
 -- | https://cardano-foundation.github.io/cardano-wallet/api/#operation/submitTransaction
@@ -1196,7 +1197,7 @@ type SignSharedTransaction n = "shared-wallets"
 type DecodeSharedTransaction n = "shared-wallets"
     :> Capture "walletId" (ApiT WalletId)
     :> "transactions-decode"
-    :> ReqBody '[JSON] ApiSerialisedTransaction
+    :> ReqBody '[JSON] ApiDecodeTransactionPostData
     :> PostAccepted '[JSON] (ApiDecodedTransactionT n)
 
 -- | https://cardano-foundation.github.io/cardano-wallet/api/#operation/submitSharedTransaction

lib/wallet/api/http/Cardano/Wallet/Api/Client.hs

@@ -68,6 +68,7 @@ import Cardano.Wallet.Api.Types
     , ApiCoinSelectionT
     , ApiConstructTransactionDataT
     , ApiConstructTransactionT
+    , ApiDecodeTransactionPostData
     , ApiDecodedTransactionT
     , ApiFee
     , ApiNetworkClock
@@ -230,7 +231,7 @@ data TransactionClient = TransactionClient
         -> ClientM ApiSerialisedTransaction
     , decodeTransaction
         :: ApiT WalletId
-        -> ApiSerialisedTransaction
+        -> ApiDecodeTransactionPostData
         -> ClientM (ApiDecodedTransactionT Aeson.Value)
     , submitTransaction
         :: ApiT WalletId

lib/wallet/api/http/Cardano/Wallet/Api/Http/Shelley/Server.hs

@@ -353,6 +353,7 @@ import Cardano.Wallet.Api.Types
     , ApiCoinSelectionWithdrawal (..)
     , ApiConstructTransaction (..)
     , ApiConstructTransactionData (..)
+    , ApiDecodeTransactionPostData (..)
     , ApiDecodedTransaction (..)
     , ApiExternalInput (..)
     , ApiFee (..)
@@ -446,6 +447,7 @@ import Cardano.Wallet.Api.Types
     , XPubOrSelf (..)
     , getApiMnemonicT
     , toApiAsset
+    , toApiDecodeTransactionPostData
     , toApiEra
     , toApiNetworkParameters
     , toApiUtxoStatistics
@@ -2619,19 +2621,26 @@ constructTransaction
     -> ApiConstructTransactionData n
     -> Handler (ApiConstructTransaction n)
 constructTransaction api argGenChange knownPools poolStatus apiWalletId body = do
-    body & \(ApiConstructTransactionData _ _ _ _ _ _ _ _) ->
+    body & \(ApiConstructTransactionData _ _ _ _ _ _ _ _ _) ->
     -- Above is the way to get a compiler error when number of fields changes,
     -- in order not to forget to update the pattern below:
         case body of
             ApiConstructTransactionData
                 { payments = Nothing
                 , withdrawal = Nothing
                 , metadata = Nothing
+                , encryptMetadata = Nothing
                 , mintBurn = Nothing
                 , delegations = Nothing
                 } -> liftHandler $ throwE ErrConstructTxWrongPayload
             _ -> pure ()
 
+    when (isJust (body ^. #encryptMetadata) && isNothing (body ^. #metadata) ) $
+        liftHandler $ throwE ErrConstructTxWrongPayload
+
+    when (isJust (body ^. #encryptMetadata)) $
+        liftHandler $ throwE ErrConstructTxNotImplemented
+
     validityInterval <-
         liftHandler $ parseValidityInterval ti $ body ^. #validityInterval
 
@@ -2801,7 +2810,8 @@ constructTransaction api argGenChange knownPools poolStatus apiWalletId body = d
                     , encoding = body ^. #encoding
                     }
 
-        apiDecoded <- decodeTransaction @_ @n api apiWalletId balancedTx
+        apiDecoded <- decodeTransaction @_ @n api apiWalletId
+                      (toApiDecodeTransactionPostData balancedTx)
 
         (_, _, rewardPath) <- handler $ W.readRewardAccount @s db
 
@@ -3221,7 +3231,8 @@ constructSharedTransaction
                         , encoding = body ^. #encoding
                         }
 
-                apiDecoded <- decodeSharedTransaction api (ApiT wid) balancedTx
+                apiDecoded <- decodeSharedTransaction api (ApiT wid)
+                              (toApiDecodeTransactionPostData balancedTx)
                 let deposits = case optionalDelegationAction of
                         Just (JoinRegisteringKey _poolId) ->
                             [W.getStakeKeyDeposit pp]
@@ -3277,9 +3288,11 @@ decodeSharedTransaction
     :: forall n . HasSNetworkId n
     => ApiLayer (SharedState n SharedKey)
     -> ApiT WalletId
-    -> ApiSerialisedTransaction
+    -> ApiDecodeTransactionPostData
     -> Handler (ApiDecodedTransaction n)
-decodeSharedTransaction ctx (ApiT wid) (ApiSerialisedTransaction (ApiT sealed) _) = do
+decodeSharedTransaction ctx (ApiT wid) postData = do
+    let ApiDecodeTransactionPostData (ApiT sealed) decryptMetadata = postData
+    when (isJust decryptMetadata) $ error "not implemented"
     era <- liftIO $ NW.currentNodeEra nl
     (txinsOutsPaths, collateralInsOutsPaths, outsPath, pp, certs, txId, fee
         , metadata, scriptValidity, interval, witsCount, withdrawals, rewardAcctM)
@@ -3439,10 +3452,12 @@ decodeTransaction
        )
     => ApiLayer s
     -> ApiT WalletId
-    -> ApiSerialisedTransaction
+    -> ApiDecodeTransactionPostData
     -> Handler (ApiDecodedTransaction n)
 decodeTransaction
-    ctx@ApiLayer{..} (ApiT wid) (ApiSerialisedTransaction (ApiT sealed) _) = do
+    ctx@ApiLayer{..} (ApiT wid) postData = do
+    let ApiDecodeTransactionPostData (ApiT sealed) decryptMetadata = postData
+    when (isJust decryptMetadata) $ error "not implemented"
     era <- liftIO $ NW.currentNodeEra netLayer
     withWorkerCtx ctx wid liftE liftE $ \wrk -> do
         (k, _) <- liftHandler $ W.readPolicyPublicKey wrk
@@ -3575,7 +3590,8 @@ submitTransaction ctx apiw@(ApiT wid) apitx = do
 
     let sealedTx = getApiT . (view #serialisedTxSealed) $ apitx
 
-    apiDecoded <- decodeTransaction @s @n ctx apiw apitx
+    apiDecoded <- decodeTransaction @s @n ctx apiw
+                  (toApiDecodeTransactionPostData apitx)
     when (isForeign apiDecoded) $
         liftHandler $ throwE ErrSubmitTransactionForeignWallet
     let ourOuts = getOurOuts apiDecoded
@@ -3709,7 +3725,8 @@ submitSharedTransaction ctx apiw@(ApiT wid) apitx = do
 
     let sealedTx = getApiT . (view #serialisedTxSealed) $ apitx
 
-    apiDecoded <- decodeSharedTransaction @n ctx apiw apitx
+    apiDecoded <- decodeSharedTransaction @n ctx apiw
+                  (toApiDecodeTransactionPostData apitx)
     when (isForeign apiDecoded) $
         liftHandler $ throwE ErrSubmitTransactionForeignWallet
     let ourOuts = getOurOuts apiDecoded

lib/wallet/api/http/Cardano/Wallet/Api/Types.hs

@@ -79,6 +79,7 @@ module Cardano.Wallet.Api.Types
     , ApiCoinSelectionCollateral (..)
     , ApiCoinSelectionOutput (..)
     , ApiCoinSelectionWithdrawal (..)
+    , ApiEncryptMetadata (..)
     , ApiConstructTransaction (..)
     , ApiConstructTransactionData (..)
     , ApiCosignerIndex (..)
@@ -188,6 +189,9 @@ module Cardano.Wallet.Api.Types
     , WalletPutPassphraseMnemonicData (..)
     , WalletPutPassphraseOldPassphraseData (..)
     , XPubOrSelf (..)
+    , ApiDecodeTransactionPostData (..)
+    , fromApiDecodeTransactionPostData
+    , toApiDecodeTransactionPostData
 
     -- * API Types (Byron)
     , ApiByronWallet (..)
@@ -1198,12 +1202,19 @@ data ApiMultiDelegationAction
     deriving (Eq, Generic, Show)
     deriving anyclass NFData
 
+newtype ApiEncryptMetadata = ApiEncryptMetadata
+    { passphrase :: ApiT (Passphrase "lenient") }
+    deriving (Eq, Generic, Show)
+    deriving (FromJSON, ToJSON) via DefaultRecord ApiEncryptMetadata
+    deriving anyclass NFData
+
 -- | Input parameters for transaction construction.
 data ApiConstructTransactionData (n :: NetworkDiscriminant) =
     ApiConstructTransactionData
     { payments :: !(Maybe (ApiPaymentDestination n))
     , withdrawal :: !(Maybe ApiSelfWithdrawalPostData)
     , metadata :: !(Maybe TxMetadataWithSchema)
+    , encryptMetadata :: !(Maybe ApiEncryptMetadata)
     , mintBurn :: !(Maybe (NonEmpty (ApiMintBurnData n)))
     , delegations :: !(Maybe (NonEmpty ApiMultiDelegationAction))
     , validityInterval :: !(Maybe ApiValidityInterval)
@@ -1243,6 +1254,24 @@ data ApiValidityBound
     deriving (Eq, Generic, Show)
     deriving anyclass NFData
 
+data ApiDecodeTransactionPostData = ApiDecodeTransactionPostData
+    { transaction :: !(ApiT SealedTx)
+    , decrypt_metadata :: !(Maybe ApiEncryptMetadata)
+    }
+    deriving (Eq, Generic, Show)
+
+fromApiDecodeTransactionPostData
+    :: ApiDecodeTransactionPostData
+    -> ApiSerialisedTransaction
+fromApiDecodeTransactionPostData (ApiDecodeTransactionPostData sealedtx _) =
+    ApiSerialisedTransaction sealedtx HexEncoded
+
+toApiDecodeTransactionPostData
+    :: ApiSerialisedTransaction
+    -> ApiDecodeTransactionPostData
+toApiDecodeTransactionPostData (ApiSerialisedTransaction sealedTx _) =
+    ApiDecodeTransactionPostData sealedTx Nothing
+
 data ApiSignTransactionPostData = ApiSignTransactionPostData
     { transaction :: !(ApiT SealedTx)
     , passphrase :: !(ApiT (Passphrase "lenient"))
@@ -2569,6 +2598,11 @@ instance ToJSON ApiSerialisedTransaction where
                            sealedTxBytesValue @'Base64 . getApiT $ tx
                ]
 
+instance FromJSON ApiDecodeTransactionPostData where
+    parseJSON = genericParseJSON strictRecordTypeOptions
+instance ToJSON ApiDecodeTransactionPostData where
+    toJSON = genericToJSON strictRecordTypeOptions
+
 instance FromJSON ApiSignTransactionPostData where
     parseJSON = genericParseJSON strictRecordTypeOptions
 instance ToJSON ApiSignTransactionPostData where