Skip to content

Commit

Permalink
Merge #2801
Browse files Browse the repository at this point in the history
2801: Bump to cardano-node alonzo-white-1.4 r=Anviking a=Anviking

# Issue Number

ADP-1062


# Overview

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

- [x] Bump to alonzo-white-1.4
- [x] Figure out how to fix the CLI tests
- [x] Fix any newly appearing CI errors 


# Comments

input-output-hk/cardano-haskell#53
input-output-hk/cardano-haskell#54

<!-- 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)
 ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket
 ✓ Acknowledge any changes required to the Wiki
 ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages.
-->


Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
  • Loading branch information
3 people authored Aug 9, 2021
2 parents e4503c8 + 804f471 commit b759e88
Show file tree
Hide file tree
Showing 102 changed files with 1,154 additions and 706 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ See **Installation Instructions** for each available [release](https://github.co
>
> | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions)
> | --- | --- | ---
> | `master` branch | [alonzo-white-1.3](https:/input-output-hk/cardano-node/releases/tag/alonzo-white-1.3) | [1.4.0](https:/input-output-hk/smash/releases/tag/1.4.0)
> | `master` branch | [alonzo-white-1.4](https:/input-output-hk/cardano-node/releases/tag/alonzo-white-1.4) | [1.4.0](https:/input-output-hk/smash/releases/tag/1.4.0)
> | [v2021-07-30](https:/input-output-hk/cardano-wallet/releases/tag/v2021-07-30) | [1.28.0](https:/input-output-hk/cardano-node/releases/tag/1.28.0) | [1.4.0](https:/input-output-hk/smash/releases/tag/1.4.0)
> | [v2021-06-11](https:/input-output-hk/cardano-wallet/releases/tag/v2021-06-11) | [1.27.0](https:/input-output-hk/cardano-node/releases/tag/1.27.0) | [1.4.0](https:/input-output-hk/smash/releases/tag/1.4.0)
> | [v2021-05-26](https:/input-output-hk/cardano-wallet/releases/tag/v2021-05-26) | [1.26.2](https:/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.4.0](https:/input-output-hk/smash/releases/tag/1.4.0)
Expand Down
29 changes: 23 additions & 6 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,22 @@ packages:
, lib/shelley/
, lib/strict-non-empty-containers/

-- Using a fork until our patches can be merged upstream
-- (according to cardano-node cabal.project)
source-repository-package
type: git
location: https:/input-output-hk/optparse-applicative
tag: 27b99b346d58db877a61224a745de872601ba3e6
--sha256: 00gavws6jvl930rq09gs5rdwmyc4n42avk7p9s7pjv52d205v967

-- Using a fork until our patches can be merged upstream
-- (according to cardano-node cabal.project)
source-repository-package
type: git
location: https:/input-output-hk/criterion
tag: fb2e7be532db96255d203f86360230cae37130f3
--sha256: 14r9zkfa8zslky3969gaq27gi7yi9rlqv0h1iq7zam9l15z53vhr

source-repository-package
type: git
location: https:/input-output-hk/Win32-network
Expand All @@ -60,22 +76,23 @@ source-repository-package
source-repository-package
type: git
location: https:/input-output-hk/cardano-base
tag: c028519d1180e42d6ab3ddf97d6fa57395966c2e
tag: 8c732560b201b5da8e3bdf175c6eda73a32d64bc
subdir:
base-deriving-via
binary
binary/test
cardano-crypto-class
cardano-crypto-praos
cardano-crypto-tests
orphans-deriving-via
measures
strict-containers
slotting

source-repository-package
type: git
location: https:/input-output-hk/cardano-crypto
tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
tag: f73079303f663e028288f9f4a9e08bcca39a923e

