cardano-foundation · Anviking · Mar 27, 2025 · Mar 27, 2025
diff --git a/cabal.project b/cabal.project
@@ -49,11 +49,11 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 -- repeating the index-state for hackage to work around hackage.nix parsing limitation
-index-state: 2025-01-01T23:24:19Z
+index-state: 2025-04-02T17:19:52Z
 
 index-state:
-  , hackage.haskell.org 2025-01-01T23:24:19Z
-  , cardano-haskell-packages 2025-03-01T00:00:00Z
+  , hackage.haskell.org 2025-04-02T17:19:52Z
+  , cardano-haskell-packages 2025-04-02T11:34:47Z
 
 packages:
   lib/address-derivation-discovery
@@ -112,33 +112,6 @@ source-repository-package
 -- END OpenAPI
 --------------------------------------------------------------------------------
 
---------------------------------------------------------------------------------
--- BEGIN Cardano Addresses Dependency
-
-source-repository-package
-    type: git
-    location: https://github.com/IntersectMBO/cardano-addresses
-    tag: 2bca06deaa60e54a5322ac757387d744bf043367
-    --sha256: 1y1mzfly7jac40b9g4xc078rcm5zqhc3xxv77kwxi10yph1jwq7z
-    subdir: command-line
-            core
-
--- Normally cabal won't apply ghc-options which we specify to build packages
--- to their "regular" dependencies.
--- However, the dependencies declared using the `source-repository-package`
--- pragma are an exception to this rule.
--- This is why we need to manually control options that are applied to the
--- `cardano-addresses` package by declaring them explicitly here.
-package cardano-addresses-cli
-    ghc-options:
-        -Wwarn=deprecations
-
-package cardano-addresses
-    ghc-options:
-        -Wwarn=incomplete-uni-patterns
--- END Cardano Addresses Dependency
---------------------------------------------------------------------------------
-
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-sl-x509
@@ -168,6 +141,7 @@ allow-newer:
   , servant-openapi3:*
   , katip:Win32
   , ekg-wai:time
+
 constraints:
     base >= 4.18.2.0 && < 5
   , openapi3 >= 3.2.0

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -241,7 +241,7 @@
 
                 # Adrestia tool belt
                 inherit (project.hsPkgs.bech32.components.exes) bech32;
-                inherit (project.hsPkgs.cardano-addresses-cli.components.exes) cardano-address;
+                inherit (project.hsPkgs.cardano-addresses.components.exes) cardano-address;
 
                 # Cardano
                 cardano-cli = nodeProject.hsPkgs.cardano-cli.components.exes.cardano-cli;

diff --git a/lib/address-derivation-discovery/address-derivation-discovery.cabal b/lib/address-derivation-discovery/address-derivation-discovery.cabal
@@ -46,7 +46,7 @@ library
     , bech32-th
     , binary
     , bytestring
-    , cardano-addresses            >=3.12.0   && <3.13
+    , cardano-addresses            >=4.0.0    && <4.1
     , cardano-crypto               >=1.1.2    && <1.2
     , cardano-crypto-class         >=2.1.5.0  && <2.2
     , cardano-ledger-api           >=1.10.0.0 && <1.11

diff --git a/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation/SharedKey.hs b/lib/address-derivation-discovery/lib/Cardano/Wallet/Address/Derivation/SharedKey.hs
@@ -33,7 +33,6 @@ import Prelude
 
 import Cardano.Address.Script
     ( Cosigner
-    , KeyHash
     , Script (..)
     , ScriptTemplate (..)
     , toScriptHash
@@ -81,7 +80,7 @@ import GHC.Stack
 
 import qualified Cardano.Address as CA
 import qualified Cardano.Address.Derivation as CA
-import qualified Cardano.Address.Script as CA
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Style.Shelley as CA
 import qualified Data.Map.Strict as Map
 
@@ -152,11 +151,11 @@ replaceCosignersWithVerKeys
     :: CA.Role
     -> ScriptTemplate
     -> Index 'Soft 'CredFromScriptK
-    -> Script KeyHash
+    -> Script CA.KeyHash
 replaceCosignersWithVerKeys role' (ScriptTemplate xpubs scriptTemplate) ix =
     replaceCosigner scriptTemplate
   where
-    replaceCosigner :: Script Cosigner -> Script KeyHash
+    replaceCosigner :: Script Cosigner -> Script CA.KeyHash
     replaceCosigner = \case
         RequireSignatureOf c -> RequireSignatureOf $ toKeyHash c
         RequireAllOf xs      -> RequireAllOf (map replaceCosigner xs)
@@ -169,7 +168,7 @@ replaceCosignersWithVerKeys role' (ScriptTemplate xpubs scriptTemplate) ix =
         Index 'Soft 'CredFromScriptK -> CA.Index 'CA.Soft 'CA.PaymentK
     convertIndex = fromJust . CA.indexFromWord32 . fromIntegral . fromEnum
 
-    toKeyHash :: HasCallStack => Cosigner -> KeyHash
+    toKeyHash :: HasCallStack => Cosigner -> CA.KeyHash
     toKeyHash c =
         case Map.lookup c xpubs of
             Nothing -> error "Impossible: cosigner without accXPpub."

diff --git a/lib/api/cardano-wallet-api.cabal b/lib/api/cardano-wallet-api.cabal
@@ -39,7 +39,7 @@ library
     , bech32-th
     , binary
     , bytestring
-    , cardano-addresses             >=3.12.0   && <3.13
+    , cardano-addresses             >=4.0.0    && <4.1
     , cardano-api                   >=10.8.0.0 && <10.9
     , cardano-api:internal
     , cardano-balance-tx

diff --git a/lib/api/src/Cardano/Wallet/Api/Http/Server.hs b/lib/api/src/Cardano/Wallet/Api/Http/Server.hs
@@ -267,7 +267,7 @@ import Servant.Server
     )
 
 import qualified Cardano.Address.Derivation as CA
