wip: slot <-> time convcersion

- minor refactoring and docs

Author: mikekeke

examples/ex-units/src/PlutipRun.hs

@@ -74,8 +74,8 @@ mkPabConf pparams pparamsFile clusterDir ownPkh =
     , pcPort = 9080
     , pcProtocolParams = pparams
     , pcTipPollingInterval = 1_000_000
-    -- , pcSlotConfig = def {scSlotZeroTime = POSIXTime $ 1652956123 * 1000}
-    , pcOwnPubKeyHash = ownPkh
+    , -- , pcSlotConfig = def {scSlotZeroTime = POSIXTime $ 1652956123 * 1000}
+      pcOwnPubKeyHash = ownPkh
     , pcOwnStakePubKeyHash = Nothing
     , pcScriptFileDir = Text.pack $ clusterDir </> "bot-plutus-interface/scripts"
     , pcSigningKeyFileDir = Text.pack $ clusterDir </> "bot-plutus-interface/signing-keys"

examples/ex-units/src/TestnetRun.hs

@@ -63,32 +63,32 @@ mkContractEnv bpiDir = do
   pkhs <- getPkhs bpiDir
   return $
     ContractEnvironment
-      { cePABConfig = mkPabConf pparams (Text.pack paramsFile) bpiDir (head pkhs),
-        ceContractState = contractState,
-        ceContractInstanceId = contractInstanceID,
-        ceContractStats = contractStats
+      { cePABConfig = mkPabConf pparams (Text.pack paramsFile) bpiDir (head pkhs)
+      , ceContractState = contractState
+      , ceContractInstanceId = contractInstanceID
+      , ceContractStats = contractStats
       }
 
 mkPabConf :: ProtocolParameters -> Text -> FilePath -> PubKeyHash -> PABConfig
 mkPabConf pparams pparamsFile bpiDir ownPkh =
   PABConfig
-    { pcCliLocation = Local,
-      pcNetwork = Testnet (NetworkMagic 1097911063),
-      pcChainIndexUrl = BaseUrl Http "localhost" 9083 "",
-      pcPort = 9080,
-      pcProtocolParams = pparams,
-      pcTipPollingInterval = 1_000_000,
-      pcOwnPubKeyHash = ownPkh,
-      pcOwnStakePubKeyHash = Nothing,
-      pcScriptFileDir = Text.pack $ bpiDir </> "scripts",
-      pcSigningKeyFileDir = Text.pack $ bpiDir </> "signing-keys",
-      pcTxFileDir = Text.pack $ bpiDir </> "txs",
-      pcDryRun = False,
-      pcLogLevel = Error,
-      pcProtocolParamsFile = pparamsFile,
-      pcEnableTxEndpoint = True,
-      pcCollectStats = True,
-      pcMetadataDir = Text.pack $ bpiDir </> "metadata"
+    { pcCliLocation = Local
+    , pcNetwork = Testnet (NetworkMagic 1097911063)
+    , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
+    , pcPort = 9080
+    , pcProtocolParams = pparams
+    , pcTipPollingInterval = 1_000_000
+    , pcOwnPubKeyHash = ownPkh
+    , pcOwnStakePubKeyHash = Nothing
+    , pcScriptFileDir = Text.pack $ bpiDir </> "scripts"
+    , pcSigningKeyFileDir = Text.pack $ bpiDir </> "signing-keys"
+    , pcTxFileDir = Text.pack $ bpiDir </> "txs"
+    , pcDryRun = False
+    , pcLogLevel = Error
+    , pcProtocolParamsFile = pparamsFile
+    , pcEnableTxEndpoint = True
+    , pcCollectStats = True
+    , pcMetadataDir = Text.pack $ bpiDir </> "metadata"
     }
 
 getPkhs :: FilePath -> IO [PubKeyHash]

examples/ex-units/src/TimeDebugContract.hs

@@ -28,6 +28,7 @@ import Ledger
     strictUpperBound,
     unitDatum,
     validatorHash,
+    getCardanoTxId
   )
 import Ledger.Constraints qualified as Constraints
 import Ledger.Typed.Scripts.Validators qualified as Validators
@@ -174,12 +175,12 @@ unlockWithTimeCheck = do
                 Constraints.unspentOutputs (Map.fromList utxos)
               ]
       !tx <- submitTxConstraintsWith @TestTime lkps txc
