Adding Gen types for ScriptContexts

.gitignore

@@ -50,3 +50,7 @@ cabal.project.local*
 # ctags 
 tags 
 TAGS
+
+# Local hoogle 
+.hoogle 
+.haddock

Makefile

@@ -2,8 +2,6 @@
 # are made availible by the nix shell defined in shell.nix.
 # In most cases you should execute Make after entering nix-shell.
 
-SHELL := /usr/bin/env bash
-
 .PHONY: hoogle build test watch ghci readme_contents \
 	format lint refactor requires_nix_shell
 
@@ -25,16 +23,20 @@ usage:
 	@echo "  format_check        -- Check source code formatting without making changes"
 	@echo "  cabalfmt            -- Apply cabal formatting with cabal-fmt"
 	@echo "  cabalfmt_check      -- Check cabal files for formatting errors without making changes"
-	@echo "  nixfmt              -- Apply nix formatting with nixfmt"
-	@echo "  nixfmt_check        -- Check nix files for format errors"
+	@echo "  nixpkgsfmt          -- Apply nix formatting with nixpkgs-fmt"
+	@echo "  nixpkgsfmt_check    -- Check nix files for format errors"
 	@echo "  lint                -- Check the sources with hlint"
 	@echo "  refactor_cautious   -- Automatically apply hlint refactors, with prompt"
 	@echo "  refactor            -- Automatically apply hlint refactors, without prompt"
 	@echo "  readme_contents     -- Add table of contents to README"
 	@echo "  update_plutus       -- Update plutus version with niv"
+	@echo "  haddock             -- Generate haddock docs.
 
 hoogle: requires_nix_shell
-	hoogle server --local
+	pkill hoogle || true
+	hoogle generate --local=.haddock --database=.hoogle/local.hoo
+	hoogle server --local -p 8080 >> /dev/null &
+	hoogle server --local --database=.hoogle/local.hoo -p 8081 >> /dev/null &
 
 STACK_EXE_PATH = $(shell stack $(STACK_FLAGS) path --local-install-root)/bin
 
@@ -71,7 +73,7 @@ format: requires_nix_shell
 format_check: requires_nix_shell
 	fourmolu --mode check --check-idempotence $(FORMAT_EXTENSIONS) $(FORMAT_SOURCES)
 
-CABAL_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.cabal' )
+CABAL_SOURCES := $(shell fd -ecabal)
 
 cabalfmt: requires_nix_shell
 	cabal-fmt --inplace $(CABAL_SOURCES)
@@ -80,13 +82,13 @@ cabalfmt_check: requires_nix_shell
 	cabal-fmt --check $(CABAL_SOURCES)
 
 # Nix files to format
-NIX_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.nix' )
+NIX_SOURCES := $(shell fd -enix)
 
-nixfmt: requires_nix_shell
-	nixfmt $(NIX_SOURCES)
+nixpkgsfmt: requires_nix_shell
+	nixpkgs-fmt $(NIX_SOURCES)
 
-nixfmt_check: requires_nix_shell
-	nixfmt --check $(NIX_SOURCES)
+nixpkgsfmt_check: requires_nix_shell
+	nixpkgs-fmt --check $(NIX_SOURCES)
 
 # Check with hlint, currently I couldn't get --refactor to work
 lint: requires_nix_shell
@@ -123,3 +125,6 @@ update_plutus:
 	@echo "Make sure to update the plutus rev in cabal.project with:"
 	@echo "    commit: $(PLUTUS_REV)"
 	@echo "This may require further resolution of dependency versions."
+
+haddock: requires_nix_shell
+	cabal haddock --haddock-html --haddock-hoogle --builddir=.haddock

apropos-tx.cabal

@@ -40,6 +40,7 @@ common lang
   build-depends:
     , apropos
     , base               >=4.14
+    , bytestring
     , containers
     , free
     , hedgehog
@@ -49,6 +50,7 @@ common lang
     , plutarch
     , plutus-core
     , plutus-ledger-api
+    , plutus-tx
     , pretty
     , pretty-show
     , safe
@@ -64,6 +66,18 @@ common lang
 library
   import:          lang
   exposed-modules:
+    Apropos.Gen.Address
+    Apropos.Gen.Api
+    Apropos.Gen.Contexts
+    Apropos.Gen.Credential
+    Apropos.Gen.Crypto
+    Apropos.Gen.DCert
+    Apropos.Gen.Extra
+    Apropos.Gen.Interval
+    Apropos.Gen.Scripts
+    Apropos.Gen.Time
+    Apropos.Gen.TxId
+    Apropos.Gen.Value
     Apropos.Script
     Apropos.Tx
 
@@ -88,6 +102,9 @@ test-suite examples
     , containers
     , hedgehog
     , mtl