-import qualified Cardano.Address.Script as CA
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Style.Shelley as CA
 import qualified Cardano.Api as Cardano
 import qualified Cardano.Wallet.Address.Derivation.Shared as Shared

diff --git a/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs b/lib/api/src/Cardano/Wallet/Api/Http/Shelley/Server.hs
@@ -142,8 +142,6 @@ import Cardano.Address.Derivation
     )
 import Cardano.Address.Script
     ( Cosigner (..)
-    , KeyHash (KeyHash)
-    , KeyRole (..)
     , Script
     , ScriptTemplate (..)
     , ValidationLevel (..)
@@ -839,6 +837,7 @@ import UnliftIO.Exception
     ( tryAnyDeep
     )
 
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Script as CA
 import qualified Cardano.Address.Style.Shelley as CA
 import qualified Cardano.Api as Cardano
@@ -3456,7 +3455,7 @@ decodeTransaction
                         $ maybe
                             AnyWitnessCountCtx
                             ( ShelleyWalletCtx
-                                . KeyHash Policy
+                                . CA.KeyHash CA.Policy
                                 . xpubToBytes
                             )
                             policyKeyM
@@ -3810,8 +3809,8 @@ submitSharedTransaction ctx apiw@(ApiT wid) apitx = do
     isTimelock (NativeExplicitScript _ _) = True
     isTimelock _ = False
 
-    isDelegationKeyHash (KeyHash CA.Delegation _) = True
-    isDelegationKeyHash (KeyHash _ _) = False
+    isDelegationKeyHash (CA.KeyHash CA.Delegation _) = True
+    isDelegationKeyHash (CA.KeyHash _ _) = False
 
     hasDelegationKeyHash s =
         isTimelock s && all isDelegationKeyHash (retrieveAllKeyHashes s)

diff --git a/lib/api/src/Cardano/Wallet/Api/Types.hs b/lib/api/src/Cardano/Wallet/Api/Types.hs
@@ -262,9 +262,12 @@ import Cardano.Address.Derivation
     , xpubFromBytes
     , xpubToBytes
     )
