Merge pull request #1150 from Plutonomicon/jy14898/cache-pparam

Cache ProtocolParameters during balancing
Plutonomicon · Oct 27, 2022 · ccb328d · ccb328d
2 parents 886ac0a + e9a471e
commit ccb328d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 30 deletions.
diff --git a/src/Contract/ProtocolParameters.purs b/src/Contract/ProtocolParameters.purs
@@ -3,8 +3,10 @@ module Contract.ProtocolParameters
   ) where
 
 import Contract.Monad (Contract, wrapContract)
+import Ctl.Internal.QueryM (getProtocolParameters) as QueryM
 import Ctl.Internal.QueryM.Ogmios (ProtocolParameters)
-import Ctl.Internal.QueryM.ProtocolParameters (getProtocolParameters) as QueryM
 
+-- | Returns the `ProtocolParameters` from the `Contract` environment.
+-- | Note that this is not necessarily the current value from the ledger.
 getProtocolParameters :: forall (r :: Row Type). Contract r ProtocolParameters
 getProtocolParameters = wrapContract QueryM.getProtocolParameters
diff --git a/src/Internal/Plutip/Server.purs b/src/Internal/Plutip/Server.purs
@@ -60,7 +60,6 @@ import Ctl.Internal.QueryM
   )
 import Ctl.Internal.QueryM as QueryM
 import Ctl.Internal.QueryM.Logging (setupLogs)
-import Ctl.Internal.QueryM.ProtocolParameters as Ogmios
 import Ctl.Internal.QueryM.UniqueId (uniqueId)
 import Ctl.Internal.Types.UsedTxOuts (newUsedTxOuts)
 import Ctl.Internal.Wallet.Key (PrivatePaymentKey(PrivatePaymentKey))
@@ -491,7 +490,7 @@ mkClusterContractEnv plutipCfg logger customLogger = do
       , host = plutipCfg.ogmiosConfig.host
       }
   usedTxOuts <- newUsedTxOuts
-  pparams <- Ogmios.getProtocolParametersAff ogmiosWs logger
+  pparams <- QueryM.getProtocolParametersAff ogmiosWs logger
   pure $ ContractEnv
     { config:
         { ctlServerConfig: plutipCfg.ctlServerConfig

diff --git a/src/Internal/QueryM.purs b/src/Internal/QueryM.purs
@@ -34,6 +34,7 @@ module Ctl.Internal.QueryM
   , getDatumsByHashes
   , getDatumsByHashesWithErrors
   , getLogger
+  , getProtocolParameters
   , getProtocolParametersAff
   , getWalletAddresses
   , liftQueryM
@@ -453,6 +454,12 @@ runQueryMInRuntime
 runQueryMInRuntime config runtime = do
   flip runReaderT { config, runtime, extraConfig: {} } <<< unwrap
 
+-- | Returns the `ProtocolParameters` from the `QueryM` environment.
+-- | Note that this is not necessarily the current value from the ledger.
+getProtocolParameters :: QueryM Ogmios.ProtocolParameters
+getProtocolParameters =
+  asks $ _.runtime >>> _.pparams
+
 getProtocolParametersAff
   :: OgmiosWebSocket
   -> (LogLevel -> String -> Effect Unit)

diff --git a/src/Internal/QueryM/MinFee.purs b/src/Internal/QueryM/MinFee.purs
@@ -14,8 +14,7 @@ import Ctl.Internal.Cardano.Types.TransactionUnspentOutput
   )
 import Ctl.Internal.Cardano.Types.Value (Coin)
 import Ctl.Internal.Helpers (liftM, liftedM)
-import Ctl.Internal.QueryM (QueryM, getWalletAddresses)
-import Ctl.Internal.QueryM.ProtocolParameters (getProtocolParameters)
+import Ctl.Internal.QueryM (QueryM, getProtocolParameters, getWalletAddresses)
 import Ctl.Internal.QueryM.Utxos (getUtxo, getWalletCollateral)
 import Ctl.Internal.Serialization.Address
   ( Address

diff --git a/src/Internal/QueryM/ProtocolParameters.purs b/src/Internal/QueryM/ProtocolParameters.purs
diff --git a/src/Internal/Types/ScriptLookups.purs b/src/Internal/Types/ScriptLookups.purs
@@ -97,9 +97,13 @@ import Ctl.Internal.Plutus.Types.Transaction (TransactionOutputWithRefScript) as
 import Ctl.Internal.Plutus.Types.TransactionUnspentOutput
   ( TransactionUnspentOutput(TransactionUnspentOutput)
   )
-import Ctl.Internal.QueryM (QueryM, QueryMExtended, getDatumByHash)
+import Ctl.Internal.QueryM
+  ( QueryM
+  , QueryMExtended
+  , getDatumByHash
+  , getProtocolParameters
+  )
 import Ctl.Internal.QueryM.EraSummaries (getEraSummaries)
-import Ctl.Internal.QueryM.ProtocolParameters (getProtocolParameters)
 import Ctl.Internal.QueryM.SystemStart (getSystemStart)
 import Ctl.Internal.Scripts
   ( mintingPolicyHash

diff --git a/test/AffInterface.purs b/test/AffInterface.purs
@@ -16,7 +16,6 @@ import Ctl.Internal.QueryM
 import Ctl.Internal.QueryM.CurrentEpoch (getCurrentEpoch)
 import Ctl.Internal.QueryM.EraSummaries (getEraSummaries)
 import Ctl.Internal.QueryM.Ogmios (OgmiosAddress)
-import Ctl.Internal.QueryM.ProtocolParameters (getProtocolParameters)
 import Ctl.Internal.QueryM.SystemStart (getSystemStart)
 import Ctl.Internal.QueryM.Utxos (utxosAt)
 import Ctl.Internal.QueryM.WaitUntilSlot (waitUntilSlot)
@@ -55,7 +54,6 @@ suite = do
     test "Get ChainTip" testGetChainTip
     test "Get waitUntilSlot" testWaitUntilSlot
     test "Get EraSummaries" testGetEraSummaries
-    test "Get ProtocolParameters" testGetProtocolParameters
     test "Get CurrentEpoch" testGetCurrentEpoch
     test "Get SystemStart" testGetSystemStart
   group "Ogmios error" do
@@ -117,10 +115,6 @@ testSubmitTxFailure = do
   let bytes = hexToByteArrayUnsafe "00"
   void $ submitTxOgmios bytes (wrap bytes)
 
-testGetProtocolParameters :: QueryM Unit
-testGetProtocolParameters = do
-  void getProtocolParameters
-
 testGetCurrentEpoch :: QueryM Unit
 testGetCurrentEpoch = do
   void getCurrentEpoch