diff --git a/agora/Agora/Governor.hs b/agora/Agora/Governor.hs index 9084d53..812c6ed 100644 --- a/agora/Agora/Governor.hs +++ b/agora/Agora/Governor.hs @@ -410,14 +410,13 @@ governorValidator gov = inputsFromStakeValidatorWithStateToken <- plet $ pfilter - # ( phoistAcyclic $ - plam - ( \((pfield @"resolved" #) -> txOut') -> P.do - txOut <- pletFields @'["address", "value"] txOut' + # phoistAcyclic + ( plam $ + \((pfield @"resolved" #) -> txOut') -> P.do + txOut <- pletFields @'["address", "value"] txOut' - txOut.address #== pdata pstakeValidatorAddress - #&& psymbolValueOf # pstakeStateSymbol # txOut.value #== 1 - ) + txOut.address #== pdata pstakeValidatorAddress + #&& psymbolValueOf # pstakeStateSymbol # txOut.value #== 1 ) # pfromData txInfo.inputs @@ -449,14 +448,13 @@ governorValidator gov = outputsToProposalValidatorWithStateToken <- plet $ pfilter - # ( phoistAcyclic $ - plam - ( \txOut' -> P.do - txOut <- pletFields @'["address", "value"] txOut' + # phoistAcyclic + ( plam $ + \txOut' -> P.do + txOut <- pletFields @'["address", "value"] txOut' - txOut.address #== pdata pproposalValidatorAddress - #&& psymbolValueOf # pproposalSymbol # txOut.value #== 1 - ) + txOut.address #== pdata pproposalValidatorAddress + #&& psymbolValueOf # pproposalSymbol # txOut.value #== 1 ) # pfromData txInfo.outputs @@ -507,14 +505,13 @@ governorValidator gov = outputToStakeValidatorWithStateToken <- plet $ pfilter - # ( phoistAcyclic $ - plam - ( \(txOut') -> P.do - txOut <- pletFields @'["address", "value"] txOut' + # phoistAcyclic + ( plam $ + \txOut' -> P.do + txOut <- pletFields @'["address", "value"] txOut' - txOut.address #== pdata pstakeValidatorAddress - #&& psymbolValueOf # pstakeStateSymbol # txOut.value #== 1 - ) + txOut.address #== pdata pstakeValidatorAddress + #&& psymbolValueOf # pstakeStateSymbol # txOut.value #== 1 ) # pfromData txInfo.outputs @@ -654,7 +651,7 @@ governorValidator gov = votesList = pto $ pto $ pfromData inputProposalDatum.votes winner' = - pfoldr # highestVoteFolder # (pcon PNothing) # votesList + pfoldr # highestVoteFolder # pcon PNothing # votesList winner <- plet $ mustBePJust # "Empty votes" # winner' diff --git a/agora/Agora/Utils.hs b/agora/Agora/Utils.hs index f2f5d16..563015b 100644 --- a/agora/Agora/Utils.hs +++ b/agora/Agora/Utils.hs @@ -530,7 +530,7 @@ hasOnlyOneTokenOfAssetClass' ac@(AssetClass (as, _)) = phoistAcyclic $ plam $ \vs -> P.do let ps = pconstant as - hasOnlyOneTokenOfCurrencySymbol # ps # vs + hasOnlyOneTokenOfCurrencySymbol # ps # vs #&& passetClassValueOf' ac # vs #== 1 -- | The entire value only contains one token of the specific currency symbol. @@ -547,9 +547,13 @@ hasOnlyOneTokenOfCurrencySymbol = phoistAcyclic $ mustFindDatum' :: forall (datum :: PType). PIsData datum => - forall s. Term s (PMaybeData PDatumHash :--> - (PBuiltinList (PAsData (PTuple PDatumHash PDatum))) - :--> datum) + forall s. + Term + s + ( PMaybeData PDatumHash + :--> (PBuiltinList (PAsData (PTuple PDatumHash PDatum))) + :--> datum + ) mustFindDatum' = phoistAcyclic $ plam $ \mdh datums -> P.do PDJust ((pfield @"_0" #) -> dh) <- pmatch mdh