From 9ca544d5f5545f7aab6a144292f18a02c73c0a39 Mon Sep 17 00:00:00 2001
From: Michal Rus <michal.rus@iohk.io>
Date: Tue, 19 Nov 2024 10:09:47 +0100
Subject: [PATCH] [LW-11505] Update `cardano-wallet` to `v2024-11-18`

---
 CHANGELOG.md            |  2 +-
 flake.lock              | 26 ++++----------------------
 flake.nix               |  4 +---
 nix/internal/common.nix |  2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c8173d4ae..d18fed5fc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Chores
 
-- Update `cardano-node` to 10.1.1 via `cardano-wallet` [`ba7d3340968`](https://github.com/cardano-foundation/cardano-wallet/commit/ba7d33409680f4e75ef260add8744dcf71f40a77) ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
+- Update `cardano-node` to 10.1.1 via `cardano-wallet` v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
 
 ## 6.0.2
 
diff --git a/flake.lock b/flake.lock
index ff1e0b1b9f..0df724831d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,22 +1,5 @@
 {
   "nodes": {
-    "cardano-node-override": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730468447,
-        "narHash": "sha256-yNEv7MQEcOPY9I9k9RCzeMfJY6gzuGc7K53GKNHs6v8=",
-        "owner": "IntersectMBO",
-        "repo": "cardano-node",
-        "rev": "01bda2e2cb0a70cd95067d696dbb44665f1d680a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "IntersectMBO",
-        "ref": "10.1.2",
-        "repo": "cardano-node",
-        "type": "github"
-      }
-    },
     "cardano-playground": {
       "flake": false,
       "locked": {
@@ -54,16 +37,16 @@
     "cardano-wallet-unpatched": {
       "flake": false,
       "locked": {
-        "lastModified": 1730750355,
-        "narHash": "sha256-+Z+WGEK3Jmpn2oxj/RuSmVM6XenMVHhfiiEOINTCVGU=",
+        "lastModified": 1731946435,
+        "narHash": "sha256-vCnp2dV+mAQIt25i8VRYNmLHAH1YZfK1bsBNNrvqJSo=",
         "owner": "cardano-foundation",
         "repo": "cardano-wallet",
-        "rev": "9078093ca150d97a6a4ca09895ec123bb76227c0",
+        "rev": "9eb5f59c328163ca061a20f47519686b6f118d74",
         "type": "github"
       },
       "original": {
         "owner": "cardano-foundation",
-        "ref": "pull/4830/head",
+        "ref": "v2024-11-18",
         "repo": "cardano-wallet",
         "type": "github"
       }
@@ -118,7 +101,6 @@
     },
     "root": {
       "inputs": {
-        "cardano-node-override": "cardano-node-override",
         "cardano-playground": "cardano-playground",
         "cardano-shell": "cardano-shell",
         "cardano-wallet-unpatched": "cardano-wallet-unpatched",
diff --git a/flake.nix b/flake.nix
index 988ce88e8e..0e2f2f8bee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/pull/4830/head";  # cardano-node 10.1.2
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
-    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.2";  # we have to override because of <https://github.com/cardano-foundation/cardano-wallet/issues/4834>
-    cardano-node-override.flake = false;
     cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
     cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
diff --git a/nix/internal/common.nix b/nix/internal/common.nix
index 1a4408ca6b..1c59b81927 100644
--- a/nix/internal/common.nix
+++ b/nix/internal/common.nix
@@ -40,7 +40,7 @@ rec {
   }).defaultNix;
 
   nodeFlake = let
-    unpatched = inputs.cardano-node-override;
+    unpatched = walletFlake.inputs.cardano-node-runtime;
   in (flake-compat {
     src = {
       outPath = toString (pkgs.runCommand "source" {} ''