Plutarch 1.2

.gitignore

@@ -1,4 +1,3 @@
 /result*
 /dist-newstyle
 .direnv
-bench.csv

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 # Unreleased
 
+- Add `pshow` and `ptraceShowId` 
+
+  Started by [#352](https://github.com/Plutonomicon/plutarch/pull/352)
+
+- Add `puncons` and `ptryUncons` functions for deconstructing list.
+
+  Started by: [#333](https://github.com/Plutonomicon/plutarch/pull/333)
+
+- Add generic deriving for `PEq`
+
+  Started by [#335](https://github.com/Plutonomicon/plutarch/pull/335)
+
 - `TermCont`: Parametrize by result type; add `MonadFail` instance; etc.
 
   Also, export from `Plutarch.TermCont`, and then from `Plutarch.Prelude` (TermCont is no longer exported by `Plutarch.Internal`).
@@ -71,6 +83,15 @@
 
   Added by: [#235](https://github.com/Plutonomicon/plutarch/pull/270)
 
+- Add `Plutarch.Test` for testing Plutarch code with goldens for UPLC printing and Plutus benchmarks.
+
+- `plutarch-extra`: Add a new directory scaffold "`plutarch-extra`" which will be home to everything too specific to not be in the 
+  main Plutarch repo. Also refactored the test library.
+
+  Directory: `plutarch-extra`
+
+  Added by: [#329](https://github.com/Plutonomicon/plutarch/pull/329)
+
 # 1.1.0
 
 - General repository changes.

Plutarch/Api/V1.hs

@@ -31,8 +31,6 @@ module Plutarch.Api.V1 (
 
   -- ** Crypto
   Crypto.PPubKeyHash (PPubKeyHash),
-  Crypto.PPubKey (PPubKey),
-  Crypto.PSignature (PSignature),
 
   -- ** DCert
   DCert.PDCert (

Plutarch/Api/V1/Crypto.hs

@@ -3,16 +3,12 @@
 
 module Plutarch.Api.V1.Crypto (
   PPubKeyHash (PPubKeyHash),
-  PPubKey (PPubKey),
-  PSignature (PSignature),
 ) where
 
 import qualified Plutus.V1.Ledger.Api as Plutus
-import qualified Plutus.V1.Ledger.Crypto as PlutusCrypto
-import qualified PlutusTx.Builtins.Internal as PT
 
 import Plutarch.Lift (
-  DerivePConstantViaNewtype (DerivePConstantViaNewtype),
+  DerivePConstantViaBuiltin (DerivePConstantViaBuiltin),
   PLifted,
   PUnsafeLiftDecl,
  )
@@ -23,24 +19,6 @@ newtype PPubKeyHash (s :: S) = PPubKeyHash (Term s PByteString)
 
 instance PUnsafeLiftDecl PPubKeyHash where type PLifted PPubKeyHash = Plutus.PubKeyHash
 deriving via
-  (DerivePConstantViaNewtype Plutus.PubKeyHash PPubKeyHash PByteString)
+  (DerivePConstantViaBuiltin Plutus.PubKeyHash PPubKeyHash PByteString)
   instance
     (PConstant Plutus.PubKeyHash)
-
-newtype PPubKey (s :: S) = PPubKey (Term s PByteString)
-  deriving (PlutusType, PIsData, PEq, POrd) via (DerivePNewtype PPubKey PByteString)
-
-instance PUnsafeLiftDecl PPubKey where type PLifted PPubKey = PlutusCrypto.PubKey
-deriving via
-  (DerivePConstantViaNewtype PlutusCrypto.PubKey PPubKey PByteString)
-  instance
-    (PConstant PlutusCrypto.PubKey)
-
-newtype PSignature (s :: S) = PSignature (Term s PByteString)
-  deriving (PlutusType, PIsData, PEq, POrd) via (DerivePNewtype PSignature PByteString)
-
-instance PUnsafeLiftDecl PSignature where type PLifted PSignature = PlutusCrypto.Signature
-deriving via
-  (DerivePConstantViaNewtype PlutusCrypto.Signature PSignature PByteString)
-  instance
-    (PConstant PlutusCrypto.Signature)

Plutarch/Api/V1/Scripts.hs

@@ -12,10 +12,9 @@ module Plutarch.Api.V1.Scripts (
 ) where
 
 import qualified Plutus.V1.Ledger.Api as Plutus
-import qualified PlutusTx.Builtins.Internal as PT
 
 import Plutarch.Lift (
-  DerivePConstantViaNewtype (DerivePConstantViaNewtype),
+  DerivePConstantViaBuiltin (DerivePConstantViaBuiltin),
   PLifted,
   PUnsafeLiftDecl,
  )
@@ -25,26 +24,26 @@ newtype PDatum (s :: S) = PDatum (Term s PData)
   deriving (PlutusType, PIsData, PEq) via (DerivePNewtype PDatum PData)
 
 instance PUnsafeLiftDecl PDatum where type PLifted PDatum = Plutus.Datum
-deriving via (DerivePConstantViaNewtype Plutus.Datum PDatum PData) instance (PConstant Plutus.Datum)
+deriving via (DerivePConstantViaBuiltin Plutus.Datum PDatum PData) instance (PConstant Plutus.Datum)
 
 newtype PRedeemer (s :: S) = PRedeemer (Term s PData)
   deriving (PlutusType, PIsData, PEq) via (DerivePNewtype PRedeemer PData)
 
 instance PUnsafeLiftDecl PRedeemer where type PLifted PRedeemer = Plutus.Redeemer
-deriving via (DerivePConstantViaNewtype Plutus.Redeemer PRedeemer PData) instance (PConstant Plutus.Redeemer)
+deriving via (DerivePConstantViaBuiltin Plutus.Redeemer PRedeemer PData) instance (PConstant Plutus.Redeemer)
 
 newtype PDatumHash (s :: S) = PDatumHash (Term s PByteString)
   deriving (PlutusType, PIsData, PEq, POrd) via (DerivePNewtype PDatumHash PByteString)
 
 instance PUnsafeLiftDecl PDatumHash where type PLifted PDatumHash = Plutus.DatumHash
-deriving via (DerivePConstantViaNewtype Plutus.DatumHash PDatumHash PByteString) instance (PConstant Plutus.DatumHash)
+deriving via (DerivePConstantViaBuiltin Plutus.DatumHash PDatumHash PByteString) instance (PConstant Plutus.DatumHash)
 
 newtype PStakeValidatorHash (s :: S) = PStakeValidatorHash (Term s PByteString)
   deriving (PlutusType, PIsData, PEq, POrd) via (DerivePNewtype PStakeValidatorHash PByteString)
 
 instance PUnsafeLiftDecl PStakeValidatorHash where type PLifted PStakeValidatorHash = Plutus.StakeValidatorHash
 deriving via
-  (DerivePConstantViaNewtype Plutus.StakeValidatorHash PStakeValidatorHash PByteString)
+  (DerivePConstantViaBuiltin Plutus.StakeValidatorHash PStakeValidatorHash PByteString)
   instance
     (PConstant Plutus.StakeValidatorHash)
 
@@ -53,7 +52,7 @@ newtype PRedeemerHash (s :: S) = PRedeemerHash (Term s PByteString)
 
 instance PUnsafeLiftDecl PRedeemerHash where type PLifted PRedeemerHash = Plutus.RedeemerHash
 deriving via
-  (DerivePConstantViaNewtype Plutus.RedeemerHash PRedeemerHash PByteString)
+  (DerivePConstantViaBuiltin Plutus.RedeemerHash PRedeemerHash PByteString)
   instance
     (PConstant Plutus.RedeemerHash)
 
@@ -62,6 +61,6 @@ newtype PValidatorHash (s :: S) = PValidatorHash (Term s PByteString)
 
 instance PUnsafeLiftDecl PValidatorHash where type PLifted PValidatorHash = Plutus.ValidatorHash
 deriving via
-  (DerivePConstantViaNewtype Plutus.ValidatorHash PValidatorHash PByteString)
+  (DerivePConstantViaBuiltin Plutus.ValidatorHash PValidatorHash PByteString)
   instance
     (PConstant Plutus.ValidatorHash)

Plutarch/Api/V1/Value.hs

@@ -8,10 +8,10 @@ module Plutarch.Api.V1.Value (
 ) where
 
 import qualified Plutus.V1.Ledger.Api as Plutus
-import qualified PlutusTx.Builtins.Internal as PT
 
 import Plutarch.Api.V1.AssocMap (PMap)
 import Plutarch.Lift (
+  DerivePConstantViaBuiltin (DerivePConstantViaBuiltin),
   DerivePConstantViaNewtype (DerivePConstantViaNewtype),
   PLifted,
   PUnsafeLiftDecl,
@@ -23,7 +23,7 @@ newtype PTokenName (s :: S) = PTokenName (Term s PByteString)
 
 instance PUnsafeLiftDecl PTokenName where type PLifted PTokenName = Plutus.TokenName
 deriving via
-  (DerivePConstantViaNewtype Plutus.TokenName PTokenName PByteString)
+  (DerivePConstantViaBuiltin Plutus.TokenName PTokenName PByteString)
   instance
     (PConstant Plutus.TokenName)
 
@@ -32,7 +32,7 @@ newtype PCurrencySymbol (s :: S) = PCurrencySymbol (Term s PByteString)
 
 instance PUnsafeLiftDecl PCurrencySymbol where type PLifted PCurrencySymbol = Plutus.CurrencySymbol
 deriving via
-  (DerivePConstantViaNewtype Plutus.CurrencySymbol PCurrencySymbol PByteString)
+  (DerivePConstantViaBuiltin Plutus.CurrencySymbol PCurrencySymbol PByteString)
   instance
     (PConstant Plutus.CurrencySymbol)
 

Plutarch/Bool.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE DefaultSignatures #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
@@ -17,6 +19,20 @@ module Plutarch.Bool (
   por',
 ) where
 
+import Data.Foldable (foldl')
+import Generics.SOP (
+  All,
+  All2,
+  HCollapse (hcollapse),
+  K (K),
+  NP,
+  Proxy (Proxy),
+  SOP (SOP),
+  ccompare_NS,
+  hcliftA2,
+ )
+import Plutarch.Internal (punsafeAsClosedTerm)
+import Plutarch.Internal.Generic (PCode, PGeneric, gpfrom)
 import Plutarch.Internal.Other (
   DerivePNewtype,
   PDelayed,
@@ -45,6 +61,7 @@ import qualified PlutusCore as PLC
 
 -- | Plutus 'BuiltinBool'
 data PBool (s :: S) = PTrue | PFalse
+  deriving stock (Show)
 
 instance PUnsafeLiftDecl PBool where type PLifted PBool = Bool
 deriving via (DerivePConstantDirect Bool PBool) instance (PConstant Bool)
@@ -57,6 +74,12 @@ instance PlutusType PBool where
 
 class PEq t where
   (#==) :: Term s t -> Term s t -> Term s PBool
+  default (#==) ::
+    (PGeneric s t, PlutusType t, All2 PEq (PCode s t)) =>
+    Term s t ->
+    Term s t ->
+    Term s PBool
+  a #== b = gpeq # a # b
 
 infix 4 #==
 
@@ -88,7 +111,7 @@ pif b case_true case_false = pmatch b $ \case
 
 -- | Boolean negation for 'PBool' terms.
 pnot :: Term s (PBool :--> PBool)
-pnot = phoistAcyclic $ plam $ \x -> pif x (pcon PFalse) $ pcon PTrue
+pnot = phoistAcyclic $ plam $ \x -> pif' # x # pcon PFalse # pcon PTrue
 
 -- | Lazily evaluated boolean and for 'PBool' terms.
 infixr 3 #&&
@@ -112,8 +135,42 @@ pand' = phoistAcyclic $ plam $ \x y -> pif' # x # y # (pcon PFalse)
 
 -- | Hoisted, Plutarch level, lazily evaluated boolean or function.
 por :: Term s (PBool :--> PDelayed PBool :--> PDelayed PBool)
-por = phoistAcyclic $ plam $ \x y -> pif' # x # (phoistAcyclic $ pdelay $ pcon PTrue) # y
+por = phoistAcyclic $ plam $ \x -> pif' # x # (phoistAcyclic $ pdelay $ pcon PTrue)
 
 -- | Hoisted, Plutarch level, strictly evaluated boolean or function.
 por' :: Term s (PBool :--> PBool :--> PBool)
-por' = phoistAcyclic $ plam $ \x y -> pif' # x # (pcon PTrue) # y
+por' = phoistAcyclic $ plam $ \x -> pif' # x # (pcon PTrue)
+
+-- | Generic version of (#==)
+gpeq ::
+  forall t s.
+  ( PGeneric s t
+  , PlutusType t
+  , All2 PEq (PCode s t)
+  ) =>
+  Term s (t :--> t :--> PBool)
+gpeq =
+  phoistAcyclic $
+    punsafeAsClosedTerm @s $
+      plam $ \x y ->
+        pmatch x $ \x' ->
+          pmatch y $ \y' ->
+            gpeq' @t (gpfrom x') (gpfrom y')
+
+gpeq' ::
+  forall a s.
+  All2 PEq (PCode s a) =>
+  SOP (Term s) (PCode s a) ->
+  SOP (Term s) (PCode s a) ->
+  Term s PBool
+gpeq' (SOP c1) (SOP c2) =
+  ccompare_NS (Proxy @(All PEq)) (pcon PFalse) eqProd (pcon PFalse) c1 c2
+  where
+    eqProd :: All PEq xs => NP (Term s) xs -> NP (Term s) xs -> Term s PBool
+    eqProd p1 p2 =
+      foldl' (#&&) (pcon PTrue) $
+        hcollapse $ hcliftA2 (Proxy :: Proxy PEq) eqTerm p1 p2
+      where
+        eqTerm :: forall a. PEq a => Term s a -> Term s a -> K (Term s PBool) a
+        eqTerm a b =
+          K $ a #== b

Plutarch/Builtin.hs

@@ -63,7 +63,20 @@ import Plutarch.Lift (
   pconstantFromRepr,
   pconstantToRepr,
  )
-import Plutarch.List (PListLike (..), plistEquals)
+import Plutarch.List (
+  PListLike (
+    PElemConstraint,
+    pcons,
+    pelimList,
+    phead,
+    pnil,
+    pnull,
+    ptail
+  ),
+  plistEquals,
+  pshowList,
+ )
+import Plutarch.Show (PShow (pshow'))
 import Plutarch.Unit (PUnit)
 import Plutarch.Unsafe (punsafeBuiltin, punsafeCoerce, punsafeFrom)
 import qualified PlutusCore as PLC
@@ -104,6 +117,9 @@ data PBuiltinList (a :: PType) (s :: S)
   = PCons (Term s a) (Term s (PBuiltinList a))
   | PNil
 
+instance (PShow a, PLift a) => PShow (PBuiltinList a) where
+  pshow' _ x = pshowList @PBuiltinList @a # x
+
 pheadBuiltin :: Term s (PBuiltinList a :--> a)
 pheadBuiltin = phoistAcyclic $ pforce $ punsafeBuiltin PLC.HeadList