Merge pull request #29 from input-output-hk/merge-hls-fixes

Merge hls fixes
input-output-hk · Aug 26, 2021 · d51e7a2 · d51e7a2
2 parents b8146f5 + 2d74599
commit d51e7a2
Show file tree

Hide file tree

Showing 8 changed files with 135 additions and 51 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Plutus Starter Project",
-    "image": "docker.io/inputoutput/plutus-starter-devcontainer:v1.0.7",
+    "image": "docker.io/inputoutput/plutus-starter-devcontainer:v1.0.8",
 
     "remoteUser": "plutus",
 

diff --git a/cabal.project b/cabal.project
@@ -28,7 +28,7 @@ source-repository-package
     prettyprinter-configurable
     quickcheck-dynamic
     word-array
-  tag: plutus-starter-devcontainer/v1.0.7
+  tag: plutus-starter-devcontainer/v1.0.8
 
 
 -- The following sections are copied from the 'plutus' repository cabal.project at the revision
@@ -81,10 +81,6 @@ package ouroboros-consensus-cardano
 package cardano-api
   optimization: False
 
--- Turn off the tests for a while
-package plutus-metatheory
-  tests: False
-
 -- https://github.com/Quid2/flat/pull/22 fixes a potential exception
 -- when decoding invalid (e.g. malicious) text literals.
 source-repository-package
@@ -117,12 +113,12 @@ source-repository-package
     base-deriving-via
     binary
     binary/test
-    measures
-    orphans-deriving-via
-    slotting
     cardano-crypto-class
     cardano-crypto-praos
     cardano-crypto-tests
+    measures
+    orphans-deriving-via
+    slotting
     strict-containers
 
 source-repository-package
@@ -136,7 +132,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: f149c1c1e4e4bb5bab51fa055e9e3a7084ddc30e
+  tag: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b
   subdir:
     monoidal-synchronisation
     typed-protocols
@@ -155,7 +151,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
-  tag: 34abfb7f4f5610cabb45396e0496472446a0b2ca
+  tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
   subdir:
     iohk-monitoring
     tracer-transformers
@@ -169,7 +165,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-ledger-specs
-  tag: 12a0ef69d64a55e737fbf4e846bd8ed9fb30a956
+  tag: d5b184a820853c7ba202efd615b8fadca1acb52c
   subdir:
     byron/chain/executable-spec
     byron/crypto
@@ -192,7 +188,7 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node.git
-  tag: 3a56ac245c83d3345f81123ec3bb496bb23477a3
+  tag: ed11e8b6429d4af1cb2539460e5cb2283a06b2dc
   subdir:
     cardano-api
     cardano-node

diff --git a/examples/test/Spec/game.pir b/examples/test/Spec/game.pir
@@ -18,7 +18,9 @@
         (vardecl StakingHash (fun Credential StakingCredential))
         (vardecl
           StakingPtr
-          (fun (con integer) (fun (con integer) (fun (con integer) StakingCredential)))
+          (fun
+            (con integer)
+            (fun (con integer) (fun (con integer) StakingCredential)))
         )
       )
     )
@@ -75,33 +77,34 @@
         (tyvardecl Extended (fun (type) (type)))
         (tyvardecl a (type))
         Extended_match
-        (vardecl Finite (fun a [Extended a]))
-        (vardecl NegInf [Extended a])
-        (vardecl PosInf [Extended a])
+        (vardecl Finite (fun a [ Extended a ]))
+        (vardecl NegInf [ Extended a ])
+        (vardecl PosInf [ Extended a ])
       )
     )
     (datatypebind
       (datatype
         (tyvardecl LowerBound (fun (type) (type)))
         (tyvardecl a (type))
         LowerBound_match
-        (vardecl LowerBound (fun [Extended a] (fun Bool [LowerBound a])))
+        (vardecl LowerBound (fun [ Extended a ] (fun Bool [ LowerBound a ])))
       )
     )
     (datatypebind
       (datatype
         (tyvardecl UpperBound (fun (type) (type)))
         (tyvardecl a (type))
         UpperBound_match
-        (vardecl UpperBound (fun [Extended a] (fun Bool [UpperBound a])))
+        (vardecl UpperBound (fun [ Extended a ] (fun Bool [ UpperBound a ])))
       )
     )
     (datatypebind
       (datatype
         (tyvardecl Interval (fun (type) (type)))
         (tyvardecl a (type))
         Interval_match
-        (vardecl Interval (fun [LowerBound a] (fun [UpperBound a] [Interval a]))
+        (vardecl
+          Interval (fun [ LowerBound a ] (fun [ UpperBound a ] [ Interval a ]))
         )
       )
     )
@@ -110,7 +113,7 @@
         (tyvardecl Maybe (fun (type) (type)))
         (tyvardecl a (type))
         Maybe_match
-        (vardecl Just (fun a [Maybe a])) (vardecl Nothing [Maybe a])
+        (vardecl Just (fun a [ Maybe a ])) (vardecl Nothing [ Maybe a ])
       )
     )
     (datatypebind
@@ -119,7 +122,7 @@
 
         Address_match
         (vardecl
-          Address (fun Credential (fun [Maybe StakingCredential] Address))
+          Address (fun Credential (fun [ Maybe StakingCredential ] Address))
         )
       )
     )
