Merge branch 'lc/build-plan' into 'master'

Update build plan to latest plutus See merge request !1

Merge branch 'lc/build-plan' into 'master'
Update build plan to latest plutus See merge request !1
e18c461d · locallycompact · d0199934 · cd1d16a9 · d0199934 · e18c461d
Commit e18c461d authored 2 years ago by locallycompact
7 changed files
--- a/.gitlab-ci.dhall
+++ b/.gitlab-ci.dhall
-let Prelude =
-        env:DHALL_PRELUDE
-      ? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v20.1.0/Prelude/package.dhall
-          sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98
-
-let Item = { description : Text, name : Text, type : Text }
-
-let Attr
-    : ∀(x : Type) → Type
-    = λ(x : Type) → { mapKey : Text, mapValue : x }
-
-let Step = { script : List Text }
-
-let toStep
-    : ∀(id : Text) → ∀(prefix : Text) → ∀(x : Attr Item) → Attr Step
-    = λ(id : Text) →
-      λ(prefix : Text) →
-      λ(x : Attr Item) →
-        { mapKey = id
-        , mapValue.script = [ "nix build .#${prefix}.${x.mapKey}" ]
-        }
-
-let input = env:INPUT
-
-let checks =
-      Prelude.List.map
-        (Attr Item)
-        (Attr Step)
-        (λ(x : Attr Item) → toStep "Check ${x.mapKey}" "checks.x86_64-linux" x)
-        (toMap input.checks.x86_64-linux)
-
-let packages =
-      Prelude.List.map
-        (Attr Item)
-        (Attr Step)
-        ( λ(x : Attr Item) →
-            toStep "Package ${x.mapKey}" "packages.x86_64-linux" x
-        )
-        (toMap input.packages.x86_64-linux)
-
-let devShell
-    : Attr Step
-    = { mapKey = "Build devShell"
-      , mapValue.script = [ "nix build .#devShell.x86_64-linux" ]
-      }
-
-in  checks # packages # [ devShell ]
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-Build devShell:
-  script:
-    - "nix build .#devShell.x86_64-linux"
-Check hlint:
-  script:
-    - "nix build .#checks.x86_64-linux.hlint"
-Check hpack:
-  script:
-    - "nix build .#checks.x86_64-linux.hpack"
-Check nixpkgs-fmt:
-  script:
-    - "nix build .#checks.x86_64-linux.nixpkgs-fmt"
-Check stylish-haskell:
-  script:
-    - "nix build .#checks.x86_64-linux.stylish-haskell"
-Package plutus-validator-pk-auth:lib:plutus-validator-pk-auth:
-  script:
-    - "nix build .#packages.x86_64-linux.plutus-validator-pk-auth:lib:plutus-validator-pk-auth"
+stages:
+- generate
+- check
+
+generate-flake-ci:
+  stage: generate
+  script: nix run "git+https://gitlab.homotopic.tech/haskell/flake-to-gitlab-ci" > flake-ci.yml
+  artifacts:
+    paths:
+      - flake-ci.yml
+
+flake-ci:
+  stage: check
+  trigger:
+    include:
+      - artifact: flake-ci.yml
+        job: generate-flake-ci
+    strategy: depend
--- a/.update-ci.sh
+++ b/.update-ci.sh
-#!/usr/bin/env bash
-
-nix flake show --allow-import-from-derivation --json | json-to-dhall > temp
-export INPUT=./temp
-dhall-to-yaml --file .gitlab-ci.dhall > .gitlab-ci.yml
--- a/ChangeLog.md
+++ b/ChangeLog.md
+# Plutus Validator: PK-Auth
+
+## v0.1.0.0
+
+* PK-Auth validator with module exports `PKAuth`, `isPKAuthorised`, `mkValidator`, `validator`, `vtorHash`.
--- a/flake.lock
+++ b/flake.lock
@@ -101,11 +101,11 @@
    },
    "flake-utils": {
      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
        "type": "github"
      },
      "original": {
@@ -180,11 +180,11 @@
    "hackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1645233434,
-        "narHash": "sha256-7yqQTa9DvM4EZ6qHw2diTVSu7DWDkCQ62089jKBxJeA=",
+        "lastModified": 1652145673,
+        "narHash": "sha256-IHV/7dJXGcNKcygaGGpXKfcNKRtTbdZXMEi4vtq9D6Q=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "c95afe76fbbcf2b38fc8afcc4cd5d6f6eed8abea",
+        "rev": "062123bc328bb7eec7359ebb770e6be9ae15049f",
        "type": "github"
      },
      "original": {
@@ -196,11 +196,11 @@
    "hackage-nix": {
      "flake": false,
      "locked": {
-        "lastModified": 1644369434,
-        "narHash": "sha256-WqU6f1OhSM0UHXFW8Mhhvhz0tcij+NQVtmb6sW4RiFw=",
+        "lastModified": 1651108473,
+        "narHash": "sha256-zHGCnBdwKvrcYanjf3GARTWF8V2pyJl1QNONUNZSoc0=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "644a0d702abf84cdec62f4e620ff1034000e6146",
+        "rev": "dbab3b292c3400d028a2257e3acd2ac0249da774",
        "type": "github"
      },
      "original": {
@@ -212,16 +212,16 @@
    "haskell-language-server": {
      "flake": false,
      "locked": {
-        "lastModified": 1643835246,
-        "narHash": "sha256-5LQHcQmi3mUGRgJu+X/m3jeM3kdkYjLD+KwgnxBlbeU=",
+        "lastModified": 1650980856,
+        "narHash": "sha256-uiwsfh/K3IABZDYj7JUZNIAPRVqH6g/r8X6QKg8DrZE=",
        "owner": "haskell",
        "repo": "haskell-language-server",
-        "rev": "024ddc8b3904f8b8e8fe67ba6b9ebd8a4bd7ce76",
+        "rev": "b5a37f7fc360596899cb2945f363030f44156415",
        "type": "github"
      },
      "original": {
        "owner": "haskell",
-        "ref": "1.6.1.1",
+        "ref": "1.7.0.0",
        "repo": "haskell-language-server",
        "type": "github"
      }
@@ -229,11 +229,11 @@
    "haskell-nix": {
      "flake": false,
      "locked": {
-        "lastModified": 1629380841,
-        "narHash": "sha256-gWOWCfX7IgVSvMMYN6rBGK6EA0pk6pmYguXzMvGte+Q=",
+        "lastModified": 1651151636,
+        "narHash": "sha256-WdMP9IMB5kByT0zimDuCYZF/dinRB104H8iDTG/c1Eo=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "7215f083b37741446aa325b20c8ba9f9f76015eb",
+        "rev": "f707aa2e75c0d33473166abc61c0b43ac6e107c0",
        "type": "github"
      },
      "original": {
@@ -253,6 +253,7 @@
        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
        "hackage": "hackage",
        "hpc-coveralls": "hpc-coveralls",
+        "hydra": "hydra",
        "nix-tools": "nix-tools",
        "nixpkgs": [
          "nixpkgs"
@@ -265,11 +266,11 @@
        "stackage": "stackage"
      },
      "locked": {
-        "lastModified": 1645233617,
-        "narHash": "sha256-m/BRlSHyoNM0TLfxKYH6aZx3LSpo52cDRTMk7deu49g=",
+        "lastModified": 1652145787,
+        "narHash": "sha256-phEsQ/Q4UJEbBx3BkEwkc4mUHUr0PPD+m2JiaE0ni8w=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "31a8266cce50355596189c42d54f5be612ed9394",
+        "rev": "6c94f1151eecb608d310adb556bb1e4d493f2cb9",
        "type": "github"
      },
      "original": {
@@ -294,6 +295,29 @@
        "type": "github"
      }
    },
+    "hydra": {
+      "inputs": {
+        "nix": "nix",
+        "nixpkgs": [
+          "haskellNix",
+          "hydra",
+          "nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1646878427,
+        "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=",
+        "owner": "NixOS",
+        "repo": "hydra",
+        "rev": "28b682b85b7efc5cf7974065792a1f22203a5927",
+        "type": "github"
+      },
+      "original": {
+        "id": "hydra",
+        "type": "indirect"
+      }
+    },
    "iohk-nix": {
      "flake": false,
      "locked": {
@@ -313,14 +337,14 @@
    "lint-utils": {
      "inputs": {
        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1645282688,
-        "narHash": "sha256-X7aK1w3mb/jEJpfQhV99q9Egsw/tL3qcZSbkic0h9yE=",
+        "lastModified": 1652186144,
+        "narHash": "sha256-zJyyaASu/iZAcxwXMwYHjv6U8kr6bEisF0RvRoLR5wk=",
        "ref": "master",
-        "rev": "ed78160a6c4081e900e644690e69a7a33c0a6f52",
-        "revCount": 13,
+        "rev": "ac0c7f9839ec2479f45dc37ece1d8a531ca008b4",
+        "revCount": 24,
        "type": "git",
        "url": "https://gitlab.homotopic.tech/nix/lint-utils"
      },
@@ -329,14 +353,51 @@
        "url": "https://gitlab.homotopic.tech/nix/lint-utils"
      }
    },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1643066034,
+        "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "2.6.0",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
    "nix-tools": {
      "flake": false,
      "locked": {
-        "lastModified": 1644395812,
-        "narHash": "sha256-BVFk/BEsTLq5MMZvdy3ZYHKfaS3dHrsKh4+tb5t5b58=",
+        "lastModified": 1649424170,
+        "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=",
        "owner": "input-output-hk",
        "repo": "nix-tools",
-        "rev": "d847c63b99bbec78bf83be2a61dc9f09b8a9ccc1",
+        "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7",
        "type": "github"
      },
      "original": {
@@ -347,18 +408,17 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1644525281,
-        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
+        "lastModified": 1632864508,
+        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
+        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-21.05-small",
+        "type": "indirect"
      }
    },
    "nixpkgs-2003": {
@@ -379,11 +439,11 @@
    },
    "nixpkgs-2105": {
      "locked": {
-        "lastModified": 1642244250,
-        "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",
+        "lastModified": 1645296114,
+        "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",
+        "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
        "type": "github"
      },
      "original": {
@@ -395,11 +455,11 @@
    },
    "nixpkgs-2111": {
      "locked": {
-        "lastModified": 1644510859,
-        "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=",
+        "lastModified": 1648744337,
+        "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3",
+        "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052",
        "type": "github"
      },
      "original": {
@@ -409,13 +469,28 @@
        "type": "github"
      }
    },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "indirect"
+      }
+    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1644486793,
-        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "lastModified": 1648219316,
+        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
        "type": "github"
      },
      "original": {
@@ -442,13 +517,29 @@
      }
    },
    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1652082323,
+        "narHash": "sha256-7GSVLvfCJtH9dJ3om9Lg4fsi9UKvoxxR69gUTcx0ol8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2a3aac479caeba0a65b2ad755fe5f284f1fde74d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
      "flake": false,
      "locked": {
-        "lastModified": 1628785280,
-        "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=",
+        "lastModified": 1645493675,
+        "narHash": "sha256-9xundbZQbhFodsQRh6QMN1GeSXfo3y/5NL0CZcJULz0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb",
+        "rev": "74b10859829153d5c5d50f7c77b86763759e8654",
        "type": "github"
      },
      "original": {
@@ -483,17 +574,16 @@
        "haskell-language-server": "haskell-language-server",
        "haskell-nix": "haskell-nix",
        "iohk-nix": "iohk-nix",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "sphinxcontrib-haddock": "sphinxcontrib-haddock",
-        "stackage-nix": "stackage-nix"
+        "sphinxcontrib-haddock": "sphinxcontrib-haddock"
      },
      "locked": {
-        "lastModified": 1645228051,
-        "narHash": "sha256-tcp/q/+SRKomUcIeC7Lgw5r23jeXs7UOnOL6556CCyo=",
+        "lastModified": 1652192225,
+        "narHash": "sha256-eiN+YMgj7dFKKJR/kaiGLvklSwh9xZe60+D8v8ZeHs8=",
        "owner": "input-output-hk",
        "repo": "plutus",
-        "rev": "0397f83b8298ba1b3c531511172637651b624164",
+        "rev": "ea588a3e2c37993ddd3b5241cfbf9768507057e9",
        "type": "github"
      },
      "original": {
@@ -523,7 +613,7 @@
        "flake-utils": "flake-utils",
        "haskellNix": "haskellNix",
        "lint-utils": "lint-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "plutus": "plutus"
      }
    },
@@ -546,27 +636,11 @@
    "stackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1645233556,
-        "narHash": "sha256-cqxr0vUAslM119p3bGvb6Er1UKIQRK3xlSpA560+V38=",
-        "owner": "input-output-hk",
-        "repo": "stackage.nix",
-        "rev": "0ea21c7777a7d66b9b3f7828390357030dabdbb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "input-output-hk",
-        "repo": "stackage.nix",
-        "type": "github"
-      }
-    },
-    "stackage-nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1597712578,
-        "narHash": "sha256-c/pcfZ6w5Yp//7oC0hErOGVVphBLc5vc4IZlWKZ/t6E=",
+        "lastModified": 1651799909,
+        "narHash": "sha256-O7s14Kl4Je7nwJcrt4Y8UhR0wNFteoMKNeLXj9rz9aQ=",
        "owner": "input-output-hk",
        "repo": "stackage.nix",
-        "rev": "e32c8b06d56954865725514ce0d98d5d1867e43a",
+        "rev": "900cc0efd1c773095c39d14454f82ef6f367bebd",
        "type": "github"
      },
      "original": {

--- a/src/Plutus/Validators/PKAuth.hs
+++ b/src/Plutus/Validators/PKAuth.hs
@@ -35,7 +35,7 @@ isPKAuthorised (AtLeast n xs) ctx = isAuthorised'

 validator :: PKAuth -> TypedValidator PKAuth
 validator x = Scripts.mkTypedValidator @PKAuth
-    ($$(PlutusTx.compile [||\x' -> mkValidator x'||])
+    ($$(PlutusTx.compile [||mkValidator||])
      `PlutusTx.applyCode` PlutusTx.liftCode x)
    $$(PlutusTx.compile [||wrap||]) where
      wrap = Scripts.wrapValidator @() @()

--- a/stack.yaml
+++ b/stack.yaml
-resolver: lts-18.25
+resolver: lts-18.28
 packages:
 - .

 extra-deps:
+- MissingH-1.5.0.0
 - OddWord-1.0.2.0
 - Unique-0.4.7.9
 - async-timer-0.2.0.0
@@ -10,12 +11,17 @@ extra-deps:
 - beam-migrate-0.5.1.2
 - beam-sqlite-0.5.1.2
 - blaze-textual-0.2.2.1
+- blockfrost-api-0.3.1.0
+- blockfrost-client-core-0.2.0.0
+- blockfrost-client-0.3.1.0
 - canonical-json-0.6.0.0
 - command-0.1.1
 - composition-prelude-3.0.0.2
+- cryptostore-0.2.1.0
 - dependent-map-0.4.0.0
 - dependent-sum-0.7.1.0
 - dependent-sum-template-0.1.1.1
+- docopt-0.7.0.7
 - dom-lt-0.2.3
 - ekg-0.4.0.15
 - ekg-core-0.1.1.7
@@ -27,6 +33,7 @@ extra-deps:
 - hspec-2.9.4
 - hspec-core-2.9.4
 - io-streams-haproxy-1.0.1.0
+- jwt-0.11.0
 - lazy-search-0.1.2.1
 - libsystemd-journal-1.4.5
 - monoidal-containers-0.6.2.0
@@ -37,8 +44,9 @@ extra-deps:
 - partial-order-0.2.0.0
 - pqueue-1.4.1.4
 - protolude-0.3.0
- recursion-schemes-5.2.2.2
+- recursion-schemes-5.1.3
 - row-types-1.0.1.2
+- servant-multipart-client-0.12.1
 - servant-options-0.1.0.0
 - servant-subscriber-0.7.0.0
 - servant-websockets-2.0.0
@@ -54,17 +62,19 @@ extra-deps:
 - transformers-except-0.1.2


+- git: https://github.com/input-output-hk/ekg-forward
+  commit: 297cd9db5074339a2fb2e5ae7d0780debb670c63
 - git: https://github.com/Quid2/flat.git
  commit: d32c2c0c0c3c38c41177684ade9febe92d279b06
 - git: https://github.com/input-output-hk/purescript-bridge.git
  commit: 47a1f11825a0f9445e0f98792f79172efef66c00
 - git: https://github.com/input-output-hk/servant-purescript.git
-  commit: 002e172173ad2f2f69f98a3b56b7312364f23afe
+  commit: 44e7cacf109f84984cd99cd3faf185d161826963
 - git: https://github.com/input-output-hk/cardano-crypto.git
-  commit: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
-  # nix-sha256: sha256-oxIOVlgm07FAEmgGRF1C2me9TXqVxQulEOcJ22zpTRs=
+  commit: f73079303f663e028288f9f4a9e08bcca39a923e
+  # nix-sha256: sha256-2Fipex/WjIRMrvx6F3hjJoAeMtFd2wGnZECT0kuIB9k=
 - git: https://github.com/input-output-hk/cardano-base
-  commit: 5c1786f3a2b9b2647489862963003afdc1f27818
+  commit: 41545ba3ac6b3095966316a99883d678b5ab8da8
  subdirs:
    - base-deriving-via
    - binary
@@ -77,25 +87,31 @@ extra-deps:
    - slotting
    - strict-containers
 - git: https://github.com/input-output-hk/cardano-prelude
-  commit: c7fc9fba236972c27a55e0f3d34c2758cf616bfc
+  commit: bb4ed71ba8e587f672d06edf9d2e376f4b055555
  subdirs:
    - cardano-prelude
    - cardano-prelude-test
 - git: https://github.com/input-output-hk/cardano-addresses
-  commit: 5a313b60ed64e4374095de65bc13cb080001e520
+  commit: 71006f9eb956b0004022e80aadd4ad50d837b621
  subdirs:
+    - command-line
    - core
- git: https://github.com/locallycompact/cardano-wallet
-  commit: d001a56aa3a4bb794094c40c8cba560064b879d5
+- git: https://github.com/input-output-hk/cardano-wallet
+  commit: f6d4db733c4e47ee11683c343b440552f59beff7
  subdirs:
+    - lib/cli
+    - lib/core
+    - lib/core-integration
    - lib/dbvar
-    - lib/text-class
+    - lib/launcher
+    - lib/numeric
+    - lib/shelley
    - lib/strict-non-empty-containers
-    - lib/core
    - lib/test-utils
-    - lib/numeric
+    - lib/text-class
+  # nix-sha256: sha256-3oeHsrAhDSSKBSzpGIAqmOcFmBdAJ5FR02UXPLb/Yz0=
 - git: https://github.com/input-output-hk/ouroboros-network
-  commit: 3bf172b86354178153a37efcbfe41219861ba6ae
+  commit: 4fac197b6f0d2ff60dc3486c593b68dc00969fbf
  subdirs:
    - io-classes
    - io-sim
@@ -127,7 +143,7 @@ extra-deps:
    - plugins/scribe-systemd
  # nix-sha256: sha256-QE3QRpIHIABm+qCP/wP4epbUx0JmSJ9BMePqWEd3iMY=
 - git: https://github.com/input-output-hk/cardano-ledger-specs
-  commit: 2048cd4679ef3155d88a445e0f818abad09a0827
+  commit: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
  subdirs:
    - eras/alonzo/impl
    - eras/byron/chain/executable-spec
@@ -148,13 +164,22 @@ extra-deps:
    - libs/set-algebra
    - libs/small-steps
    - libs/small-steps-test
-  # nix-sha256: sha256-k57O4QMlubtIUoJ1nVpGBgpcPuwFSf2sbaZ0fMmvzuM=
+  # nix-sha256: sha256-lRNfkGMHnpPO0T19FZY5BnuRkr0zTRZIkxZVgHH0fys=
 - git: https://github.com/input-output-hk/cardano-node.git
-  commit: 09e5c0017caedffae0a62764ebd4cc27e80eb617
+  commit: 2b1d18c6c7b7142d9eebfec34da48840ed4409b6
  subdirs:
    - cardano-api
-    - cardano-node
    - cardano-cli
+    - cardano-git-rev
+    - cardano-node
+    - cardano-submit-api
+    - cardano-testnet
+    - trace-dispatcher
+    - trace-forward
+    - trace-resources
+  # nix-sha256: sha256-V1Yx7/zjcx8qv9b5dje6vLJQe4sPLZvgEXJrX0SRV4A=
+- git: https://github.com/input-output-hk/cardano-config
+  commit: e9de7a2cf70796f6ff26eac9f9540184ded0e4e6
 - git: https://github.com/input-output-hk/optparse-applicative
  commit: 7497a29cb998721a9068d5725d49461f2bba0e7a
  # nix-sha256: sha256-uQx+SEYsCH7JcG3xAT0eJck9yq3y0cvx49bvItLLer8=
@@ -163,7 +188,7 @@ extra-deps:
 - git: https://github.com/input-output-hk/goblins
  commit: cde90a2b27f79187ca8310b6549331e59595e7ba
 - git: https://github.com/input-output-hk/plutus
-  commit: 6a199c252b26b276d9831d243ebefefb243c353b
+  commit: 00a6eee2ed318fc2ba46c7672576e692196f2ada
  subdirs:
    - plutus-core
    - plutus-ledger-api
@@ -172,8 +197,9 @@ extra-deps:
    - word-array
    - prettyprinter-configurable
    - stubs/plutus-ghc-stub
+  # nix-sha256: sha256-d+4cuj8N6OkW2C6tN/oABfxVgd0q5vcvIoN9IhdS0/0=
 - git: https://github.com/input-output-hk/plutus-apps
-  commit: 7c119373e0840f9a4e681754ab5aed5ad69a3827
+  commit: 310d848f7ea05884c75be55712ae97ce7579c3bb
  subdirs:
  - freer-extras
  - playground-common
@@ -183,8 +209,9 @@ extra-deps:
  - plutus-ledger
  - plutus-ledger-constraints
  - plutus-pab
+  - plutus-pab-executables
  - plutus-playground-server
  - plutus-use-cases
  - quickcheck-dynamic
  - web-ghc
-  # nix-sha256: sha256-If79he0yJaTnWeoc+XVmSZPLkJU2L7dFlPAOsRbq5mk=
+  # nix-sha256: sha256-9LEWRMoWdwTxm+OiAmXJVxVKf7dDAvgGJf9JrOR1P34=