+    , plutarch
+    , plutus-core
+    , plutus-ledger-api
     , tasty
     , tasty-hedgehog
     , text

examples/Spec/Int.hs

@@ -56,12 +56,12 @@ instance HasParameterisedGenerator IntProp Int where
             else
               if IsMaxBound `elem` s
                 then pure maxBound
-                else int (linear 11 (maxBound -1))
+                else int (linear 11 (maxBound - 1))
     if IsNegative `elem` s
       then
         if IsMinBound `elem` s
           then pure minBound
-          else pure (- i)
+          else pure (-i)
       else pure i
 
 intGenTests :: TestTree

examples/Spec/IntPermutationGen.hs

@@ -67,7 +67,7 @@ instance HasPermutationGenerator IntProp Int where
         { name = "MakeLarge"
         , match = Not $ Var IsLarge
         , contract = clear >> addAll [IsLarge, IsPositive]
-        , morphism = \_ -> int (linear 11 (maxBound -1))
+        , morphism = \_ -> int (linear 11 (maxBound - 1))
         }
     , Morphism
         { name = "MakeSmall"
@@ -83,7 +83,7 @@ instance HasPermutationGenerator IntProp Int where
               [ has IsNegative >> remove IsNegative >> add IsPositive
               , has IsPositive >> remove IsPositive >> add IsNegative
               ]
-        , morphism = \i -> pure (- i)
+        , morphism = \i -> pure (-i)
         }
     ]
 

examples/Spec/Plutarch/CostModel.hs

@@ -24,7 +24,7 @@ numCostModels = 10
 
 peano :: Integer -> Term s PInteger
 peano 0 = 0
-peano i = papp (plam (+ 1)) (peano (i -1))
+peano i = papp (plam (+ 1)) (peano (i - 1))
 
 addCost :: Integer -> Script
 addCost i = compile $ peano i

examples/Spec/Plutarch/MagicNumber.hs

@@ -28,7 +28,7 @@ numMagicNumbers = 4
 
 -- accepts a range of numbers determined by a Magic Number
 magicNumber :: Integer -> Script
