chore: removed extra wallet creation + added patch to use native crypto in bip39

Author: ignaciosantise

wallets/rn_cli_wallet/.yarn/patches/bip39-npm-3.1.0-03958ed434.patch

@@ -0,0 +1,82 @@
+diff --git a/src/index.js b/src/index.js
+index b83863f4b3d09df1159eb2c05d43e20a05d55767..926895a1f697905d48bf32f32fc538de3ce1b252 100644
+--- a/src/index.js
++++ b/src/index.js
+@@ -38,20 +38,68 @@ function salt(password) {
+ function mnemonicToSeedSync(mnemonic, password) {
+     const mnemonicBuffer = Uint8Array.from(Buffer.from(normalize(mnemonic), 'utf8'));
+     const saltBuffer = Uint8Array.from(Buffer.from(salt(normalize(password)), 'utf8'));
+-    const res = pbkdf2_1.pbkdf2(sha512_1.sha512, mnemonicBuffer, saltBuffer, {
+-        c: 2048,
+-        dkLen: 64,
+-    });
+-    return Buffer.from(res);
++    
++    // Use react-native-quick-crypto's native PBKDF2
++    try {
++        var crypto = require("crypto");
++        const res = crypto.pbkdf2Sync(
++            mnemonicBuffer,
++            saltBuffer,
++            2048,  // iterations
++            64,    // key length
++            'sha512'
++        );
++        return Buffer.from(res);
++    } catch (e) {
++        console.warn('Native pbkdf2Sync failed, falling back to JS implementation', e);
++        // Fallback to original implementation
++        const res = pbkdf2_1.pbkdf2(sha512_1.sha512, mnemonicBuffer, saltBuffer, {
++            c: 2048,
++            dkLen: 64,
++        });
++        return Buffer.from(res);
++    }
+ }
+ exports.mnemonicToSeedSync = mnemonicToSeedSync;
++
+ function mnemonicToSeed(mnemonic, password) {
+     const mnemonicBuffer = Uint8Array.from(Buffer.from(normalize(mnemonic), 'utf8'));
+     const saltBuffer = Uint8Array.from(Buffer.from(salt(normalize(password)), 'utf8'));
+-    return pbkdf2_1.pbkdf2Async(sha512_1.sha512, mnemonicBuffer, saltBuffer, {
+-        c: 2048,
+-        dkLen: 64,
+-    }).then((res) => Buffer.from(res));
++    
++    // Use react-native-quick-crypto's native PBKDF2
++    try {
++        var crypto = require("crypto");
++        return new Promise((resolve, reject) => {
++            crypto.pbkdf2(
++                mnemonicBuffer,
++                saltBuffer,
++                2048,  // iterations
++                64,    // key length
++                'sha512',
++                (err, res) => {
++                    if (err) {
++                        reject(err);
++                    } else {
++                        resolve(Buffer.from(res));
++                    }
++                }
++            );
++        }).catch((err) => {
++            console.warn('Native pbkdf2 failed, falling back to JS implementation', err);
++            // Fallback to original implementation
++            return pbkdf2_1.pbkdf2Async(sha512_1.sha512, mnemonicBuffer, saltBuffer, {
++                c: 2048,
++                dkLen: 64,
++            }).then((res) => Buffer.from(res));
++        });
++    } catch (e) {
++        console.warn('Native pbkdf2 not available, using JS implementation', e);
++        // Fallback to original implementation
++        return pbkdf2_1.pbkdf2Async(sha512_1.sha512, mnemonicBuffer, saltBuffer, {
++            c: 2048,
++            dkLen: 64,
++        }).then((res) => Buffer.from(res));
++    }
+ }
+ exports.mnemonicToSeed = mnemonicToSeed;
+ function mnemonicToEntropy(mnemonic, wordlist) {

wallets/rn_cli_wallet/index.js

@@ -2,9 +2,9 @@ import 'react-native-gesture-handler';
 import '@walletconnect/react-native-compat';
 import {AppRegistry} from 'react-native';
 import {name as appName} from './app.json';
-import crypto from 'react-native-quick-crypto';
+import crypto, { install } from 'react-native-quick-crypto';
 
-import App from './src/screens/App';
+install();
 
 const polyfillDigest = async (algorithm, data) => {
   const algo = algorithm.replace('-', '').toLowerCase();
@@ -13,11 +13,10 @@ const polyfillDigest = async (algorithm, data) => {
   return hash.digest();
 };
 
-// eslint-disable-next-line no-undef
-globalThis.crypto = crypto;
 // eslint-disable-next-line no-undef
 globalThis.crypto.subtle = {
   digest: polyfillDigest,
 };
 
+import App from './src/screens/App';
 AppRegistry.registerComponent(appName, () => App);

wallets/rn_cli_wallet/package.json

@@ -106,7 +106,8 @@
     "brace-expansion": "1.1.12",
     "@ton/[email protected]": "patch:@ton/crypto-primitives@npm%3A2.1.0#./.yarn/patches/@ton-crypto-primitives-npm-2.1.0-3d1ea62176.patch",
     "@ethersproject/[email protected]": "patch:@ethersproject/pbkdf2@npm%3A5.8.0#./.yarn/patches/@ethersproject-pbkdf2-npm-5.8.0-b720e81bcc.patch",
-    "@ethersproject/pbkdf2@^5.8.0": "patch:@ethersproject/pbkdf2@npm%3A5.8.0#./.yarn/patches/@ethersproject-pbkdf2-npm-5.8.0-b720e81bcc.patch"
+    "@ethersproject/pbkdf2@^5.8.0": "patch:@ethersproject/pbkdf2@npm%3A5.8.0#./.yarn/patches/@ethersproject-pbkdf2-npm-5.8.0-b720e81bcc.patch",
+    "[email protected]": "patch:bip39@npm%3A3.1.0#./.yarn/patches/bip39-npm-3.1.0-03958ed434.patch"
   },
   "packageManager": "[email protected]"
 }

wallets/rn_cli_wallet/src/screens/Scan/index.tsx

@@ -18,7 +18,7 @@ import styles from './styles';
 type Props = RootStackScreenProps<'Scan'>;
 
 export default function Scan({navigation}: Props) {
-  const device = useCameraDevice('back');
+  const device = useCameraDevice('back', {physicalDevices: ['wide-angle-camera']});
   const [showCamera, setShowCamera] = useState(false);
 
   // 2. Only activate Camera when the app is focused and this screen is currently opened

wallets/rn_cli_wallet/src/utils/EIP155WalletUtil.ts

@@ -7,33 +7,27 @@ export let eip155Wallets: Record<string, EIP155Lib>;
 export let eip155Addresses: string[];
 
 let address1: string;
-let address2: string;
+// let address2: string;
 
 /**
  * Utilities
  */
 export async function createOrRestoreEIP155Wallet() {
   const mnemonic1 = await storage.getItem('EIP155_MNEMONIC_1');
-  const mnemonic2 = await storage.getItem('EIP155_MNEMONIC_2');
 
-  if (mnemonic1 && mnemonic2) {
+  if (mnemonic1) {
     wallet1 = EIP155Lib.init({mnemonic: mnemonic1});
-    wallet2 = EIP155Lib.init({mnemonic: mnemonic2});
   } else {
     wallet1 = EIP155Lib.init({});
-    wallet2 = EIP155Lib.init({});
 
     // Don't store mnemonic in local storage in a production project!
     storage.setItem('EIP155_MNEMONIC_1', wallet1.getMnemonic());
-    storage.setItem('EIP155_MNEMONIC_2', wallet2.getMnemonic());
   }
 
   address1 = wallet1.getAddress();
-  address2 = wallet2.getAddress();
 
   eip155Wallets = {
     [address1]: wallet1,
-    [address2]: wallet2,
   };
   eip155Addresses = Object.keys(eip155Wallets);
 

wallets/rn_cli_wallet/src/utils/TonWalletUtil.ts

@@ -7,33 +7,25 @@ export let tonWallets: Record<string, TonLib>
 export let tonAddresses: string[]
 
 let address1: string
-let address2: string
 
 /**
  * Utilities
  */
 export async function createOrRestoreTonWallet() {
   const secretKey1 = await storage.getItem('TON_SECRET_KEY_1')
-  const secretKey2 = await storage.getItem('TON_SECRET_KEY_2')
 
-  if (secretKey1 && secretKey2) {
+  if (secretKey1) {
     wallet1 = await TonLib.init({ secretKey: secretKey1 })
-    wallet2 = await TonLib.init({ secretKey: secretKey2 })
   } else {
     wallet1 = await TonLib.init({})
-    wallet2 = await TonLib.init({})
-
     // Don't store secretKey in local storage in a production project!
     await storage.setItem('TON_SECRET_KEY_1', wallet1.getSecretKey())
-    await storage.setItem('TON_SECRET_KEY_2', wallet2.getSecretKey())
   }
 
   address1 = await wallet1.getAddress()
-  address2 = await wallet2.getAddress()
 
   tonWallets = {
     [address1]: wallet1,
-    [address2]: wallet2
   }
   tonAddresses = Object.keys(tonWallets)
 

wallets/rn_cli_wallet/yarn.lock

@@ -4846,6 +4846,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bip39@patch:bip39@npm%3A3.1.0#./.yarn/patches/bip39-npm-3.1.0-03958ed434.patch::locator=RNWeb3Wallet%40workspace%3A.":
+  version: 3.1.0
+  resolution: "bip39@patch:bip39@npm%3A3.1.0#./.yarn/patches/bip39-npm-3.1.0-03958ed434.patch::version=3.1.0&hash=6ad58d&locator=RNWeb3Wallet%40workspace%3A."
+  dependencies:
+    "@noble/hashes": ^1.2.0
+  checksum: 482916c2a55755aff5e354042932c71b1f37cbe7c8ff870306ea2dc185b932db3b2e775e61175f68e3263f532fcbf8588ee7fe4422b60f55b6b208b6527b51a5
+  languageName: node
+  linkType: hard
+
 "bl@npm:^4.0.3, bl@npm:^4.1.0":
   version: 4.1.0
   resolution: "bl@npm:4.1.0"