Merge pull request #117 from input-output-hk/Metalamp/nft-marketplace/update-pab-to-2021-11-05

Metalamp/nft-marketplace/update-plutus-app-to-2021-11-05

Author: stanislav-az

.devcontainer/ devcontainer.json

@@ -0,0 +1,23 @@
+{
+    "name": "Plutus Starter Project",
+    "image": "docker.io/inputoutput/plutus-starter-devcontainer:v1.0.14",
+
+    "remoteUser": "plutus",
+
+    "mounts": [
+        // This shares cabal's remote repository state with the host. We don't mount the whole of '.cabal', because
+        // 1. '.cabal/config' contains absolute paths that will only make sense on the host, and
+        // 2. '.cabal/store' is not necessarily portable to different version of cabal etc.
+        "source=${localEnv:HOME}/.cabal/packages,target=/home/plutus/.cabal/packages,type=bind,consistency=cached",
+    ],
+
+    "settings": {
+        // Note: don't change from bash so it runs .bashrc
+        "terminal.integrated.shell.linux": "/bin/bash"
+    },
+
+    // IDs of extensions inside container
+    "extensions": [
+        "haskell.haskell"
+    ],
+}

MetaLamp/nft-marketplace/Makefile

@@ -1,3 +1,2 @@
 fmt:
 	fix-stylish-haskell
-	fix-purty

MetaLamp/nft-marketplace/cabal.project

@@ -9,31 +9,29 @@ write-ghc-environment-files: never
 tests: true
 benchmarks: true
 
--- Plutus revision from 2021/08/16
+-- Plutus revision from 2021/11/05
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/plutus.git
+  location: https://github.com/input-output-hk/plutus-apps.git
   subdir:
+    doc
     freer-extras
     playground-common
-    plutus-core
-    plutus-contract
     plutus-chain-index
+    plutus-chain-index-core
+    plutus-contract
     plutus-ledger
-    plutus-ledger-api
-    plutus-tx
-    plutus-tx-plugin
     plutus-pab
+    plutus-playground-server
     plutus-use-cases
-    prettyprinter-configurable
     quickcheck-dynamic
-    word-array
-  tag: plutus-pab/v0.0.2
+    web-ghc
+  tag: v2021-11-05
 
 
--- The following sections are copied from the 'plutus' repository cabal.project at the revision
+-- The following sections are copied from the 'plutus-apps' repository cabal.project at the revision
 -- given above.
--- This is necessary because the  'plutus' libraries depend on a number of other libraries which are
+-- This is necessary because the  'plutus-apps' libraries depend on a number of other libraries which are
 -- not on Hackage, and so need to be pulled in as `source-repository-package`s themselves. Make sure to
 -- re-update this section from the template when you do an upgrade.
 
@@ -48,14 +46,15 @@ benchmarks: true
 test-show-details: streaming
 
 allow-newer:
-           -- Pins to an old version of Template Haskell, unclear if/when it will be updated
+           -- Copied from plutus-core
            size-based:template-haskell
            , ouroboros-consensus-byron:formatting
            , beam-core:aeson
            , beam-sqlite:aeson
            , beam-sqlite:dlist
            , beam-migrate:aeson
 
+-- Copied from plutus-core
 constraints:
   -- big breaking change here, inline-r doens't have an upper bound
   singletons < 3.0
@@ -64,10 +63,6 @@ constraints:
   -- constraint from dependent-sum-template (which is the library we actually use).
   , dependent-sum > 0.6.2.0
 
--- See the note on nix/pkgs/default.nix:agdaPackages for why this is here.
--- (NOTE this will change to ieee754 in newer versions of nixpkgs).
-extra-packages: ieee, filemanip
-
 -- These packages appear in our dependency tree and are very slow to build.
 -- Empirically, turning off optimization shaves off ~50% build time.
 -- It also mildly improves recompilation avoidance.
@@ -81,33 +76,34 @@ package ouroboros-consensus-cardano
 package cardano-api
   optimization: False
 
--- https://github.com/Quid2/flat/pull/22 fixes a potential exception
--- when decoding invalid (e.g. malicious) text literals.
+-- Copied from plutus-core
 source-repository-package
   type: git
   location: https://github.com/Quid2/flat.git
   tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
 
--- Needs some patches, but upstream seems to be fairly dead (no activity in > 1 year)
+-- TODO replace with something more sustainable (and maintained)
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/purescript-bridge.git
-  tag: 6a92d7853ea514be8b70bab5e72077bf5a510596
+  tag: 366fc70b341e2633f3ad0158a577d52e1cd2b138
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/servant-purescript.git
-  tag: a0c7c7e37c95564061247461aef4be505a853538
+  tag: ebea59c7bdfc0338d83fca772b9a57e28560bcde
 
