cardano-foundation · paolino · May 26, 2025 · Dec 18, 2025 · Dec 18, 2025 · Dec 18, 2025
diff --git a/cabal.project b/cabal.project
@@ -118,20 +118,9 @@ source-repository-package
 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
+    tag: 3749045778e0d8bb1f2bed1c598594eeed0b442e
+    --sha256: lNCt4V4TyD9EmQwA6dcbEOdhVdAEXPeG4B2IP93icaw=
+
 
 package cardano-addresses
     ghc-options:

diff --git a/flake.nix b/flake.nix
@@ -277,7 +277,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
@@ -31,9 +31,11 @@ module Cardano.Wallet.Address.Derivation.SharedKey
 
 import Prelude
 
+import Cardano.Address.KeyHash
+    ( KeyHash
+    )
 import Cardano.Address.Script
     ( Cosigner
-    , KeyHash
     , Script (..)
     , ScriptTemplate (..)
     , toScriptHash
@@ -81,7 +83,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
 

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
@@ -140,10 +140,12 @@ import Cardano.Address.Derivation
     , xpubPublicKey
     , xpubToBytes
     )
+import Cardano.Address.KeyHash
+    ( KeyHash (KeyHash)
+    , KeyRole (..)
+    )
 import Cardano.Address.Script
     ( Cosigner (..)
-    , KeyHash (KeyHash)
-    , KeyRole (..)
     , Script
     , ScriptTemplate (..)
     , ValidationLevel (..)
@@ -839,6 +841,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

diff --git a/lib/api/src/Cardano/Wallet/Api/Types.hs b/lib/api/src/Cardano/Wallet/Api/Types.hs
@@ -262,9 +262,11 @@ 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/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
@@ -141,7 +141,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
@@ -187,7 +187,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/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

diff --git a/lib/integration/framework/Test/Integration/Framework/TestData.hs b/lib/integration/framework/Test/Integration/Framework/TestData.hs
@@ -506,7 +506,7 @@ errMsg400ScriptTimelocksContradictory =
 
 errMsg400ScriptNotUniformRoles :: String
 errMsg400ScriptNotUniformRoles =
-    "All keys of a script must have the same role: either payment or delegation."
+    "All keys of a script must have the same role: payment, delegation, policy, representative, committee cold or committee hot."
 
 --------------------------------------------------------------------------------
 -- Transaction metadata

diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shared/Transactions.hs
@@ -213,7 +213,7 @@ import Test.Integration.Framework.Request
     ( RequestException
     )
 
-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.Faucet.Mnemonics as Mnemonics

diff --git a/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs b/lib/integration/scenarios/Test/Integration/Scenario/API/Shelley/TransactionsNew.hs
@@ -23,12 +23,14 @@ import Cardano.Address.Derivation
     ( XPub
     , xpubPublicKey
     )
-import Cardano.Address.Script
+import Cardano.Address.KeyHash
     ( KeyHash
     , KeyRole (..)
-    , Script (..)
-    , ScriptHash (..)
     , keyHashFromBytes
+    )
+import Cardano.Address.Script
+    ( Script (..)
+    , ScriptHash (..)
     , toScriptHash
     )
 import Cardano.Api
@@ -366,7 +368,7 @@ import UnliftIO.Exception
     ( fromEither
     )
 
-import qualified Cardano.Address.Script as CA
+import qualified Cardano.Address.KeyHash as CA
 import qualified Cardano.Api as Cardano
 import qualified Cardano.Ledger.Keys as Ledger
 import qualified Cardano.Wallet.Address.Derivation.Shelley as Shelley

diff --git a/lib/local-cluster/local-cluster.cabal b/lib/local-cluster/local-cluster.cabal
@@ -103,7 +103,7 @@ library
     , base                               >=4.14      && <5
     , base58-bytestring                  >=0.1       && <0.2
     , 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-binary                     >=1.7.1.0   && <1.8
     , cardano-cli                        >=10.4.0.0  && <10.5
@@ -231,7 +231,7 @@ common test-common
     , aeson-qq                             >=0.8.4    && <0.9
     , base
     , bytestring
-    , cardano-addresses                    >=3.12.0   && <3.13
+    , cardano-addresses                    >=4.0.0    && <4.1
     , cardano-binary                       >=1.7.1.0  && <1.8
     , cardano-ledger-alonzo                >=1.12.0.0 && <1.13
     , cardano-ledger-babbage               >=1.10.1.0 && <1.11

diff --git a/lib/local-cluster/test/unit/Cardano/Wallet/Launch/Cluster/Faucet/SerializeSpec.hs b/lib/local-cluster/test/unit/Cardano/Wallet/Launch/Cluster/Faucet/SerializeSpec.hs
@@ -1,4 +1,6 @@
+{-# LANGUAGE PackageImports #-}
 {-# OPTIONS_GHC -Wno-missing-local-signatures #-}
+
 module Cardano.Wallet.Launch.Cluster.Faucet.SerializeSpec
     ( spec
     )
@@ -19,7 +21,7 @@ import Cardano.Wallet.Launch.Cluster.Faucet.Serialize
 import Cardano.Wallet.Launch.Cluster.FileOf
     ( FileOf (..)
     )
-import System.IO.Extra
+import "extra" System.IO.Extra
     ( withTempFile
     )
 import System.Path

diff --git a/lib/primitive/cardano-wallet-primitive.cabal b/lib/primitive/cardano-wallet-primitive.cabal
@@ -45,7 +45,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-binary                >=1.7.1.0  && <1.8
@@ -229,7 +229,7 @@ test-suite test
     , base58-bytestring
     , 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-crypto-class            >=2.1.5.0  && <2.2
     , cardano-ledger-allegra:testlib  >=1.6.1.0  && <1.7

diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Convert.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Convert.hs
@@ -57,10 +57,12 @@ module Cardano.Wallet.Primitive.Ledger.Convert
 
 import Prelude
 
-import Cardano.Address.Script
+import Cardano.Address.KeyHash
     ( KeyHash (..)
     , KeyRole (..)
-    , Script (..)
+    )
+import Cardano.Address.Script
+    ( Script (..)
     )
 import Cardano.Crypto.Hash
     ( hashFromBytes

diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/Mint.hs
@@ -24,9 +24,11 @@ module Cardano.Wallet.Primitive.Ledger.Read.Tx.Features.Mint
 
 import Prelude
 
-import Cardano.Address.Script
+import Cardano.Address.KeyHash
     ( KeyRole (..)
-    , ScriptHash (..)
+    )
+import Cardano.Address.Script
+    ( ScriptHash (..)
     )
 import Cardano.Crypto.Hash
     ( hashToBytes

diff --git a/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/WitnessCount.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Read/Tx/Features/WitnessCount.hs
@@ -7,6 +7,9 @@ module Cardano.Wallet.Primitive.Ledger.Read.Tx.Features.WitnessCount where
 
 import Prelude
 
+import Cardano.Address.KeyHash
+    ( KeyRole (..)
+    )
 import Cardano.Ledger.Api
     ( ScriptHash
     , StandardCrypto
@@ -50,9 +53,6 @@ import Cardano.Wallet.Read
     , Tx
     )
 
-import Cardano.Address.Script
-    ( KeyRole (..)
-    )
 import Cardano.Ledger.Babbage
     ( AlonzoScript
     , BabbageTxOut