Merge pull request #183 from mlabs-haskell/gergely/version-bump

- Updated `cardano-wallet` to latest version (compatible with cardano-node 8.1.1)
- Updated nixpkgs, haskell.nix (moved to iog branch) , hackage.nix, iohk.nix

Author: zmrocze

CHANGELOG.md

@@ -4,6 +4,10 @@ This format is based on [Keep A Changelog](https://keepachangelog.com/en/1.0.0).
 
 
 ## Unreleased (Plutip-Core)
+
+### Changed
+
+- Updated `cardano-wallet` (2023-09-15)
 - No functionality to run test contracts with `Plutip.Contract`
 - No setup for BPI from cluster setup
 - No copying of relay node logs
@@ -13,6 +17,9 @@ This format is based on [Keep A Changelog](https://keepachangelog.com/en/1.0.0).
 - No `NegativeLovelaces` in `ClusterStartupFailureReason`
 - Moved saving keys into 'signing-keys' (before: 'bot-plutus-interface/signing-keys')
 - New: withFundedCluster, withCluster (previously withPlutusInterface)
+
+### Added
+
 - Add `dump-info-json` to local-cluster
 - Add configurable MaxTxSize and MaxExUnits to `ExtraConfig`
 

Makefile

@@ -36,7 +36,7 @@ requires_nix_shell:
 	@ [ "$(IN_NIX_SHELL)" ] || echo "The $(MAKECMDGOALS) target must be run from inside a nix shell"
 	@ [ "$(IN_NIX_SHELL)" ] || (echo "    run 'nix develop' first" && false)
 
-FOURMOLU_EXTENSIONS := -o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor
+FOURMOLU_EXTENSIONS := -o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o
 
 # Add folder locations to the list to be reformatted.
 excluded := src/Test/Plutip/Internal/Cluster.hs

cabal.project

@@ -9,41 +9,104 @@ repository cardano-haskell-packages
     c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
-index-state: 2022-05-25T00:00:00Z
-index-state: cardano-haskell-packages 2022-10-25T20:00:00Z
+-- Align index-states with cardano-wallet
+index-state: 2023-06-06T00:00:00Z
+
+index-state:
+  , hackage.haskell.org 2023-06-06T00:00:00Z
+  , cardano-haskell-packages 2023-06-05T06:39:32Z
 
 packages: ./.
 
 tests: true
 benchmarks: true
 test-show-details: direct
+constraints:
+  -- TH Name shadowing warnings nconstraints:
+    bimap >= 0.4.0
+  , openapi3 >= 3.2.0
+  , libsystemd-journal >= 1.4.4
+  , systemd >= 2.3.0
+  -- dependency of systemd-2.3.0
+  , network >= 3.1.1.1
+  -- choose versions that work with base >= 4.12
+  , hjsonpointer >= 1.5.0
+  , hjsonschema >= 1.10.0
+  , Cabal >= 3.4.0.0
+  , async-timer >= 0.2.0.0
+  , unliftio-core >= 0.2.0.1
+  , generic-arbitrary >= 0.2.2
+  , iohk-monitoring >= 0.1.11
+
+  -- lower versions of katip won't build with the Win32-2.12.0.1
+  -- which is shipped with the ghc-9.2.8
+  , katip >= 0.8.7.4
+
+  -- Cardano Node dependencies:
+  , cardano-api ^>=8.2
+  , cardano-slotting >= 0.1
+  , ouroboros-network ^>= 0.8.1.0
+  , persistent == 2.13.3.3
+
+package cardano-wallet
+  optimization: False
+package cardano-wallet-core
+  optimization: False
+package cardano-wallet-cli
+  optimization: False
+package cardano-wallet-launcher
+  optimization: False
+package cardano-wallet-core-integration
+  optimization: False
 
 allow-newer:
-    *:aeson
-  , size-based:template-haskell
+    hjsonschema:*
+  , hjsonpointer:*
+  , *:aeson
+  , *:hashable
+  , async-timer:unliftio-core
+  , ekg:*
+  , ntp-client:*
+  , libsystemd-journal:base
 
-constraints:
---  cardano-node == 1.35.4
-  , aeson >= 2
-
-  , hedgehog >= 1.1
-
-  , cardano-prelude == 0.1.0.0
-  , base-deriving-via == 0.1.0.0
-  , cardano-binary  == 1.5.0
-  , cardano-binary-test == 1.3.0
-  , cardano-crypto-class  == 2.0.0.0.1
-  , cardano-crypto-praos  == 2.0.0.0.1
-  , cardano-crypto-tests  == 2.0.0.0.1
-  , cardano-slotting  == 0.1.0.0
-  , measures == 0.1.0.0
-  , orphans-deriving-via == 0.1.0.0
-  , strict-containers == 0.1.0.0
-  , plutus-core == 1.0.0.1
-  , plutus-ledger-api == 1.0.0.1
-  , plutus-tx == 1.0.0.0
-  , plutus-tx-plugin == 1.0.0.0
-  , prettyprinter-configurable == 0.1.0.0
-  , plutus-ghc-stub == 8.6.5
-  , word-array == 0.1.0.0
-  , word-array == 0.1.0.0
+source-repository-package
+    type: git
+    location: https://github.com/cardano-foundation/cardano-wallet
+    tag: ae6e90b99ff14eda88769211218aaae2b0fe528b
+    --sha256: 060r6z9sy9r1jr8iinlyirprw4k3s54malp9sz732vl7byh6vylf
+    subdir:
+       lib/application-extras
+       lib/balance-tx
+       lib/crypto-hash-extra
+       lib/coin-selection
+       lib/delta-store
+       lib/delta-table
+       lib/delta-types
+       lib/iohk-monitoring-extra
+       lib/launcher
+       lib/local-cluster
+       lib/numeric
+       lib/primitive
+       lib/read
+       lib/temporary-extra
+       lib/test-utils
+       lib/text-class
+       lib/wai-middleware-logging
+       lib/wallet-benchmarks
+       lib/wallet
+       lib/wallet-e2e
+
+source-repository-package
+    type: git
+    location: https://github.com/input-output-hk/cardano-addresses
+    tag: 44d5a9eb3505b6bfbf281d40fa88531c3253b771
+    --sha256: 16rja48ryfjw3531kf15w0h3cdmscqgs8l1z1i2mvahq1vlhr2y6
+    subdir: command-line
+            core
+
+source-repository-package
+    type: git
+    location: https://github.com/cardano-foundation/cardano-wallet-client.git
+    tag: 353412ca621dc28af53e4a19795338b19bab1b7b
+    --sha256: 04q58c82wy6x9nkwqbvcxbv6s61fx08h5kf62sb511aqp08id4bb
+    subdir: generated

cluster-data/conway-genesis.yaml

@@ -0,0 +1 @@
+genDelegs: {}