Bring integration

packages/yoroi-extension/app/Routes.js

@@ -75,8 +75,6 @@ const WalletSettingsPagePromise = () => import('./containers/settings/categories
 const WalletSettingsPage = React.lazy(WalletSettingsPagePromise);
 const ExternalStorageSettingsPagePromise = () => import('./containers/settings/categories/ExternalStorageSettingsPage');
 const ExternalStorageSettingsPage = React.lazy(ExternalStorageSettingsPagePromise);
-const OAuthDropboxPagePromise = () => import('./containers/settings/categories/OAuthDropboxPage');
-const OAuthDropboxPage = React.lazy(OAuthDropboxPagePromise);
 const TermsOfUseSettingsPagePromise = () => import('./containers/settings/categories/TermsOfUseSettingsPage');
 const TermsOfUseSettingsPage = React.lazy(TermsOfUseSettingsPagePromise);
 const SupportSettingsPagePromise = () => import('./containers/settings/categories/SupportSettingsPage');
@@ -87,9 +85,6 @@ const AnalyticsSettingsPage = React.lazy(AnalyticsSettingsPagePromise);
 const NightlyPagePromise = () => import('./containers/profile/NightlyPage');
 const NightlyPage = React.lazy(NightlyPagePromise);
 
-const MyWalletsPagePromise = () => import('./containers/wallet/MyWalletsPage');
-const MyWalletsPage = React.lazy(MyWalletsPagePromise);
-
 const WalletSummaryPagePromise = () => import('./containers/wallet/WalletSummaryPage');
 const WalletSummaryPage = React.lazy(WalletSummaryPagePromise);
 
@@ -132,6 +127,9 @@ const TokensPageRevamp = React.lazy(TokensPageRevampPromise);
 const TokensDetailPageRevampPromise = () => import('./containers/wallet/TokenDetailPageRevamp');
 const TokensDetailPageRevamp = React.lazy(TokensDetailPageRevampPromise);
 
+const CashbackPagePromise = () => import('./containers/cashback/CashbackPage');
+const CashbackPage = React.lazy(CashbackPagePromise)
+
 const NFTsPageRevampPromise = () => import('./containers/wallet/NFTsPageRevamp');
 const NFTsPageRevamp = React.lazy(NFTsPageRevampPromise);
 
@@ -157,11 +155,9 @@ export const LazyLoadPromises: Array<() => any> = [
   GeneralSettingsPagePromise,
   WalletSettingsPagePromise,
   ExternalStorageSettingsPagePromise,
-  OAuthDropboxPagePromise,
   TermsOfUseSettingsPagePromise,
   SupportSettingsPagePromise,
   NightlyPagePromise,
-  MyWalletsPagePromise,
   WalletSummaryPagePromise,
   WalletSendPagePromise,
   WalletAssetsPagePromise,
@@ -216,10 +212,13 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PROFILE.OPT_FOR_ANALYTICS}
             component={props => <OptForAnalyticsPage {...props} stores={stores} />}
           />
-          <Route exact path={ROUTES.MY_WALLETS} component={props => <MyWalletsPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.STAKING} component={props => <StakingPage {...props} stores={stores} />} />
           <Route path={ROUTES.ASSETS.ROOT} component={props => wrapAssets({ ...props, stores }, AssetsSubpages(stores))} />
           <Route path={ROUTES.NFTS.ROOT} component={props => wrapNFTs({ ...props, stores }, NFTsSubPages(stores))} />
+          <Route
+            path={ROUTES.CASHBACK.ROOT}
+            component={props => <CashbackPage {...props} stores={stores} />}
+          />
           <Route exact path={ROUTES.WALLETS.ADD} component={props => <AddWalletPage {...props} stores={stores} />} />
           <Route
             exact
@@ -241,11 +240,6 @@ export const Routes = (stores: StoresMap): Node => {
           <Route path={ROUTES.SWAP.ROOT} component={props => wrapSwap({ ...props, stores }, SwapSubpages(stores))} />
           <Route path={ROUTES.TRANSFER.ROOT} component={props => <Transfer {...props} stores={stores} />} />
           <Route exact path={ROUTES.SEND_FROM_URI.ROOT} component={props => <URILandingPage {...props} stores={stores} />} />
-          <Route
-            exact
-            path={ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX}
-            component={props => <OAuthDropboxPage {...props} stores={stores} />}
-          />
           <Route exact path={ROUTES.SWITCH} component={props => <WalletSwitch {...props} stores={stores} />} />
           <Route exact path={ROUTES.REVAMP.CATALYST_VOTING} component={props => <VotingPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.EXCHANGE_END} component={props => <ExchangeEndPage {...props} stores={stores} />} />
@@ -259,8 +253,7 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PORTFOLIO.ROOT}
             component={() => PortfolioSubpages(stores)}
           />
-
-          <Redirect to={ROUTES.MY_WALLETS} />
+          <Redirect to={ROUTES.WALLETS.ROOT} />
         </Switch>
       </Suspense>
     </QueryClientProvider>

packages/yoroi-extension/app/UI/context/IntlProvider.tsx

@@ -8,4 +8,4 @@ export const IntlProvider = ({ children, intl }: { children: React.ReactNode; in
 };
 
 export const useIntl = () =>
-  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderontext: needs to be wrapped in a IntlProvider');
+  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderContext: needs to be wrapped in a IntlProvider');

packages/yoroi-extension/app/api/ada/index.js

@@ -44,9 +44,10 @@ import {
   asGetSigningKey,
   asHasLevels,
   asHasUtxoChains,
+  asGetStakingKey,
 } from './lib/storage/models/PublicDeriver/traits';
 import { ConceptualWallet } from './lib/storage/models/ConceptualWallet/index';
-import type { IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
+import { WalletTypeOption, type IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
 import type {
   Address,
   Addressing,
@@ -165,6 +166,7 @@ import TimeUtils from './lib/storage/bridge/timeUtils';
 import type { IFetcher } from './lib/state-fetch/IFetcher.types';
 import { Bip44DerivationLevels, CoinType } from '@emurgo/yoroi-lib';
 import type { ProtocolParameters } from '@emurgo/yoroi-lib/dist/protocol-parameters/models';
+import { encryptWithPassword } from '../../utils/passwordCipher';
 
 // ADA specific Request / Response params
 
@@ -494,7 +496,6 @@ export type CreateHardwareWalletRequest = {|
   publicKey: string,
   ...Addressing,
   hwFeatures: HWFeatures,
-  checkAddressesInUse: FilterFunc,
   network: $ReadOnly<NetworkRow>,
 |};
 export type CreateHardwareWalletResponse = {|
@@ -1808,6 +1809,86 @@ export default class AdaApi {
     }
   }
 
+  async cloneWallet(
+    db: lf$Database,
+    publicDeriver: PublicDeriver<>,
+    network: $ReadOnly<NetworkRow>,
+  ): Promise<PublicDeriver<>> {
+    const withPublicKey = asGetPublicKey(publicDeriver);
+    if (!withPublicKey) {
+      throw new Error('unable to get public key');
+    }
+    const publicKey = await withPublicKey.getPublicKey();
+    const accountPublicKey = RustModule.WalletV4.Bip32PublicKey.from_hex(publicKey.Hash);
+
+    const conceptualWallet = publicDeriver.getParent();
+    const walletName = (await conceptualWallet.getFullConceptualWalletInfo()).Name;
+
+    let wallet;
+    if (conceptualWallet.getWalletType() === WalletTypeOption.HARDWARE_WALLET) {
+      const withStakingKey = asGetStakingKey(publicDeriver);
+      if (!withStakingKey) {
+        throw new Error('unable to get staking key');
+      }
+      const stakingKey = await withStakingKey.getStakingKey();
+
+      const hwMeta = conceptualWallet.getHwWalletMeta();
+      if (!hwMeta) {
+        throw new Error('unexpectedly missing hardware metadata');
+      }
+
+      wallet = await createHardwareCip1852Wallet({
+        db,
+        accountPublicKey,
+        accountIndex: stakingKey.addressing.path[2],
+        walletName,
+        accountName: '',
+        hwWalletMetaInsert: {
+          Vendor: hwMeta.Vendor,
+          Model: hwMeta.Model,
+          DeviceId: hwMeta.DeviceId,
+        },
+        network,
+      });
+    } else {
+      const withSigningKey = asGetSigningKey(publicDeriver);
+      if (!withSigningKey) {
+        throw new Error('unable to get signing key');
+      }
+      const signingKey = await withSigningKey.getSigningKey();
+      const encryptedRoot = signingKey.row.Hash;
+
+      const accountIndex = signingKey.path[3].Index;
+      if (accountIndex === null) {
+        throw new Error('missing account index');
+      }
+
+      wallet = await createStandardCip1852Wallet({
+        db,
+        encryptedRoot,
+        accountPublicKey,
+        accountIndex,
+        walletName,
+        accountName: '', // set account name empty now
+        network,
+      });
+    }
+
+    const cip1852Wallet = await Cip1852Wallet.createCip1852Wallet(
+      db,
+      wallet.cip1852WrapperRow,
+    );
+
+    if (wallet.publicDeriver.length !== 1) {
+      throw new Error(`${nameof(AdaApi)}::${nameof(this.cloneWallet)} should only do 1 HW derivation at a time`);
+    }
+    const pubDeriverResult = wallet.publicDeriver[0].publicDeriverResult;
+    return await PublicDeriver.createPublicDeriver(
+      pubDeriverResult,
+      cip1852Wallet,
+    );
+  }
+
   /**
    * Creates wallet and saves result to DB
   */
@@ -1823,11 +1904,21 @@ export default class AdaApi {
     try {
       // Note: we only restore for 0th account
       const rootPk = generateWalletRootKey(recoveryPhrase);
+      const encryptedRoot = encryptWithPassword(
+        walletPassword,
+        rootPk.as_bytes(),
+      );
+      const accountPublicKey = rootPk
+        .derive(WalletTypePurpose.CIP1852)
+        .derive(CoinTypes.CARDANO)
+        .derive(request.accountIndex)
+        .to_public();
+
       const newPubDerivers = [];
       const wallet = await createStandardCip1852Wallet({
         db: request.db,
-        rootPk,
-        password: walletPassword,
+        encryptedRoot,
+        accountPublicKey,
         accountIndex: request.accountIndex,
         walletName,
         accountName: '', // set account name empty now
@@ -2694,11 +2785,13 @@ export async function encodeHardwareWalletSignResult(
   signatureHex: string,
   payloadHex: string,
   signingPublicKeyHex: string,
+  payloadHashed: boolean = false,
 ): Promise<{| signature: string, key: string |}> {
   const coseSign1 = await buildCoseSign1FromSignature (
     hexToBytes(addressHex),
     hexToBytes(signatureHex),
     hexToBytes(payloadHex),
+    payloadHashed,
   );
 
   const key = makeCip8Key(hexToBytes(signingPublicKeyHex));

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js

@@ -178,6 +178,7 @@ export const buildCoseSign1FromSignature = async (
   address: Buffer,
   signature: Buffer,
   payload: Buffer,
+  payloadHashed: boolean = false,
 ): Promise<RustModule.MessageSigning.COSESign1> => {
   const protectedHeader = RustModule.MessageSigning.HeaderMap.new();
   protectedHeader.set_algorithm_id(
@@ -191,8 +192,19 @@ export const buildCoseSign1FromSignature = async (
   );
   const protectedSerialized = RustModule.MessageSigning.ProtectedHeaderMap.new(protectedHeader);
   const unprotected = RustModule.MessageSigning.HeaderMap.new();
+  if (payloadHashed) {
+    unprotected.set_header(
+      RustModule.MessageSigning.Label.new_text('hashed'),
+      RustModule.MessageSigning.CBORValue.new_special(
+        RustModule.MessageSigning.CBORSpecial.new_bool(true)
+      ),
+    );
+  }
   const headers = RustModule.MessageSigning.Headers.new(protectedSerialized, unprotected);
   const builder = RustModule.MessageSigning.COSESign1Builder.new(headers, payload, false);
+  if (payloadHashed) {
+    builder.hash_payload();
+  }
   return builder.build(signature);
 }
 

packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js

@@ -21,7 +21,7 @@ import { migrateFromStorageV1 } from './bridge/walletBuilder/byron';
 import { RustModule } from '../cardanoCrypto/rustLoader';
 import { removeAllTransactions } from './bridge/updateTransactions';
 import { removePublicDeriver } from './bridge/walletBuilder/remove';
-import { asGetAllUtxos, asHasLevels, } from './models/PublicDeriver/traits';
+import { asGetAllUtxos, asHasLevels, asGetPublicKey, } from './models/PublicDeriver/traits';
 import { ConceptualWallet, isLedgerNanoWallet, } from './models/ConceptualWallet/index';
 import { loadWalletsFromStorage } from './models/load';
 import environment from '../../../../environment';
@@ -32,6 +32,7 @@ import { getAllSchemaTables, raii, } from './database/utils';
 import type { BlockRow } from './database/primitives/tables';
 import { GetBlock } from './database/primitives/api/read';
 import { ModifyUtxoAtSafePoint } from './database/utxo/api/write';
+import type { PublicDeriver } from './models/PublicDeriver/index';
 
 export async function migrateToLatest(
   localStorageApi: LocalStorageApi,
@@ -98,6 +99,7 @@ export async function migrateToLatest(
     ['<3.8.0', () => cardanoTxHistoryReset(persistentDb)],
     ['<4.18', () => populateNewUtxodata(persistentDb)],
     ['<5.4', () => unsetLegacyThemeFlags(localStorageApi)],
+    ['<5.5', () => migrateWalletOrderAndSelectedWalletForNetworkSwitch(persistentDb, localStorageApi)],
   ];
 
   let appliedMigration = false;
@@ -421,4 +423,43 @@ async function unsetLegacyThemeFlags(localStorageApi: LocalStorageApi): Promise<
   }
   await localStorageApi.unsetLegacyThemeFlags();
   return true;
-}
+}
+
+async function migrateWalletOrderAndSelectedWalletForNetworkSwitch(
+  db: lf$Database,
+  localStorageApi: LocalStorageApi,
+): Promise<boolean> {
+  const wallets = await loadWalletsFromStorage(db);
+
+  const oldWalletOrder = (await localStorageApi.getWalletsNavigation())?.cardano || [];
+  const publicKeyList = [];
+  for (const id of oldWalletOrder) {
+    const wallet = wallets.find(w => w.getPublicDeriverId() === id);
+    if (wallet) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  for (const wallet of wallets) {
+    if (!oldWalletOrder.includes(wallet.getPublicDeriverId())) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  await localStorageApi.saveWalletListOrder(publicKeyList);
+
+  const selectedWalletId = await localStorageApi.getSelectedWalletId();
+  const selectedWallet = wallets.find(
+    wallet => wallet.getPublicDeriverId() === selectedWalletId
+  );
+  if (selectedWallet) {
+    await localStorageApi.setSelectedWalletPublicKey(await getPublicKey(selectedWallet));
+  }
+  return true;
+}
+
+async function getPublicKey(publicDeriver: PublicDeriver<>): Promise<string> {
+  const withPubKey = asGetPublicKey(publicDeriver);
+  if (withPubKey == null) {
+    throw new Error('unexpected missing asGetPublicKey result');
+  }
+  return (await withPubKey.getPublicKey()).Hash;
+}

packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js

@@ -217,7 +217,7 @@ export async function createStandardBip44Wallet(request: {|
           }
           return {
             deriverRequest: {
-              decryptPrivateDeriverPassword: request.password,
+              decryptPrivateDeriver: { preDerived: false, password: request.password },
               publicDeriverMeta: {
                 name: request.accountName,
               },