Merge remote-tracking branch 'origin/develop' into feat/ddw-1025-mato…

…mo-poc

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## vNext
+
+### Fixes
+
+- Fixed downloaded installer being left in Downloads after latest update installs ([PR 2941](https://github.com/input-output-hk/daedalus/pull/2941))
+- Fixed incorrect amount of token sent ([PR 2962](https://github.com/input-output-hk/daedalus/pull/2962))
+
+### Chores
+
+- Added Vasil-supported cardano-wallet ([PR 3001](https://github.com/input-output-hk/daedalus/pull/3001))
+- Upgraded webpack to version 5 ([PR 2772](https://github.com/input-output-hk/daedalus/pull/2772))
+
 ## 4.11.0
 
 ### Fixes
@@ -15,7 +27,6 @@
 
 ### Chores
 
-- Upgraded webpack to version 5 ([PR 2772](https://github.com/input-output-hk/daedalus/pull/2772))
 - Bumped vulnerable dependencies versions ([PR 2943](https://github.com/input-output-hk/daedalus/pull/2943))
 - Added support for Trezor firmware 2.5.1 ([PR 2991](https://github.com/input-output-hk/daedalus/pull/2991))
 - Added steps on how to link with `react-polymorph` and other external UI libraries ([PR 2948](https://github.com/input-output-hk/daedalus/pull/2948))

default.nix

@@ -31,7 +31,14 @@ let
     };
   };
   pkgs = import sources.nixpkgs { inherit system config; };
-  sources = localLib.sources;
+  sources = localLib.sources // {
+    cardano-wallet = pkgs.runCommand "cardano-wallet" {} ''
+      cp -r ${localLib.sources.cardano-wallet} $out
+      chmod -R +w $out
+      cd $out
+      patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
+    '';
+  };
   haskellNix = import sources."haskell.nix" {};
   inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
   flake-compat = import sources.flake-compat;
@@ -61,7 +68,7 @@ let
   ostable.aarch64-darwin = "macos64-arm";
 
   packages = self: {
-    inherit cluster pkgs version target nodeImplementation;
+    inherit walletFlake cluster pkgs version target nodeImplementation;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 

installers/common/WindowsInstaller.hs

@@ -204,15 +204,13 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                       file [] "genesis-shelley.json"
                       file [] "genesis-alonzo.json"
                     file [] "libsodium-23.dll"
+                    file [] "libsecp256k1-0.dll"
                     when (clusterName == Selfnode) $ do
                       file [] "signing.key"
                       file [] "delegation.cert"
                       file [] "local-cluster.exe"
-                      file [] "libgcc_s_seh-1.dll"
                       file [] "libgmpxx-4.dll"
-                      file [] "libstdc++-6.dll"
                       file [] "libwinpthread-1.dll"
-                      file [] "mcfgthread-12.dll"
                       file [] "mock-token-metadata-server.exe"
                       file [Recursive] "test\\"
                       file [] "token-metadata.json"

nix/cardano-wallet--enable-aarch64-darwin.patch

@@ -0,0 +1,32 @@
+diff --git a/flake.nix b/flake.nix
+index e17573394..9afa5b2bd 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -388,7 +388,14 @@
+     lib.recursiveUpdate (removeAttrs systems [ "systemHydraJobs" "systemHydraJobsPr" "systemHydraJobsBors" ])
+       {
+         inherit overlay nixosModule nixosModules;
+-        hydraJobs = mkHydraJobs systems.systemHydraJobs;
++        # Temporarily fix some merge bug – @michalrus
++        hydraJobs =
++          let hj = mkHydraJobs systems.systemHydraJobs; in
++          hj // {
++            macos = hj.macos // {
++              silicon = systems.systemHydraJobs.aarch64-darwin.macos.silicon;
++            };
++          };
+         hydraJobsPr = mkHydraJobs systems.systemHydraJobsPr;
+         hydraJobsBors = mkHydraJobs systems.systemHydraJobsBors;
+       }
+diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
+index 6e3f0d94e..5de7138b3 100644
+--- a/nix/supported-systems.nix
++++ b/nix/supported-systems.nix
+@@ -1,6 +1,5 @@
+ [
+   "x86_64-linux"
+   "x86_64-darwin"
+-  # TODO: Enable aarch64-darwin when there are Hydra builders for it
+-  # "aarch64-darwin"
++  "aarch64-darwin"
+ ]

nix/sources.json

@@ -1,14 +1,14 @@
 {
     "cardano-node": {
-        "branch": "tags/1.34.1",
+        "branch": "tags/1.35.0",
         "description": null,
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "73f9a746362695dc2cb63ba757fbcabb81733d23",
-        "sha256": "1hh53whcj5y9kw4qpkiza7rmkniz18r493vv4dzl1a8r5fy3b2bv",
+        "rev": "9f1d7dc163ee66410d912e48509d6a2300cfa68a",
+        "sha256": "06arx9hv7dn3qxfy83f0b6018rxbsvh841nvfyg5w6qclm1hddj7",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/73f9a746362695dc2cb63ba757fbcabb81733d23.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/9f1d7dc163ee66410d912e48509d6a2300cfa68a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-shell": {
@@ -24,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {
-        "branch": "hkm/enable-aarch64-darwin",
+        "branch": "v2022-07-01",
         "description": "Official Wallet Backend & API for Cardano decentralized",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "a0f5096828105085e57c11bb208ae058e1060795",
-        "sha256": "0143drwghi2k29imfh554j6k59l5dqy2w70sv5m0q5w640dbk7d9",
+        "rev": "211c357a91d48b30fdf77a3a169499b38822f9cd",
+        "sha256": "0ii631ak757kjzs7jm625zfv2g28ffjrfkmgslxbbgvwpqxkdbaj",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/a0f5096828105085e57c11bb208ae058e1060795.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/211c357a91d48b30fdf77a3a169499b38822f9cd.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "flake-compat": {

source/main/environment.ts

@@ -47,7 +47,7 @@ const isDevelopment = checkIsDevelopment(NETWORK);
 const analyticsFeatureEnabled = isMainnet || isStaging || isTestnet;
 const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING;
 const API_VERSION = process.env.API_VERSION || 'dev';
-const NODE_VERSION = '1.34.1'; // TODO: pick up this value from process.env
+const NODE_VERSION = '1.35.0'; // TODO: pick up this value from process.env
 
 const mainProcessID = get(process, 'ppid', '-');
 const rendererProcessID = process.pid;