Skip to content

Commit

Permalink
Generic wellformedness precondition (#345)
Browse files Browse the repository at this point in the history
  • Loading branch information
MaximilianAlgehed authored Mar 8, 2022
1 parent 2216702 commit c4960ae
Show file tree
Hide file tree
Showing 53 changed files with 17,531 additions and 18,285 deletions.
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/input-output-hk/plutus
tag: cc72a56eafb02333c96f662581b57504f8f8992f
tag: 4127e9cd6e889824d724c30eae55033cb50cbf3e
subdir:
plutus-core
plutus-ledger-api
Expand Down
6 changes: 4 additions & 2 deletions doc/plutus/tutorials/GameModel.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
Expand All @@ -17,6 +18,7 @@ module GameModel where
import Control.Applicative
import Control.Lens hiding (elements)
import Control.Monad
import Data.Data
import System.Random

-- START import Log
Expand Down Expand Up @@ -78,7 +80,7 @@ data GameModel = GameModel
{ _gameValue :: Integer
, _hasToken :: Maybe Wallet
, _currentSecret :: String }
deriving (Show)
deriving (Show, Data)

makeLenses 'GameModel
-- END GameModel
Expand All @@ -92,7 +94,7 @@ instance ContractModel GameModel where
data Action GameModel = Lock Wallet String Integer
| Guess Wallet String String Integer
| GiveToken Wallet
deriving (Eq, Show)
deriving (Eq, Show, Data)
-- END instance ContractModel and Action type

-- START ContractInstanceKey
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/pkgs/haskell/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let
inherit checkMaterialization;
sha256map = {
"https://github.com/input-output-hk/iohk-monitoring-framework"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0";
"https://github.com/input-output-hk/plutus"."cc72a56eafb02333c96f662581b57504f8f8992f" = "1w89ikv3jsg5x9xf7qpcjnix3nf016z0xpf48q5238h4ngvcqp9y";
"https://github.com/input-output-hk/plutus"."4127e9cd6e889824d724c30eae55033cb50cbf3e" = "186w0x7vk8m8npmsfg9pdkxds0rlj6bmhr8nkgn96rkvaz5azjsb";
"https://github.com/Quid2/flat"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm";
"https://github.com/input-output-hk/servant-purescript"."44e7cacf109f84984cd99cd3faf185d161826963" = "10pb0yfp80jhb9ryn65a4rha2lxzsn2vlhcc6xphrrkf4x5lhzqc";
"https://github.com/input-output-hk/purescript-bridge"."47a1f11825a0f9445e0f98792f79172efef66c00" = "0da1vn2l6iyfxcjk58qal1l4755v92zi6yppmjmqvxf1gacyf9px";
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

137 changes: 89 additions & 48 deletions nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 41 additions & 3 deletions nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions nix/pkgs/haskell/materialized-darwin/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c4960ae

Please sign in to comment.