Merge pull request #32 from input-output-hk/upgrade-to-1-0.10

version bump

Author: silky

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
  "name": "Plutus Starter Project",
- "image": "docker.io/inputoutput/plutus-starter-devcontainer:v1.0.9",
+ "image": "docker.io/inputoutput/plutus-starter-devcontainer:v1.0.10",
 
  "remoteUser": "plutus",
 

cabal.project

@@ -28,7 +28,7 @@ source-repository-package
  prettyprinter-configurable
  quickcheck-dynamic
  word-array
- tag: plutus-starter-devcontainer/v1.0.9
+ tag: plutus-starter-devcontainer/v1.0.10
 
 
 -- The following sections are copied from the 'plutus' repository cabal.project at the revision
@@ -91,13 +91,13 @@ source-repository-package
 -- Needs some patches, but upstream seems to be fairly dead (no activity in > 1 year)
 source-repository-package
  type: git
- location: https://github.com/shmish111/purescript-bridge.git
+ location: https://github.com/input-output-hk/purescript-bridge.git
  tag: 6a92d7853ea514be8b70bab5e72077bf5a510596
 
 source-repository-package
  type: git
- location: https://github.com/shmish111/servant-purescript.git
- tag: a76104490499aa72d40c2790d10e9383e0dbde63
+ location: https://github.com/input-output-hk/servant-purescript.git
+ tag: a0c7c7e37c95564061247461aef4be505a853538
 
 source-repository-package
  type: git
@@ -107,7 +107,7 @@ source-repository-package
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-base
- tag: 46502694f6a9f0498f822068008b232b3837a9e9
+ tag: 592aa61d657ad5935a33bace1243abce3728b643
  subdir:
  base-deriving-via
  binary
@@ -128,10 +128,28 @@ source-repository-package
  cardano-prelude
  cardano-prelude-test
 
+source-repository-package
+ type: git
+ location: https://github.com/input-output-hk/cardano-addresses
+ tag: d2f86caa085402a953920c6714a0de6a50b655ec
+ subdir:
+ core
+
+source-repository-package
+ type: git
+ location: https://github.com/input-output-hk/cardano-wallet
+ tag: ae7569293e94241ef6829139ec02bd91abd069df
+ subdir:
+ lib/text-class
+ lib/strict-non-empty-containers
+ lib/core
+ lib/test-utils
+ lib/numeric
+
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/ouroboros-network
- tag: 6d00ff77f9bcd769fb6d7fd02216cec4e837bfcf
+ tag: 5d37a927046bc7da2887830d8e35cf604622ce09
  subdir:
  monoidal-synchronisation
  typed-protocols
@@ -146,6 +164,7 @@ source-repository-package
  io-sim
  io-classes
  network-mux
+ ntp-client
 
 source-repository-package
  type: git
@@ -173,8 +192,8 @@ source-repository-package
 
 source-repository-package
  type: git
- location: https://github.com/input-output-hk/cardano-ledger-specs
- tag: 8efcfc755faae4db3a64ad45343235fce3ed5c47
+ location: https://github.com/raduom/cardano-ledger-specs
+ tag: ef6bb99782d61316da55470620c7da994cc352b2
  subdir:
  byron/chain/executable-spec
  byron/crypto
@@ -183,6 +202,7 @@ source-repository-package
  byron/ledger/impl
  byron/ledger/impl/test
  semantics/executable-spec
+ cardano-protocol-tpraos
  semantics/small-steps-test
  shelley/chain-and-ledger/dependencies/non-integer
  shelley/chain-and-ledger/executable-spec
@@ -197,7 +217,7 @@ source-repository-package
 source-repository-package
  type: git
  location: https://github.com/input-output-hk/cardano-node.git
- tag: 8cf2b208c7708bd890c7e74d5b1d7c4167a3b40b
+ tag: ed7fdbf65f40f8e194850b87dd8c631fe26154e6
  subdir:
  cardano-api
  cardano-node

