Change walletManager with UID (#43)

Author: lmcmz

packages/common/ios/Podfile

@@ -57,7 +57,7 @@ end
 # -------------------------------------------------- #
 def native
   # Native Dependencies
-  pod 'Web3swift.pod', git: 'https://github.com/matter-labs/web3swift', branch: 'master'
+  pod 'web3swift', git: 'https://github.com/matter-labs/web3swift', branch: 'master'
   pod 'KeychainAccess'
   pod 'ToastHybrid', :path => './lib'
 end

packages/common/ios/common/Modules/ReactNative/RNBridge.m

@@ -17,8 +17,7 @@ @interface RCT_EXTERN_MODULE(WalletModule, NSObject)
 RCT_EXTERN_METHOD(generateMnemonic:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(generateAndStoreMnemonic(NSString *)uid
-                  mnemonic:(NSString *)mnemonic
+RCT_EXTERN_METHOD(generateAndStoreMnemonic:(NSString *)uid
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
@@ -28,7 +27,6 @@ @interface RCT_EXTERN_MODULE(WalletModule, NSObject)
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(retrieveMnemonic:(NSString *)uid
-                  mnemonic:(NSString *)mnemonic
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 

packages/common/src/Screens/NativeBridgeTests.js

@@ -11,6 +11,8 @@ import {
 const {height, width} = Dimensions.get('window');
 import WalletManager from '../Util/WalletManager';
 
+const uid = 'test';
+
 export default class nativeBridgeTests extends React.Component {
   constructor(props) {
     super(props);
@@ -32,6 +34,7 @@ export default class nativeBridgeTests extends React.Component {
     };
 
     this.child = React.createRef();
+    WalletManager.init(uid);
   }
 
   generateMnemonic = async () => {
@@ -46,7 +49,9 @@ export default class nativeBridgeTests extends React.Component {
 
   generateAndStoreMnemonic = async () => {
     try {
-      const mnemonicsAndStore = await NativeWallet.generateAndStoreMnemonic();
+      const mnemonicsAndStore = await NativeWallet.generateAndStoreMnemonic(
+        uid,
+      );
       console.log('mnemonicsAndStore: ', mnemonicsAndStore);
       this.setState({mnemonicsAndStore});
     } catch (e) {
@@ -57,6 +62,7 @@ export default class nativeBridgeTests extends React.Component {
   storeMnemonic = async () => {
     try {
       const storedMnemonic = await NativeWallet.storeMnemonic(
+        uid,
         'order cabin immune pond brave guilt boil index car aware snap list',
       );
       console.log('storeMnemonic: ', storedMnemonic);
@@ -68,7 +74,7 @@ export default class nativeBridgeTests extends React.Component {
 
   retrieveMnemonic = async () => {
     try {
-      const keychainMnemonics = await NativeWallet.retrieveMnemonic();
+      const keychainMnemonics = await NativeWallet.retrieveMnemonic(uid);
       console.log('keychainMnemonics: ', keychainMnemonics);
       this.setState({keychainMnemonics});
     } catch (e) {
@@ -78,7 +84,7 @@ export default class nativeBridgeTests extends React.Component {
 
   getOwnerBalance = async () => {
     try {
-      const manager = await WalletManager.getInstance();
+      const manager = WalletManager.getInstance();
       const address = await manager.getOwnerAccount();
       const balance = await manager.getBalance(address);
       this.setState({ownerAccount: address, ownerBalance: balance});
@@ -89,7 +95,7 @@ export default class nativeBridgeTests extends React.Component {
 
   getBalance = async () => {
     try {
-      const manager = await WalletManager.getInstance();
+      const manager = WalletManager.getInstance();
       const address = manager.getAddress();
       const balance = await manager.getBalance(manager.address);
       this.setState({address, balance});
@@ -100,7 +106,7 @@ export default class nativeBridgeTests extends React.Component {
 
   sendTransaction = async () => {
     try {
-      const manager = await WalletManager.getInstance();
+      const manager = WalletManager.getInstance();
       const {response, hash} = await manager.sendTransaction(
         '0x41B788babf69FC7F98336ff7A47F5A80c3A63d40',
         '0.001',
@@ -117,7 +123,7 @@ export default class nativeBridgeTests extends React.Component {
 
   readSmartContract = async () => {
     try {
-      const manager = await WalletManager.getInstance();
+      const manager = WalletManager.getInstance();
       let value = await manager.readSmartContract(
         '0x2f21957c7147c3eE49235903D6471159a16c9ccd',
         MessageContract,
@@ -131,7 +137,7 @@ export default class nativeBridgeTests extends React.Component {
 
   callSmartContract = async () => {
     try {
-      const manager = await WalletManager.getInstance();
+      const manager = WalletManager.getInstance();
       let message = `Hello ${Math.floor(Math.random() * Math.floor(50))}`;
       console.log(message);
       const {

packages/common/src/Util/WalletManager.js

@@ -4,9 +4,9 @@ import CPK from 'contract-proxy-kit';
 
 export default class WalletManager {
   static myInstance = null;
-  constructor(provider, cpkAddress) {
+  constructor(provider, cpkAddress, uid) {
     return (async () => {
-      this.mnemonic = await NativeWallet.retrieveMnemonic();
+      this.mnemonic = await NativeWallet.retrieveMnemonic(uid);
       this.provider = provider;
       this.ethWallet = ethers.Wallet.fromMnemonic(this.mnemonic).connect(
         this.provider,
@@ -21,21 +21,29 @@ export default class WalletManager {
     })();
   }
 
-  static getInstance = async () => {
+  static init = async uid => {
+    const cpkAddress = {
+      4: {
+        masterCopyAddress: '0xaE32496491b53841efb51829d6f886387708F99B',
+        proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
+        multiSendAddress: '0xB522a9f781924eD250A11C54105E51840B138AdD',
+        fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980',
+      },
+    };
+    const provider = new ethers.providers.InfuraProvider(
+      'rinkeby',
+      '3c08878d00734c0c98a3e4741d0b4cfc',
+    );
+    WalletManager.myInstance = await new WalletManager(
+      provider,
+      cpkAddress,
+      uid,
+    );
+  };
+
+  static getInstance = () => {
     if (WalletManager.myInstance == null) {
-      const cpkAddress = {
-        4: {
-          masterCopyAddress: '0xaE32496491b53841efb51829d6f886387708F99B',
-          proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
-          multiSendAddress: '0xB522a9f781924eD250A11C54105E51840B138AdD',
-          fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980',
-        },
-      };
-      const provider = new ethers.providers.InfuraProvider(
-        'rinkeby',
-        '3c08878d00734c0c98a3e4741d0b4cfc',
-      );
-      WalletManager.myInstance = await new WalletManager(provider, cpkAddress);
+      throw new Error('WalletManager have not initialized');
     }
     return this.myInstance;
   };