source-repository-package
type: git
Expand All @@ -92,7 +109,7 @@ source-repository-package
source-repository-package
type: git
location: https:/input-output-hk/cardano-ledger-specs
tag: bc5e54f0611a416db1e906d3783e4b973429f5eb
tag: 30eca73a2f5c13f1fbed9a98a59540ac3d0c8afe
subdir: alonzo/impl
byron/chain/executable-spec
byron/crypto
Expand All @@ -112,7 +129,7 @@ source-repository-package
source-repository-package
type: git
location: https:/input-output-hk/cardano-node
tag: ba70f27ac982b1eae70ba19450b840b5a8cbcba4
tag: 9921d76c40928369592f1e289a0b0c1c32c97631
subdir: cardano-api
cardano-cli
cardano-config
Expand All @@ -122,7 +139,7 @@ source-repository-package
source-repository-package
type: git
location: https:/input-output-hk/cardano-prelude
tag: fd773f7a58412131512b9f694ab95653ac430852
tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
subdir: cardano-prelude
cardano-prelude-test

Expand Down Expand Up @@ -151,7 +168,7 @@ source-repository-package
source-repository-package
type: git
location: https:/input-output-hk/ouroboros-network
tag: f026e71e8925dc2cb1a55a9a77b54bbeb1273ef0
tag: e9cda57df7ea6969edbc3bfc4e117668277d09c8
subdir:
io-sim
io-classes
Expand Down
1 change: 1 addition & 0 deletions lib/cli/cardano-wallet-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ test-suite unit
base
, cardano-wallet-cli
, cardano-wallet-core
, cardano-wallet-test-utils
, containers
, filepath
, hspec
Expand Down
21 changes: 21 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/--help
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The CLI is a proxy to the wallet server, which is required for
most commands. Commands are turned into corresponding API calls,
and submitted to an up-and-running server. Some commands do not
require an active server and can be run offline (e.g.
'recovery-phrase generate').

Usage: COMMAND

Cardano Wallet Command-Line Interface (CLI)

Available options:
-h,--help Show this help text

Available commands:
recovery-phrase About recovery phrases
key About public/private keys
wallet About wallets
transaction About transactions
address About addresses
stake-pool About stake pools
network About the network
19 changes: 19 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/address --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Usage: address COMMAND

About addresses

Available options:
-h,--help Show this help text

Available commands:
list List all known addresses of a given
wallet.
create Create a new random address. Only
available for random wallets. The
address index is optional, give none
to let the wallet generate a random
one.
import Import a random address generated
elsewhere. Only available for random
wallets. The address must belong to
the target wallet.
14 changes: 14 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/address create --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Usage: address create
[--port INT]
[--address-index INDEX]
WALLET_ID

Create a new random address. Only available for random wallets.
The address index is optional, give none to let the wallet
generate a random one.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
--address-index INDEX A derivation index for the address
9 changes: 9 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/address import --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Usage: address import [--port INT] WALLET_ID ADDRESS

Import a random address generated elsewhere. Only available for
random wallets. The address must belong to the target wallet.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
10 changes: 10 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/address list --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Usage: address list [--port INT] [--state STRING] WALLET_ID

List all known addresses of a given wallet.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
--state STRING only addresses with the given state:
either 'used' or 'unused'.
39 changes: 39 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/key --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Usage: key COMMAND

About public/private keys

Available options:
-h,--help Show this help text

Available commands:
from-recovery-phrase Convert a recovery phrase to an
extended private key
child Derive child keys from a parent
public/private key
public Get the public counterpart of a
private key
inspect Show information about a key
hash Get the hash of a public key

Example:
$ cardano-wallet recovery-phrase generate --size 15 \
| cardano-wallet key from-recovery-phrase Shelley > root.prv

$ cat root.prv \
| cardano-wallet key child 1852H/1815H/0H \
| tee acct.prv \
| cardano-wallet key public --with-chain-code > acct.pub

$ cardano-wallet key inspect <<< $(cat acct.prv)
{
"key_type": "private",
"chain_code": "67bef6f80df02c7452e20e76ffb4bb57cae8aac2adf042b21a6b19e4f7b1f511",
"extended_key": "90ead3efad7aacac242705ede323665387f49ed847bed025eb333708ccf6aa54403482a867daeb18f38c57d6cddd7e6fd6aed4a3209f7425a3d1c5d9987a9c5f"
}

