Merge pull request Emurgo#3240 from Emurgo/yushi/YOEXT-617/remove-byron

remove restoring byron wallet from hardware or mnemonics

Author: vsubhuman

packages/yoroi-extension/app/components/wallet/add/option-dialog/WalletEraOptionDialog.js

@@ -27,7 +27,6 @@ import WalletRestoreOptionDialogContainer from './dialogs/WalletRestoreOptionDia
 import WalletRestoreDialogContainer from './dialogs/WalletRestoreDialogContainer';
 import type { GeneratedData as WalletRestoreDialogContainerData } from './dialogs/WalletRestoreDialogContainer';
 import WalletRestoreOptionDialog from '../../components/wallet/add/option-dialog/WalletRestoreOptionDialog';
-import WalletRestoreDialog from '../../components/wallet/WalletRestoreDialog';
 
 import WalletConnectHWOptionDialogContainer from './dialogs/WalletConnectHWOptionDialogContainer';
 import WalletConnectHWOptionDialog from '../../components/wallet/add/option-dialog/WalletConnectHWOptionDialog';
@@ -36,7 +35,6 @@ import type { GeneratedData as WalletTrezorConnectDialogContainerData } from './
 import WalletLedgerConnectDialogContainer from './dialogs/WalletLedgerConnectDialogContainer';
 import type { GeneratedData as WalletLedgerConnectDialogContainerData } from './dialogs/WalletLedgerConnectDialogContainer';
 
-import WalletEraOptionDialogContainer from './dialogs/WalletEraOptionDialogContainer';
 import WalletPaperDialog from '../../components/wallet/WalletPaperDialog';
 import WalletPaperDialogContainer from './dialogs/WalletPaperDialogContainer';
 import type { GeneratedData as WalletPaperDialogContainerData } from './dialogs/WalletPaperDialogContainer';
@@ -54,10 +52,7 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { getApiForNetwork, ApiOptions } from '../../api/common/utils';
 import { PublicDeriver } from '../../api/ada/lib/storage/models/PublicDeriver/index';
 import type { NetworkRow } from '../../api/ada/lib/storage/database/primitives/tables';
-import {
-  networks,
-  isCardanoHaskell,
-} from '../../api/ada/lib/storage/database/prepackaged/networks';
+import { networks } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { withLayout } from '../../styles/context/layout';
 import type { LayoutComponentMap } from '../../styles/context/layout';
 import AddWalletPageRevamp from './AddWalletPageRevamp';
@@ -183,19 +178,14 @@ class AddWalletPage extends Component<AllProps> {
         <WalletRestoreOptionDialogContainer
           onClose={this.onClose}
           onRestore15={() => {
-            if (isCardanoHaskell(selectedNetwork)) {
-              return actions.dialogs.push.trigger({
-                dialog: WalletEraOptionDialogContainer,
-              });
-            }
             return actions.dialogs.push.trigger({
-              dialog: WalletRestoreDialog,
-              params: { restoreType: { type: 'bip44', extra: undefined, length: 15 } },
+              dialog: WalletRestoreDialogContainer,
+              params: { restoreType: { type: 'cip1852', extra: undefined, length: 15 } },
             });
           }}
           onRestore24={() => {
             actions.dialogs.push.trigger({
-              dialog: WalletRestoreDialog,
+              dialog: WalletRestoreDialogContainer,
               params: { restoreType: { type: 'cip1852', extra: undefined, length: 24 } },
             });
           }}
@@ -205,40 +195,13 @@ class AddWalletPage extends Component<AllProps> {
               ? undefined
               : () =>
                   actions.dialogs.push.trigger({
-                    dialog: WalletRestoreDialog,
+                    dialog: WalletRestoreDialogContainer,
                     params: { restoreType: { type: 'bip44', extra: 'paper', length: 21 } },
                   })
           }
         />
       );
