Merge #2066

2066: Bump cardano-addresses r=KtorZ a=Anviking

# Issue Number

Release.


# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] Bump cardano-addresses


# Comments

- I believe this purely affects CLI usage of the cardano-addresses binary that will get included in the wallet release

```
Bump includes:
- [Increase default mnemonic phrase length](IntersectMBO/cardano-addresses#53)
- [Allow to inspect reward accounts wrt #46](IntersectMBO/cardano-addresses#56)
- [Allow to generate stake addresses #58](IntersectMBO/cardano-addresses#58)
- [Make 'payment' subcommand generate testnet hrp, wrt #55](IntersectMBO/cardano-addresses#59)
```

<!-- Additional comments or screenshots to attach if any -->

<!-- 
Don't forget to:

 ✓ Self-review your changes to make sure nothing unexpected slipped through
 ✓ Assign yourself to the PR
 ✓ Assign one or several reviewer(s)
 ✓ Once created, link this PR to its corresponding ticket
 ✓ Assign the PR to a corresponding milestone
 ✓ Acknowledge any changes required to the Wiki
-->


Co-authored-by: Johannes Lund <johannes.lund@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>

default.nix

@@ -83,7 +83,7 @@ let
     inherit (haskellPackages.ouroboros-consensus-byron.components.exes) db-converter;
     # adrestia tool belt
     inherit (haskellPackages.bech32.components.exes) bech32;
-    inherit (haskellPackages.cardano-addresses.components.exes) cardano-address;
+    inherit (haskellPackages.cardano-addresses-cli.components.exes) cardano-address;
     inherit (haskellPackages.cardano-transactions.components.exes) cardano-tx;
 
     cardano-wallet-jormungandr = import ./nix/package-jormungandr.nix {

lib/cli/cardano-wallet-cli.cabal

@@ -35,6 +35,7 @@ library
     , base
     , bytestring
     , cardano-addresses
+    , cardano-addresses-cli
     , cardano-wallet-core
     , contra-tracer
     , directory

lib/cli/test/unit/Cardano/CLISpec.hs

@@ -139,7 +139,7 @@ spec = do
             , "Available options:"
             , "  -h,--help                Show this help text"
             , "  --size INT               Number of mnemonic words to generate."
-            , "                           Must be a multiple of 3. (default: 15)"
+            , "                           Must be a multiple of 3. (default: 24)"
             ]
 
         ["wallet", "--help"] `shouldShowUsage`

lib/core-integration/src/Test/Integration/Framework/DSL.hs

@@ -1722,7 +1722,7 @@ pubKeyFromMnemonics mnemonics =
     T.decodeUtf8 $ serializeXPub $ publicKey
        $ deriveAccountPrivateKey mempty rootXPrv minBound
  where
-     (Right seed) = mkSomeMnemonic @'[15] mnemonics
+     seed = either (error . show) id $ mkSomeMnemonic @'[15,24] mnemonics
      rootXPrv = generateKeyFromSeed (seed, Nothing) mempty
 
 --

nix/haskell.nix

@@ -148,7 +148,7 @@ let
         # Add shell completions for tools.
         packages.cardano-node.components.exes.cardano-cli.postInstall = optparseCompletionPostInstall + libSodiumPostInstall;
         packages.cardano-node.components.exes.cardano-node.postInstall = optparseCompletionPostInstall + libSodiumPostInstall;
-        packages.cardano-addresses.components.exes.cardano-address.postInstall = optparseCompletionPostInstall;
+        packages.cardano-addresses-cli.components.exes.cardano-address.postInstall = optparseCompletionPostInstall;
         packages.cardano-transactions.components.exes.cardano-tx.postInstall = optparseCompletionPostInstall;
         packages.bech32.components.exes.bech32.postInstall = optparseCompletionPostInstall;
       }

stack.yaml

@@ -40,7 +40,10 @@ extra-deps:
     - persistent-template
 
 - git: https://github.com/input-output-hk/cardano-addresses
-  commit: 3f11638847bfc8c457dc4bb080c63e5d6de806ee
+  commit: 618bac90810fee7be324ee70428d9fb31e30abbd
+  subdirs:
+    - command-line
+    - core
 
 # Not strictly a dependency at present, but building it here to get
 # access to the cardano-tx cli.