examples/test/Spec/game.pir

@@ -274,41 +274,31 @@
  )
  )
  )
- (termbind
- (strict)
- (vardecl
- validateGuess
- (fun
- (con bytestring) (fun (con bytestring) (fun ScriptContext Bool))
- )
- )
+ (lam
+ hs
+ (con bytestring)
  (lam
- hs
+ cs
  (con bytestring)
  (lam
- cs
- (con bytestring)
- (lam
- ds
- ScriptContext
+ ds
+ ScriptContext
+ [
  [
  [
+ { (builtin ifThenElse) Bool }
  [
- { (builtin ifThenElse) Bool }
- [
- [ (builtin equalsByteString) hs ]
- [ (builtin sha2_256) cs ]
- ]
+ [ (builtin equalsByteString) hs ]
+ [ (builtin sha2_256) cs ]
  ]
- True
  ]
- False
+ True
  ]
- )
+ False
+ ]
  )
  )
  )
- validateGuess
  )
  )
  )

nix/pkgs/haskell/haskell.nix

@@ -19,21 +19,23 @@ let
  inherit compiler-nix-name;
 
  sha256map = {
- "https://github.com/input-output-hk/plutus.git"."plutus-starter-devcontainer/v1.0.9" = "12mr2p21igzslflr794vh5jhgl5vynrfli09gpjsv0x3g44wq18l";
+ "https://github.com/input-output-hk/plutus.git"."plutus-starter-devcontainer/v1.0.10" = "06c3jhsbjmzqv951yi1spq1jihija48vss2b8gx9b1fqnz50dbnm";
  "https://github.com/Quid2/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"."46502694f6a9f0498f822068008b232b3837a9e9" = "04bvsvghkrjhfjb3phh0s5yfb37fishglrrlcwbvcv48y2in1dcz";
+ "https://github.com/input-output-hk/purescript-bridge.git"."6a92d7853ea514be8b70bab5e72077bf5a510596" = "13j64vv116in3c204qsl1v0ajphac9fqvsjp7x3zzfr7n7g61drb";
+ "https://github.com/input-output-hk/servant-purescript.git"."a0c7c7e37c95564061247461aef4be505a853538" = "177na04jf6wf18kandzsah40lw3xswmmccpr3hkb8wb4hypcffnf";
+ "https://github.com/input-output-hk/cardano-base"."592aa61d657ad5935a33bace1243abce3728b643" = "1bgq3a2wfdz24jqfwylcc6jjg5aji8dpy5gjkhpnmkkvgcr2rkyb";
  "https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3";
- "https://github.com/input-output-hk/cardano-ledger-specs"."8efcfc755faae4db3a64ad45343235fce3ed5c47" = "13mj8nqk4jglyl96d6zm3dbjmx2qn5gwn06g7cmanxiwfkfm7bi1";
+ "https://github.com/raduom/cardano-ledger-specs"."ef6bb99782d61316da55470620c7da994cc352b2" = "0z2818kwiwv7smz0ff8wr4zb405pymgd12zm32asas0mp5bqxkin";
  "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"."46f994e216a1f8b36fe4669b47b2a7011b0e153c" = "1il8fx3misp3650ryj368b3x95ksz01zz3x0z9k00807j93d0ka0";
  "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r";
- "https://github.com/input-output-hk/ouroboros-network"."6d00ff77f9bcd769fb6d7fd02216cec4e837bfcf" = "19dfhm9r1z00jqwpbnx7z0d58gpqsbwx4p96xlwwamd40hi3asn3";
- "https://github.com/input-output-hk/cardano-node.git"."8cf2b208c7708bd890c7e74d5b1d7c4167a3b40b" = "0akmzzf1gb8067knlzpbqdpkn3zrk5fm16icdzip44ilzwl5y2m0";
+ "https://github.com/input-output-hk/ouroboros-network"."5d37a927046bc7da2887830d8e35cf604622ce09" = "1620zcnivgm1wp1kq3vqc44g77lv7dalzgywc96qsblf1sv9fw3p";
+ "https://github.com/input-output-hk/cardano-node.git"."ed7fdbf65f40f8e194850b87dd8c631fe26154e6" = "0ivvqnw6fflfbzywychfsyyjd6jn3pg1r0vv63m1rdwp04v59kh5";
  "https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx";
  "https://github.com/input-output-hk/hedgehog-extras"."edf6945007177a638fbeb8802397f3a6f4e47c14" = "0wc7qzkc7j4ns2rz562h6qrx2f8xyq7yjcb7zidnj7f6j0pcd0i9";
+ "https://github.com/input-output-hk/cardano-wallet"."ae7569293e94241ef6829139ec02bd91abd069df" = "1mv1dhpkdj9ridm1fvq6jc85qs6zvbp172228rq72gyawjwrgvi6";
+ "https://github.com/input-output-hk/cardano-addresses"."d2f86caa085402a953920c6714a0de6a50b655ec" = "0p6jbnd7ky2yf7bwb1350k8880py8dgqg39k49q02a6ij4ld01ay";
  };
 
  modules = [

nix/sources.json

@@ -5,10 +5,10 @@
  "homepage": "",
  "owner": "input-output-hk",
  "repo": "plutus",
- "rev": "plutus-starter-devcontainer/v1.0.8",
- "sha256": "0fas8kv57lyrsn3larvbfgif48d506w73y7g3g0mxfilfsl5nyfz",
+ "rev": "plutus-starter-devcontainer/v1.0.10",
+ "sha256": "06c3jhsbjmzqv951yi1spq1jihija48vss2b8gx9b1fqnz50dbnm",
  "type": "tarball",
- "url": "https://github.com/input-output-hk/plutus/archive/plutus-starter-devcontainer/v1.0.8.tar.gz",
+ "url": "https://github.com/input-output-hk/plutus/archive/plutus-starter-devcontainer/v1.0.10.tar.gz",
  "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
  }
 }

