Merge pull request #3019 from input-output-hk/merge-4.12.0-into-main

Merge 4.12.0 into main

Author: danielmain

.babelrc

@@ -2,26 +2,26 @@ env:
   ARTIFACT_BUCKET: s3://ci-output-sink
 steps:
   - label: 'daedalus-x86_64-darwin'
-    command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
     env:
       NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
     agents:
       queue: daedalus
       system: x86_64-darwin
   - label: 'daedalus-aarch64-darwin'
-    command: 'scripts/build-installer-unix.sh--nix-2.5 --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
     env:
       NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
       UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
     agents:
       queue: daedalus
       system: aarch64-darwin
   - label: 'daedalus-x86_64-linux-nix'
-    command: 'scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-2.5.sh scripts/build-installer-nix.sh $BUILDKITE_BUILD_NUMBER'
     agents:
       system: x86_64-linux
   - label: 'daedalus-x86_64-windows-nix'
-    command: 'scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/with-nix-2.5.sh scripts/build-cross-windows.sh $BUILDKITE_BUILD_NUMBER'
     agents:
       system: x86_64-linux
 

.buildkite/pipeline.yml

@@ -10,9 +10,6 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:react/recommended",
     "prettier",
-    "prettier/babel",
-    "prettier/@typescript-eslint",
-    "prettier/react",
     "plugin:jest/recommended"
   ],
   "env": {
@@ -22,9 +19,11 @@
     "jest": true
   },
   "rules": {
+    "arrow-body-style": 0,
     "class-methods-use-this": 0,
     "consistent-return": "warn",
     "@typescript-eslint/generic-spacing": 0,
+    "@typescript-eslint/space-after-type-colon": 0,
     "jsx-a11y/alt-text": 0,
     "lines-between-class-members": 0,
     "global-require": 0,
@@ -60,6 +59,7 @@
     "react/destructuring-assignment": 0,
     "react/display-name": 0,
     "react/jsx-curly-brace-presence": 0,
+    "react/jsx-curly-newline": 0,
     "react/jsx-filename-extension": 0,
     "react/jsx-fragments": 0,
     "react/jsx-no-bind": "warn",
@@ -76,22 +76,28 @@
     "@typescript-eslint/no-empty-function": 1,
     "@typescript-eslint/ban-types": 1,
     "import/no-unresolved": 1,
-    "@typescript-eslint/no-var-requires": 1,
+    "@typescript-eslint/no-var-requires": 0,
     "camelcase": 1,
     "no-empty": 1,
     "@typescript-eslint/no-explicit-any": 1,
     "no-shadow": 1,
     "react/no-did-update-set-state": 1,
     "react/sort-comp": 0,
     "react/state-in-constructor": 0,
-    "react/static-property-placement": 0
+    "react/static-property-placement": 0,
+    "react/jsx-no-useless-fragment": 0,
+    "prefer-regex-literals": 0,
+    "no-unused-vars": "warn",
+    "react/no-unused-class-component-methods": "warn",
+    "react/no-unstable-nested-components": "warn",
+    "no-promise-executor-return": "warn",
+    "default-param-last": "warn"
   },
   "plugins": ["@typescript-eslint", "import", "promise", "react", "jest"],
   "globals": {
     "API": true,
     "API_VERSION": true,
     "NETWORK": true,
-    "MOBX_DEV_TOOLS": true,
     "BUILD_NUMBER": true,
     "Process": true // TODO: remove after fix
   },

.eslintrc

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "16"
       - name: Install dependencies
         run: yarn
       - name: Publish to Chromatic

.github/workflows/chromatic.yml

@@ -31,6 +31,7 @@ build/Release
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+/node_modules.*
 
 # OSX
 .DS_Store
@@ -46,6 +47,9 @@ installers/config.yaml
 installers/icons/electron.icns
 installers/installer-config.json
 installers/topology.yaml
+installers/csl-daedalus/
+installers/delegation.cert
+installers/signing.key
 
 # temporary certs for daedalus dev
 tls/client

.gitignore

@@ -6,6 +6,7 @@
 !features/
 !storybook/
 !hardware-wallet-tests/
+!tests/
 
 # Now we ignore all files
 *.*

.prettierignore

@@ -1,5 +1,18 @@
 # Changelog
 
+## 4.12.0
+
+### 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 OS-architecture tuple to installer file names to help with releases ([PR 3016](https://github.com/input-output-hk/daedalus/pull/3016))
+- 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,6 +28,7 @@
 
 ### Chores
 
+- 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))
 - Published selfnode installers for all 3 platforms ([PR 2971](https://github.com/input-output-hk/daedalus/pull/2971))

CHANGELOG.md

@@ -1,3 +1,8 @@
+import { IpcRenderer } from 'electron';
+import type { request as httpRequest } from 'http';
+import type { request as httpsRequest, globalAgent } from 'https';
+import { Environment } from './source/common/types/environment.types';
+
 declare module '*.svg' {
   const content: any;
   export default content;
@@ -22,6 +27,15 @@ type Daedalus = {
   };
 };
 
+interface Http {
+  request: httpRequest;
+}
+
+interface Https {
+  request: httpsRequest;
+  Agent: globalAgent;
+}
+
 export type $ElementType<
   T extends { [P in K & any]: any },
   K extends keyof T | number
@@ -39,7 +53,18 @@ declare global {
       WALLET_COUNT: number;
     }
   }
+  /* eslint-disable no-var, vars-on-top */
   var daedalus: Daedalus;
+  var environment: Environment;
+  var http: Http;
+  var https: Https;
+  var legacyStateDir: string;
+  var isFlight: boolean;
+  var ipcRenderer: Pick<
+    IpcRenderer,
+    'on' | 'once' | 'send' | 'removeListener' | 'removeAllListeners'
+  >;
+  /* eslint-enable no-var, vars-on-top */
 }
 
 export {};

declaration.d.ts

@@ -31,7 +31,22 @@ 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}
+      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" {};
   inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
   flake-compat = import sources.flake-compat;
@@ -61,7 +76,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};
 
@@ -295,7 +310,7 @@ let
     signed-windows-installer = let
       backend_version = self.daedalus-bridge.wallet-version;
       frontend_version = (builtins.fromJSON (builtins.readFile ./package.json)).version;
-      fullName = "daedalus-${frontend_version}-${cluster}${buildNumSuffix}.exe"; # must match to packageFileName in make-installer
+      fullName = "daedalus-${frontend_version}-${cluster}${buildNumSuffix}-x86_64-windows.exe"; # must match to packageFileName in make-installer
     in pkgs.runCommand "signed-windows-installer-${cluster}" {} ''
       mkdir $out
       cp -v ${self.signFile "${self.unsigned-windows-installer}/${fullName}"} $out/${fullName}
@@ -412,7 +427,7 @@ let
       version = (builtins.fromJSON (builtins.readFile ./package.json)).version;
       backend = "cardano-wallet-${nodeImplementation}";
       suffix = if buildNum == null then "" else "-${toString buildNum}";
-      fn = "daedalus-${version}-${self.linuxClusterBinName}${suffix}.bin";
+      fn = "daedalus-${version}-${self.linuxClusterBinName}${suffix}-x86_64-linux.bin";
     in pkgs.runCommand fn {} ''
       mkdir -p $out
       cp ${self.newBundle} $out/${fn}