Merge pull request #87 from mlabs-haskell/sam/confirm-until-time

Change awaitConfirmedTxSlot to Time

Author: samuelWilliams99

src/BotPlutusInterface/Helpers.hs

@@ -1,29 +1,29 @@
-module BotPlutusInterface.Helpers (awaitTxConfirmedUntilSlot) where
+module BotPlutusInterface.Helpers (awaitTxConfirmedUntilTime) where
 
 import Control.Lens (review)
+import Control.Monad (void)
+import Data.Kind (Type)
+import Data.Row (Row)
 import Data.Text (pack)
-import Ledger (Slot, TxId)
+import Ledger (POSIXTime, TxId)
 import Plutus.Contract.Error (AsContractError, _OtherContractError)
-import Plutus.Contract.Request (RollbackState (Unknown), awaitTxStatusChange, currentSlot, waitNSlots)
+import Plutus.Contract.Request (RollbackState (Unknown), awaitTxStatusChange, currentTime, waitNSlots)
 import Plutus.Contract.Types (Contract, throwError)
 import Prelude
 
-awaitTxConfirmedUntilSlot :: forall w s e. (AsContractError e) => TxId -> Slot -> Contract w s e ()
-awaitTxConfirmedUntilSlot txId maxSlot = go 0
-  where
-    go :: Integer -> Contract w s e ()
-    go n = do
-      mTx <- awaitTxStatusChange txId
-      case mTx of
-        Unknown -> do
-          curSlot <- currentSlot
-          if curSlot > maxSlot
-            then
-              throwError @e $
-                review _OtherContractError $
-                  pack $
-                    "Could not find transaction - " ++ show txId ++ " - before slot " ++ show maxSlot
-            else do
-              _ <- waitNSlots 20
-              go (n + 1)
-        _ -> pure ()
+awaitTxConfirmedUntilTime :: forall (w :: Type) (s :: Row Type) (e :: Type). (AsContractError e) => TxId -> POSIXTime -> Contract w s e ()
+awaitTxConfirmedUntilTime txId maxTime = do
+  mTx <- awaitTxStatusChange txId
+  case mTx of
+    Unknown -> do
+      curTime <- currentTime
+      if curTime > maxTime
+        then
+          throwError $
+            review _OtherContractError $
+              pack $
+                "Could not find transaction - " ++ show txId ++ " - before " ++ show maxTime
+        else do
+          void $ waitNSlots 20
+          awaitTxConfirmedUntilTime txId maxTime
+    _ -> pure ()