Merge pull request #2312 from input-output-hk/release-with-master

Merge release/3.2.0-FC1 into master

Author: nikolaglumac

CHANGELOG.md

@@ -1,6 +1,27 @@
 Changelog
 =========
 
+## 3.2.0-FC1
+
+### Features
+
+- Improve Mnemonic Phrase Input UX [PR 2280](https://github.com/input-output-hk/daedalus/pull/2280)
+- Added wallet public key viewing feature ([PR 2271](https://github.com/input-output-hk/daedalus/pull/2271))
+- Added tile view for delegated Stake pools in Delegation Center ([PR 2275](https://github.com/input-output-hk/daedalus/pull/2275))
+
+### Fixes
+
+- Fixed Ledger TXs to Byron addresses ([PR 2299](https://github.com/input-output-hk/daedalus/pull/2299))
+
+### Chores
+
+- Updated `cardano-wallet` to version `2021-01-12` ([PR 2303](https://github.com/input-output-hk/daedalus/pull/2303))
+- Improved "Settings" screen scrolling actions ([PR 2302](https://github.com/input-output-hk/daedalus/pull/2302))
+- Improved scrollable dialogs ([PR 2285](https://github.com/input-output-hk/daedalus/pull/2285))
+- Disabled and hid copy and paste context menu items on some scenarios ([PR 2300](https://github.com/input-output-hk/daedalus/pull/2300))
+- Applied validation to spending password to be not longer than 255 characters ([PR 2287](https://github.com/input-output-hk/daedalus/pull/2287))
+- Update `axios` package ([PR 2291](https://github.com/input-output-hk/daedalus/pull/2291))
+
 ## 3.1.0
 
 ### Features
@@ -9,6 +30,7 @@ Changelog
 
 ### Fixes
 
+- Fixed Daedalus development environment issues on OSX Big Sur ([PR 2288](https://github.com/input-output-hk/daedalus/pull/2288))
 - Added initial loading state to UTXO screen ([PR 2265](https://github.com/input-output-hk/daedalus/pull/2265))
 
 ### Chores

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.23" {};
+  github = self.callHackage "github" "0.26" {};
 }

nix/sources.json

@@ -29,12 +29,12 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "bcbed39dbe61b978453d6dee94140504bd0f6f9b",
-        "sha256": "00d5488yzsx3f6mqnnz9cd91zrbz2v6xqgqgcxk4vhl9qkc9vnfr",
+        "rev": "4e49b1f12ae7d653eca149b60d67f2a1a578104a",
+        "sha256": "1ypkyn2s12nxwrk1ims8vrhhyy1xl3v5y35yxrwvqp8y8m2sac2x",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/bcbed39dbe61b978453d6dee94140504bd0f6f9b.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/4e49b1f12ae7d653eca149b60d67f2a1a578104a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "version": "v2020-12-08"
+        "version": "v2021-01-12"
     },
     "gitignore": {
         "branch": "master",
@@ -61,15 +61,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "iohk-nix": {
-        "branch": "master",
+        "branch": "nixpkgs-bump",
         "description": "nix scripts shared across projects",
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "5b86d63a0b59b7666d19901b654d8fbde27d9500",
-        "sha256": "1mfb93nnw0x4gyq93v6lh6h7imliw4j0wp5l9gpdafy3rw621xzb",
+        "rev": "940f3b7c16b9e7d4493d400280eedf2c936aa5c0",
+        "sha256": "1m5c8abw3bi5ij99vbcb5bpjywljy72yig5bbm4158r1mck7hljd",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/5b86d63a0b59b7666d19901b654d8fbde27d9500.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/940f3b7c16b9e7d4493d400280eedf2c936aa5c0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "3.1.0",
+  "version": "3.2.0-FC1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -93,7 +93,7 @@
     "@storybook/react": "5.3.14",
     "asar": "2.1.0",
     "autodll-webpack-plugin": "0.4.2",
-    "axios": "0.20.0",
+    "axios": "0.21.1",
     "babel-eslint": "10.1.0",
     "babel-loader": "8.0.4",
     "babel-plugin-react-intl": "3.0.1",
@@ -152,6 +152,7 @@
     "regenerator-runtime": "0.13.7",
     "resolve-url": "0.2.1",
     "sass-loader": "7.1.0",
+    "sinon": "9.2.2",
     "spawn-sync": "2.0.0",
     "spectron": "10.0.1",
     "style-loader": "0.23.1",
@@ -227,7 +228,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "0.9.7-rc.6",
+    "react-polymorph": "0.9.7-rc.11",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",

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

@@ -109,9 +109,9 @@ export type StakingBlockchainPointer = {|
 
 export type LedgerSignTransactionInputsType = Array<LedgerSignTransactionInputType>;
 
-export type LedgerSignTransactionOutputsType = Array<
-  LedgerOutputTypeAddress | LedgerOutputTypeChange
->;
+export type LedgerSignTransactionOutputsType =
+  | []
+  | Array<LedgerOutputTypeAddress | LedgerOutputTypeChange>;
 
 export type TrezorSignTransactionInputType = {
   path: string,

source/main/windows/main.js

@@ -84,10 +84,22 @@ export const createMainWindow = (locale: string) => {
   window.setTitle(getWindowTitle(locale));
 
   window.webContents.on('context-menu', (e, props) => {
-    const contextMenuOptions = [
-      { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' },
-      { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' },
-    ];
+    const { canCopy, canPaste } = props.editFlags;
+    const contextMenuOptions = [];
+    if (canCopy && props.selectionText) {
+      contextMenuOptions.push({
+        label: 'Copy',
+        accelerator: 'CmdOrCtrl+C',
+        role: 'copy',
+      });
+    }
+    if (canPaste) {
+      contextMenuOptions.push({
+        label: 'Paste',
+        accelerator: 'CmdOrCtrl+V',
+        role: 'paste',
+      });
+    }
 
     if (isDev || isTest) {
       const { x, y } = props;
@@ -99,7 +111,9 @@ export const createMainWindow = (locale: string) => {
       });
     }
 
-    Menu.buildFromTemplate(contextMenuOptions).popup(window);
+    if (contextMenuOptions.length) {
+      Menu.buildFromTemplate(contextMenuOptions).popup(window);
+    }
   });
 
   window.webContents.on('did-frame-finish-load', () => {

source/renderer/app/actions/wallets-actions.js

@@ -76,6 +76,7 @@ export default class WalletsActions {
     filePath: string,
   }> = new Action();
   saveQRCodeImageSuccess: Action<{ walletAddress: string }> = new Action();
+  copyPublicKey: Action<{ publicKey: string }> = new Action();
   copyAddress: Action<{ address: string }> = new Action();
   updateCertificateStep: Action<any> = new Action();
   closeCertificateGeneration: Action<any> = new Action();

source/renderer/app/api/addresses/requests/inspectAddress.js

@@ -1,11 +1,12 @@
 // @flow
 import { request } from '../../utils/request';
 import type { RequestConfig } from '../../common/types';
+import type { InspectAddressResponse } from '../types';
 
 export const inspectAddress = (
   config: RequestConfig,
   { addressId }: any // @TODO
-): Promise<any> =>
+): Promise<InspectAddressResponse> =>
   request(
     {
       method: 'GET',

source/renderer/app/api/addresses/types.js

@@ -1,6 +1,10 @@
 // @flow
 export type AddressState = 'used' | 'unused';
 
+export type AddressStyle = 'Byron' | 'Shelley' | 'Icarus';
+
+export type StakeReference = 'none' | 'by value' | 'by pointer';
+
 export type GetAddressesRequestQueryParams = {
   state: AddressState,
 };
@@ -19,6 +23,22 @@ export type GetAddressesRequest = {
   isHardwareWallet?: boolean,
 };
 
+export type InspectAddressResponse = {
+  address_style: AddressStyle,
+  stake_reference: StakeReference,
+  network_tag?: number,
+  spending_key_hash?: string,
+  stake_key_hash?: string,
+  script_hash?: string,
+  pointer?: {
+    slot_num: number,
+    transaction_index: number,
+    output_index: number,
+  },
+  address_root?: string,
+  derivation_path?: string,
+};
+
 // Byron related types
 
 export type CreateByronWalletAddressRequest = {

source/renderer/app/api/api.js

@@ -61,6 +61,7 @@ import { updateByronWallet } from './wallets/requests/updateByronWallet';
 import { getWalletUtxos } from './wallets/requests/getWalletUtxos';
 import { getByronWalletUtxos } from './wallets/requests/getByronWalletUtxos';
 import { getWallet } from './wallets/requests/getWallet';
+import { getWalletPublicKey } from './wallets/requests/getWalletPublicKey';
 import { getLegacyWallet } from './wallets/requests/getLegacyWallet';
 import { transferFundsCalculateFee } from './wallets/requests/transferFundsCalculateFee';
 import { transferFunds } from './wallets/requests/transferFunds';
@@ -108,6 +109,7 @@ import type {
   Address,
   GetAddressesRequest,
   CreateByronWalletAddressRequest,
+  InspectAddressResponse,
 } from './addresses/types';
 
 // Common Types
@@ -163,6 +165,7 @@ import type {
   ImportWalletFromFileRequest,
   GetWalletUtxosRequest,
   GetWalletRequest,
+  GetWalletPublicKeyRequest,
   TransferFundsCalculateFeeRequest,
   TransferFundsCalculateFeeApiResponse,
   TransferFundsCalculateFeeResponse,
@@ -293,6 +296,30 @@ export default class AdaApi {
     }
   };
 
+  getWalletPublicKey = async (
+    request: GetWalletPublicKeyRequest
+  ): Promise<string> => {
+    logger.debug('AdaApi::getWalletPublicKey called', {
+      parameters: filterLogData(request),
+    });
+    try {
+      const { walletId, role, index } = request;
+      const walletPublicKey = await getWalletPublicKey(this.config, {
+        walletId,
+        role,
+        index,
+      });
+      logger.debug('AdaApi::getWalletPublicKey success', { walletPublicKey });
+      return walletPublicKey;
+    } catch (error) {
+      logger.error('AdaApi::getWalletPublicKey error', { error });
+      // @TODO: Uncomment this when api is ready
+      // throw new ApiError(error);
+      // @TODO: Delete this when api is ready
+      return '8edd9c9b73873ce8826cbe3e2e08534d35f1ba64cc94c063c0525865aa28e35527be51bb72ee9983d173f5617493bc6804a6750b359538c79cd5b43ccbbd48e5';
+    }
+  };
+
   getAddresses = async (
     request: GetAddressesRequest
   ): Promise<Array<WalletAddress>> => {
@@ -970,9 +997,9 @@ export default class AdaApi {
     }
   };
 
-  inspectAddress = async (
-    request: any // @TODO
-  ): Promise<any> => {
+  inspectAddress = async (request: {
+    addressId: string,
+  }): Promise<InspectAddressResponse> => {
     logger.debug('AdaApi::inspectAddress called', {
       parameters: filterLogData(request),
     });
@@ -1967,7 +1994,7 @@ export default class AdaApi {
         blockchain_start_time, // eslint-disable-line
         slot_length: slotLength,
         epoch_length: epochLength,
-        epoch_stability: epochStability,
+        security_parameter: securityParameter,
         active_slot_coefficient: activeSlotCoefficient,
         decentralization_level: decentralizationLevel,
         desired_pool_number: desiredPoolNumber,
@@ -1981,7 +2008,7 @@ export default class AdaApi {
         blockchainStartTime,
         slotLength,
         epochLength,
-        epochStability,
+        securityParameter,
         activeSlotCoefficient,
         decentralizationLevel,
         desiredPoolNumber,