From f6a630b6f3aa06a58acb79dc7bc6e354568da0d2 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Thu, 26 May 2022 15:45:02 +0200 Subject: [PATCH 1/2] Bump to cardano-addresses 3.10.0 --- cabal.project | 2 +- nix/materialized/stack-nix/.stack-to-nix.cache | 4 ++-- nix/materialized/stack-nix/.stack-to-nix.cache.0 | 4 ++-- nix/materialized/stack-nix/.stack-to-nix.cache.1 | 4 ++-- nix/sha256map.nix | 2 +- stack.yaml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cabal.project b/cabal.project index 4bfaf0fabee..b23963ff1f9 100644 --- a/cabal.project +++ b/cabal.project @@ -80,7 +80,7 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-addresses - tag: b33e0f365550bd9d329bdbb0a0d2dfe2b23a3dcf + tag: ba8390504b6613957b73bf8d0d2aab1a989f104d subdir: command-line core diff --git a/nix/materialized/stack-nix/.stack-to-nix.cache b/nix/materialized/stack-nix/.stack-to-nix.cache index 438020c7640..0b2960882cd 100644 --- a/nix/materialized/stack-nix/.stack-to-nix.cache +++ b/nix/materialized/stack-nix/.stack-to-nix.cache @@ -1,5 +1,5 @@ -https://github.com/input-output-hk/cardano-addresses b33e0f365550bd9d329bdbb0a0d2dfe2b23a3dcf command-line 05vj2fc6n8rmn3ch6115pc6l5vw6pqbv2kwbzxf3y41sa40k50vc cardano-addresses-cli .stack-to-nix.cache.0 -https://github.com/input-output-hk/cardano-addresses b33e0f365550bd9d329bdbb0a0d2dfe2b23a3dcf core 05vj2fc6n8rmn3ch6115pc6l5vw6pqbv2kwbzxf3y41sa40k50vc cardano-addresses .stack-to-nix.cache.1 +https://github.com/input-output-hk/cardano-addresses ba8390504b6613957b73bf8d0d2aab1a989f104d command-line 0d4kkd9a3rbs9dva2f71qj711s96734qkf55lj29iblziznnf796 cardano-addresses-cli .stack-to-nix.cache.0 +https://github.com/input-output-hk/cardano-addresses ba8390504b6613957b73bf8d0d2aab1a989f104d core 0d4kkd9a3rbs9dva2f71qj711s96734qkf55lj29iblziznnf796 cardano-addresses .stack-to-nix.cache.1 https://github.com/biocad/servant-openapi3 4165b837d3a71debd1059c3735460075840000b5 . 1dngrr353kjhmwhn0b289jzqz5rf32llwcv79zcyq15ldpqpbib9 servant-openapi3 .stack-to-nix.cache.2 https://github.com/paolino/openapi3 c30d0de6875d75edd64d1aac2272886528bc492d . 0b0fzj5vrnfrc8qikabxhsnp4p8lrjpssblbh2rb7aji5hzzfli9 openapi3 .stack-to-nix.cache.3 https://github.com/input-output-hk/optparse-applicative 7497a29cb998721a9068d5725d49461f2bba0e7a . 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r optparse-applicative-fork .stack-to-nix.cache.4 diff --git a/nix/materialized/stack-nix/.stack-to-nix.cache.0 b/nix/materialized/stack-nix/.stack-to-nix.cache.0 index dcca0de499a..a0809b82590 100644 --- a/nix/materialized/stack-nix/.stack-to-nix.cache.0 +++ b/nix/materialized/stack-nix/.stack-to-nix.cache.0 @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses-cli"; version = "3.9.0"; }; + identifier = { name = "cardano-addresses-cli"; version = "3.10.0"; }; license = "Apache-2.0"; copyright = "2021-2022 IOHK"; maintainer = "operations@iohk.io"; @@ -82,5 +82,5 @@ }; }; } // rec { - src = (pkgs.lib).mkDefault /nix/store/mppiglijmgwx201yk20kkcfdx3zp7101-cardano-addresses-b33e0f3/command-line; + src = (pkgs.lib).mkDefault /nix/store/5z2l73w6l0ylr88b3qh0mmf5vg4h1vd1-cardano-addresses-ba83905/command-line; } diff --git a/nix/materialized/stack-nix/.stack-to-nix.cache.1 b/nix/materialized/stack-nix/.stack-to-nix.cache.1 index 1982f6151a7..df0ed4f5a3d 100644 --- a/nix/materialized/stack-nix/.stack-to-nix.cache.1 +++ b/nix/materialized/stack-nix/.stack-to-nix.cache.1 @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.12"; - identifier = { name = "cardano-addresses"; version = "3.9.0"; }; + identifier = { name = "cardano-addresses"; version = "3.10.0"; }; license = "Apache-2.0"; copyright = "2021-2022 IOHK"; maintainer = "operations@iohk.io"; @@ -77,5 +77,5 @@ }; }; } // rec { - src = (pkgs.lib).mkDefault /nix/store/mppiglijmgwx201yk20kkcfdx3zp7101-cardano-addresses-b33e0f3/core; + src = (pkgs.lib).mkDefault /nix/store/5z2l73w6l0ylr88b3qh0mmf5vg4h1vd1-cardano-addresses-ba83905/core; } diff --git a/nix/sha256map.nix b/nix/sha256map.nix index 365ae75735f..17f53154db0 100644 --- a/nix/sha256map.nix +++ b/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/input-output-hk/cardano-addresses"."b33e0f365550bd9d329bdbb0a0d2dfe2b23a3dcf" = "05vj2fc6n8rmn3ch6115pc6l5vw6pqbv2kwbzxf3y41sa40k50vc"; + "https://github.com/input-output-hk/cardano-addresses"."ba8390504b6613957b73bf8d0d2aab1a989f104d" = "0d4kkd9a3rbs9dva2f71qj711s96734qkf55lj29iblziznnf796"; "https://github.com/biocad/servant-openapi3"."4165b837d3a71debd1059c3735460075840000b5" = "1dngrr353kjhmwhn0b289jzqz5rf32llwcv79zcyq15ldpqpbib9"; "https://github.com/paolino/openapi3"."c30d0de6875d75edd64d1aac2272886528bc492d" = "0b0fzj5vrnfrc8qikabxhsnp4p8lrjpssblbh2rb7aji5hzzfli9"; "https://github.com/input-output-hk/optparse-applicative"."7497a29cb998721a9068d5725d49461f2bba0e7a" = "1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r"; diff --git a/stack.yaml b/stack.yaml index 58d1604bb5c..807ef3c394d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -75,9 +75,9 @@ extra-deps: - quickcheck-quid-0.0.1 - servant-multipart-client-0.12.1 - # cardano-addresses-3.9.0 + # cardano-addresses-3.10.0 - git: https://github.com/input-output-hk/cardano-addresses - commit: b33e0f365550bd9d329bdbb0a0d2dfe2b23a3dcf + commit: ba8390504b6613957b73bf8d0d2aab1a989f104d subdirs: - command-line - core From c8c24c9e75fee08d307dcd4f29582c98bf7cd889 Mon Sep 17 00:00:00 2001 From: Piotr Stachyra Date: Thu, 26 May 2022 15:47:57 +0200 Subject: [PATCH 2/2] Bump cardano-wallet to v2022-05-27 --- README.md | 2 +- docker-compose.yml | 2 +- lib/cli/cardano-wallet-cli.cabal | 2 +- lib/core-integration/cardano-wallet-core-integration.cabal | 2 +- lib/core/cardano-wallet-core.cabal | 2 +- lib/launcher/cardano-wallet-launcher.cabal | 2 +- lib/shelley/cardano-wallet.cabal | 2 +- lib/test-utils/cardano-wallet-test-utils.cabal | 2 +- lib/text-class/text-class.cabal | 2 +- nix/materialized/stack-nix/cardano-wallet-cli.nix | 2 +- .../stack-nix/cardano-wallet-core-integration.nix | 2 +- nix/materialized/stack-nix/cardano-wallet-core.nix | 2 +- nix/materialized/stack-nix/cardano-wallet-launcher.nix | 2 +- nix/materialized/stack-nix/cardano-wallet-test-utils.nix | 2 +- nix/materialized/stack-nix/cardano-wallet.nix | 2 +- nix/materialized/stack-nix/text-class.nix | 2 +- scripts/make_release.sh | 4 ++-- specifications/api/swagger.yaml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index c9e29cda71a..ff9f44fb995 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,9 @@ See **Installation Instructions** for each available [release](https://github.co > | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions) > | --- | --- | --- > | `master` branch | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) +> | [v2022-05-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-05-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) > | [v2022-04-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-04-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) > | [v2022-01-18](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-01-18) | [1.33.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.33.0) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) -> | [v2021-12-15](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-12-15) | [1.32.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.32.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) ## How to build from sources diff --git a/docker-compose.yml b/docker-compose.yml index f8519e3a648..fabc2a7d2fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: max-size: "50m" cardano-wallet: - image: inputoutput/cardano-wallet:2022.4.27 + image: inputoutput/cardano-wallet:2022.5.27 volumes: - wallet-${NETWORK}-db:/wallet-db - node-ipc:/ipc diff --git a/lib/cli/cardano-wallet-cli.cabal b/lib/cli/cardano-wallet-cli.cabal index dedd1f824e4..e828a1cfe33 100644 --- a/lib/cli/cardano-wallet-cli.cabal +++ b/lib/cli/cardano-wallet-cli.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-cli -version: 2022.4.27 +version: 2022.5.27 synopsis: Utilities for a building Command-Line Interfaces homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/lib/core-integration/cardano-wallet-core-integration.cabal b/lib/core-integration/cardano-wallet-core-integration.cabal index 8ae9d7296ed..cd8d0667016 100644 --- a/lib/core-integration/cardano-wallet-core-integration.cabal +++ b/lib/core-integration/cardano-wallet-core-integration.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-core-integration -version: 2022.4.27 +version: 2022.5.27 synopsis: Core integration test library. description: Shared core functionality for our integration test suites. homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal index ca2bc983eec..38011987bce 100644 --- a/lib/core/cardano-wallet-core.cabal +++ b/lib/core/cardano-wallet-core.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-core -version: 2022.4.27 +version: 2022.5.27 synopsis: The Wallet Backend for a Cardano node. description: Please see README.md homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/launcher/cardano-wallet-launcher.cabal b/lib/launcher/cardano-wallet-launcher.cabal index cd3cfb4930f..05890a563e5 100644 --- a/lib/launcher/cardano-wallet-launcher.cabal +++ b/lib/launcher/cardano-wallet-launcher.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-launcher -version: 2022.4.27 +version: 2022.5.27 synopsis: Utilities for a building commands launcher homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/lib/shelley/cardano-wallet.cabal b/lib/shelley/cardano-wallet.cabal index 0de0194d156..3c6352c96a8 100644 --- a/lib/shelley/cardano-wallet.cabal +++ b/lib/shelley/cardano-wallet.cabal @@ -1,5 +1,5 @@ name: cardano-wallet -version: 2022.4.27 +version: 2022.5.27 synopsis: Wallet backend protocol-specific bits implemented using Shelley nodes description: Please see README.md homepage: https://github.com/input-output-hk/cardano-wallet diff --git a/lib/test-utils/cardano-wallet-test-utils.cabal b/lib/test-utils/cardano-wallet-test-utils.cabal index a940cdddf60..22371d13722 100644 --- a/lib/test-utils/cardano-wallet-test-utils.cabal +++ b/lib/test-utils/cardano-wallet-test-utils.cabal @@ -1,5 +1,5 @@ name: cardano-wallet-test-utils -version: 2022.4.27 +version: 2022.5.27 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 diff --git a/lib/text-class/text-class.cabal b/lib/text-class/text-class.cabal index ad57b4a2a1c..900f612165c 100644 --- a/lib/text-class/text-class.cabal +++ b/lib/text-class/text-class.cabal @@ -1,5 +1,5 @@ name: text-class -version: 2022.4.27 +version: 2022.5.27 synopsis: Extra helpers to convert data-types to and from Text homepage: https://github.com/input-output-hk/cardano-wallet author: IOHK Engineering Team diff --git a/nix/materialized/stack-nix/cardano-wallet-cli.nix b/nix/materialized/stack-nix/cardano-wallet-cli.nix index 1f977dfa0a1..2ee37c2fa51 100644 --- a/nix/materialized/stack-nix/cardano-wallet-cli.nix +++ b/nix/materialized/stack-nix/cardano-wallet-cli.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-cli"; version = "2022.4.27"; }; + identifier = { name = "cardano-wallet-cli"; version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/materialized/stack-nix/cardano-wallet-core-integration.nix b/nix/materialized/stack-nix/cardano-wallet-core-integration.nix index 5fabf5bb36e..37efcd6a608 100644 --- a/nix/materialized/stack-nix/cardano-wallet-core-integration.nix +++ b/nix/materialized/stack-nix/cardano-wallet-core-integration.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-core-integration"; - version = "2022.4.27"; + version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; diff --git a/nix/materialized/stack-nix/cardano-wallet-core.nix b/nix/materialized/stack-nix/cardano-wallet-core.nix index db11e86dffe..2ef7caa1c59 100644 --- a/nix/materialized/stack-nix/cardano-wallet-core.nix +++ b/nix/materialized/stack-nix/cardano-wallet-core.nix @@ -11,7 +11,7 @@ flags = { release = false; scrypt = true; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-core"; version = "2022.4.27"; }; + identifier = { name = "cardano-wallet-core"; version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/materialized/stack-nix/cardano-wallet-launcher.nix b/nix/materialized/stack-nix/cardano-wallet-launcher.nix index c1b2129a258..8a1d81fafa6 100644 --- a/nix/materialized/stack-nix/cardano-wallet-launcher.nix +++ b/nix/materialized/stack-nix/cardano-wallet-launcher.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet-launcher"; version = "2022.4.27"; }; + identifier = { name = "cardano-wallet-launcher"; version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/materialized/stack-nix/cardano-wallet-test-utils.nix b/nix/materialized/stack-nix/cardano-wallet-test-utils.nix index 6ff584bdb8e..fd3c1f1d3fa 100644 --- a/nix/materialized/stack-nix/cardano-wallet-test-utils.nix +++ b/nix/materialized/stack-nix/cardano-wallet-test-utils.nix @@ -13,7 +13,7 @@ specVersion = "1.10"; identifier = { name = "cardano-wallet-test-utils"; - version = "2022.4.27"; + version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; diff --git a/nix/materialized/stack-nix/cardano-wallet.nix b/nix/materialized/stack-nix/cardano-wallet.nix index 00a6abb597b..9817888f58b 100644 --- a/nix/materialized/stack-nix/cardano-wallet.nix +++ b/nix/materialized/stack-nix/cardano-wallet.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-wallet"; version = "2022.4.27"; }; + identifier = { name = "cardano-wallet"; version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/nix/materialized/stack-nix/text-class.nix b/nix/materialized/stack-nix/text-class.nix index 9d090efbcac..f47d59ee3e4 100644 --- a/nix/materialized/stack-nix/text-class.nix +++ b/nix/materialized/stack-nix/text-class.nix @@ -11,7 +11,7 @@ flags = { release = false; }; package = { specVersion = "1.10"; - identifier = { name = "text-class"; version = "2022.4.27"; }; + identifier = { name = "text-class"; version = "2022.5.27"; }; license = "Apache-2.0"; copyright = "2018-2020 IOHK"; maintainer = "operations@iohk.io"; diff --git a/scripts/make_release.sh b/scripts/make_release.sh index 5b4df3d627c..abb0c662c59 100755 --- a/scripts/make_release.sh +++ b/scripts/make_release.sh @@ -21,8 +21,8 @@ SCRIPT=$(realpath "$0") ################################################################################ # Release-specific parameters. Can be changed interactively by running the script. # Release tags must follow format vYYYY-MM-DD. -GIT_TAG="v2022-04-27" -OLD_GIT_TAG="v2022-01-18" +GIT_TAG="v2022-05-27" +OLD_GIT_TAG="v2022-04-27" CARDANO_NODE_TAG="1.34.1" ################################################################################ diff --git a/specifications/api/swagger.yaml b/specifications/api/swagger.yaml index 4a6d2531821..1f9a6b83865 100644 --- a/specifications/api/swagger.yaml +++ b/specifications/api/swagger.yaml @@ -1,7 +1,7 @@ openapi: 3.0.3 info: title: Cardano Wallet Backend API - version: v2022-04-27 + version: v2022-05-27 license: name: Apache-2.0 url: https://raw.githubusercontent.com/input-output-hk/cardano-wallet/master/LICENSE