Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DDW-1121] Update cardano-node to 1.35.2 #3021

Merged
merged 2 commits into from Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -9,6 +9,7 @@

### Chores

- Updated cardano-node to 1.35.2 ([PR 3021](https://github.com/input-output-hk/daedalus/pull/3021))
- Fix `darwin-launcher.go` to replace its process image with `cardano-launcher` (binary), and not swallow `stdout` ([PR 3023](https://github.com/input-output-hk/daedalus/pull/3023))
- Updated cardano-node to 1.35.1 ([PR 3012](https://github.com/input-output-hk/daedalus/pull/3012))

Expand Down
8 changes: 0 additions & 8 deletions default.nix
Expand Up @@ -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" {};
Expand Down
63 changes: 0 additions & 63 deletions nix/cardano-wallet--pr-3382--ledger-bug.patch

This file was deleted.

16 changes: 8 additions & 8 deletions 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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"cardano-shell": {
Expand All @@ -24,15 +24,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.tar.gz"
},
"flake-compat": {
Expand Down
2 changes: 1 addition & 1 deletion source/main/environment.ts
Expand Up @@ -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;
Expand Down