diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Version [0.12.0.0](https://github.com/blockfrost/blockfrost-haskell/compare/api-0.11.0.0...api-0.12.0.0) (2024-09-19) + +* Additions + * `ProtocolParams` extended with Conway related protocol parameters and raw cost models [#59](https://github.com/blockfrost/blockfrost-haskell/pull/59) + * Mempool endpoints [#62](https://github.com/blockfrost/blockfrost-haskell/pull/62) + * `/txs/:hash/cbor` endpoint with `TransactionCBOR` data type [#63](https://github.com/blockfrost/blockfrost-haskell/pull/63) + # Version [0.11.0.0](https://github.com/blockfrost/blockfrost-haskell/compare/api-0.10.0.0...api-0.11.0.0) (2024-08-26) Changes diff --git a/blockfrost-api.cabal b/blockfrost-api.cabal --- a/blockfrost-api.cabal +++ b/blockfrost-api.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: blockfrost-api -version: 0.11.0.0 +version: 0.12.0.0 synopsis: API definitions for blockfrost.io description: Core types and Servant API description homepage: https://github.com/blockfrost/blockfrost-haskell @@ -34,6 +34,7 @@ DeriveAnyClass DeriveGeneric DerivingVia + DuplicateRecordFields GADTs GeneralizedNewtypeDeriving FlexibleContexts @@ -68,6 +69,7 @@ , Blockfrost.API.Cardano.Blocks , Blockfrost.API.Cardano.Epochs , Blockfrost.API.Cardano.Ledger + , Blockfrost.API.Cardano.Mempool , Blockfrost.API.Cardano.Metadata , Blockfrost.API.Cardano.Network , Blockfrost.API.Cardano.Pools @@ -89,6 +91,7 @@ , Blockfrost.Types.Cardano.Blocks , Blockfrost.Types.Cardano.Epochs , Blockfrost.Types.Cardano.Genesis + , Blockfrost.Types.Cardano.Mempool , Blockfrost.Types.Cardano.Metadata , Blockfrost.Types.Cardano.Network , Blockfrost.Types.Cardano.Pools diff --git a/src/Blockfrost/API.hs b/src/Blockfrost/API.hs --- a/src/Blockfrost/API.hs +++ b/src/Blockfrost/API.hs @@ -98,6 +98,11 @@ :- "genesis" :> Tag "Cardano » Ledger" :> ToServantApi LedgerAPI + , _mempool + :: route + :- "mempool" + :> Tag "Cardano » Mempool" + :> ToServantApi MempoolAPI , _metadata :: route :- "metadata" diff --git a/src/Blockfrost/API/Cardano.hs b/src/Blockfrost/API/Cardano.hs --- a/src/Blockfrost/API/Cardano.hs +++ b/src/Blockfrost/API/Cardano.hs @@ -9,6 +9,7 @@ , module Blockfrost.API.Cardano.Blocks , module Blockfrost.API.Cardano.Epochs , module Blockfrost.API.Cardano.Ledger + , module Blockfrost.API.Cardano.Mempool , module Blockfrost.API.Cardano.Metadata , module Blockfrost.API.Cardano.Network , module Blockfrost.API.Cardano.Pools @@ -23,6 +24,7 @@ import Blockfrost.API.Cardano.Blocks import Blockfrost.API.Cardano.Epochs import Blockfrost.API.Cardano.Ledger +import Blockfrost.API.Cardano.Mempool import Blockfrost.API.Cardano.Metadata import Blockfrost.API.Cardano.Network import Blockfrost.API.Cardano.Pools diff --git a/src/Blockfrost/API/Cardano/Mempool.hs b/src/Blockfrost/API/Cardano/Mempool.hs new file mode 100644 --- /dev/null +++ b/src/Blockfrost/API/Cardano/Mempool.hs @@ -0,0 +1,42 @@ +-- | Cardano Mempool endpoints + +{-# OPTIONS_HADDOCK hide #-} + +module Blockfrost.API.Cardano.Mempool + where + +import Servant.API +import Servant.API.Generic + +import Blockfrost.Types +import Blockfrost.Util.Pagination +import Blockfrost.Util.Sorting + +data MempoolAPI route = + MempoolAPI + { + _mempoolTransactions + :: route + :- Summary "Transactions in Mempool." + :> Description "Tx hash list of all transactions that are currently stored in the mempool." + :> Pagination + :> Sorting + :> Get '[JSON] [TxHashObject] + , _specificTransaction + :: route + :- Summary "Transaction in mempoool." + :> Description "Content of a specific transaction in the mempool." + :> Capture "hash" TxHash + :> Get '[JSON] MempoolTransaction + , _specificAddress + :: route + :- Summary "Transactions involving an address in mempool." + :> Description "List of transactions in the mempool that involves a specific address." + :> "addresses" + :> Capture "address" Address + :> Pagination + :> Sorting + :> Get '[JSON] [TxHashObject] + } deriving (Generic) + + diff --git a/src/Blockfrost/API/Cardano/Transactions.hs b/src/Blockfrost/API/Cardano/Transactions.hs --- a/src/Blockfrost/API/Cardano/Transactions.hs +++ b/src/Blockfrost/API/Cardano/Transactions.hs @@ -83,6 +83,13 @@ :> Capture "hash" TxHash :> "metadata" :> Get '[JSON] [TransactionMetaJSON] + , _txCBOR + :: route + :- Summary "Transaction in CBOR" + :> Description "Obtain the CBOR serialized transaction." + :> Capture "hash" TxHash + :> "cbor" + :> Get '[JSON] [TransactionCBOR] , _txMetadataCBOR :: route :- Summary "Transaction metadata in CBOR" diff --git a/src/Blockfrost/Lens.hs b/src/Blockfrost/Lens.hs --- a/src/Blockfrost/Lens.hs +++ b/src/Blockfrost/Lens.hs @@ -45,6 +45,12 @@ makeFields ''Genesis +makeFields ''MempoolTransaction +makeFields ''TransactionInMempool +makeFields ''Amount +makeFields ''MempoolUTxOInput +makeFields ''MempoolRedeemer + makeFields ''TxMeta makeFields ''TxMetaJSON makeFields ''TxMetaCBOR @@ -78,6 +84,7 @@ makeFields ''PoolUpdateMetadata makeFields ''TransactionPoolRetiring makeFields ''TransactionMetaJSON +makeFields ''TransactionCBOR makeFields ''TransactionMetaCBOR makeFields ''TransactionRedeemer diff --git a/src/Blockfrost/Types/Cardano.hs b/src/Blockfrost/Types/Cardano.hs --- a/src/Blockfrost/Types/Cardano.hs +++ b/src/Blockfrost/Types/Cardano.hs @@ -7,6 +7,7 @@ , module Blockfrost.Types.Cardano.Blocks , module Blockfrost.Types.Cardano.Epochs , module Blockfrost.Types.Cardano.Genesis + , module Blockfrost.Types.Cardano.Mempool , module Blockfrost.Types.Cardano.Metadata , module Blockfrost.Types.Cardano.Network , module Blockfrost.Types.Cardano.Pools @@ -21,6 +22,7 @@ import Blockfrost.Types.Cardano.Blocks import Blockfrost.Types.Cardano.Epochs import Blockfrost.Types.Cardano.Genesis +import Blockfrost.Types.Cardano.Mempool import Blockfrost.Types.Cardano.Metadata import Blockfrost.Types.Cardano.Network import Blockfrost.Types.Cardano.Pools diff --git a/src/Blockfrost/Types/Cardano/Epochs.hs b/src/Blockfrost/Types/Cardano/Epochs.hs --- a/src/Blockfrost/Types/Cardano/Epochs.hs +++ b/src/Blockfrost/Types/Cardano/Epochs.hs @@ -5,6 +5,7 @@ , PoolStakeDistribution (..) , ProtocolParams (..) , CostModels (..) + , CostModelsRaw (..) , StakeDistribution (..) ) where @@ -77,6 +78,7 @@ , _protocolParamsMinPoolCost :: Lovelaces -- ^ Minimum stake cost forced on the pool , _protocolParamsNonce :: Text -- ^ Epoch number only used once , _protocolParamsCostModels :: CostModels -- ^ Cost models parameters for Plutus Core scripts + , _protocolParamsCostModelsRaw :: CostModelsRaw , _protocolParamsPriceMem :: Rational -- ^ The per word cost of script memory usage , _protocolParamsPriceStep :: Rational -- ^ The cost of script execution step usage , _protocolParamsMaxTxExMem :: Quantity -- ^ The maximum number of execution memory allowed to be used in a single transaction @@ -88,10 +90,32 @@ , _protocolParamsMaxCollateralInputs :: Integer -- ^ The maximum number of collateral inputs allowed in a transaction , _protocolParamsCoinsPerUtxoSize :: Lovelaces -- ^ The cost per UTxO size. Cost per UTxO *word* for Alozno. Cost per UTxO *byte* for Babbage and later , _protocolParamsCoinsPerUtxoWord :: Lovelaces -- ^ The cost per UTxO word (DEPRECATED) + , _protocolParamsPvtMotionNoConfidence :: Maybe Rational + , _protocolParamsPvtCommitteeNormal :: Maybe Rational + , _protocolParamsPvtCommitteeNoConfidence :: Maybe Rational + , _protocolParamsPvtHardForkInitiation :: Maybe Rational + , _protocolParamsPvtppSecurityGroup :: Maybe Rational + , _protocolParamsDvtMotionNoConfidence :: Maybe Rational + , _protocolParamsDvtCommitteeNormal :: Maybe Rational + , _protocolParamsDvtCommitteeNoConfidence :: Maybe Rational + , _protocolParamsDvtUpdateToConstitution :: Maybe Rational + , _protocolParamsDvtHardForkInitiation :: Maybe Rational + , _protocolParamsDvtPPNetworkGroup :: Maybe Rational + , _protocolParamsDvtPPEconomicGroup :: Maybe Rational + , _protocolParamsDvtPPTechnicalGroup :: Maybe Rational + , _protocolParamsDvtPPGovGroup :: Maybe Rational + , _protocolParamsDvtTreasuryWithdrawal :: Maybe Rational + , _protocolParamsCommitteeMinSize :: Maybe Quantity + , _protocolParamsCommitteeMaxTermLength :: Maybe Quantity + , _protocolParamsGovActionLifetime :: Maybe Quantity + , _protocolParamsGovActionDeposit :: Maybe Lovelaces + , _protocolParamsDrepDeposit :: Maybe Lovelaces + , _protocolParamsDrepActivity :: Maybe Quantity + , _protocolParamsMinFeeRefScriptCostPerByte :: Maybe Rational } deriving stock (Show, Eq, Generic) deriving (FromJSON, ToJSON) - via CustomJSON '[FieldLabelModifier '[StripPrefix "_protocolParams", CamelToSnake]] ProtocolParams + via CustomJSON '[FieldLabelModifier '[StripPrefix "_protocolParams", CamelToSnake, Rename "dvt_pp_network_group" "dvt_p_p_network_group", Rename "dvt_pp_economic_group" "dvt_p_p_economic_group", Rename "dvt_pp_technical_group" "dvt_p_p_technical_group", Rename "dvt_pp_gov_group" "dvt_p_p_gov_group"]] ProtocolParams instance ToSample ProtocolParams where toSamples = pure $ singleSample @@ -117,6 +141,7 @@ , _protocolParamsMinPoolCost = 340000000 , _protocolParamsNonce = "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81" , _protocolParamsCostModels = costModelsSample + , _protocolParamsCostModelsRaw = costModelsRawSample , _protocolParamsPriceMem = 0.0577 , _protocolParamsPriceStep = 0.0000721 , _protocolParamsMaxTxExMem = 10000000 @@ -128,6 +153,28 @@ , _protocolParamsMaxCollateralInputs = 3 , _protocolParamsCoinsPerUtxoSize = 34482 , _protocolParamsCoinsPerUtxoWord = 34482 + , _protocolParamsPvtMotionNoConfidence = Just 0.51 + , _protocolParamsPvtCommitteeNormal = Just 0.51 + , _protocolParamsPvtCommitteeNoConfidence = Just 0.51 + , _protocolParamsPvtHardForkInitiation = Just 0.51 + , _protocolParamsPvtppSecurityGroup = Just 0.51 + , _protocolParamsDvtMotionNoConfidence = Just 0.67 + , _protocolParamsDvtCommitteeNormal = Just 0.67 + , _protocolParamsDvtCommitteeNoConfidence = Just 0.6 + , _protocolParamsDvtUpdateToConstitution = Just 0.75 + , _protocolParamsDvtHardForkInitiation = Just 0.6 + , _protocolParamsDvtPPNetworkGroup = Just 0.67 + , _protocolParamsDvtPPEconomicGroup = Just 0.67 + , _protocolParamsDvtPPTechnicalGroup = Just 0.67 + , _protocolParamsDvtPPGovGroup = Just 0.75 + , _protocolParamsDvtTreasuryWithdrawal = Just 0.67 + , _protocolParamsCommitteeMinSize = Just 7 + , _protocolParamsCommitteeMaxTermLength = Just 146 + , _protocolParamsGovActionLifetime = Just 6 + , _protocolParamsGovActionDeposit = Just 100000000000 + , _protocolParamsDrepDeposit = Just 500000000 + , _protocolParamsDrepActivity = Just 20 + , _protocolParamsMinFeeRefScriptCostPerByte = Just 15 } newtype CostModels = CostModels { unCostModels :: Map ScriptType (Map Text Integer) } @@ -169,6 +216,37 @@ pure $ CostModels $ Data.Map.fromList langs +newtype CostModelsRaw = CostModelsRaw { unCostModelsRaw :: Map ScriptType [Integer] } + deriving (Eq, Show, Generic) + +instance ToJSON CostModelsRaw where + toJSON = + object + . map (\(lang, params) -> + ( Data.Aeson.Key.fromString $ show lang + , toJSON params) + ) + . Data.Map.toList + . unCostModelsRaw + +instance FromJSON CostModelsRaw where + parseJSON = withObject "CostModelsRaw" $ \o -> do + langs <- mapM + (\(kLang, vParams) -> do + l <- parseJSON + $ toJSON + $ (\lang -> case lang of + [] -> fail "Absurd empty language in CostModelsRaw" + (x:xs) -> Data.Char.toLower x:xs + ) + $ Data.Aeson.Key.toString kLang + ps <- parseJSON vParams + pure (l, ps) + ) + $ Data.Aeson.KeyMap.toList o + + pure $ CostModelsRaw $ Data.Map.fromList langs + costModelsSample :: CostModels costModelsSample = CostModels $ Data.Map.fromList @@ -188,6 +266,24 @@ instance ToSample CostModels where toSamples = pure $ singleSample costModelsSample + +costModelsRawSample :: CostModelsRaw +costModelsRawSample = CostModelsRaw + $ Data.Map.fromList + [ ( PlutusV1 + , [ 197209 + , 0 + ] + ) + , (PlutusV2 + , [ 197209 + , 0 + ] + ) + ] + +instance ToSample CostModelsRaw where + toSamples = pure $ singleSample costModelsRawSample -- | Active stake distribution for an epoch data StakeDistribution = StakeDistribution diff --git a/src/Blockfrost/Types/Cardano/Mempool.hs b/src/Blockfrost/Types/Cardano/Mempool.hs new file mode 100644 --- /dev/null +++ b/src/Blockfrost/Types/Cardano/Mempool.hs @@ -0,0 +1,68 @@ +-- | Transaction metadata + +module Blockfrost.Types.Cardano.Mempool + ( MempoolTransaction(..) + , TransactionInMempool (..) + , MempoolUTxOInput(..) + , MempoolRedeemer(..) + ) where + +import Data.Text +import Deriving.Aeson +import Blockfrost.Types.Cardano.Transactions +import Blockfrost.Types.Shared.Ada +import Blockfrost.Types.Shared.Amount + +data MempoolTransaction = MempoolTransaction + { _tx :: TransactionInMempool + , _inputs :: [MempoolUTxOInput] + , _outputs :: [UtxoOutput] + , _redeemers :: Maybe [MempoolRedeemer] + } + deriving stock (Show, Eq, Generic) + deriving (FromJSON, ToJSON) + via CustomJSON '[FieldLabelModifier '[StripPrefix "_", CamelToSnake]] MempoolTransaction + +data TransactionInMempool = TransactionInMempool + { _transactionHash :: Text -- ^ Transaction hash + , _transactionOutputAmount :: [Amount] -- ^ Transaction outputs + , _transactionFees :: Lovelaces -- ^ Transaction fee + , _transactionDeposit :: Lovelaces -- ^ Deposit within the transaction in Lovelaces + , _transactionSize :: Integer -- ^ Size of the transaction in Bytes + , _transactionInvalidBefore :: Maybe Text -- ^ Left (included) endpoint of the timelock validity intervals + , _transactionInvalidHereafter :: Maybe Text -- ^ Right (excluded) endpoint of the timelock validity intervals + , _transactionUtxoCount :: Integer -- ^ Count of UTXOs within the transaction + , _transactionWithdrawalCount :: Integer -- ^ Count of the withdrawals within the transaction + , _transactionMirCertCount :: Integer -- ^ Count of the MIR certificates within the transaction + , _transactionDelegationCount :: Integer -- ^ Count of the delegations within the transaction + , _transactionStakeCertCount :: Integer -- ^ Count of the stake keys (de)registration and delegation certificates within the transaction + , _transactionPoolUpdateCount :: Integer -- ^ Count of the stake pool registration and update certificates within the transaction + , _transactionPoolRetireCount :: Integer -- ^ Count of the stake pool retirement certificates within the transaction + , _transactionAssetMintOrBurnCount :: Integer -- ^ Count of asset mints and burns within the transaction + , _transactionRedeemerCount :: Integer -- ^ Count of redeemers within the transaction + , _transactionValidContract :: Bool -- ^ True if this is a valid transaction, False in case of contract validation failure + } + deriving stock (Show, Eq, Generic) + deriving (FromJSON, ToJSON) + via CustomJSON '[FieldLabelModifier '[StripPrefix "_transaction", CamelToSnake]] TransactionInMempool + +data MempoolUTxOInput = MempoolUTxOInput + { _address :: Text -- ^ Address + , _txHash :: Text -- ^ Transaction hash + , _outputIndex :: Integer -- ^ Output index + , _collateral :: Bool -- ^ True if the input is a collateral input + , _reference :: Bool -- ^ Is the input a reference input + } + deriving stock (Show, Eq, Generic) + deriving (FromJSON, ToJSON) + via CustomJSON '[FieldLabelModifier '[StripPrefix "_", CamelToSnake]] MempoolUTxOInput + +data MempoolRedeemer = MempoolRedeemer + { _tx_index :: Integer -- ^ Transaction index + , _purpose :: Text -- ^ Purpose of the redeemer + , _unit_mem :: Text -- ^ Memory unit + , _unit_steps :: Text -- ^ Steps unit + } + deriving stock (Show, Eq, Generic) + deriving (FromJSON, ToJSON) + via CustomJSON '[FieldLabelModifier '[StripPrefix "_", CamelToSnake]] MempoolRedeemer diff --git a/src/Blockfrost/Types/Cardano/Transactions.hs b/src/Blockfrost/Types/Cardano/Transactions.hs --- a/src/Blockfrost/Types/Cardano/Transactions.hs +++ b/src/Blockfrost/Types/Cardano/Transactions.hs @@ -15,6 +15,7 @@ , PoolUpdateMetadata (..) , TransactionPoolRetiring (..) , TransactionMetaJSON (..) + , TransactionCBOR (..) , TransactionMetaCBOR (..) ) where @@ -366,6 +367,17 @@ "1968" (Just $ oracleMeta "0.15409850555139935") ] + +-- | Transaction in CBOR +newtype TransactionCBOR = TransactionCBOR { _transactionCBORCbor :: Text } + deriving stock (Show, Eq, Generic) + deriving (FromJSON, ToJSON) + via CustomJSON '[FieldLabelModifier '[StripPrefix "_transactionCBOR", CamelToSnake]] TransactionCBOR + +instance ToSample TransactionCBOR where + toSamples = pure $ singleSample $ + TransactionCBOR + "a100a16b436f6d62696e6174696f6e8601010101010c" -- | Transaction metadata in CBOR data TransactionMetaCBOR = TransactionMetaCBOR diff --git a/src/Blockfrost/Types/Shared/TxHash.hs b/src/Blockfrost/Types/Shared/TxHash.hs --- a/src/Blockfrost/Types/Shared/TxHash.hs +++ b/src/Blockfrost/Types/Shared/TxHash.hs @@ -2,9 +2,10 @@ module Blockfrost.Types.Shared.TxHash ( TxHash (..) + , TxHashObject (..) ) where -import Data.Aeson (FromJSON (..), ToJSON (..)) +import Data.Aeson (FromJSON (..), ToJSON (..), object, (.=), withObject, (.:)) import Data.String (IsString (..)) import Data.Text (Text) import qualified Data.Text @@ -35,3 +36,19 @@ instance ToCapture (Capture "hash" TxHash) where toCapture _ = DocCapture "hash" "Hash of the requested transaction." + + +-- Temporary until blockfrost server returns proper TxHash + +newtype TxHashObject = TxHashObject { unTxHashObject :: Text } + deriving stock (Show, Eq, Ord, Generic) + deriving newtype (FromHttpApiData, ToHttpApiData) + +instance IsString TxHashObject where + fromString = TxHashObject . Data.Text.pack + +instance ToJSON TxHashObject where + toJSON hash = object ["tx_hash" .= unTxHashObject hash] + +instance FromJSON TxHashObject where + parseJSON = withObject "TxHashObject" $ \o -> TxHashObject <$> o .: "tx_hash" diff --git a/test/Cardano/Epochs.hs b/test/Cardano/Epochs.hs --- a/test/Cardano/Epochs.hs +++ b/test/Cardano/Epochs.hs @@ -100,6 +100,20 @@ "addInteger-cpu-arguments-slope": 0 } }, + "cost_models_raw": { + "PlutusV1": [ + 197209, + 0 + ], + "PlutusV2": [ + 197209, + 0 + ], + "PlutusV3": [ + 197209, + 0 + ] + }, "price_mem": 0.0577, "price_step": 0.0000721, "max_tx_ex_mem": "10000000", @@ -110,7 +124,29 @@ "collateral_percent": 150, "max_collateral_inputs": 3, "coins_per_utxo_size": "34482", - "coins_per_utxo_word": "34482" + "coins_per_utxo_word": "34482", + "pvt_motion_no_confidence": 0.51, + "pvt_committee_normal": 0.51, + "pvt_committee_no_confidence": 0.51, + "pvt_hard_fork_initiation": 0.51, + "dvt_motion_no_confidence": 0.67, + "dvt_committee_normal": 0.67, + "dvt_committee_no_confidence": 0.6, + "dvt_update_to_constitution": 0.75, + "dvt_hard_fork_initiation": 0.6, + "dvt_p_p_network_group": 0.67, + "dvt_p_p_economic_group": 0.67, + "dvt_p_p_technical_group": 0.67, + "dvt_p_p_gov_group": 0.75, + "dvt_treasury_withdrawal": 0.67, + "committee_min_size": "7", + "committee_max_term_length": "146", + "gov_action_lifetime": "6", + "gov_action_deposit": "100000000000", + "drep_deposit": "500000000", + "drep_activity": "20", + "pvtpp_security_group": 0.51, + "min_fee_ref_script_cost_per_byte": 15 } |] @@ -152,6 +188,25 @@ ] ) ] + , _protocolParamsCostModelsRaw = + CostModelsRaw + $ Data.Map.fromList + [ ( PlutusV1 + , [ 197209 + , 0 + ] + ) + , (PlutusV2 + , [ 197209 + , 0 + ] + ) + , (PlutusV3 + , [ 197209 + , 0 + ] + ) + ] , _protocolParamsPriceMem = 0.0577 , _protocolParamsPriceStep = 0.0000721 , _protocolParamsMaxTxExMem = 10000000 @@ -164,6 +219,28 @@ , _protocolParamsCoinsPerUtxoSize = 34482 -- deprecated , _protocolParamsCoinsPerUtxoWord = 34482 + , _protocolParamsPvtMotionNoConfidence = Just 0.51 + , _protocolParamsPvtCommitteeNormal = Just 0.51 + , _protocolParamsPvtCommitteeNoConfidence = Just 0.51 + , _protocolParamsPvtHardForkInitiation = Just 0.51 + , _protocolParamsPvtppSecurityGroup = Just 0.51 + , _protocolParamsDvtMotionNoConfidence = Just 0.67 + , _protocolParamsDvtCommitteeNormal = Just 0.67 + , _protocolParamsDvtCommitteeNoConfidence = Just 0.6 + , _protocolParamsDvtUpdateToConstitution = Just 0.75 + , _protocolParamsDvtHardForkInitiation = Just 0.6 + , _protocolParamsDvtPPNetworkGroup = Just 0.67 + , _protocolParamsDvtPPEconomicGroup = Just 0.67 + , _protocolParamsDvtPPTechnicalGroup = Just 0.67 + , _protocolParamsDvtPPGovGroup = Just 0.75 + , _protocolParamsDvtTreasuryWithdrawal = Just 0.67 + , _protocolParamsCommitteeMinSize = Just 7 + , _protocolParamsCommitteeMaxTermLength = Just 146 + , _protocolParamsGovActionLifetime = Just 6 + , _protocolParamsGovActionDeposit = Just 100000000000 + , _protocolParamsDrepDeposit = Just 500000000 + , _protocolParamsDrepActivity = Just 20 + , _protocolParamsMinFeeRefScriptCostPerByte = Just 15 } stakeDistributionSample = [r| diff --git a/test/Cardano/Transactions.hs b/test/Cardano/Transactions.hs --- a/test/Cardano/Transactions.hs +++ b/test/Cardano/Transactions.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE NumericUnderscores #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes #-} @@ -67,6 +68,11 @@ `shouldBe` Right transactionMetaJSONExpected + it "parses transaction (CBOR) sample" $ do + eitherDecode transactionCBORSample + `shouldBe` + Right transactionCBORExpected + it "parses transaction meta (CBOR) sample" $ do eitherDecode transactionMetaCBORSample `shouldBe` @@ -428,6 +434,16 @@ "1968" (Just $ oracleMeta "0.15409850555139935") ] + +transactionCBORSample = [r| +{ + "cbor": "a100a16b436f6d62696e6174696f6e8601010101010c" +} +|] + +transactionCBORExpected = + TransactionCBOR + "a100a16b436f6d62696e6174696f6e8601010101010c" transactionMetaCBORSample = [r| {