pab/Main.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
@@ -16,6 +17,7 @@ import Control.Monad.IO.Class (MonadIO (..))
 import Data.Aeson (FromJSON (..), ToJSON (..), genericToJSON, genericParseJSON
  , defaultOptions, Options(..))
 import Data.Default (def)
+import qualified Data.OpenApi as OpenApi
 import Data.Text.Prettyprint.Doc (Pretty (..), viaShow)
 import GHC.Generics (Generic)
 import Plutus.Contract (ContractError)
@@ -65,6 +67,7 @@ writeCostingScripts = do
 data StarterContracts =
  GameContract
  deriving (Eq, Ord, Show, Generic)
+ deriving anyclass OpenApi.ToSchema
 
 -- NOTE: Because 'StarterContracts' only has one constructor, corresponding to
 -- the demo 'Game' contract, we kindly ask aeson to still encode it as if it had
@@ -95,3 +98,4 @@ handlers =
  Simulator.mkSimulatorHandlers def def
  $ interpret (contractHandler Builtin.handleBuiltin)
 
+

plutus-starter.cabal

@@ -53,7 +53,7 @@ library
  plutus-contract,
  plutus-tx-plugin,
  plutus-tx,
- plutus-ledger
+ plutus-ledger,
  hs-source-dirs: src examples/src
 
 test-suite plutus-example-projects-test
@@ -91,4 +91,6 @@ executable plutus-starter-pab
  freer-simple -any,
  prettyprinter -any,
  freer-extras -any,
- plutus-ledger -any
+ plutus-ledger -any,
+ openapi3 -any,
+

shell.nix

@@ -15,5 +15,7 @@ in
  pkgs.niv
  cardano-repo-tool
  pkgs.ghcid
+ # HACK: This shouldn't need to be here.
+ pkgs.lzma.dev
  ];
  }