Do not query datums by hash in processConstraints

Plutonomicon · Jul 16, 2024 · aa8169e · aa8169e
1 parent 44fd4a0
commit aa8169e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/src/Contract/UnbalancedTx.purs b/src/Contract/UnbalancedTx.purs
@@ -18,7 +18,6 @@ import Ctl.Internal.ProcessConstraints.Error
 import Ctl.Internal.ProcessConstraints.Error
   ( MkUnbalancedTxError
       ( CannotFindDatum
-      , CannotQueryDatum
       , CannotConvertPOSIXTimeRange
       , CannotSolveTimeConstraints
       , CannotGetMintingPolicyScriptIndex

diff --git a/src/Internal/ProcessConstraints.purs b/src/Internal/ProcessConstraints.purs
@@ -81,7 +81,6 @@ import Ctl.Internal.ProcessConstraints.Error
       , CannotMintZero
       , ExpectedPlutusScriptGotNativeScript
       , CannotFindDatum
-      , CannotQueryDatum
       , CannotGetValidatorHashFromAddress
       , TxOutRefWrongType
       , CannotConvertPOSIXTimeRange
@@ -173,7 +172,7 @@ import Ctl.Internal.Types.Val as Val
 import Data.Array (cons, partition, toUnfoldable, zip)
 import Data.Array (mapMaybe, singleton, (:)) as Array
 import Data.Bifunctor (lmap)
-import Data.Either (Either(Left, Right), either, hush, isRight, note)
+import Data.Either (Either(Left, Right), either, note)
 import Data.Foldable (foldM)
 import Data.Lens ((%=), (%~), (.=), (.~), (<>=))
 import Data.Lens.Getter (to, use)
@@ -192,7 +191,6 @@ import Effect.Aff.Class (liftAff)
 import Effect.Class (liftEffect)
 import Effect.Exception (throw)
 import Partial.Unsafe (unsafePartial)
-import Prelude (join) as Bind
 
 -- The constraints don't precisely match those of Plutus:
 -- `forall v. (FromData (DatumType v), ToData (DatumType v), ToData (RedeemerType v))`
@@ -548,15 +546,7 @@ processConstraint
             -- Use the datum hash inside the lookup
             case datum' of
               Just (OutputDatumHash dHash) -> do
-                dat <- ExceptT do
-                  mDatumLookup <- lookupDatum dHash
-                  if isRight mDatumLookup then
-                    pure mDatumLookup
-                  else
-                    liftAff $ queryHandle.getDatumByHash dHash <#> hush
-                      >>> Bind.join
-                      >>> note
-                        (CannotQueryDatum dHash)
+                dat <- ExceptT $ lookupDatum dHash
                 lift $ addDatum dat
               Just (OutputDatum _) -> pure unit
               Nothing -> throwError CannotFindDatum

diff --git a/src/Internal/ProcessConstraints/Error.purs b/src/Internal/ProcessConstraints/Error.purs
@@ -37,7 +37,6 @@ import Data.UInt as UInt
 
 data MkUnbalancedTxError
   = CannotFindDatum
-  | CannotQueryDatum DataHash
   | CannotConvertPOSIXTimeRange POSIXTimeRange PosixTimeToSlotError
   | CannotSolveTimeConstraints POSIXTimeRange POSIXTimeRange
   | CannotGetMintingPolicyScriptIndex -- Should be impossible
@@ -70,10 +69,6 @@ instance Show MkUnbalancedTxError where
 explainMkUnbalancedTxError :: MkUnbalancedTxError -> String
 explainMkUnbalancedTxError = case _ of
   CannotFindDatum -> "Cannot find datum"
-  CannotQueryDatum dh ->
-    "Querying for datum by datum hash ("
-      <> byteArrayToHex (unwrap $ encodeCbor dh)
-      <> ") failed: no datum found"
   CannotConvertPOSIXTimeRange tr ttsErr ->
     "Cannot convert POSIX time range to slot time range.\nRange: "
       <> show tr