bump plutarch/LPE/PCB; point plutarch to master branch

agora/Agora/Governor/Scripts.hs

@@ -60,6 +60,7 @@ import Plutarch.Api.V1 (
   PTokenName,
   PValue (PValue),
  )
+import Plutarch.Api.V1.AssocMap (plookup)
 import Plutarch.Api.V1.AssocMap qualified as AssocMap
 import Plutarch.Api.V2 (
   PAddress,
@@ -72,10 +73,7 @@ import Plutarch.Builtin (ppairDataBuiltin)
 import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf)
 import Plutarch.Extra.Field (pletAllC)
 import Plutarch.Extra.List (pfirstJust)
-import Plutarch.Extra.Map (
-  plookup,
-  plookup',
- )
+import Plutarch.Extra.Map (ptryLookup)
 import Plutarch.Extra.Maybe (passertPJust, pfromJust, pmaybeData, pnothing)
 import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=))
 import Plutarch.Extra.ScriptContext (
@@ -480,7 +478,7 @@ governorValidator as =
               finalResultTag = pwinner # proposalInputDatumF.votes # quorum # neutralOption
 
           -- The effects of the winner outcome.
-          effectGroup <- pletC $ plookup' # finalResultTag #$ proposalInputDatumF.effects
+          effectGroup <- pletC $ ptryLookup # finalResultTag #$ proposalInputDatumF.effects
 
           gatCount <- pletC $ plength #$ pto $ pto effectGroup
 

agora/Agora/Proposal.hs

@@ -728,6 +728,7 @@ phasNeutralEffect = phoistAcyclic $ PAssocMap.pany # PAssocMap.pnull
 -}
 pisEffectsVotesCompatible ::
   forall (s :: S).
+  (PIsListLike PList PResultTag) =>
   Term
     s
     ( PMap 'Sorted PResultTag PProposalEffectGroup
@@ -735,7 +736,7 @@ pisEffectsVotesCompatible ::
         :--> PBool
     )
 pisEffectsVotesCompatible = phoistAcyclic $
-  plam $ \((PM.pkeys #) -> effectKeys) ((PM.pkeys #) . pto -> voteKeys) ->
+  plam $ \((PM.pkeys @PList #) -> effectKeys) ((PM.pkeys #) . pto -> voteKeys) ->
     plistEquals # effectKeys # voteKeys
 
 {- | Retutns true if vote counts of /all/ the options are zero.

agora/Agora/Proposal/Scripts.hs

@@ -42,6 +42,7 @@ import Agora.Utils (
   pltAsData,
  )
 import Plutarch.Api.V1 (PCredential)
+import Plutarch.Api.V1.AssocMap (plookup)
 import Plutarch.Api.V2 (
   PDatumHash,
   PMintingPolicy,
@@ -55,7 +56,7 @@ import Plutarch.Extra.AssetClass (passetClass, passetClassValueOf)
 import Plutarch.Extra.Comonad (pextract)
 import Plutarch.Extra.Field (pletAll, pletAllC)
 import Plutarch.Extra.List (pfirstJust, pisUniq', pmapMaybe, pmergeBy, pmsortBy)
-import Plutarch.Extra.Map (plookup, pupdate)
+import Plutarch.Extra.Map (pupdate)
 import Plutarch.Extra.Maybe (passertPJust, pfromJust, pisJust, pjust, pnothing)
 import Plutarch.Extra.Record (mkRecordConstr, (.&), (.=))
 import Plutarch.Extra.ScriptContext (

flake.nix

@@ -15,7 +15,7 @@
 
     # Plutarch and its friends
     plutarch = {
-      url = "github:Plutonomicon/plutarch-plutus?ref=staging";
+      url = "github:Plutonomicon/plutarch-plutus?ref=master";
 
       inputs.emanote.follows =
         "plutarch/haskell-nix/nixpkgs-unstable";