-      wait 10
+      -- Contract.awaitTxConfirmed (getCardanoTxId tx)
       utxosAfterSpent <- Map.toList <$> Contract.utxosAt validatorAddr
       pure (Hask.show utxosAfterSpent)
     rest -> Contract.throwError $ "Unlocking error: Unwanted set of utxos: " Hask.<> Text.pack (Hask.show rest)
   where
-    wait = void . Contract.waitNSlots
+    -- wait = void . Contract.waitNSlots
 
 lockAtScript :: Contract () EmptySchema Text Hask.String
 lockAtScript = do
@@ -189,5 +190,5 @@ lockAtScript = do
           unitDatum
           (Value.adaValueOf 10)
   !tx <- submitTx constr
-  -- awaitTxConfirmed $ getCardanoTxId tx
+  -- Contract.awaitTxConfirmed $ getCardanoTxId tx
   pure "Lock done"

src/BotPlutusInterface/Balance.hs

@@ -59,8 +59,8 @@ import Plutus.V1.Ledger.Api (
  )
 
 import BotPlutusInterface.BodyBuilder qualified as BodyBuilder
-import Prelude
 import Data.Bifunctor (bimap)
+import Prelude
 
 {- | Collect necessary tx inputs and collaterals, add minimum lovelace values and balance non ada
  assets
@@ -95,7 +95,7 @@ balanceTxIO pabConf ownPkh unbalancedTx =
       lift $ printLog @w Debug $ show utxoIndex
 
       -- We need this folder on the CLI machine, which may not be the local machine
-      lift $ createDirectoryIfMissingCLI @w False (Text.unpack         "pcTxFileDir"            )
+      lift $ createDirectoryIfMissingCLI @w False (Text.unpack "pcTxFileDir")
 
       -- Adds required collaterals, only needs to happen once
       -- Also adds signatures for fee calculation
@@ -365,14 +365,13 @@ addValidRange ::
   Eff effs (Either Text Tx)
 addValidRange timeRange tx =
   if validateRange timeRange
-    then bimap (Text.pack . show) (setRange tx) <$>
-          convertTimeRangeToSlotRange @w timeRange
+    then
+      bimap (Text.pack . show) (setRange tx)
+        <$> convertTimeRangeToSlotRange @w timeRange
     else pure $ Left "Invalid validity interval."
-
   where
     setRange tx' range = tx' {txValidRange = range}
 
-
 validateRange :: forall (a :: Type). Ord a => Interval a -> Bool
 validateRange (Interval (LowerBound PosInf _) _) = False
 validateRange (Interval _ (UpperBound NegInf _)) = False

src/BotPlutusInterface/Effects.hs

@@ -158,11 +158,11 @@ handlePABEffect contractEnv =
           ExBudget.estimateBudget contractEnv.cePABConfig txPath
         SaveBudget txId exBudget -> saveBudgetImpl contractEnv txId exBudget
         SlotToPOSIXTime slot ->
-          TimeSlot.slotToPOSIXTimeImpl contractEnv.cePABConfig slot
+          TimeSlot.slotToPOSIXTimeIO contractEnv.cePABConfig slot
         POSIXTimeToSlot pTime ->
-          TimeSlot.posixTimeToSlotImpl contractEnv.cePABConfig pTime
+          TimeSlot.posixTimeToSlotIO contractEnv.cePABConfig pTime
         POSIXTimeRangeToSlotRange pTimeRange ->
-          TimeSlot.posixTimeRangeToContainedSlotRangeImpl contractEnv.cePABConfig pTimeRange
+          TimeSlot.posixTimeRangeToContainedSlotRangeIO contractEnv.cePABConfig pTimeRange
     )
 
 printLog' :: LogLevel -> LogLevel -> String -> IO ()