forgot to remove some upstreamed utils for some reason :)

agora/Agora/Effect/TreasuryWithdrawal.hs

@@ -18,7 +18,7 @@ import GHC.Generics qualified as GHC
 import Generics.SOP (Generic, I (I))
 
 import Agora.Effect (makeEffect)
-import Agora.Utils (findTxOutByTxOutRef, isPubKey)
+import Agora.Utils (isPubKey)
 import Plutarch.Api.V1 (
   AmountGuarantees (Positive),
   KeyGuarantees (Sorted),
@@ -30,6 +30,7 @@ import Plutarch.Api.V1 (
  )
 import Plutarch.Internal (punsafeCoerce)
 
+import Plutarch.Api.V1.ScriptContext (pfindTxInByTxOutRef)
 import "plutarch" Plutarch.Api.V1.Value (pnormalize)
 import Plutarch.DataRepr (
   DerivePConstantViaData (..),
@@ -112,7 +113,7 @@ treasuryWithdrawalValidator currSymbol = makeEffect currSymbol $
   \_cs (datum' :: Term _ PTreasuryWithdrawalDatum) txOutRef' txInfo' -> unTermCont $ do
     datum <- tcont $ pletFields @'["receivers", "treasuries"] datum'
     txInfo <- tcont $ pletFields @'["outputs", "inputs"] txInfo'
-    PJust txOut <- pmatchC $ findTxOutByTxOutRef # txOutRef' # pfromData txInfo.inputs
+    PJust ((pfield @"resolved" #) -> txOut) <- pmatchC $ pfindTxInByTxOutRef # txOutRef' # pfromData txInfo.inputs
     effInput <- tcont $ pletFields @'["address", "value"] $ txOut
     outputValues <-
       pletC $

agora/Agora/Proposal/Scripts.hs

@@ -34,7 +34,6 @@ import Agora.Stake (
   pgetStakeUsage,
  )
 import Agora.Utils (
-  findTxOutByTxOutRef,
   getMintingPolicySymbol,
   mustBePJust,
   mustFindDatum',
@@ -48,6 +47,7 @@ import Plutarch.Api.V1 (
  )
 import Plutarch.Api.V1.AssetClass (passetClass, passetClassValueOf)
 import Plutarch.Api.V1.ScriptContext (
+  pfindTxInByTxOutRef,
   pisTokenSpent,
   ptxSignedBy,
   pvalueSpent,
@@ -163,7 +163,7 @@ proposalValidator proposal =
           txInfo'
     PSpending ((pfield @"_0" #) -> txOutRef) <- pmatchC $ pfromData ctx.purpose
 
-    PJust txOut <- pmatchC $ findTxOutByTxOutRef # txOutRef # txInfoF.inputs
+    PJust ((pfield @"resolved" #) -> txOut) <- pmatchC $ pfindTxInByTxOutRef # txOutRef # txInfoF.inputs
     txOutF <- tcont $ pletFields @'["address", "value"] $ txOut
 
     (pfromData -> proposalDatum, _) <-

agora/Agora/Utils.hs

@@ -6,7 +6,6 @@ Description: Plutarch utility functions that should be upstreamed or don't belon
 Plutarch utility functions that should be upstreamed or don't belong anywhere else.
 -}
 module Agora.Utils (
-  findTxOutByTxOutRef,
   scriptHashFromAddress,
   findOutputsToAddress,
   findTxOutDatum,
@@ -20,7 +19,6 @@ module Agora.Utils (
   validatorHashToAddress,
   isScriptAddress,
   isPubKey,
-  psingletonValue,
 ) where
 
 --------------------------------------------------------------------------------
@@ -47,19 +45,15 @@ import Plutarch.Api.V1 (
   PMintingPolicy,
   PTokenName (PTokenName),
   PTuple,
-  PTxInInfo,
   PTxOut,
-  PTxOutRef,
   PValidatorHash,
   PValue,
   mintingPolicySymbol,
   mkMintingPolicy,
  )
-import Plutarch.Api.V1.AssocMap (PMap (PMap))
-import Plutarch.Api.V1.ScriptContext (pfindDatum, pfindTxInByTxOutRef)
+import Plutarch.Api.V1.ScriptContext (pfindDatum)
 import "liqwid-plutarch-extra" Plutarch.Api.V1.Value (psymbolValueOf)
-import "plutarch" Plutarch.Api.V1.Value (PValue (PValue))
-import Plutarch.Builtin (pforgetData, ppairDataBuiltin)
+import Plutarch.Builtin (pforgetData)
 import Plutarch.Extra.List (plookupTuple)
 import Plutarch.Extra.TermCont (pletC, pmatchC)
 
@@ -67,25 +61,6 @@ import Plutarch.Extra.TermCont (pletC, pmatchC)
    All of these functions are quite inefficient.
 -}
 
--- | Create a value with a single asset class.
-psingletonValue ::
-  forall (keys :: KeyGuarantees) (amounts :: AmountGuarantees) (s :: S).
-  Term s (PCurrencySymbol :--> PTokenName :--> PInteger :--> PValue keys amounts)
-psingletonValue = phoistAcyclic $
-  plam $ \sym tok int ->
-    let innerTup = pcon $ PMap $ psingleton #$ ppairDataBuiltin # pdata tok # pdata int
-        outerTup = pcon $ PMap $ psingleton #$ ppairDataBuiltin # pdata sym # pdata innerTup
-        res = pcon $ PValue outerTup
-     in res
-
--- | Finds the TxOut of an effect from TxInfo and TxOutRef
-findTxOutByTxOutRef :: Term s (PTxOutRef :--> PBuiltinList (PAsData PTxInInfo) :--> PMaybe PTxOut)
-findTxOutByTxOutRef = phoistAcyclic $
-  plam $ \txOutRef inputs ->
-    pmatch (pfindTxInByTxOutRef # txOutRef # inputs) $ \case
-      PJust ((pfield @"resolved" #) -> txOut) -> pcon $ PJust txOut
-      PNothing -> pcon PNothing
-
 -- | Get script hash from an Address.
 scriptHashFromAddress :: Term s (PAddress :--> PMaybe PValidatorHash)
 scriptHashFromAddress = phoistAcyclic $