Refine dependencies and remove unused packages (#214)

* re-organize dependencies * fix minor API breaking changes * updateMaterialized
IntersectMBO · Jan 20, 2022 · 8c82060 · 8c82060
1 parent b1d3c10
commit 8c82060
Show file tree

Hide file tree

Showing 240 changed files with 2,020 additions and 2,673 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
--- Bump this if you need newer packages
+-- Bump this if you need newer packages.
 index-state: 2021-10-20T00:00:00Z
 
 packages: doc
@@ -23,29 +23,16 @@ write-ghc-environment-files: never
 tests: true
 benchmarks: true
 
--- The only sensible test display option
+-- The only sensible test display option.
 test-show-details: streaming
 
 allow-newer:
-           -- 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
+  size-based:template-haskell
+
 constraints:
-  -- big breaking change here, inline-r doens't have an upper bound
-  singletons < 3.0
-  -- bizarre issue: in earlier versions they define their own 'GEq', in newer
-  -- ones they reuse the one from 'some', but there isn't e.g. a proper version
-  -- constraint from dependent-sum-template (which is the library we actually use).
-  , dependent-sum > 0.6.2.0
   -- Newer Hashable have instances for Set, which breaks beam-migrate
   -- which declares its own instances of Hashable Set
-  , hashable < 1.3.4.0
+  hashable < 1.3.4.0
 
 -- These packages appear in our dependency tree and are very slow to build.
 -- Empirically, turning off optimization shaves off ~50% build time.
@@ -70,184 +57,187 @@ package cardano-wallet-launcher
 package cardano-wallet-core-integration
   optimization: False
 
--- Copied from plutus-core
+-- Direct dependency.
+-- 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.
 source-repository-package
   type: git
-  location: https://github.com/Quid2/flat.git
-  tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
+  location: https://github.com/input-output-hk/iohk-monitoring-framework
+  tag: 46f994e216a1f8b36fe4669b47b2a7011b0e153c
+  subdir:
+    contra-tracer
+    iohk-monitoring
+    tracer-transformers
+    plugins/backend-ekg
 
--- TODO replace with something more sustainable (and maintained)
+-- Direct dependency.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/purescript-bridge.git
-  tag: 366fc70b341e2633f3ad0158a577d52e1cd2b138
-
+  location: https://github.com/input-output-hk/plutus
+  tag: cc72a56eafb02333c96f662581b57504f8f8992f
+  subdir:
+    plutus-core
+    plutus-ledger-api
+    plutus-tx
+    plutus-tx-plugin
+    prettyprinter-configurable
+    stubs/plutus-ghc-stub
+    word-array
+
+-- Should follow plutus.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/servant-purescript.git
-  tag: ebea59c7bdfc0338d83fca772b9a57e28560bcde
+  location: https://github.com/Quid2/flat
+  tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
 
--- Copied from plutus-core
+-- Direct dependency.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-crypto.git
-  tag: f73079303f663e028288f9f4a9e08bcca39a923e
-  --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
+  location: https://github.com/input-output-hk/servant-purescript
+  tag: ebea59c7bdfc0338d83fca772b9a57e28560bcde
 
--- Copied from plutus-core
+-- Direct dependency.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-base
-  tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0
-  --sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4
-  subdir:
-    base-deriving-via
-    binary
-    binary/test
-    cardano-crypto-class
-    cardano-crypto-praos
-    cardano-crypto-tests
-    measures
-    orphans-deriving-via
-    slotting
-    strict-containers
+  location: https://github.com/input-output-hk/purescript-bridge
+  tag: 366fc70b341e2633f3ad0158a577d52e1cd2b138
 
--- Copied from plutus-core
+-- Direct dependency.
+-- Compared to others, cardano-wallet doesn't bump dependencies very often.
+-- Making it a good place to start when bumping dependencies.
+-- As, for example, bumping the node first highly risks breaking API with the wallet.
+-- Unless early bug fixes are required, this is fine as the wallet tracks stable releases of the node.
+-- And it is indeed nice for plutus-apps to track stable releases of the node too.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-prelude
-  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
-  --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
+  location: https://github.com/input-output-hk/cardano-wallet
+  tag: a5085acbd2670c24251cf8d76a4e83c77a2679ba
   subdir:
-    cardano-prelude
-    cardano-prelude-test
+    lib/cli
+    lib/core
+    lib/core-integration
+    lib/dbvar
+    lib/launcher
+    lib/numeric
+    lib/shelley
+    lib/strict-non-empty-containers
+    lib/test-utils
+    lib/text-class
 
+-- Should follow cardano-wallet.
+-- Currently tracking v1.33.0.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-addresses
-  tag: d2f86caa085402a953920c6714a0de6a50b655ec
+  location: https://github.com/input-output-hk/cardano-node
+  tag: 814df2c146f5d56f8c35a681fe75e85b905aed5d
   subdir:
-    core
-    command-line
+    cardano-api
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-wallet
-  tag: 760140e238a5fbca61d1b286d7a80ece058dc729
-  --sha256: 014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
   subdir:
-    lib/dbvar
-    lib/text-class
-    lib/strict-non-empty-containers
-    lib/core
-    lib/test-utils
-    lib/numeric
-    lib/launcher
-    lib/core-integration
-    lib/cli
-    lib/shelley
+    eras/alonzo/impl
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/crypto/test
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/impl
+    libs/cardano-data
+    libs/cardano-ledger-core
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/compact-map
+    libs/non-integral
+    libs/set-algebra
+    libs/small-steps
+    libs/small-steps-test
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: d613de3d872ec8b4a5da0c98afb443f322dc4dab
-  --sha256: 0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl
+  tag: d2d219a86cda42787325bb8c20539a75c2667132
   subdir:
+    io-classes
+    io-sim
     monoidal-synchronisation
-    typed-protocols
-    typed-protocols-cborg
-    typed-protocols-examples
-    ouroboros-network
-    ouroboros-network-testing
-    ouroboros-network-framework
+    network-mux
+    ntp-client
     ouroboros-consensus
     ouroboros-consensus-byron
     ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
     ouroboros-consensus-shelley
-    io-sim
-    io-classes
-    network-mux
-    ntp-client
+    ouroboros-network
+    ouroboros-network-framework
+    ouroboros-network-testing
+    strict-stm
+    typed-protocols
+    typed-protocols-cborg
+    typed-protocols-examples
 
+-- Should follow cardano-wallet.
 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.
+  location: https://github.com/input-output-hk/cardano-base
+  tag: 41545ba3ac6b3095966316a99883d678b5ab8da8
   subdir:
-    iohk-monitoring
-    tracer-transformers
-    contra-tracer
-    plugins/backend-aggregation
-    plugins/backend-ekg
-    plugins/backend-monitoring
-    plugins/backend-trace-forwarder
-    plugins/scribe-systemd
+    base-deriving-via
+    binary
+    binary/test
+    cardano-crypto-class
+    cardano-crypto-praos
+    measures
+    orphans-deriving-via
+    slotting
+    strict-containers
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-ledger
-  tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
-  --sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx
+  location: https://github.com/input-output-hk/cardano-prelude
+  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
   subdir:
-    byron/ledger/impl
-    cardano-ledger-core
-    cardano-protocol-tpraos
-    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
-    libs/non-integral
-    libs/small-steps
-    libs/cardano-ledger-pretty
-    semantics/small-steps-test
+    cardano-prelude
+    cardano-prelude-test
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-node.git
-  tag: 4f65fb9a27aa7e3a1873ab4211e412af780a3648
-  --sha256: 00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx
-  subdir:
-    cardano-api
+  location: https://github.com/input-output-hk/cardano-crypto
+  tag: f73079303f663e028288f9f4a9e08bcca39a923e
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/Win32-network
-  tag: 3825d3abf75f83f406c1f7161883c438dac7277d
+  location: https://github.com/input-output-hk/cardano-addresses
+  tag: 71006f9eb956b0004022e80aadd4ad50d837b621
+  subdir:
+    command-line
+    core
 
+-- Should follow cardano-wallet.
 source-repository-package
   type: git
   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
+-- Should follow cardano-wallet.
 source-repository-package
- type: git
- location: https://github.com/input-output-hk/plutus
- tag: 65bad0fd53e432974c3c203b1b1999161b6c2dce
- subdir:
-   plutus-ledger-api
-   word-array
-   prettyprinter-configurable
-   stubs/plutus-ghc-stub
-   plutus-core
-   plutus-tx
-   plutus-tx-plugin
+  type: git
+  location: https://github.com/input-output-hk/Win32-network
+  tag: 3825d3abf75f83f406c1f7161883c438dac7277d
diff --git a/flake.lock b/flake.lock