feat(HW-709): refactor providers usage in mobile app (#2106)

* feat(HW-709): refactor providers usage in mobile app * chore: install release @haqq/rn-wallet-providers --------- Co-authored-by: iGroza <[email protected]>
haqq-network · Sep 25, 2024 · 65fd80e · 65fd80e
1 parent bc660e9
commit 65fd80e
Show file tree

Hide file tree

Showing 61 changed files with 279 additions and 331 deletions.
diff --git a/__tests__/init.ts b/__tests__/init.ts
@@ -89,20 +89,19 @@ jest.mock('react-native-fs', jest.fn);
 jest.mock('@react-navigation/native', () => ({
   createNavigationContainerRef: jest.fn,
 }));
-jest.mock('@haqq/provider-ledger-react-native', () => ({
-  getBleManager: jest.fn,
-}));
 jest.mock('react-native-ble-plx', () => ({
   State: jest.fn,
 }));
-jest.mock('@haqq/provider-mnemonic-react-native', () => ({
-  ProviderMnemonicReactNative: jest.fn,
-}));
-jest.mock('@haqq/provider-sss-react-native', () => ({
-  ProviderSSSReactNative: jest.fn,
-}));
-jest.mock('@haqq/provider-hot-react-native', () => ({
-  ProviderHotReactNative: jest.fn,
+jest.mock('@haqq/rn-wallet-providers', () => ({
+  utils: {
+    getBleManager: jest.fn,
+  },
+  ProviderMnemonicBase: jest.fn,
+  ProviderMnemonicEvm: jest.fn,
+  ProviderSSSBase: jest.fn,
+  ProviderSSSEvm: jest.fn,
+  ProviderHotBase: jest.fn,
+  ProviderHotEvm: jest.fn,
 }));
 jest.mock('@react-native-async-storage/async-storage', jest.fn);
 jest.mock('@haqq/shared-react-native', () => ({

diff --git a/package.json b/package.json
@@ -42,13 +42,8 @@
     "@expo/react-native-action-sheet": "4.0.1",
     "@haqq/encryption-react-native": "0.0.4",
     "@haqq/format-number-with-subscript-zeros": "1.0.1",
-    "@haqq/provider-base": "0.0.23",
-    "@haqq/provider-hot-react-native": "0.0.10",
-    "@haqq/provider-keystone-react-native": "0.0.7",
-    "@haqq/provider-ledger-react-native": "0.0.28",
-    "@haqq/provider-mnemonic-react-native": "0.0.14",
-    "@haqq/provider-sss-react-native": "0.0.14",
     "@haqq/provider-web3-utils": "0.0.14",
+    "@haqq/rn-wallet-providers": "0.0.2",
     "@haqq/shared-react-native": "0.0.12",
     "@invertase/react-native-apple-authentication": "2.2.2",
     "@keystonehq/bc-ur-registry-eth": "0.7.7",

diff --git a/src/components/ledger-scan/ledger-scan-row.tsx b/src/components/ledger-scan/ledger-scan-row.tsx
@@ -1,6 +1,6 @@
 import React, {useCallback} from 'react';
 
-import {Device} from '@haqq/provider-ledger-react-native';
+import {Device} from '@haqq/rn-wallet-providers';
 import {ActivityIndicator, TouchableOpacity} from 'react-native';
 
 import {Color} from '@app/colors';

diff --git a/src/components/ledger-scan/ledger-scan.tsx b/src/components/ledger-scan/ledger-scan.tsx
@@ -1,6 +1,6 @@
 import React, {useCallback} from 'react';
 
-import {Device} from '@haqq/provider-ledger-react-native';
+import {Device} from '@haqq/rn-wallet-providers';
 import {FlatList, ListRenderItem} from 'react-native';
 
 import {PopupContainer} from '@app/components/ui';

diff --git a/src/components/modals/cloud-share-not-found.tsx b/src/components/modals/cloud-share-not-found.tsx
@@ -1,6 +1,6 @@
 import React, {useCallback, useEffect} from 'react';
 
-import {ProviderSSSReactNative} from '@haqq/provider-sss-react-native';
+import {ProviderSSSBase} from '@haqq/rn-wallet-providers';
 import {observer} from 'mobx-react';
 import {Image, Platform, View} from 'react-native';
 
@@ -63,7 +63,7 @@ export const CloudShareNotFound = observer(
           );
           const storage = await getProviderStorage('', 'cloud');
 
-          await ProviderSSSReactNative.initialize(
+          await ProviderSSSBase.initialize(
             creds.privateKey,
             null,
             localShare,

diff --git a/src/event-actions/on-app-backup.ts b/src/event-actions/on-app-backup.ts
@@ -1,5 +1,4 @@
-import {ProviderMnemonicReactNative} from '@haqq/provider-mnemonic-react-native';
-import {ProviderSSSReactNative} from '@haqq/provider-sss-react-native';
+import {ProviderMnemonicBase, ProviderSSSBase} from '@haqq/rn-wallet-providers';
 import {isAfter} from 'date-fns';
 
 import {app} from '@app/contexts';
@@ -19,10 +18,10 @@ export async function onAppBackup() {
     return;
   }
 
-  const mnemonics = await ProviderMnemonicReactNative.getAccounts();
+  const mnemonics = await ProviderMnemonicBase.getAccounts();
 
   if (isFeatureEnabled(Feature.sss)) {
-    const sss = await ProviderSSSReactNative.getAccounts();
+    const sss = await ProviderSSSBase.getAccounts();
     if (mnemonics.length && !sss.length) {
       navigator.navigate(SettingsStackRoutes.BackupSssSuggestion, {
         accountId: mnemonics[0],

diff --git a/src/event-actions/on-push-subscription-transactions-subscribe.ts b/src/event-actions/on-push-subscription-transactions-subscribe.ts
@@ -1,11 +1,9 @@
-import {cosmosAddress} from '@haqq/provider-base';
-
+import {AddressUtils} from '@app/helpers/address-utils';
 import {VariablesBool} from '@app/models/variables-bool';
 import {VariablesString} from '@app/models/variables-string';
 import {Wallet} from '@app/models/wallet';
 import {Backend} from '@app/services/backend';
 import {PushNotificationTopicsEnum} from '@app/services/push-notifications';
-import {COSMOS_PREFIX} from '@app/variables/common';
 
 export async function onPushSubscriptionTransactionsSubscribe() {
   VariablesBool.set(
@@ -22,7 +20,7 @@ export async function onPushSubscriptionTransactionsSubscribe() {
       wallets.map(async w =>
         Backend.instance.createNotificationSubscription(
           subscription,
-          cosmosAddress(w.address, COSMOS_PREFIX),
+          AddressUtils.toHaqq(w.address),
         ),
       ),
     );

diff --git a/src/event-actions/on-wallet-create.ts b/src/event-actions/on-wallet-create.ts
@@ -1,4 +1,4 @@
-import {ProviderMnemonicReactNative} from '@haqq/provider-mnemonic-react-native';
+import {ProviderMnemonicBase} from '@haqq/rn-wallet-providers';
 
 import {app} from '@app/contexts';
 import {onStakingSync} from '@app/event-actions/on-staking-sync';
@@ -43,7 +43,7 @@ export async function onWalletCreate(wallet: Wallet) {
         case WalletType.mnemonic:
           const providerMnemonic = (await getProviderInstanceForWallet(
             wallet,
-          )) as ProviderMnemonicReactNative;
+          )) as ProviderMnemonicBase;
           if (typeof providerMnemonic.isMnemonicSaved === 'function') {
             mnemonicSaved = await providerMnemonic.isMnemonicSaved();
           } else {

diff --git a/src/event-actions/on-wallet-mnemonic-check.ts b/src/event-actions/on-wallet-mnemonic-check.ts
@@ -1,4 +1,4 @@
-import {ProviderMnemonicReactNative} from '@haqq/provider-mnemonic-react-native';
+import {ProviderMnemonicBase} from '@haqq/rn-wallet-providers';
 import {isAfter} from 'date-fns';
 
 import {app} from '@app/contexts';
@@ -20,7 +20,7 @@ export async function onWalletMnemonicCheck(snoozeBackup: Date) {
     );
 
     for (const accountId of accounts) {
-      const provider = new ProviderMnemonicReactNative({
+      const provider = new ProviderMnemonicBase({
         account: accountId,
         getPassword: app.getPassword.bind(app),
       });

diff --git a/src/event-actions/on-wallet-mnemonic-saved.ts b/src/event-actions/on-wallet-mnemonic-saved.ts
@@ -1,4 +1,4 @@
-import {ProviderMnemonicReactNative} from '@haqq/provider-mnemonic-react-native';
+import {ProviderMnemonicBase} from '@haqq/rn-wallet-providers';
 
 import {app} from '@app/contexts';
 import {Wallet} from '@app/models/wallet';
@@ -7,7 +7,7 @@ import {WalletType} from '@app/types';
 export async function onWalletMnemonicSaved(accountId: string) {
   const wallets = Wallet.getAll();
 
-  const provider = new ProviderMnemonicReactNative({
+  const provider = new ProviderMnemonicBase({
     account: accountId,
     getPassword: app.getPassword.bind(app),
   });

diff --git a/src/event-actions/on-wallet-sss-check.ts b/src/event-actions/on-wallet-sss-check.ts
@@ -1,4 +1,4 @@
-import {ProviderSSSReactNative} from '@haqq/provider-sss-react-native';
+import {ProviderSSSBase} from '@haqq/rn-wallet-providers';
 import {isAfter} from 'date-fns';
 
 import {app} from '@app/contexts';
@@ -23,7 +23,7 @@ export async function onWalletSssCheck(snoozeBackup: Date) {
 
     for (const accountId of accounts) {
       const storage = await getProviderStorage(accountId);
-      const provider = new ProviderSSSReactNative({
+      const provider = new ProviderSSSBase({
         storage,
         account: accountId,
         getPassword: app.getPassword.bind(app),

diff --git a/src/event-actions/on-wallet-sss-saved.ts b/src/event-actions/on-wallet-sss-saved.ts
@@ -1,4 +1,4 @@
-import {ProviderSSSReactNative} from '@haqq/provider-sss-react-native';
+import {ProviderSSSBase} from '@haqq/rn-wallet-providers';
 
 import {app} from '@app/contexts';
 import {getProviderStorage} from '@app/helpers/get-provider-storage';
@@ -9,15 +9,13 @@ export async function onWalletSssSaved(accountId: string) {
   const wallets = Wallet.getAll();
 
   const storage = await getProviderStorage(accountId);
-  const provider = new ProviderSSSReactNative({
+  const provider = new ProviderSSSBase({
     account: accountId,
     storage,
     getPassword: app.getPassword.bind(app),
   });
 
-  const storages = await ProviderSSSReactNative.getStoragesForAccount(
-    accountId,
-  );
+  const storages = await ProviderSSSBase.getStoragesForAccount(accountId);
 
   const isShareSaved = await Promise.all(
     storages.map(async s => {

diff --git a/src/helpers/address.ts b/src/helpers/address.ts
diff --git a/src/helpers/await-for-bluetooth.ts b/src/helpers/await-for-bluetooth.ts
@@ -1,4 +1,4 @@
-import {getBleManager} from '@haqq/provider-ledger-react-native';
+import {utils} from '@haqq/rn-wallet-providers';
 import {State} from 'react-native-ble-plx';
 
 import {hideModal, showModal} from '@app/helpers/modal';
@@ -10,7 +10,7 @@ export const awaitForBluetooth = () => {
   return new Promise<void>((resolve, reject) => {
     let currentState = State.Unknown;
     let currentModal: ModalName | null = null;
-    const manager = getBleManager();
+    const manager = utils.getBleManager();
 
     const onClose = () => {
       reject(new Error('bluetooth_popup_closed'));

diff --git a/src/helpers/await-for-ledger.ts b/src/helpers/await-for-ledger.ts
@@ -1,5 +1,8 @@
-import {ProviderInterface} from '@haqq/provider-base';
-import {ProviderLedgerReactNative} from '@haqq/provider-ledger-react-native';
+import {
+  ProviderInterface,
+  ProviderLedgerBase,
+  ProviderLedgerEvm,
+} from '@haqq/rn-wallet-providers';
 import {Keyboard} from 'react-native';
 
 import {app} from '@app/contexts';
@@ -19,7 +22,10 @@ const LEDGER_PROVIDER_EVENTS = [
 ];
 
 export const awaitForLedger = async (transport: ProviderInterface) => {
-  if (transport instanceof ProviderLedgerReactNative) {
+  if (
+    transport instanceof ProviderLedgerBase ||
+    transport instanceof ProviderLedgerEvm
+  ) {
     Keyboard.dismiss();
     await awaitForBluetooth();
     return new Promise<void>((resolve, reject) => {

diff --git a/src/helpers/create-wallets-for-provider.ts b/src/helpers/create-wallets-for-provider.ts
@@ -1,4 +1,4 @@
-import {ProviderInterface} from '@haqq/provider-base';
+import {ProviderInterface} from '@haqq/rn-wallet-providers';
 
 import {app} from '@app/contexts';
 import {I18N, getText} from '@app/i18n';

diff --git a/src/helpers/decrypt-local-share.ts b/src/helpers/decrypt-local-share.ts
@@ -1,5 +1,5 @@
-import {ITEM_KEY} from '@haqq/provider-sss-react-native/dist/constants';
 import {accountInfo} from '@haqq/provider-web3-utils';
+import {constants} from '@haqq/rn-wallet-providers';
 import {decryptShare} from '@haqq/shared-react-native';
 import EncryptedStorage from 'react-native-encrypted-storage';
 
@@ -9,7 +9,9 @@ export const decryptLocalShare = async (
 ) => {
   const account = await accountInfo(sssPrivateKey);
   const _value = await EncryptedStorage.getItem(
-    `${ITEM_KEY}_${account.address.toLowerCase()}`,
+    `${
+      constants.ITEM_KEYS[constants.WalletType.sss]
+    }_${account.address.toLowerCase()}`,
   );
   const shareStore = await decryptShare(JSON.parse(_value || ''), password);
 

diff --git a/src/helpers/get-provider-for-new-wallet.ts b/src/helpers/get-provider-for-new-wallet.ts
@@ -1,5 +1,4 @@
-import {ProviderMnemonicReactNative} from '@haqq/provider-mnemonic-react-native';
-import {ProviderSSSReactNative} from '@haqq/provider-sss-react-native';
+import {ProviderMnemonicBase, ProviderSSSBase} from '@haqq/rn-wallet-providers';
 
 import {app} from '@app/contexts';
 import {getProviderStorage} from '@app/helpers/get-provider-storage';
@@ -12,7 +11,7 @@ export async function getProviderForNewWallet(params?: WalletInitialData) {
 
   if (params && params.type === 'sss') {
     const storage = await getProviderStorage('', params.provider);
-    return await ProviderSSSReactNative.initialize(
+    return await ProviderSSSBase.initialize(
       params.action === 'restore' ? params.sssPrivateKey || null : null,
       params.sssCloudShare || null,
       params.sssLocalShare || null,
@@ -28,26 +27,26 @@ export async function getProviderForNewWallet(params?: WalletInitialData) {
     ).catch(err => ErrorHandler.handle('sssLimitReached', err));
   }
 
-  const keysSss = await ProviderSSSReactNative.getAccounts();
+  const keysSss = await ProviderSSSBase.getAccounts();
 
   if (keysSss.length) {
     const storage = await getProviderStorage(keysSss[0]);
 
-    return new ProviderSSSReactNative({
+    return new ProviderSSSBase({
       storage,
       account: keysSss[0],
       getPassword,
     });
   }
 
-  const keysMnemonic = await ProviderMnemonicReactNative.getAccounts();
+  const keysMnemonic = await ProviderMnemonicBase.getAccounts();
 
   if (keysMnemonic.length) {
-    return new ProviderMnemonicReactNative({
+    return new ProviderMnemonicBase({
       account: keysMnemonic[0],
       getPassword,
     });
   }
 
-  return await ProviderMnemonicReactNative.initialize(null, getPassword, {});
+  return await ProviderMnemonicBase.initialize(null, getPassword, {});
 }
diff --git a/src/helpers/get-provider-storage.ts b/src/helpers/get-provider-storage.ts
@@ -1,7 +1,4 @@
-import {
-  ProviderSSSReactNative,
-  StorageInterface,
-} from '@haqq/provider-sss-react-native';
+import {ProviderSSSBase, StorageInterface} from '@haqq/rn-wallet-providers';
 
 import {AsyncLocalStorage} from '@app/services/async-local-storage';
 import {Cloud} from '@app/services/cloud';
@@ -13,7 +10,7 @@ export async function getProviderStorage(
 ): Promise<StorageInterface> {
   const storages = storage
     ? [storage]
-    : await ProviderSSSReactNative.getStoragesForAccount(accountId);
+    : await ProviderSSSBase.getStoragesForAccount(accountId);
 
   const cloudEnabled = await Cloud.isEnabled();
   if (

diff --git a/src/helpers/get-wallets-from-provider.tsx b/src/helpers/get-wallets-from-provider.tsx
@@ -1,5 +1,8 @@
-import {ProviderInterface} from '@haqq/provider-base';
-import {ProviderKeystoneReactNative} from '@haqq/provider-keystone-react-native';
+import {
+  ProviderInterface,
+  ProviderKeystoneBase,
+  ProviderKeystoneEvm,
+} from '@haqq/rn-wallet-providers';
 
 import {ChooseAccountTabNames} from '@app/components/choose-account/choose-account';
 import {Wallet} from '@app/models/wallet';
@@ -28,7 +31,10 @@ export async function* getWalletsFromProvider(
   })[] = [];
 
   const genHdPath = (_index: number) => {
-    if (provider instanceof ProviderKeystoneReactNative) {
+    if (
+      provider instanceof ProviderKeystoneBase ||
+      provider instanceof ProviderKeystoneEvm
+    ) {
       return provider.buildPath(_index);
     }
     if (mnemonicType === ChooseAccountTabNames.Basic) {

diff --git a/src/helpers/ledger-transport-wrapper.ts b/src/helpers/ledger-transport-wrapper.ts
@@ -1,5 +1,8 @@
-import {ProviderInterface} from '@haqq/provider-base';
-import {ProviderLedgerReactNative} from '@haqq/provider-ledger-react-native';
+import {
+  ProviderInterface,
+  ProviderLedgerBase,
+  ProviderLedgerEvm,
+} from '@haqq/rn-wallet-providers';
 
 import {ModalName, awaitForBluetooth, awaitForLedger, hideModal} from './';
 import {ExtractPromiseType} from '../types';
@@ -18,7 +21,10 @@ export const ledgerTransportCbWrapper = async <ReturnType>(
 ): Promise<ExtractPromiseType<ReturnType>> => {
   let result;
   try {
-    if (transport instanceof ProviderLedgerReactNative) {
+    if (
+      transport instanceof ProviderLedgerBase ||
+      transport instanceof ProviderLedgerEvm
+    ) {
       await awaitForBluetooth();
       // no need await here
       awaitForLedger(transport);