-    } else if (uiDialogs.isOpen(WalletEraOptionDialogContainer)) {
-      if (selectedNetwork === undefined) {
-        throw new Error(`${nameof(AddWalletPage)} no API selected`);
-      }
-      const hardware = uiDialogs.getParam<'trezor' | 'ledger'>('hardware');
-      const onEra = (era: 'bip44' | 'cip1852') => {
-        if (hardware == null) {
-          return actions.dialogs.push.trigger({
-            dialog: WalletRestoreDialog,
-            params: { restoreType: { type: era, extra: undefined, length: 15 } },
-          });
-        }
-        if (hardware === 'ledger') {
-          openLedgerConnectDialog(era);
-        }
-        if (hardware === 'trezor') {
-          openTrezorConnectDialog(era);
-        }
-      };
-      activeDialog = (
-        <WalletEraOptionDialogContainer
-          onClose={this.onClose}
-          onByron={() => onEra('bip44')}
-          onShelley={() => onEra('cip1852')}
-          onBack={() => actions.dialogs.pop.trigger()}
-        />
-      );
-    } else if (uiDialogs.isOpen(WalletRestoreDialog)) {
+    } else if (uiDialogs.isOpen(WalletRestoreDialogContainer)) {
       const mode = uiDialogs.getParam<RestoreModeType>('restoreType');
       if (mode == null)
         throw new Error(`${nameof(AddWalletPage)} no mode for restoration selected`);
@@ -254,18 +217,8 @@ class AddWalletPage extends Component<AllProps> {
       activeDialog = (
         <WalletConnectHWOptionDialogContainer
           onClose={this.onClose}
-          onTrezor={() =>
-            actions.dialogs.push.trigger({
-              dialog: WalletEraOptionDialogContainer,
-              params: { hardware: 'trezor' },
-            })
-          }
-          onLedger={() =>
-            actions.dialogs.push.trigger({
-              dialog: WalletEraOptionDialogContainer,
-              params: { hardware: 'ledger' },
-            })
-          }
+          onTrezor={() => openTrezorConnectDialog('cip1852')}
+          onLedger={() => openLedgerConnectDialog('cip1852')}
         />
       );
     } else if (uiDialogs.isOpen(WalletTrezorConnectDialogContainer)) {

packages/yoroi-extension/app/containers/wallet/AddWalletPage.js

@@ -35,7 +35,6 @@ import WalletRestoreOptionDialog from '../../components/wallet/add/option-dialog
 import WalletConnectHWOptionDialog from '../../components/wallet/add/option-dialog/WalletConnectHWOptionDialog';
 import WalletTrezorConnectDialogContainer from './dialogs/WalletTrezorConnectDialogContainer';
 import WalletLedgerConnectDialogContainer from './dialogs/WalletLedgerConnectDialogContainer';
-import WalletEraOptionDialogContainer from './dialogs/WalletEraOptionDialogContainer';
 import { getPaperWalletIntro } from '../../stores/toplevel/ProfileStore';
 import WalletPaperDialog from '../../components/wallet/WalletPaperDialog';
 import UserPasswordDialog from '../../components/wallet/add/paper-wallets/UserPasswordDialog';
@@ -642,19 +641,6 @@ export const ErgoRestoreOptions = (): Node => {
   );
 };
 
-export const CardanoEraSelect = (): Node => {
-  return (
-    <AddWalletPage
-      generated={defaultProps(
-        Object.freeze({
-          selectedNetwork: networks.CardanoMainnet,
-          openDialog: WalletEraOptionDialogContainer,
-        })
-      )}
-    />
-  );
-};
-
 export const RestoreWalletStart = (): Node => {
   const modeOptions: {| [key: string]: RestoreModeType |} = {
     SHELLEY15: { type: 'cip1852', extra: undefined, length: 15 },

packages/yoroi-extension/app/containers/wallet/AddWalletPage.stories.js

@@ -449,11 +449,6 @@
   "wallet.add.optionDialog.restore.normalWallet.title": "Enter a {length}-word recovery phrase",
   "wallet.add.optionDialog.restore.paperWallet.description": "If you have generated a Yoroi paper wallet (which is usually printed and kept offline), you can choose this option to import the funds from your Yoroi paper wallet.",
   "wallet.add.optionDialog.restore.paperWallet.title": "Paper Wallet",
-  "wallet.add.optionDialog.walletEra.byronEra.description": "Wallets created before July 29th, 2020 are Byron-era wallets and cannot delegate.",
-  "wallet.add.optionDialog.walletEra.byronEra.title": "Byron-era (read-only) wallet",
-  "wallet.add.optionDialog.walletEra.dialogTitle": "Choose era",
-  "wallet.add.optionDialog.walletEra.standard.description": "Standard modern wallets support delegation to stake pools.",
-  "wallet.add.optionDialog.walletEra.standard.title": "Standard wallet",
   "wallet.add.page.create.title": "Create wallet",
   "wallet.add.page.create.tooltip": "Generate a new 15-word recovery phrase<br/>and create a Yoroi wallet.",
   "wallet.add.page.daedalusTransfer.title": "Transfer funds from a Daedalus wallet to Yoroi",
@@ -787,11 +782,9 @@
   "wallet.restore.dialog.title.verify.label": "Verify Yoroi wallet",
   "wallet.restore.dialog.title.verify.paper.label": "Verify Yoroi Paper wallet",
   "wallet.restore.dialog.upgrade.noop": "Your wallet did not need to be upgraded",
-  "wallet.restore.dialog.verify.accountId.byron.label": "Byron account checksum:",
   "wallet.restore.dialog.verify.accountId.label": "Your Wallet Account checksum:",
   "wallet.restore.dialog.verify.accountId.shelley.label": "Shelley account checksum:",
   "wallet.restore.dialog.verify.addressesLabel": "Your Wallet address[es]:",
-  "wallet.restore.dialog.verify.byron.addressesLabel": "Byron Wallet address[es]:",
   "wallet.restore.dialog.verify.intro.line1": "Be careful about wallet restoration:",
   "wallet.restore.dialog.verify.intro.line2": "Make sure account checksum and icon match what you remember.",
   "wallet.restore.dialog.verify.intro.line3": "Make sure addresses match what you remember.",
@@ -1057,4 +1050,4 @@
   "yoroiTransfer.waiting.progressInfo.checkingAddresses": "Checking addresses funds",
   "yoroiTransfer.waiting.progressInfo.restoringAddresses": "Fetching addresses",
   "yoroiTransfer.waiting.title.label": "Wallet is being restored"
-}
+}

packages/yoroi-extension/app/containers/wallet/dialogs/WalletEraOptionDialogContainer.js

@@ -9,7 +9,7 @@ import type {
 } from '../../actions/common/wallet-restore-actions';
 import type { PlateResponse } from '../../api/common/lib/crypto/plate';
 import { unscramblePaperAdaMnemonic } from '../../api/ada/lib/cardanoCrypto/paperWallet';
-import { generateByronPlate, generateShelleyPlate } from '../../api/ada/lib/cardanoCrypto/plate';
+import { generateShelleyPlate } from '../../api/ada/lib/cardanoCrypto/plate';
 import { generateErgoPlate } from '../../api/ergo/lib/crypto/plate';
 import { HARD_DERIVATION_START } from '../../config/numbersConfig';
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
@@ -36,10 +36,6 @@ const messages = defineMessages({
     id: 'wallet.restore.dialog.verify.accountId.label',
     defaultMessage: '!!!Your Wallet Account checksum:',
   },
-  walletRestoreVerifyByronAccountIdLabel: {
-    id: 'wallet.restore.dialog.verify.accountId.byron.label',
-    defaultMessage: '!!!Byron account checksum:',
-  },
   walletRestoreVerifyShelleyAccountIdLabel: {
     id: 'wallet.restore.dialog.verify.accountId.shelley.label',
     defaultMessage: '!!!Shelley account checksum:',
@@ -48,10 +44,6 @@ const messages = defineMessages({
     id: 'wallet.restore.dialog.verify.addressesLabel',
     defaultMessage: '!!!Your Wallet address[es]:',
   },
-  walletRestoreVerifyByronAddressesLabel: {
-    id: 'wallet.restore.dialog.verify.byron.addressesLabel',
-    defaultMessage: '!!!Byron Wallet address[es]:',
-  },
   walletRestoreVerifyShelleyAddressesLabel: {
     id: 'wallet.restore.dialog.verify.shelley.addressesLabel',
     defaultMessage: '!!!Shelley Wallet address[es]:',
@@ -237,19 +229,6 @@ export function generatePlates(
       : generateAdaWalletRootKey(recoveryPhrase);
   };
 
-  const shouldShowByronPlate = (() => {
-    if (
-      // generically show byron checksum if length is 15
-      // since 15-word wallets were supported in Byron
-      (isCardanoHaskell(network) && (mode.length === 15 || mode.extra === 'paper')) ||
-      // only show HW byron checksums if using bip44
-      (mode.type === 'bip44' && (mode.extra === 'trezor' || mode.extra === 'ledger'))
-    ) {
-      return true;
-    }
-    return false;
-  })();
-
   const shouldShowShelleyPlate = (() => {
     return isCardanoHaskell(network) && mode.type === 'cip1852';
   })();
@@ -267,24 +246,6 @@ export function generatePlates(
       addressMessage: messages.walletRestoreVerifyShelleyAddressesLabel,
     });
   }
-  if (shouldShowByronPlate) {
-    const byronPlate = generateByronPlate(
-      getCardanoKey(),
-      accountIndex - HARD_DERIVATION_START,
-      addressCount,
-      (() => {
-        if (network.BaseConfig[0].ByronNetworkId != null) {
-          return network.BaseConfig[0].ByronNetworkId;
-        }
-        throw new Error(`${nameof(generatePlates)} missing Byron network id`);
-      })()
-    );
-    plates.push({
-      ...byronPlate,
-      checksumTitle: messages.walletRestoreVerifyAccountIdLabel,
-      addressMessage: messages.walletRestoreVerifyAddressesLabel,
-    });
-  }
 
   if (isErgo(network)) {
     const rootKey = generateErgoWalletRootKey(recoveryPhrase);