+-- Copied from plutus-core
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-crypto.git
   tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
 
+-- Copied from plutus-core
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 592aa61d657ad5935a33bace1243abce3728b643
+  tag: 4ea7e2d927c9a7f78ddc69738409a5827ab66b98
   subdir:
     base-deriving-via
     binary
@@ -120,6 +116,7 @@ source-repository-package
     slotting
     strict-containers
 
+-- Copied from plutus-core
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
@@ -134,25 +131,31 @@ source-repository-package
   tag: d2f86caa085402a953920c6714a0de6a50b655ec
   subdir:
     core
+    command-line
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-wallet
-  tag: ae7569293e94241ef6829139ec02bd91abd069df
+  location: https://github.com/j-mueller/cardano-wallet
+  tag: 6be73ab852c0592713dfe78218856d4a8a0ee69e
   subdir:
     lib/text-class
     lib/strict-non-empty-containers
     lib/core
     lib/test-utils
     lib/numeric
+    lib/launcher
+    lib/core-integration
+    lib/cli
+    lib/shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 5d37a927046bc7da2887830d8e35cf604622ce09
+  tag: 1f4973f36f689d6da75b5d351fb124d66ef1057d
   subdir:
     monoidal-synchronisation
     typed-protocols
+    typed-protocols-cborg
     typed-protocols-examples
     ouroboros-network
     ouroboros-network-testing
@@ -169,7 +172,17 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/iohk-monitoring-framework
+  -- Important Note: Read below, before changing this!
   tag: 46f994e216a1f8b36fe4669b47b2a7011b0e153c
+  -- Are you thinking of updating this tag to some other commit?  Please
+  -- ensure that the commit you are about to use is the latest one from
+  -- the *develop* branch of this repo:
+  --   * <https://github.com/input-output-hk/iohk-monitoring-framework/commits/develop>
+  -- (not master!)
+  --
+  -- In particular we rely on the code from this PR:
+  --  * <https://github.com/input-output-hk/iohk-monitoring-framework/pull/622>
+  -- being merged.
   subdir:
     iohk-monitoring
     tracer-transformers
@@ -182,32 +195,35 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/raduom/cardano-ledger-specs
-  tag: ef6bb99782d61316da55470620c7da994cc352b2
+  location: https://github.com/input-output-hk/cardano-ledger-specs
+  tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
   subdir:
-    byron/chain/executable-spec
-    byron/crypto
-    byron/crypto/test
-    byron/ledger/executable-spec
     byron/ledger/impl
-    byron/ledger/impl/test
-    semantics/executable-spec
+    cardano-ledger-core
     cardano-protocol-tpraos
-    semantics/small-steps-test
-    shelley/chain-and-ledger/dependencies/non-integer
-    shelley/chain-and-ledger/executable-spec
+    eras/alonzo/impl
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/crypto/test
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl/test
+    eras/shelley/impl
+    eras/shelley-ma/impl
+    eras/shelley/chain-and-ledger/executable-spec
+    eras/shelley/test-suite
     shelley/chain-and-ledger/shelley-spec-ledger-test
-    shelley-ma/impl
-    cardano-ledger-core
-    alonzo/impl
+    libs/non-integral
+    libs/small-steps
+    libs/cardano-ledger-pretty
+    semantics/small-steps-test
 
--- A lot of plutus dependencies have to be synchronized with the dependencies of
+-- A lot of plutus-apps dependencies have to be synchronized with the dependencies of
 -- cardano-node. If you update cardano-node, please make sure that all dependencies
 -- of cardano-node are also updated.
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node.git
-  tag: ed7fdbf65f40f8e194850b87dd8c631fe26154e6
+  tag: b6ca519f97a0e795611a63174687e6bb70c9f752
   subdir:
     cardano-api
     cardano-node
@@ -226,10 +242,21 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/hedgehog-extras
-  tag: edf6945007177a638fbeb8802397f3a6f4e47c14
+  location: https://github.com/input-output-hk/goblins
+  tag: cde90a2b27f79187ca8310b6549331e59595e7ba
 
+-- A lot of plutus-apps dependencies have to be syncronized with the dependencies of
+-- plutus. If you update plutus, please make sure that all dependencies of plutus
+-- are also updated
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/goblins
-  tag: cde90a2b27f79187ca8310b6549331e59595e7ba
+  location: https://github.com/input-output-hk/plutus
+  tag: 3f089ccf0ca746b399c99afe51e063b0640af547
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
+    plutus-tx-plugin
+    word-array
+    prettyprinter-configurable
+    stubs/plutus-ghc-stub