@@ -128,7 +131,7 @@
         (tyvardecl Tuple2 (fun (type) (fun (type) (type))))
         (tyvardecl a (type)) (tyvardecl b (type))
         Tuple2_match
-        (vardecl Tuple2 (fun a (fun b [[Tuple2 a] b])))
+        (vardecl Tuple2 (fun a (fun b [ [ Tuple2 a ] b ])))
       )
     )
     (let
@@ -138,7 +141,8 @@
           (tyvardecl List (fun (type) (type)))
           (tyvardecl a (type))
           Nil_match
-          (vardecl Nil [List a]) (vardecl Cons (fun a (fun [List a] [List a])))
+          (vardecl Nil [ List a ])
+          (vardecl Cons (fun a (fun [ List a ] [ List a ])))
         )
       )
       (let
@@ -150,7 +154,24 @@
             TxOut_match
             (vardecl
               TxOut
-              (fun Address (fun [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] (con integer)]] (fun [Maybe (con bytestring)] TxOut)))
+              (fun
+                Address
+                (fun
+                  [
+                    [
+                      (lam k (type) (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                      (con bytestring)
+                    ]
+                    [
+                      [
+                        (lam
+                          k (type) (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                        (con bytestring)
+                      ]
+                      (con integer)
+                    ]
+                  ]
+                  (fun [ Maybe (con bytestring) ] TxOut)))
             )
           )
         )
@@ -169,7 +190,60 @@
             TxInfo_match
             (vardecl
               TxInfo
-              (fun [List TxInInfo] (fun [List TxOut] (fun [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] (con integer)]] (fun [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] [[(lam k (type) (lam v (type) [List [[Tuple2 k] v]])) (con bytestring)] (con integer)]] (fun [List DCert] (fun [List [[Tuple2 StakingCredential] (con integer)]] (fun [Interval (con integer)] (fun [List (con bytestring)] (fun [List [[Tuple2 (con bytestring)] (con data)]] (fun (con bytestring) TxInfo))))))))))
+              (fun
+                [ List TxInInfo ]
+                (fun
+                  [ List TxOut ]
+                  (fun
+                    [
+                      [
+                        (lam
+                          k (type) (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                        (con bytestring)
+                      ]
+                      [
+                        [
+                          (lam
+                            k (type) (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                          (con bytestring)
+                        ]
+                        (con integer)
+                      ]
+                    ]
+                    (fun
+                      [
+                        [
+                          (lam
+                            k (type) (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                          (con bytestring)
+                        ]
+                        [
+                          [
+                            (lam
+                              k
+                              (type)
+                              (lam v (type) [ List [ [ Tuple2 k ] v ] ]))
+                            (con bytestring)
+                          ]
+                          (con integer)
+                        ]
+                      ]
+                      (fun
+                        [ List DCert ]
+                        (fun
+                          [
+                            List [ [ Tuple2 StakingCredential ] (con integer) ]
+                          ]
+                          (fun
+                            [ Interval (con integer) ]
+                            (fun
+                              [ List (con bytestring) ]
+                              (fun
+                                [
+                                  List
+                                  [ [ Tuple2 (con bytestring) ] (con data) ]
+                                ]
+                                (fun (con bytestring) TxInfo))))))))))
             )
           )
         )
@@ -187,7 +261,8 @@
           (strict)
           (vardecl
             validateGuess
-            (fun (con bytestring) (fun (con bytestring) (fun ScriptContext Bool)))
+            (fun
+              (con bytestring) (fun (con bytestring) (fun ScriptContext Bool)))
           )
           (lam
             hs

diff --git a/hie.yaml b/hie.yaml
@@ -1,2 +1,10 @@
 cradle:
   cabal:
+    - path: "./src"
+      component: "plutus-starter:lib:plutus-starter"
+    - path: "./examples/src"
+      component: "plutus-starter:lib:plutus-starter"
+    - path: "./examples/test"
+      component: "plutus-starter:test:plutus-example-projects-test"
+    - path: "./pab"
+      component: "plutus-starter:exe:plutus-starter-pab"
diff --git a/nix/pkgs/haskell/haskell.nix b/nix/pkgs/haskell/haskell.nix
@@ -19,19 +19,19 @@ let
     inherit compiler-nix-name;
 
     sha256map = {
-      "https://github.com/input-output-hk/plutus.git"."plutus-starter-devcontainer/v1.0.7" = "1x60gjpab8zssm64l3n0z443c66qg4q3811vzw67fx7id0by32p3";
+      "https://github.com/input-output-hk/plutus.git"."plutus-starter-devcontainer/v1.0.8" = "0fas8kv57lyrsn3larvbfgif48d506w73y7g3g0mxfilfsl5nyfz";
       "https://github.com/michaelpj/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm";
       "https://github.com/shmish111/purescript-bridge.git"."6a92d7853ea514be8b70bab5e72077bf5a510596" = "13j64vv116in3c204qsl1v0ajphac9fqvsjp7x3zzfr7n7g61drb";
       "https://github.com/shmish111/servant-purescript.git"."a76104490499aa72d40c2790d10e9383e0dbde63" = "11nxxmi5bw66va7psvrgrw7b7n85fvqgfp58yva99w3v9q3a50v9";
       "https://github.com/input-output-hk/cardano-base"."cb0f19c85e5bb5299839ad4ed66af6fa61322cc4" = "0dnkfqcvbifbk3m5pg8kyjqjy0zj1l4vd23p39n6ym4q0bnib1cq";
       "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3";
-      "https://github.com/input-output-hk/cardano-ledger-specs"."12a0ef69d64a55e737fbf4e846bd8ed9fb30a956" = "0mx1g18ypdd5m8ijc2cl9m1xmymlqfbwl1r362f92vxrmziacifv";
+      "https://github.com/input-output-hk/cardano-ledger-specs"."d5b184a820853c7ba202efd615b8fadca1acb52c" = "04k5p6qwmfdza65gl5319r1ahdfwjnyqgzpfxdx0x2g5jcbimar4";
       "https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6";
       "https://github.com/input-output-hk/goblins"."cde90a2b27f79187ca8310b6549331e59595e7ba" = "17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg";
-      "https://github.com/input-output-hk/iohk-monitoring-framework"."34abfb7f4f5610cabb45396e0496472446a0b2ca" = "1fdc0a02ipa385dnwa6r6jyc8jlg537i12hflfglkhjs2b7i92gs";
-      "https://github.com/input-output-hk/ouroboros-network"."f149c1c1e4e4bb5bab51fa055e9e3a7084ddc30e" = "1szh3xr7qnx56kyxd554yswpddbavb7m7k2mk3dqdn7xbg7s8b8w";
-      "https://github.com/input-output-hk/cardano-node.git"."3a56ac245c83d3345f81123ec3bb496bb23477a3" = "0dglxqhqrdn5nc3n6c8b7himgxrjdjszcl905xihrnaav49z09mg";
+      "https://github.com/input-output-hk/iohk-monitoring-framework"."808724ff8a19a33d0ed06f9ef59fbd900b08553c" = "0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz";
       "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r";
+      "https://github.com/input-output-hk/ouroboros-network"."877ce057ff6fb086474c8eaad53f2b7f0e0fce6b" = "1kp0qysfy3hl96a3a61rijascq36f1imh3z4jy0vyiygb6qrv47z";
+      "https://github.com/input-output-hk/cardano-node.git"."ed11e8b6429d4af1cb2539460e5cb2283a06b2dc" = "1wvr3zzl37i1fn5y9ni027rqw5bhh25z1bacvcaapxxjgdn38lbq";
       "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx";
       "https://github.com/input-output-hk/hedgehog-extras"."edf6945007177a638fbeb8802397f3a6f4e47c14" = "0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9";
     };

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "input-output-hk",
         "repo": "plutus",
-        "rev": "plutus-starter-devcontainer/v1.0.7",
-        "sha256": "1x60gjpab8zssm64l3n0z443c66qg4q3811vzw67fx7id0by32p3",
+        "rev": "plutus-starter-devcontainer/v1.0.8",
+        "sha256": "0fas8kv57lyrsn3larvbfgif48d506w73y7g3g0mxfilfsl5nyfz",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/plutus/archive/plutus-starter-devcontainer/v1.0.7.tar.gz",
+        "url": "https://github.com/input-output-hk/plutus/archive/plutus-starter-devcontainer/v1.0.8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/pab/Main.hs b/pab/Main.hs
@@ -11,23 +11,18 @@
 module Main(main) where
 
 import           Control.Monad                       (void)
-import           Control.Monad.Freer                 (Eff, Member, interpret, type (~>))
-import           Control.Monad.Freer.Extras.Log      (LogMsg)
-import           Control.Monad.Freer.Error           (Error)
+import           Control.Monad.Freer                 (interpret)
 import           Control.Monad.IO.Class              (MonadIO (..))
 import           Data.Aeson                          (FromJSON (..), ToJSON (..), genericToJSON, genericParseJSON
                                                      , defaultOptions, Options(..))
 import           Data.Default                        (def)
 import           Data.Text.Prettyprint.Doc           (Pretty (..), viaShow)
 import           GHC.Generics                        (Generic)
 import           Plutus.Contract                     (ContractError)
-import           Plutus.PAB.Effects.Contract         (ContractEffect (..))
 import           Plutus.PAB.Effects.Contract.Builtin (Builtin, SomeBuiltin (..), BuiltinHandler(contractHandler))
 import qualified Plutus.PAB.Effects.Contract.Builtin as Builtin
-import           Plutus.PAB.Monitoring.PABLogMsg     (PABMultiAgentMsg)
 import           Plutus.PAB.Simulator                (SimulatorEffectHandlers)
 import qualified Plutus.PAB.Simulator                as Simulator
-import           Plutus.PAB.Types                    (PABError (..))
 import qualified Plutus.PAB.Webserver.Server         as PAB.Server
 import           Plutus.Contracts.Game               as Game