$ cardano-wallet key inspect <<< $(cat acct.pub)
{
"key_type": "public",
"chain_code": "67bef6f80df02c7452e20e76ffb4bb57cae8aac2adf042b21a6b19e4f7b1f511",
"extended_key": "d306350ee88f51fb710252e27f0c40006c58e994761b383e02d400e2be59b3cc"
}
11 changes: 11 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/key child --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Usage: key child DERIVATION-PATH

Derive child keys from a parent public/private key

Available options:
-h,--help Show this help text
DERIVATION-PATH Slash-separated derivation path.
Hardened indexes are marked with a 'H'
(e.g. 1852H/1815H/0H/0).

The parent key is read from stdin.
13 changes: 13 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/key from-recovery-phrase --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Usage: key from-recovery-phrase STYLE

Convert a recovery phrase to an extended private key

Available options:
-h,--help Show this help text
STYLE Byron | Icarus | Shelley | Shared

The recovery phrase is read from stdin.

Example:
$ cardano-wallet recovery-phrase generate \
| cardano-wallet key from-recovery-phrase Icarus
8 changes: 8 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/key inspect --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Usage: key inspect

Show information about a key

Available options:
-h,--help Show this help text

The parent key is read from stdin.
8 changes: 8 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/key public --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Usage: key public (--without-chain-code | --with-chain-code)

Get the public counterpart of a private key

Available options:
-h,--help Show this help text

The private key is read from stdin.To get extended public key pass '--with-chain-code'.To get public key pass '--without-chain-code'.
12 changes: 12 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/network --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Usage: network COMMAND

About the network

Available options:
-h,--help Show this help text

Available commands:
information View network information.
parameters View network parameters for the
current epoch.
clock View NTP offset.
11 changes: 11 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/network clock --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Usage: network clock [--port INT] [--force-ntp-check]

View NTP offset.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
--force-ntp-check When set, will block and force an NTP
check with the server. Otherwise, uses
an available cached result.
8 changes: 8 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/network information --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Usage: network information [--port INT]

View network information.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
8 changes: 8 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/network parameters --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Usage: network parameters [--port INT]

View network parameters for the current epoch.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
9 changes: 9 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/recovery-phrase --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Usage: recovery-phrase COMMAND

About recovery phrases

Available options:
-h,--help Show this help text

Available commands:
generate Generate an English recovery phrase
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Usage: recovery-phrase generate [--size INT]

Generate an English recovery phrase

Available options:
-h,--help Show this help text
--size INT Number of mnemonic words to generate.
Must be a multiple of 3. (default: 24)
11 changes: 11 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/stake-pool list --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Usage: stake-pool list [--port INT] [--stake STAKE]

List all known stake pools.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
--stake STAKE The stake you intend to delegate,
which affects the rewards and the
ranking of pools.
17 changes: 17 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/transaction --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Usage: transaction COMMAND

About transactions

Available options:
-h,--help Show this help text

Available commands:
create Create and submit a new transaction.
fees Estimate fees for a transaction.
list List the transactions associated with
a wallet.
submit Submit an externally-signed
transaction.
forget Forget a pending transaction with
specified id.
get Get a transaction with specified id.
23 changes: 23 additions & 0 deletions lib/cli/test/data/Cardano/CLISpec/transaction create --help
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Usage: transaction create
[--port INT]
WALLET_ID
(--payment PAYMENT)
[--metadata JSON]
[--ttl DURATION]

Create and submit a new transaction.

Available options:
-h,--help Show this help text
--port INT port used for serving the wallet API.
(default: 8090)
--payment PAYMENT address to send to and amount to send
separated by @, e.g.
'<amount>@<address>'
--metadata JSON Application-specific transaction
metadata as a JSON object. The value
must match the schema defined in the
cardano-wallet OpenAPI specification.
--ttl DURATION Time-to-live value. Expressed in
seconds with a trailing 's'. Default
is 3600s (2 hours).
Loading

0 comments on commit b759e88

Please sign in to comment.