Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PlutusTx] [Builtins] Split 'FromBuiltin' and 'ToBuiltin' #5971

Merged
merged 12 commits into from
May 15, 2024
Merged

[PlutusTx] [Builtins] Split 'FromBuiltin' and 'ToBuiltin' #5971

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1f7f634
Try naive type families
effectfully May 9, 2024
94ff0ff
Split 'Has*' into 'From*' and 'To*' again
effectfully May 10, 2024
1f0d147
Remove type families from '*Opaque'
effectfully May 10, 2024
8a02b66
Add 'ToBuiltin'
effectfully May 11, 2024
669e25f
Add 'TestInstances'
effectfully May 11, 2024
bb18d98
Make it work for GHC-8.10
effectfully May 11, 2024
0ec5c85
Polishing
effectfully May 12, 2024
173ee90
Improve docs
effectfully May 13, 2024
6e329d6
Polishing
effectfully May 13, 2024
29f0b1a
Address comments
effectfully May 14, 2024
0cc3acf
Address comments
effectfully May 15, 2024
5b7b797
Irrelevant tweaking
effectfully May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Polishing
  • Loading branch information
@effectfully
effectfully committed May 13, 2024
commit 6e329d685ea4bdabdc28429c2ad5343171367eda
1 change: 0 additions & 1 deletion plutus-core/plutus-ir/test/PlutusIR/Transform/StrictLetRec/strictLetRec.uplc.golden
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ instance HasToOpaque [BuiltinData] (BuiltinList BuiltinData) where
goList :: [BuiltinData] -> BuiltinList BuiltinData
goList [] = mkNilData unitval
goList (d:ds) = mkCons (toOpaque d) (goList ds)
{-# INLINE toOpaque #-}
{-# INLINABLE toOpaque #-}
instance
HasToOpaque
[(BuiltinData, BuiltinData)]
Expand All @@ -208,7 +208,7 @@ instance
goList :: [(BuiltinData, BuiltinData)] -> BuiltinList (BuiltinPair BuiltinData BuiltinData)
goList [] = mkNilPairData unitval
goList (d:ds) = mkCons (toOpaque d) (goList ds)
{-# INLINE toOpaque #-}
{-# INLINABLE toOpaque #-}
instance HasFromOpaque arep a => HasFromOpaque (BuiltinList arep) [a] where
fromOpaque = go
where
Expand Down
2 changes: 1 addition & 1 deletion plutus-tx/src/PlutusTx/Lift/Class.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ instance uni `PLC.HasTypeLevel` Data => Typeable uni BuiltinData where

-- See Note [Lift and Typeable instances for builtins]
instance uni `PLC.HasTermLevel` Data => Lift uni BuiltinData where
lift = liftBuiltin . builtinDataToData
lift = liftBuiltin . fromBuiltin

-- See Note [Lift and Typeable instances for builtins]
instance uni `PLC.HasTypeLevel` PlutusCore.Crypto.BLS12_381.G1.Element =>
Expand Down