+
+import Cardano.Address.KeyHash
+    ( KeyHash (..)
+    )
 import Cardano.Address.Script
     ( Cosigner (..)
-    , KeyHash (..)
     , Script
     , ScriptHash (..)
     , ScriptTemplate

diff --git a/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs b/lib/application-tls/test/Cardano/Wallet/Application/TlsSpec.hs
@@ -259,8 +259,7 @@ mkHttpsManagerSettings TlsConfiguration{tlsCaCert, tlsSvCert, tlsSvKey} = do
     sockSettings = Nothing
     clientParams caChain credentials =
         (defaultParamsClient "127.0.0.1" "")
-            { clientUseMaxFragmentLength = Nothing
-            , clientUseServerNameIndication = True
+            { clientUseServerNameIndication = True
             , clientWantSessionResume = Nothing
             , clientShared = clientShared caChain credentials
             , clientHooks = clientHooks credentials

diff --git a/lib/application/cardano-wallet-application.cabal b/lib/application/cardano-wallet-application.cabal
@@ -106,8 +106,7 @@ library
     , ansi-terminal
     , base
     , bytestring
-    , cardano-addresses               >=3.12.0  && <3.13
-    , cardano-addresses-cli           >=3.12.0  && <3.13
+    , cardano-addresses               >=4.0.0   && <4.1
     , cardano-wallet
     , cardano-wallet-api
     , cardano-wallet-application-tls

diff --git a/lib/balance-tx/cardano-balance-tx.cabal b/lib/balance-tx/cardano-balance-tx.cabal
@@ -52,7 +52,7 @@ library internal
   build-depends:
     , base                         >=4.14     && <5
     , bytestring                   >=0.10.6   && <0.13
-    , cardano-addresses            >=3.12.0   && <3.13
+    , cardano-addresses            >=4.0.0    && <4.1
     , cardano-api                  >=10.8.0.0 && <10.9
     , cardano-coin-selection
     , cardano-crypto-class         >=2.1.5.0  && <2.2
@@ -115,7 +115,7 @@ test-suite test
     , address-derivation-discovery
     , base
     , bytestring
-    , cardano-addresses               >=3.12.0    && <3.13
+    , cardano-addresses               >=4.0.0     && <4.1
     , cardano-api                     >=10.8.0.0  && <10.9
     , cardano-api-extra
     , cardano-balance-tx:internal

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs
@@ -269,6 +269,7 @@ import Text.Pretty.Simple
     ( pShow
     )
 
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Script as CA
 import qualified Cardano.CoinSelection.UTxOIndex as UTxOIndex
 import qualified Cardano.CoinSelection.UTxOSelection as UTxOSelection

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Sign.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Sign.hs
@@ -105,6 +105,7 @@ import Numeric.Natural
     ( Natural
     )
 
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Script as CA
 import qualified Cardano.Api as CardanoApi
 import qualified Cardano.Api.Shelley as CardanoApi

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/UTxOAssumptions.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/UTxOAssumptions.hs
@@ -19,6 +19,7 @@ import Internal.Cardano.Write.Tx
     ( Address
     )
 
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Address.Script as CA
 
 -- | Assumptions about UTxOs that are needed for coin selection.

diff --git a/lib/benchmarks/cardano-wallet-benchmarks.cabal b/lib/benchmarks/cardano-wallet-benchmarks.cabal
@@ -107,7 +107,7 @@ benchmark restore
     , aeson
     , base
     , bytestring
-    , cardano-addresses             >=3.12.0  && <3.13
+    , cardano-addresses             >=4.0.0   && <4.1
     , cardano-balance-tx
     , cardano-balance-tx:internal
     , cardano-wallet
@@ -140,7 +140,7 @@ benchmark latency
   build-depends:
     , aeson
     , base
-    , cardano-addresses                     >=3.12.0  && <3.13
+    , cardano-addresses                     >=4.0.0   && <4.1
     , cardano-wallet
     , cardano-wallet-api
     , cardano-wallet-application
@@ -186,7 +186,7 @@ benchmark db
     , address-derivation-discovery
     , base
     , bytestring
-    , cardano-addresses                >=3.12.0   && <3.13
+    , cardano-addresses                >=4.0.0    && <4.1
     , cardano-api                      >=10.8.0.0 && <10.9
     , cardano-crypto                   >=1.1.2    && <1.2
     , cardano-wallet

diff --git a/lib/benchmarks/exe/latency-bench.hs b/lib/benchmarks/exe/latency-bench.hs
@@ -6,6 +6,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE OverloadedLabels #-}
+{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
 
@@ -224,7 +225,7 @@ import System.Environment.Extended
 import System.IO
     ( stdout
     )
-import System.IO.Extra
+import "extra" System.IO.Extra
     ( withTempFile
     )
 import System.IO.Temp.Extra

diff --git a/lib/cardano-api-extra/cardano-api-extra.cabal b/lib/cardano-api-extra/cardano-api-extra.cabal
@@ -60,7 +60,7 @@ library
     , iproute
     , network
     , ordered-containers
-    , plutus-ledger-api:plutus-ledger-api-testlib
+    , plutus-ledger-api:plutus-ledger-api-testlib  >=1.37.0.0 && <1.38
     , QuickCheck
     , quickcheck-instances
     , random

diff --git a/lib/faucet/faucet.cabal b/lib/faucet/faucet.cabal
@@ -58,7 +58,7 @@ library
     , aeson-pretty
     , base
     , bytestring
-    , cardano-addresses          >=3.12.0 && <3.13
+    , cardano-addresses          >=4.0.0 && <4.1
     , containers
     , directory
     , extra

diff --git a/lib/integration/cardano-wallet-integration.cabal b/lib/integration/cardano-wallet-integration.cabal
@@ -51,7 +51,7 @@ library framework
     , bech32
     , bech32-th
     , bytestring
-    , cardano-addresses                    >=3.12.0   && <3.13
+    , cardano-addresses                    >=4.0.0    && <4.1
     , cardano-ledger-shelley               >=1.15.0.0 && <1.16
     , cardano-wallet
     , cardano-wallet-api
@@ -135,7 +135,7 @@ library scenarios
     , base
     , bech32-th
     , bytestring
-    , cardano-addresses                     >=3.12.0   && <3.13
+    , cardano-addresses                     >=4.0.0    && <4.1
     , cardano-api                           >=10.8.0.0 && <10.9
     , cardano-crypto                        >=1.1.2    && <1.2
     , cardano-crypto-class                  >=2.1.5.0  && <2.2
@@ -231,7 +231,7 @@ test-suite e2e
   build-depends:
     , aeson
     , bytestring
-    , cardano-addresses                     >=3.12.0 && <3.13
+    , cardano-addresses                     >=4.0.0 && <4.1
     , cardano-wallet-api
     , cardano-wallet-application
     , cardano-wallet-application-extras