-magicNumber i = compile $ plam $ \ii -> pif ((pfromData ii #<= (fromInteger i :: Term s PInteger)) #&& ((fromInteger (- i) :: Term s PInteger) #<= pfromData ii)) (pcon PUnit) perror
+magicNumber i = compile $ plam $ \ii -> pif ((pfromData ii #<= (fromInteger i :: Term s PInteger)) #&& ((fromInteger (-i) :: Term s PInteger) #<= pfromData ii)) (pcon PUnit) perror
 
 data MagicNumberProp = HalfWidth Integer
   deriving stock (Eq, Ord, Show)

flake.nix

@@ -21,12 +21,14 @@
 
       nixpkgsFor = system: import nixpkgs { inherit system; overlays = [ haskell-nix.overlay ]; inherit (haskell-nix) config; };
 
+      fourmoluFor = system: (nixpkgsFor system).haskell-nix.tool "ghc8107" "fourmolu" { };
+
       projectFor = system:
         let
           deferPluginErrors = true;
           pkgs = nixpkgsFor system;
 
-          fakeSrc = pkgs.runCommand "real-source" {} ''
+          fakeSrc = pkgs.runCommand "real-source" { } ''
             cp -rT ${self} $out
             chmod u+w $out/cabal.project
             cat $out/cabal-haskell.nix.project >> $out/cabal.project
@@ -55,51 +57,55 @@
 
             # We use the ones from Nixpkgs, since they are cached reliably.
             # Eventually we will probably want to build these with haskell.nix.
-            nativeBuildInputs = [ pkgs.cabal-install pkgs.hlint pkgs.haskellPackages.fourmolu ];
+            nativeBuildInputs = with pkgs; [ cabal-install hlint (fourmoluFor system) fd haskellPackages.cabal-fmt nixpkgs-fmt coreutils ];
 
             additional = ps: [
               ps.plutarch
               ps.apropos
             ];
           };
           sha256map = {
-            "https://github.com/Plutonomicon/plutarch"."f8b7eb06184112ae2bebdec5a8156010141a05d5"
-              = "sha256-y9lalsaTFVEPCoE/P8d4bduJJLSBvVpo/791mI9kcO4=";
-            "https://github.com/mlabs-haskell/apropos"."3734bb3baa297ed990725a5ef14efcbb6a1c1c23"
-              = "sha256-C2gQrd5hFvQ+BsjAJs6V0iP9PRzd9dZMKtpk7kOjhwc=";
-            "https://github.com/input-output-hk/plutus.git"."6d8d25d1e84b2a4278da1036aab23da4161b8df8"
-              = "o8m86TkI1dTo74YbE9CPPNrBfSDSrf//DMq+v2+woEY=";
-            "https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8"
-              = "lRFND+ZnZvAph6ZYkr9wl9VAx41pb3uSFP8Wc7idP9M=";
-            "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec"
-              = "oxIOVlgm07FAEmgGRF1C2me9TXqVxQulEOcJ22zpTRs=";
-            "https://github.com/input-output-hk/cardano-base"."78b3928391b558fb1750228f63301ec371f13528"
-              = "pBUTTcenaSLMovHKGsaddJ7Jh3okRTrtu5W7Rdu6RM4=";
-            "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852"
-              = "BtbT5UxOAADvQD4qTPNrGfnjQNgbYNO4EAJwH2ZsTQo=";
-            "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d"
-              = "Hesb5GXSx0IwKSIi42ofisVELcQNX6lwHcoZcbaDiqc=";
+            "https://github.com/Plutonomicon/plutarch"."f8b7eb06184112ae2bebdec5a8156010141a05d5" = "sha256-y9lalsaTFVEPCoE/P8d4bduJJLSBvVpo/791mI9kcO4=";
+            "https://github.com/mlabs-haskell/apropos"."3734bb3baa297ed990725a5ef14efcbb6a1c1c23" = "sha256-C2gQrd5hFvQ+BsjAJs6V0iP9PRzd9dZMKtpk7kOjhwc=";
+            "https://github.com/input-output-hk/plutus.git"."6d8d25d1e84b2a4278da1036aab23da4161b8df8" = "o8m86TkI1dTo74YbE9CPPNrBfSDSrf//DMq+v2+woEY=";
+            "https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "lRFND+ZnZvAph6ZYkr9wl9VAx41pb3uSFP8Wc7idP9M=";
+            "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "oxIOVlgm07FAEmgGRF1C2me9TXqVxQulEOcJ22zpTRs=";
+            "https://github.com/input-output-hk/cardano-base"."78b3928391b558fb1750228f63301ec371f13528" = "pBUTTcenaSLMovHKGsaddJ7Jh3okRTrtu5W7Rdu6RM4=";
+            "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "BtbT5UxOAADvQD4qTPNrGfnjQNgbYNO4EAJwH2ZsTQo=";
+            "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "Hesb5GXSx0IwKSIi42ofisVELcQNX6lwHcoZcbaDiqc=";
           };
         };
+      formatCheckFor = system:
+        let
+          pkgs = nixpkgsFor system;
+        in
+        pkgs.runCommand "format-check"
+          {
+            nativeBuildInputs = [ self.devShell.${system}.nativeBuildInputs ];
+          } ''
+          cd ${self}
+          IN_NIX_SHELL=true make format_check cabalfmt_check nixpkgsfmt_check lint
+          mkdir $out
+        '';
     in
     {
-      ciNix = flake-compat-ci.lib.recurseIntoFlakeWith {
-        flake = self;
-        systems = [ "x86_64-linux" ];
-      };
-
       project = perSystem projectFor;
-      flake = perSystem (system: (projectFor system).flake {});
+      flake = perSystem (system: (projectFor system).flake { });
 
       # this could be done automatically, but would reduce readability
       packages = perSystem (system: self.flake.${system}.packages);
-      checks = perSystem (system: self.flake.${system}.checks);
+      checks = perSystem (system: self.flake.${system}.checks // {
+        formatCheck = formatCheckFor system;
+      });
       check = perSystem (system:
-        (nixpkgsFor system).runCommand "combined-test" {
-          nativeBuildInputs = builtins.attrValues self.checks.${system};
-        } "touch $out"
+        (nixpkgsFor system).runCommand "combined-test"
+          {
+            nativeBuildInputs = builtins.attrValues self.checks.${system};
+          } "touch $out"
       );
       apps = perSystem (system: self.flake.${system}.apps);
       devShell = perSystem (system: self.flake.${system}.devShell);
+
+      herculesCI.ciSystems = [ "x86_64-linux" ];
     };
 }

src/Apropos/Gen/Address.hs

@@ -0,0 +1,22 @@
+{- |
+Module: Apropos.Gen.Address
+Description: Address generators.
+Maintainer: jack@mlabs.city
+
+`Gen`s for `Plutus.V1.Ledger.Address` types.
+-}
+module Apropos.Gen.Address (address) where
+
+import Apropos.Gen (Gen)
+import Apropos.Gen.Credential (credential, stakingCredential)
+import Apropos.Gen.Extra qualified as Gen (maybe)
+import Plutus.V1.Ledger.Address (
+  Address (Address),
+ )
+
+-- | Generator for Plutus `Address` types.
+address :: Gen Address
+address = do
+  cred <- credential
+  scred <- Gen.maybe stakingCredential
+  return $ Address cred scred