Merge branch 'develop' into chore/ddw-1189-new-cardano-wallet-flake

Author: michalrus

.gitignore

@@ -51,10 +51,6 @@ installers/csl-daedalus/
 installers/delegation.cert
 installers/signing.key
 
-# temporary certs for daedalus dev
-tls/client
-tls/server
-
 # App packaged
 dist
 release

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## vNext
 
+### Fixes
+
+- Fixed decimals for syncing percentage ([PR 3106](https://github.com/input-output-hk/daedalus/pull/3106))
+
+### Chores
+
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
+- Added regeneration of dev TLS certificates for cardano-wallet on each nix-shell entry ([PR 3117](https://github.com/input-output-hk/daedalus/pull/3117))
+
 ## 5.2.0
 
 ### Features

installers/common/MacInstaller.hs

@@ -156,9 +156,6 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/dar
 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"
@@ -241,7 +238,6 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bip66"
       , "bitcoin-ops"
       , "blake-hash"
-      , "blake2"
       , "blake2b"
       , "blake2b-wasm"
       , "bn.js"

package.json

@@ -201,7 +201,7 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "5.1.0",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "6.0.0",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "6.27.1",
     "@trezor/connect": "9.0.2",

scripts/package.js

@@ -37,7 +37,6 @@ const DEFAULT_OPTS = {
     /^\/storybook($|\/)/,
     /^\/tests($|\/)/,
     /^\/tests-report($|\/)/,
-    /^\/tls($|\/)/,
     /^\/translations($|\/)/,
   ],
 };

shell.nix

@@ -52,6 +52,7 @@ let
       daedalusPkgs.daedalus-installer
       daedalusPkgs.darwin-launcher
       daedalusPkgs.mock-token-metadata-server
+      regenerateDevCerts
     ] ++ (with pkgs; [
       nix bash binutils coreutils curl gnutar
       git python27 curl jq
@@ -74,7 +75,17 @@ let
     name = "daedalus-build";
     buildInputs = daedalusShellBuildInputs;
   };
-
+  regenerateDevCerts = let
+    moddedConfig = pkgs.writeText "launcher-config.yaml" (builtins.toJSON (
+      daedalusPkgs.launcherConfigs.launcherConfig
+      // {
+        daedalusBin = "true";
+      }
+    ));
+  in
+    pkgs.writeShellScriptBin "regenerate-dev-certs" ''
+      ${daedalusPkgs.daedalus-bridge}/bin/cardano-launcher --config ${moddedConfig}
+    '';
   gcRoot = pkgs.runCommandLocal "gc-root" {
     properBuildShell = buildShell.overrideAttrs (old: { buildCommand = "export >$out"; });
     cardanoWalletsHaskellNix = daedalusPkgs.walletFlake.outputs.legacyPackages.${system}.roots;
@@ -182,6 +193,17 @@ let
 
       echo 'jq < $LAUNCHER_CONFIG'
       echo debug the node by running debug-node
+
+      echo 'Resolving environment variables to absolute paths…'
+      # XXX: they originally contain references to HOME or XDG_DATA_HOME in launcher-config.yaml:
+      export CARDANO_WALLET_TLS_PATH="${daedalusPkgs.launcherConfigs.launcherConfig.tlsPath}"
+
+      echo 'Re-generating dev certificates for ‘cardano-wallet’…'
+      mkdir -p "$CARDANO_WALLET_TLS_PATH"
+      regenerate-dev-certs >/dev/null
+
+      echo
+      echo 'Now, run ‘yarn dev’.'
     '';
   });
   daedalus = daedalusShell.overrideAttrs (oldAttrs: {

source/common/types/hardware-wallets.types.ts

@@ -1,4 +1,10 @@
 import { BridgeInfo, Device as TrezorDevice, UdevInfo } from '@trezor/connect';
+import {
+  TxOutputDestinationType,
+  AddressType,
+  CIP36VoteRegistrationFormat,
+  TxAuxiliaryDataType,
+} from '@cardano-foundation/ledgerjs-hw-app-cardano';
 
 export type BIP32Path = Array<number>;
 export type LedgerModel = 'nanoS' | 'nanoSP' | 'nanoX';
@@ -139,14 +145,18 @@ export type LedgerSignTransactionOutputsType =
   | []
   | Array<LedgerOutputTypeAddress | LedgerOutputTypeChange>;
 export type LedgerAuxiliaryDataType = {
-  type: string;
+  type: TxAuxiliaryDataType;
   params: {
-    votingPublicKeyHex: string;
+    format: CIP36VoteRegistrationFormat;
+    voteKeyHex: string;
     stakingPath: BIP32Path;
-    rewardsDestination: {
-      type: number;
+    paymentDestination: {
+      type: TxOutputDestinationType;
       params: {
-        stakingPath: BIP32Path;
+        type: AddressType;
+        params: {
+          stakingPath: BIP32Path;
+        };
       };
     };
     nonce: string;
@@ -199,7 +209,7 @@ export type LedgerSignTransactionResponse = {
   txHashHex: string;
   witnesses: Array<Witness>;
   auxiliaryDataSupplement?: {
-    catalystRegistrationSignatureHex: string;
+    cip36VoteRegistrationSignatureHex: string;
     auxiliaryDataHashHex: string;
     type: 'catalyst_registration';
   };

source/main/cardano/CardanoWalletLauncher.ts

@@ -83,15 +83,6 @@ export async function CardanoWalletLauncher(
     svCert: path.join(tlsPath, 'server/server.crt'),
     svKey: path.join(tlsPath, 'server/server.key'),
   };
-  // Prepare development TLS files
-  const { isProduction } = environment;
-
-  if (
-    !isProduction &&
-    nodeImplementation === CardanoNodeImplementationOptions.CARDANO
-  ) {
-    await fs.copy('tls', tlsPath);
-  }
 
   let tokenMetadataServer;
   // This switch statement handles any node specific

source/main/ipc/getHardwareWalletChannel.ts

@@ -3,6 +3,8 @@ import TransportNodeHid, {
   getDevices,
 } from '@ledgerhq/hw-transport-node-hid-noevents';
 import AppAda, { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { str_to_path } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/utils/address';
+import { HexString } from '@cardano-foundation/ledgerjs-hw-app-cardano/dist/types/internal';
 import TrezorConnect, {
   DEVICE,
   DEVICE_EVENT,
@@ -455,7 +457,7 @@ export const handleHardwareWalletRequests = async (
   });
   deriveXpubChannel.onRequest(async (params) => {
     const { parentXpubHex, lastIndex, derivationScheme } = params;
-    const parentXpub = utils.hex_to_buf(parentXpubHex);
+    const parentXpub = utils.hex_to_buf(parentXpubHex as HexString);
 
     try {
       const xpub = deriveChildXpub(parentXpub, lastIndex, derivationScheme);
@@ -474,10 +476,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = utils.str_to_path(spendingPathStr);
-    const stakingPath = stakingPathStr
-      ? utils.str_to_path(stakingPathStr)
-      : null;
+    const spendingPath = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
 
@@ -542,10 +542,8 @@ export const handleHardwareWalletRequests = async (
       networkId,
       protocolMagic,
     } = params;
-    const spendingPath = utils.str_to_path(spendingPathStr);
-    const stakingPath = stakingPathStr
-      ? utils.str_to_path(stakingPathStr)
-      : null;
+    const spendingPath = str_to_path(spendingPathStr);
+    const stakingPath = stakingPathStr ? str_to_path(stakingPathStr) : null;
 
     try {
       deviceConnection = get(devicesMemo, [devicePath, 'AdaConnection']);
@@ -804,9 +802,8 @@ export const handleHardwareWalletRequests = async (
       if (!deviceConnection) {
         throw new Error('Ledger device not connected');
       }
-
       const extendedPublicKey = await deviceConnection.getExtendedPublicKey({
-        path: utils.str_to_path(path),
+        path: str_to_path(path),
       });
       const deviceSerial = await deviceConnection.getSerial();
       return Promise.resolve({

source/main/utils/handleCheckBlockReplayProgress.ts

@@ -68,7 +68,7 @@ const createHandleNewLogLine = (mainWindow: BrowserWindow) => {
       return;
     }
 
-    const progress = Math.floor(parseFloat(unparsedProgress));
+    const progress = parseFloat(unparsedProgress);
 
     if (progressReport[type] !== progress) {
       progressReport[type] = progress;