From aee8a3bb64d53339c5789a55f0c4d3c3ce878363 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Mon, 25 Jul 2022 13:01:06 +0200 Subject: [PATCH 1/2] Update `cardano-node` to 1.35.2 --- CHANGELOG.md | 1 + default.nix | 8 --- nix/cardano-wallet--pr-3382--ledger-bug.patch | 63 ------------------- nix/sources.json | 16 ++--- source/main/environment.ts | 2 +- 5 files changed, 10 insertions(+), 80 deletions(-) delete mode 100644 nix/cardano-wallet--pr-3382--ledger-bug.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 34854949e4..0f86264908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Chores +- Updated cardano-node to 1.35.2 ([PR 3021](https://github.com/input-output-hk/daedalus/pull/3021)) - Updated cardano-node to 1.35.1 ([PR 3012](https://github.com/input-output-hk/daedalus/pull/3012)) ### Features diff --git a/default.nix b/default.nix index 6ded2122f9..5db33408d8 100644 --- a/default.nix +++ b/default.nix @@ -37,14 +37,6 @@ let chmod -R +w $out cd $out patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch} - patch -p1 -i ${builtins.path { - # XXX: unfortunately, GitHub changed lengths of hashes in patches it returns for PRs, - # that’s why we’re providing this patch inside our repo, with the same exact SHA-256, - # to the one released in 4.12.0: - path = ./nix/cardano-wallet--pr-3382--ledger-bug.patch; - recursive = false; - sha256 = "1ii12g2zikv4197c7bsh4v5dc1jzygn1jap8xvnr7mvh3a09pdgn"; - }} ''; }; haskellNix = import sources."haskell.nix" {}; diff --git a/nix/cardano-wallet--pr-3382--ledger-bug.patch b/nix/cardano-wallet--pr-3382--ledger-bug.patch deleted file mode 100644 index 7e05a1c666..0000000000 --- a/nix/cardano-wallet--pr-3382--ledger-bug.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3f0186bdc9231b0bc3523294d4b6ead52b0e1419 Mon Sep 17 00:00:00 2001 -From: Samuel Evans-Powell -Date: Mon, 11 Jul 2022 10:14:31 +0800 -Subject: [PATCH 1/2] Bump to cardano-node 1.35.1 - ---- - cabal.project | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cabal.project b/cabal.project -index 40f1ec8899..9eb3a27fd4 100644 ---- a/cabal.project -+++ b/cabal.project -@@ -213,8 +213,8 @@ source-repository-package - source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-node -- tag: 9f1d7dc163ee66410d912e48509d6a2300cfa68a -- --sha256: 06arx9hv7dn3qxfy83f0b6018rxbsvh841nvfyg5w6qclm1hddj7 -+ tag: c75451f0ffd7a60b5ad6c4263891e6c8acac105a -+ --sha256: 1z0zv1i58ikmbqg878f9z573jkwp4lzhmmswshm6c96rq6lprzh8 - subdir: - cardano-api - cardano-git-rev - -From a4d31a3e3d4dbd3b713dff5d911edd3869a3b343 Mon Sep 17 00:00:00 2001 -From: Samuel Evans-Powell -Date: Mon, 11 Jul 2022 10:21:02 +0800 -Subject: [PATCH 2/2] Bump version of cardano-node in compatibility matrix - ---- - README.md | 2 +- - cabal.project | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/README.md b/README.md -index d10239eec3..b0c8c7ceec 100644 ---- a/README.md -+++ b/README.md -@@ -73,7 +73,7 @@ See **Installation Instructions** for each available [release](https://github.co - > - > | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions) - > | --- | --- | --- --> | `master` branch | [1.35.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.0) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) -+> | `master` branch | [1.35.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1) - > | [v2022-07-01](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-07-01) | [1.35.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.0) | [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) -diff --git a/cabal.project b/cabal.project -index 9eb3a27fd4..c83a3e282c 100644 ---- a/cabal.project -+++ b/cabal.project -@@ -183,8 +183,8 @@ source-repository-package - source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-ledger -- tag: ce3057e0863304ccb3f79d78c77136219dc786c6 -- --sha256: 19ijcy1sl1iqa7diy5nsydnjsn3281kp75i2i42qv0fpn58238s9 -+ tag: 3be8a19083fc13d9261b1640e27dd389b51bb08e -+ --sha256: 0dvm9l43mp1i34bcywmznd0660hhcfxwgawypk9q1hjkml1i41z3 - subdir: - eras/alonzo/impl - eras/alonzo/test-suite diff --git a/nix/sources.json b/nix/sources.json index 05ece78938..550be4bff2 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "tags/1.35.1", + "branch": "tags/1.35.2", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "c75451f0ffd7a60b5ad6c4263891e6c8acac105a", - "sha256": "1z0zv1i58ikmbqg878f9z573jkwp4lzhmmswshm6c96rq6lprzh8", + "rev": "7612a245a6e2c51d0f1c3e0d65d7fe9363850043", + "sha256": "01a5qdrmsag18s2mlf8axfbrag59j2fp6xyc89pwmzgs7x77ldsr", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/c75451f0ffd7a60b5ad6c4263891e6c8acac105a.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/7612a245a6e2c51d0f1c3e0d65d7fe9363850043.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-shell": { @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-wallet": { - "branch": "v2022-07-01", + "branch": "master", "description": "Official Wallet Backend & API for Cardano decentralized", "homepage": null, "owner": "input-output-hk", "repo": "cardano-wallet", - "rev": "211c357a91d48b30fdf77a3a169499b38822f9cd", - "sha256": "0ii631ak757kjzs7jm625zfv2g28ffjrfkmgslxbbgvwpqxkdbaj", + "rev": "7ed8f067dd6d5dc78e7353bf65ea5e3423cdfca8", + "sha256": "1f9lwqi4qghaqi3754732h0cz98f7qbjhcx416jliqy6nibly6lp", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-wallet/archive/211c357a91d48b30fdf77a3a169499b38822f9cd.tar.gz", + "url": "https://github.com/input-output-hk/cardano-wallet/archive/7ed8f067dd6d5dc78e7353bf65ea5e3423cdfca8.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "flake-compat": { diff --git a/source/main/environment.ts b/source/main/environment.ts index c0921a5cc2..459c9c6b96 100644 --- a/source/main/environment.ts +++ b/source/main/environment.ts @@ -46,7 +46,7 @@ const isSelfnode = checkIsSelfnode(NETWORK); const isDevelopment = checkIsDevelopment(NETWORK); const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING; const API_VERSION = process.env.API_VERSION || 'dev'; -const NODE_VERSION = '1.35.1'; // TODO: pick up this value from process.env +const NODE_VERSION = '1.35.2'; // TODO: pick up this value from process.env const mainProcessID = get(process, 'ppid', '-'); const rendererProcessID = process.pid; From 1cc122ef3b68a2b5dca734a1be7fb8ea268b3495 Mon Sep 17 00:00:00 2001 From: Marcin Mazurek Date: Mon, 8 Aug 2022 19:15:01 +0200 Subject: [PATCH 2/2] [DDW-809] Use fixed package version --- package.json | 2 +- yarn.lock | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 60ef6fdf44..25a87d7835 100644 --- a/package.json +++ b/package.json @@ -242,7 +242,7 @@ "json-bigint": "1.0.0", "lodash": "4.17.21", "lodash-es": "4.17.15", - "matomo-tracker": "^2.2.4", + "matomo-tracker": "2.2.4", "mime-types": "2.1.27", "mkdirp": "1.0.4", "mobx": "5.15.7", diff --git a/yarn.lock b/yarn.lock index 55f6cbf68a..15eeed6618 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3093,14 +3093,7 @@ "@types/react" "*" "@types/react-router" "*" -"@types/react-router@*": - version "5.1.18" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" - dependencies: - "@types/history" "^4.7.11" - "@types/react" "*" - -"@types/react-router@5.1.18": +"@types/react-router@*", "@types/react-router@5.1.18": version "5.1.18" resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" dependencies: @@ -11563,7 +11556,7 @@ mathml-tag-names@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" -matomo-tracker@^2.2.4: +matomo-tracker@2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/matomo-tracker/-/matomo-tracker-2.2.4.tgz#ee397d915d7b2e7964996ca28a0a03f4f0692453"