From 5f4406208320bbe56c88070ddcf95d7d0824f7ec Mon Sep 17 00:00:00 2001 From: sorki Date: Thu, 28 Dec 2023 13:26:30 +0100 Subject: [PATCH 1/3] api: fix Index -> index Capture casing --- blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs b/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs index 0bff384..3866c5f 100644 --- a/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs +++ b/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs @@ -23,7 +23,7 @@ data UtilsAPI route = :> "xpub" :> Capture "xpub" Text :> Capture "role" Integer - :> Capture "Index" Integer + :> Capture "index" Integer :> Get '[JSON] DerivedAddress , _txEvaluate From 852ee674145847e19d2cbe0422fedbeb1c1a342b Mon Sep 17 00:00:00 2001 From: sorki Date: Thu, 28 Dec 2023 15:21:20 +0100 Subject: [PATCH 2/3] api: Add ToCapture instances for _deriveAddr --- blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs b/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs index 3866c5f..0b5574f 100644 --- a/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs +++ b/blockfrost-api/src/Blockfrost/API/Cardano/Utils.hs @@ -8,6 +8,7 @@ module Blockfrost.API.Cardano.Utils import Data.Text import Servant.API import Servant.API.Generic +import Servant.Docs (DocCapture (..), ToCapture (..)) import Blockfrost.Types.Cardano.Utils import Blockfrost.Types.Shared.CBOR @@ -48,3 +49,12 @@ data UtilsAPI route = :> Post '[JSON] TxEval } deriving (Generic) + +instance ToCapture (Capture "role" Integer) where + toCapture _ = DocCapture "role" "Account role" + +instance ToCapture (Capture "index" Integer) where + toCapture _ = DocCapture "index" "Address index" + +instance ToCapture (Capture "xpub" Text) where + toCapture _ = DocCapture "xpub" "Hexadecimal xpub" From dab1e87bacd13fd23d90826953501a4a964d8a66 Mon Sep 17 00:00:00 2001 From: sorki Date: Thu, 28 Dec 2023 15:21:40 +0100 Subject: [PATCH 3/3] api: Add missing lenses --- blockfrost-api/src/Blockfrost/Lens.hs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/blockfrost-api/src/Blockfrost/Lens.hs b/blockfrost-api/src/Blockfrost/Lens.hs index bcfb367..e6b0ef9 100644 --- a/blockfrost-api/src/Blockfrost/Lens.hs +++ b/blockfrost-api/src/Blockfrost/Lens.hs @@ -19,8 +19,10 @@ makeFields ''AccountDelegation makeFields ''AccountRegistration makeFields ''AccountWithdrawal makeFields ''AccountMir +makeFields ''AddressAssociatedTotal makeLensesWith blockfrostFieldRules ''AddressInfo +makeLensesWith blockfrostFieldRules ''AddressInfoExtended makeFields ''AddressDetails makeFields ''AddressUtxo makeFields ''AddressTransaction @@ -32,6 +34,7 @@ makeFields ''AssetMetadata makeFields ''AssetHistory makeFields ''AssetTransaction makeFields ''AssetAddress +makeFields ''MetadataMediaFile makeFields ''Block @@ -53,6 +56,7 @@ makeFieldsNoPrefix ''NetworkEraSummary makeFieldsNoPrefix ''NetworkEraBound makeFieldsNoPrefix ''NetworkEraParameters +makeFields ''Pool makeFields ''PoolEpoch makeFields ''PoolInfo makeFields ''PoolHistory @@ -77,6 +81,12 @@ makeFields ''TransactionMetaJSON makeFields ''TransactionMetaCBOR makeFields ''TransactionRedeemer +makeFields ''DerivedAddress +makeFields ''TxEval +makeFields ''TxEvalBudget +makeFields ''TxEvalResult +makeFields ''TxEvalInput + makeLensesWith blockfrostFieldRules ''IPFSAdd makeLensesWith blockfrostFieldRules ''IPFSPinChange makeLensesWith blockfrostFieldRules ''IPFSPin @@ -88,3 +98,4 @@ makeFields ''NutlinkTicker -- * Shared makeFields ''BlockIndex makePrisms ''Amount +makePrisms ''AmountExtended