Skip to content

Commit

Permalink
Merge #2235 #2239
Browse files Browse the repository at this point in the history
2235: Fix extra-source-files not containing files used by TH r=hasufell a=hasufell



2239: WIP: Bump version from 2020.9.30 to 2020.10.13 r=KtorZ a=jonathanknowles

<!-- Short optional summary -->

Compatible with [`jormungandr@v0.9.0`](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) and [`cardano-node@1.21.1`](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1).

## New Features

- Adds the ability for users to select their own SMASH servers for stakepool listings. (#2214)
- Adds transaction expiry slots for pending transactions. (#1879)

## Improvements

- Adds a 100-wallet scenario to the latency benchmark. (#2223)
- Adds an executable `shelley-test-cluster` which starts an integration test cluster that includes faucets. (#2178)
- Extends `isOurs` to return the derivation path of an address. (#2219)

## Resolved Issues

- Make pool garbage collection handle an unknown current epoch. (#2203)
- Fixes incorrect mainnet network parameters returned from API. (#2226)

## Known Issues

**_This section is a work in progress._**

- Wallet restoration status reported incorrectly on mainnet. ([ADP-483](https://jira.iohk.io/browse/ADP-483))

## Documentation

<!-- A snapshot of the documentation at the time of releasing. -->

Cardano (cardano-node)                                                                                             | ITN (Jörmungandr)
---                                                                                                                | ---
[API Documentation](https://input-output-hk.github.io/cardano-wallet/api/v2020-10-13)                              | [API Documentation](https://input-output-hk.github.io/cardano-wallet/api/v2020-10-13)
[CLI Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface/f71ecb7ece3deaec5bf60f4a4beea1d3950e0d46) | [CLI Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-command-line-interface-jormungandr/f71ecb7ece3deaec5bf60f4a4beea1d3950e0d46)
[Docker Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Docker/f71ecb7ece3deaec5bf60f4a4beea1d3950e0d46)                     | [Docker Manual](https://github.com/input-output-hk/cardano-wallet/wiki/Docker-jormungandr/f71ecb7ece3deaec5bf60f4a4beea1d3950e0d46)

## Installation Instructions

### Cardano (cardano-node)

1. Install [`cardano-node@1.21.1`](https://github.com/input-output-hk/cardano-node/releases/tag/1.21.1).

2. Download the provided `cardano-wallet` for your platform, and uncompress it in a directory that is on your `$PATH`, e.g. `/usr/local/bin`. Or `%PATH%` on Windows.

4. Start `cardano-wallet --help` and see available parameters.

#### Docker

Pull from DockerHub and verify the version matches 2020.10.13.

```
$ docker pull inputoutput/cardano-wallet:2020.10.13
$ docker run --rm inputoutput/cardano-wallet:2020.10.13 version
```

### ITN (jormungandr)

1. Install [`jormungandr@v0.9.0`](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0).

2. Download the provided `cardano-wallet-jormungandr` for your platform, and uncompress it in a directory that is on your `$PATH`, e.g. `/usr/local/bin`. Or `%PATH%` on Windows.

3. (optional) Install the bash/zsh auto-completion script according to the [jormungandr cli manual](https://github.com/input-output-hk/cardano-wallet/wiki/Wallet-Command-Line-Interface/{{JORM_CLI_WIKI_COMMIT}})

4. Start `cardano-wallet --help` and see available parameters.

#### Docker

Pull from DockerHub and verify the version matches 2020.10.13

```
$ docker pull inputoutput/cardano-wallet:2020.10.13-jormungandr
$ docker run --rm inputoutput/cardano-wallet:2020.10.13-jormungandr version
```

## Signatures

<!-- Signatures of people responsible for the release -->

Name                           | Role                | Approval
---                            | ---                 | ---:
Matthias Benkort @KtorZ        | Technical Team Lead | ⌛
Piotr Stachyra @piotr-iohk     | QA Engineer         | ⌛
Tatyana Valkevych @tatyanavych | Release Manager     | ⌛

Co-authored-by: Julian Ospald <julian.ospald@iohk.io>
Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
Co-authored-by: Jonathan Knowles <jonathan.knowles@iohk.io>
Co-authored-by: IOHK <devops+stack-project@iohk.io>
  • Loading branch information
5 people committed Oct 13, 2020
3 parents f28289e + 6624d65 + 18e1305 commit 77e04fc
Show file tree
Hide file tree
Showing 23 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion lib/cli/cardano-wallet-cli.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-cli
version: 2020.9.30
version: 2020.10.13
synopsis: Utilities for a building Command-Line Interfaces
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
2 changes: 1 addition & 1 deletion lib/core-integration/cardano-wallet-core-integration.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-core-integration
version: 2020.9.30
version: 2020.10.13
synopsis: Core integration test library.
description: Shared core functionality for our integration test suites.
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
1 change: 0 additions & 1 deletion lib/core/README.md

This file was deleted.

4 changes: 2 additions & 2 deletions lib/core/cardano-wallet-core.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-core
version: 2020.9.30
version: 2020.10.13
synopsis: The Wallet Backend for a Cardano node.
description: Please see README.md
homepage: https://github.com/input-output-hk/cardano-wallet
Expand All @@ -9,7 +9,7 @@ copyright: 2018-2020 IOHK
license: Apache-2.0
category: Web
build-type: Simple
extra-source-files: README.md
extra-source-files: specifications/api/swagger.yaml
cabal-version: >=1.10

flag release
Expand Down
1 change: 1 addition & 0 deletions lib/core/specifications
2 changes: 1 addition & 1 deletion lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@ specification =
unsafeDecode bytes
where
bytes = $(
let swaggerYaml = "../../specifications/api/swagger.yaml"
let swaggerYaml = "./specifications/api/swagger.yaml"
in liftIO (lookupEnv "SWAGGER_YAML") >>=
maybe (makeRelativeToProject swaggerYaml) pure >>=
embedFile
Expand Down
3 changes: 2 additions & 1 deletion lib/jormungandr/cardano-wallet-jormungandr.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-jormungandr
version: 2020.9.30
version: 2020.10.13
synopsis: Wallet backend protocol-specific bits implemented using Jörmungandr
description: Please see README.md
homepage: https://github.com/input-output-hk/cardano-wallet
Expand All @@ -10,6 +10,7 @@ license: Apache-2.0
category: Web
build-type: Simple
extra-source-files: README.md
specifications/api/swagger.yaml
cabal-version: >=1.10

flag release
Expand Down
1 change: 1 addition & 0 deletions lib/jormungandr/specifications
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ specification =
unsafeDecode bytes
where
bytes = $(
let swaggerYaml = "../../specifications/api/swagger.yaml"
let swaggerYaml = "./specifications/api/swagger.yaml"
in liftIO (lookupEnv "SWAGGER_YAML") >>=
maybe (makeRelativeToProject swaggerYaml) pure >>=
embedFile
Expand Down
2 changes: 1 addition & 1 deletion lib/launcher/cardano-wallet-launcher.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-launcher
version: 2020.9.30
version: 2020.10.13
synopsis: Utilities for a building commands launcher
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
2 changes: 1 addition & 1 deletion lib/shelley/cardano-wallet.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet
version: 2020.9.30
version: 2020.10.13
synopsis: Wallet backend protocol-specific bits implemented using Shelley nodes
description: Please see README.md
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
2 changes: 1 addition & 1 deletion lib/test-utils/cardano-wallet-test-utils.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cardano-wallet-test-utils
version: 2020.9.30
version: 2020.10.13
synopsis: Shared utilities for writing unit and property tests.
description: Shared utilities for writing unit and property tests.
homepage: https://github.com/input-output-hk/cardano-wallet
Expand Down
2 changes: 1 addition & 1 deletion lib/text-class/text-class.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: text-class
version: 2020.9.30
version: 2020.10.13
synopsis: Extra helpers to convert data-types to and from Text
homepage: https://github.com/input-output-hk/cardano-wallet
author: IOHK Engineering Team
Expand Down
4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-wallet-cli.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-core-integration.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-core.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-jormungandr.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion nix/.stack.nix/cardano-wallet-launcher.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/cardano-wallet-test-utils.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/.stack.nix/cardano-wallet.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nix/.stack.nix/text-class.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions scripts/make_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ set -euo pipefail

################################################################################
# Release-specific parameters (Change when you bump the version)
OLD_GIT_TAG="v2020-09-22"
OLD_CABAL_VERSION="2020.9.22"
OLD_GIT_TAG="v2020-09-30"
OLD_CABAL_VERSION="2020.9.30"

GIT_TAG="v2020-09-30"
CABAL_VERSION="2020.9.30"
GIT_TAG="v2020-10-13"
CABAL_VERSION="2020.10.13"

JORM_TAG="v0.9.0"
CARDANO_NODE_TAG="1.20.0"
CARDANO_NODE_TAG="1.21.1"
################################################################################
OLD_DATE="${OLD_GIT_TAG//v}"
CHANGELOG=GENERATED_CHANGELOG.md
Expand Down
2 changes: 1 addition & 1 deletion specifications/api/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.0
info:
title: Cardano Wallet Backend API
version: 2020.9.30
version: 2020.10.13
license:
name: Apache-2.0
url: https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/LICENSE
Expand Down

0 comments on commit 77e04fc

Please sign in to comment.