Merge branch 'develop' into chore/ddw-1102-update-minor-trezor-connect

michalrus · michalrus · commit 056cacb5993a · 2022-05-30T11:36:42.000+02:00
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -2,12 +2,20 @@ env:
   ARTIFACT_BUCKET: s3://ci-output-sink
 steps:
   - label: 'daedalus-x86_64-darwin'
-    command: 'scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
+    command: 'scripts/build-installer-unix.sh--nix-2.5 --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'
+    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'
     agents:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Features
 
 - Added support for Ledger Nano S Plus ([PR 2975](https://github.com/input-output-hk/daedalus/pull/2975))
+- Support of Apple AArch64 chip ([PR 2684](https://github.com/input-output-hk/daedalus/pull/2684))
 
 ### Chores
 
diff --git a/README.md b/README.md
@@ -44,8 +44,11 @@ Daedalus - Cryptocurrency Wallet
    extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
    experimental-features = nix-command flakes
 
-   # If you are running on a Mac with M1 chip please uncomment 'system' setting to enforce running on Rosetta2
-   # system = x86_64-darwin
+   # If you are running on a Mac with Intel chip 
+   system = x86_64-darwin
+   
+   # If you are running on a Mac with M1 chip
+   system = aarch64-darwin
    ```
 
 3. Run `nix-shell` with correct list of arguments or by using existing `package.json` scripts to load a shell with all the correct versions of all the required dependencies for development.
diff --git a/default.nix b/default.nix
@@ -32,6 +32,8 @@ let
   };
   pkgs = import sources.nixpkgs { inherit system config; };
   sources = localLib.sources;
+  haskellNix = import sources."haskell.nix" {};
+  inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
   flake-compat = import sources.flake-compat;
   walletFlake = flake-compat  { src = sources.cardano-wallet; };
   walletPackages = with walletFlake.defaultNix.hydraJobs; {
@@ -56,13 +58,14 @@ let
   ostable.x86_64-windows = "windows";
   ostable.x86_64-linux = "linux";
   ostable.x86_64-darwin = "macos64";
+  ostable.aarch64-darwin = "macos64-arm";
+
   packages = self: {
     inherit cluster pkgs version target nodeImplementation;
-    inherit (pkgs) hello cabal2nix;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgs.nodejs-14_x;
+    nodejs = pkgs.nodejs-16_x;
     nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
@@ -316,7 +319,11 @@ let
     };
     rawapp-win64 = self.rawapp.override { win64 = true; };
     source = builtins.filterSource localLib.cleanSourceFilter ./.;
-    yaml2json = pkgs.haskell.lib.addExtraLibrary (pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe") pkgs.haskellPackages.optparse-applicative;
+    inherit ((haskell-nix.hackage-package { name = "yaml"; compiler-nix-name = "ghc8107"; cabalProject = ''
+      packages: .
+      package yaml
+        flags: -no-exe
+    ''; }).components.exes) yaml2json;
 
     electron = pkgs.callPackage ./installers/nix/electron.nix {};
 
diff --git a/installers/Installer.hs b/installers/Installer.hs
@@ -46,5 +46,5 @@ genSignedInstaller os options'= do
     export "NETWORK" (clusterNetwork $ oCluster options')
     case os of
         Linux64 -> putStrLn ("Use default.nix, please." :: String)
-        Macos64 ->     MacInstaller.main options'
+        Macos64 -> MacInstaller.main options'
         Win64   -> WindowsInstaller.main options'
diff --git a/installers/Spec.hs b/installers/Spec.hs
@@ -50,7 +50,9 @@ macBuildSpec = do
       liftIO $ do
         withDir installersDir $ do
           mktree "../release/darwin-x64/Daedalus-darwin-x64/Daedalus.app/Contents/Resources/app"
+          mktree "../release/darwin-arm64/Daedalus-darwin-arm64/Daedalus.app/Contents/Resources/app"
           writeFile "../release/darwin-x64/Daedalus-darwin-x64/Daedalus.app/Contents/Resources/app/package.json" "{}"
+          writeFile "../release/darwin-arm64/Daedalus-darwin-arm64/Daedalus.app/Contents/Resources/app/package.json" "{}"
           Mac.main opts
 
         -- there should be an installer file at the end
diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -25,6 +25,7 @@ import           Text.RawString.QQ
 import           System.IO                 (BufferMode (NoBuffering),
                                             hSetBuffering)
 import           System.IO.Error           (IOError, isDoesNotExistError)
+import qualified System.Info
 import           System.Environment        (getEnv)
 import           System.Posix.Files
 import           Turtle                    hiding (e, prefix, stdout)
@@ -151,12 +152,16 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/build/usb_bindings.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/detection.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-arm64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-arm64-"*"/blake-hash.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-x64-"*"/blake2.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/bin/darwin-arm64-"*"/blake2.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-x64-"*"/tiny-secp256k1.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/bin/darwin-arm64-"*"/tiny-secp256k1.node"
 
 # Sign the whole component deeply
 sign_cmd "$ABS_PATH"
@@ -210,7 +215,10 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
 
   let
     formatter :: Format r (Text -> Text -> r)
-    formatter = "../release/darwin-x64/" % s % "-darwin-x64/" % s
+    formatter =
+      if System.Info.arch == "aarch64"
+      then "../release/darwin-arm64/" % s % "-darwin-arm64/" % s
+      else "../release/darwin-x64/" % s % "-darwin-x64/" % s
     pathtoapp :: Text
     pathtoapp = format formatter dcAppName dcAppNameApp
     externalYarn :: [FilePath]
@@ -305,6 +313,8 @@ npmPackage DarwinConfig{dcAppName} = do
   procs "yarn" ["install", "--frozen-lockfile"] empty
   echo "Running electron packager script..."
   export "NODE_ENV" "production"
+  homeDir <- home
+  export "TMPDIR" . tt $ homeDir </> "electron-rebuild-tmp-dir" -- else, new `electron-rebuild` fails with EACCESS
   procs "yarn" ["run", "package", "--", "--name", dcAppName ] empty
   procs "node_modules/.bin/electron-rebuild" ["-w", "usb-detection", "--useCache", "-s"] empty -- <https://github.com/MadLittleMods/node-usb-detection#install-for-electron>
   size <- inproc "du" ["-sh", "release"] empty
diff --git a/installers/common/WindowsInstaller.hs b/installers/common/WindowsInstaller.hs
@@ -217,7 +217,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                       file [Recursive] "test\\"
                       file [] "token-metadata.json"
                 file [] "cardano-launcher.exe"
-                file [] "libffi-7.dll"
                 file [] "libffi-8.dll"
                 file [] "libgmp-10.dll"
                 --file [] "cardano-x509-certificates.exe"
diff --git a/installers/daedalus-installer.nix b/installers/daedalus-installer.nix
@@ -30,6 +30,5 @@ mkDerivation {
     system-filepath temporary text turtle universum yaml
   ];
   description = "Daedalus Installer Builder";
-
   license = lib.licenses.asl20;
 }
diff --git a/installers/nix/electron.nix b/installers/nix/electron.nix
@@ -12,7 +12,7 @@ let
     homepage = https://github.com/electron/electron;
     license = licenses.mit;
     maintainers = with maintainers; [ travisbhartwell manveru ];
-    platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
+    platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
   };
 
   linux = {
diff --git a/installers/overlays/add-test-stubs.nix b/installers/overlays/add-test-stubs.nix
@@ -19,7 +19,9 @@ self: super: {
           (stub "sudo" "exec $@")
           (stub "yarn" ''
             mkdir -p dist release/darwin-x64/Daedalus-darwin-x64/Daedalus.app/Contents/MacOS
+            mkdir -p dist release/darwin-arm64/Daedalus-darwin-arm64/Daedalus.app/Contents/MacOS
             touch release/darwin-x64/Daedalus-darwin-x64/Daedalus.app/Contents/MacOS/Daedalus
+            touch release/darwin-arm64/Daedalus-darwin-arm64/Daedalus.app/Contents/MacOS/Daedalus
             touch dist/index.html
           '')
           (stub "iconutil" "exit 0")
diff --git a/installers/overlays/github.nix b/installers/overlays/github.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, aeson, base, base-compat, base16-bytestring, binary
+, binary-instances, bytestring, containers, cryptohash-sha1
+, deepseq, deepseq-generics, exceptions, file-embed, hashable
+, hspec, hspec-discover, http-client, http-client-tls
+, http-link-header, http-types, iso8601-time, lib, mtl, network-uri
+, tagged, text, time-compat, tls, transformers, transformers-compat
+, unordered-containers, vector, vector-instances
+}:
+mkDerivation {
+  pname = "github";
+  version = "0.27";
+  sha256 = "5591645d07c0e8c7ab21d6920f3f7bbb10c52b4331d85d264fdc590961d3986e";
+  libraryHaskellDepends = [
+    aeson base base-compat base16-bytestring binary binary-instances
+    bytestring containers cryptohash-sha1 deepseq deepseq-generics
+    exceptions hashable http-client http-client-tls http-link-header
+    http-types iso8601-time mtl network-uri tagged text time-compat tls
+    transformers transformers-compat unordered-containers vector
+    vector-instances
+  ];
+  testHaskellDepends = [
+    aeson base base-compat bytestring file-embed hspec tagged text
+    unordered-containers vector
+  ];
+  testToolDepends = [ hspec-discover ];
+  homepage = "https://github.com/phadej/github";
+  description = "Access to the GitHub API, v3";
+  license = lib.licenses.bsd3;
+}
diff --git a/installers/overlays/required.nix b/installers/overlays/required.nix
@@ -8,5 +8,5 @@ self: super: {
   dhall = dontCheck (doJailbreak (self.callPackage ./dhall.nix {}));
   universum = dontCheck (self.callPackage ./universum.nix {});
   nsis = self.callPackage ./nsis.nix {};
-  github = self.callHackage "github" "0.27" {};
+  github = self.callPackage ./github.nix {};
 }
diff --git a/nix/cardano-bridge.nix b/nix/cardano-bridge.nix
@@ -1,4 +1,4 @@
-{ target, runCommandCC, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server }:
+{ target, runCommandCC, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server, darwin }:
 
 runCommandCC "daedalus-cardano-bridge" {
   passthru = {
@@ -23,7 +23,7 @@ runCommandCC "daedalus-cardano-bridge" {
     '' else if target == "x86_64-linux" then ''
       cp -f ${local-cluster}/bin/local-cluster .
 
-    '' else if target == "x86_64-darwin" then ''
+    '' else if target == "x86_64-darwin" || target == "aarch64-darwin" then ''
       # For nix-shell:
       cp -f ${local-cluster}/bin/local-cluster .
 
@@ -45,4 +45,10 @@ runCommandCC "daedalus-cardano-bridge" {
       patchelf --shrink-rpath $x
     done
   ''}
+  ${lib.optionalString (target == "aarch64-darwin") ''
+    chmod +w -R .
+    for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do
+      ${darwin.sigtool}/bin/codesign --force -s - $x
+    done
+  ''}
 ''
diff --git a/nix/launcher-config.nix b/nix/launcher-config.nix
@@ -34,6 +34,7 @@ let
   configDir = configFilesSource: {
     linux = configFilesSource;
     macos64 = if devShell then configFilesSource else "\${DAEDALUS_INSTALL_DIRECTORY}/../Resources";
+    macos64-arm = if devShell then configFilesSource else "\${DAEDALUS_INSTALL_DIRECTORY}/../Resources";
     windows = "\${DAEDALUS_INSTALL_DIRECTORY}";
   };
 
@@ -46,6 +47,7 @@ let
     frontendBin.linux = "daedalus-frontend";
     frontendBin.windows = "${spacedName}";
     frontendBin.macos64 = "Frontend";
+    frontendBin.macos64-arm = "Frontend";
   in frontendBin.${os};
 
   selfnodeConfig = rec {
@@ -64,6 +66,7 @@ let
   mkBinPath = binary: let
     binDir = {
       macos64 = "\${DAEDALUS_INSTALL_DIRECTORY}";
+      macos64-arm = "\${DAEDALUS_INSTALL_DIRECTORY}";
       windows = "\${DAEDALUS_INSTALL_DIRECTORY}";
     };
     binary' = if binary == "frontend" then frontendBinPath else binary;
@@ -105,20 +108,23 @@ let
   dataDir = let
     path.linux = "\${XDG_DATA_HOME}/Daedalus/${network}";
     path.macos64 = "\${HOME}/Library/Application Support/${spacedName}";
+    path.macos64-arm = "\${HOME}/Library/Application Support/${spacedName}";
     path.windows = "\${APPDATA}\\${spacedName}";
   in path.${os};
 
   # Used for flight builds to find legacy paths for migration
   legacyDataDir = let
     path.linux = "\${XDG_DATA_HOME}/Daedalus/mainnet";
     path.macos64 = "\${HOME}/Library/Application Support/Daedalus";
+    path.macos64-arm = "\${HOME}/Library/Application Support/Daedalus";
     path.windows = "\${APPDATA}\\Daedalus";
   in path.${os};
 
   logsPrefix = let
     path.linux = "${dataDir}/Logs";
     path.windows = "Logs";
     path.macos64 = "${dataDir}/Logs";
+    path.macos64-arm = "${dataDir}/Logs";
   in path.${os};
 
   tlsConfig = {
@@ -229,12 +235,14 @@ let
     legacyWalletDB = let
       path.linux = "Wallet";
       path.macos64 = "Wallet-1.0";
+      path.macos64-arm = "Wallet-1.0";
       path.windows = "Wallet-1.0";
     in path.${os};
 
     legacySecretKey = let
       path.linux = "Secrets${dirSep}secret.key";
       path.macos64 = "Secrets-1.0${dirSep}secret.key";
+      path.macos64-arm = "Secrets-1.0${dirSep}secret.key";
       path.windows = "Secrets-1.0${dirSep}secret.key";
     in path.${os};
 
diff --git a/nix/sources.json b/nix/sources.json
@@ -12,27 +12,27 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-shell": {
-        "branch": "master",
+        "branch": "update-haskell-nix-etc",
         "description": "Node shell, a thin layer for running the node and it's modules.",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-shell",
-        "rev": "5257fc818ef7df60986834310432e197aac90711",
-        "sha256": "1si7jb084m2z9h773b1v4mgdkcjbbfpsyys3d6iz6gn0pzkijvc8",
+        "rev": "0d1d5f036c73d18e641412d2c58d4acda592d493",
+        "sha256": "05cqxzrcvsqrmv22clf9l5agwzrcrcjw33mpmc4fnim8np5ym6w3",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-shell/archive/5257fc818ef7df60986834310432e197aac90711.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-shell/archive/0d1d5f036c73d18e641412d2c58d4acda592d493.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-wallet": {
-        "branch": "v2022-04-27",
+        "branch": "hkm/enable-aarch64-darwin",
         "description": "Official Wallet Backend & API for Cardano decentralized",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "3ee8ca721f3704b34e29194ae25c6cbcb50ff506",
-        "sha256": "19xz4ngck1xbvq0577yrjhbvlp8ssfx2q71l8zr10132fx9li9jd",
+        "rev": "a0f5096828105085e57c11bb208ae058e1060795",
+        "sha256": "0143drwghi2k29imfh554j6k59l5dqy2w70sv5m0q5w640dbk7d9",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/3ee8ca721f3704b34e29194ae25c6cbcb50ff506.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/a0f5096828105085e57c11bb208ae058e1060795.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "flake-compat": {
@@ -65,10 +65,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "6260dcb06b7d2855cbcd0a0f36483453c311248e",
-        "sha256": "1q9bqgf41ch3dpghsvh74xqnj98h3khj4gxk9n2kq9qai12720yv",
+        "rev": "4b6ee9767daaf5fc1d5419e07733ab006b95ec93",
+        "sha256": "03hkqrdjbab0m16y3bpmcg4nvrnpajkbaa595v67r77hhqja3nqj",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/6260dcb06b7d2855cbcd0a0f36483453c311248e.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/4b6ee9767daaf5fc1d5419e07733ab006b95ec93.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {
diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
     "electron-devtools-installer": "3.2.0",
     "electron-mock-ipc": "0.3.12",
     "electron-packager": "15.4.0",
-    "electron-rebuild": "2.0.1",
+    "electron-rebuild": "3.2.7",
     "eslint": "7.10.0",
     "eslint-config-airbnb": "18.2.0",
     "eslint-config-prettier": "6.12.0",
diff --git a/release.nix b/release.nix
diff --git a/scripts/build-installer-unix.sh b/scripts/build-installer-unix.sh
diff --git a/scripts/build-installer-unix.sh--nix-2.5 b/scripts/build-installer-unix.sh--nix-2.5
diff --git a/shell.nix b/shell.nix
diff --git a/yarn.lock b/yarn.lock
diff --git a/yarn2nix.nix b/yarn2nix.nix

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,5 @@ mkDerivation {`
`30`	`30`	`system-filepath temporary text turtle universum yaml`
`31`	`31`	`];`
`32`	`32`	`description = "Daedalus Installer Builder";`
`33`		`-`
`34`	`33`	`license = lib.licenses.asl20;`
`35`	`34`	`}`