Add ZECTEST as test coin, setup socket initialization when a dlight/p…

…rivate enabled coin is added, and teardown when it is removed

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Debug Android",
+			"program": "${workspaceRoot}/.vscode/launchReactNative.js",
+			"type": "reactnative",
+			"request": "launch",
+			"platform": "android",
+      "sourceMaps": true,
+      "cwd": "${workspaceFolder}",
+		},
+		{
+			"name": "Debug iOS",
+			"program": "${workspaceRoot}/.vscode/launchReactNative.js",
+			"type": "reactnative",
+			"request": "launch",
+			"platform": "ios",
+      "target": "iPhone 5s",
+      "cwd": "${workspaceFolder}",
+			"sourceMaps": true,
+		}
+	]
+}

__mocks__/react-native-alert-async/mock.js

@@ -0,0 +1,19 @@
+let AsyncAlerts = []
+let AlertResponse = false
+
+function mockRnAlertAsync() {
+  return {
+    AlertAsync: (title, desc, buttons, options) => {
+      AsyncAlerts.push({title, desc, buttons, options})
+      return new Promise((resolve) => {
+        resolve(AlertResponse)
+      })
+    },
+    getAlerts: () => AsyncAlerts,
+    setAlertResponse: (response) => {
+      AlertResponse = response
+    }
+  } 
+}
+
+module.exports = mockRnAlertAsync

__mocks__/react-native-verus-light-client/WalletFolder.js

@@ -3,7 +3,7 @@ const formatResponse = require('./requests/JsonRpc')
 
 const WalletFolder = {}
 
-function createWallet(coinId, coinProto, address, port, accountHash, numAddresses, seed, birthday) {
+function createWallet(coinId, coinProto, accountHash, address, port, numAddresses, seed, birthday) {
   WalletFolder[coinId + '_' + coinProto + '_' + accountHash] = { open: false }
 
   return new Promise((resolve, reject) => resolve(true))
@@ -20,6 +20,28 @@ function openWallet(coinId, coinProto, accountHash) {
   })
 }
 
+function startSync(coinId, coinProto, accountHash) {
+  return new Promise((resolve, reject) => {
+    if (WalletFolder[coinId + '_' + coinProto + '_' + accountHash] == null) reject("Failed to open " + coinId + " wallet.")
+    else {
+      WalletFolder[coinId + '_' + coinProto + '_' + accountHash].open = true
+
+      resolve(true)
+    }
+  })
+}
+
+function stopSync(coinId, coinProto, accountHash) {
+  return new Promise((resolve, reject) => {
+    if (WalletFolder[coinId + '_' + coinProto + '_' + accountHash] == null) reject("Failed to open " + coinId + " wallet.")
+    else {
+      WalletFolder[coinId + '_' + coinProto + '_' + accountHash].open = true
+
+      resolve(true)
+    }
+  })
+}
+
 function closeWallet(coinId, coinProto, accountHash) {
   return new Promise((resolve, reject) => {
     if (WalletFolder[coinId + '_' + coinProto + '_' + accountHash] == null) reject("Failed to close " + coinId + " wallet.")
@@ -88,5 +110,7 @@ module.exports = {
   openWallet,
   closeWallet,
   deleteWallet,
+  startSync,
+  stopSync,
   request
 }

__mocks__/react-native-verus-light-client/mock.js

@@ -3,7 +3,9 @@ const {
   openWallet,
   closeWallet,
   deleteWallet,
-  request
+  request,
+  startSync,
+  stopSync
 } = require('./WalletFolder')
 
 function mockVerusLightClient() {
@@ -12,6 +14,8 @@ function mockVerusLightClient() {
     openWallet,
     closeWallet,
     deleteWallet,
+    startSync,
+    stopSync,
     request
   } 
 }

__mocks__/react-native-verus-light-client/requests/WalletRequests.js

@@ -42,11 +42,12 @@ function getTransactions(id, params) {
             {
               address: null,
               amount: 12.160704,
-              category: "sent",
+              category: "received",
               status: "confirmed",
               time: "341431",
               txid: "3242edc2c2",
-              height: "312312"
+              height: "312312",
+              memo: "746573746d656d6f"
             },
             {
               address: "2ei2joffd2",

debug/setupJest.js

@@ -1,9 +1,11 @@
 const mockAgamaWalletLibElectrums = require('../__mocks__/agama-wallet-lib/agama-wallet-lib-electrums')
 const mockVerusLightClient = require('../__mocks__/react-native-verus-light-client/mock')
+const mockRnAlertAsync = require('../__mocks__/react-native-alert-async/mock')
 const mockRedux = require('../__mocks__/redux/mock')
 
 jest.mock('agama-wallet-lib/src/electrum-servers', () => mockAgamaWalletLibElectrums());
 jest.mock('react-native-verus-light-client', () => mockVerusLightClient());
+jest.mock('react-native-alert-async', () => mockRnAlertAsync());
 jest.mock('redux', () => mockRedux());
 
 global.fetch = require('../__mocks__/react-native-fetch/fetch')

src/VerusMobile.js

@@ -26,6 +26,8 @@ import {
   initializeWallet,
   openWallet
 } from "./utils/api/channels/dlight/callCreators";
+import VerusLightClient from "react-native-verus-light-client";
+import { hashAccountId } from "./utils/crypto/hash";
 
 
 class VerusMobile extends React.Component {
@@ -43,46 +45,6 @@ class VerusMobile extends React.Component {
   }
 
   componentDidMount() {
-
-    //DELETE/REFACTOR
-    /*VerusLightClient.addWallet('ZEC', 'btc', "lightwalletd.testnet.z.cash", 9067, "abcde12345", "a seed that is at least 32 bytes long so that it will work with the ZIP 32 protocol.")
-    .then(res => {
-      console.log("ADD WALLET RES")
-      console.log(res)
-
-      return VerusLightClient.request(20, "getblockcount", ["ZEC", "abcde12345", "btc"])
-    }) 
-    .then(res => {
-      console.log("BLOCK COUNT")
-      console.log(res)
-    })
-    .catch(err => {
-      console.log("ADD WALLET OR REQ REJ")
-      console.log(err)
-    })*/
-    /*initializeWallet('ZEC', 'btc', "lightwalletd.testnet.z.cash", 9067, "8ccb033c0e48b27ff91e1ab948367e3bbc6921487c97624ed7ad064025e3dc99", 100, "a seed that is at least 32 bytes long so that it will work with the ZIP 32 protocol.", 0)
-    .then(res => {
-      console.log("INIT WALLET RES")
-      console.log(res)
-
-      return openWallet('ZEC', 'btc', '8ccb033c0e48b27ff91e1ab948367e3bbc6921487c97624ed7ad064025e3dc99')
-    })
-    .then(res => {
-      console.log("ADD WALLET RES")
-      console.log(res)
-
-      return startSync('ZEC', 'btc', '8ccb033c0e48b27ff91e1ab948367e3bbc6921487c97624ed7ad064025e3dc99')
-    }) 
-    .then(res => {
-      console.log("START SYNC RES")
-      console.log(res)
-    })
-    .catch(e => {
-      console.log("ERROR")
-      console.log(e)
-    })*/
-
-
     //TODO: Figure out what should trigger a cache clear on startup of server 
     //versions. (The action that triggers it should indicate a server upgraded it's 
     //version)

src/actions/actionCreators.js

@@ -1,4 +1,4 @@
-export * from './actions/Coins'
+export * from './actions/coins/Coins'
 export * from './actions/UserData'
 export * from './actions/WalletSettings'
 export * from './actions/cache/Electrum'
@@ -51,7 +51,9 @@ import {
   SET_COIN_STATUS,
   SIGN_IN_USER,
   AUTHENTICATE_USER,
-  SET_COINMENU_FOCUS
+  SET_COINMENU_FOCUS,
+  OPEN_DLIGHT_SOCKET,
+  CLOSE_DLIGHT_SOCKET
 } from "../utils/constants/storeType";
 
 //Reducer Name: authentication
@@ -197,6 +199,22 @@ export const setCurrentUserCoins = (activeCoinsForUser) => {
   }
 }
 
+//Reducer name: coins
+export const openDlightWallet = (chainTicker) => {
+  return {
+    type: OPEN_DLIGHT_SOCKET,
+    payload: { chainTicker }
+  }
+}
+
+//Reducer name: coins
+export const closeDlightWallet = (chainTicker) => {
+  return {
+    type: CLOSE_DLIGHT_SOCKET,
+    payload: { chainTicker }
+  }
+}
+
 //Reducer name: ledger
 export const setBalances = (balances) => {
   return {
@@ -287,11 +305,8 @@ export const setActiveSectionCustomCoins = (activeSection) => {
   }
 }
 
-// Reducer name: coinOverview
+//Reducer name: coinOverview
 export const setActiveOverviewFilter = (chainTicker, filterType) => {
-  //DELET
-  console.log("SETTING FILTER FOR")
-  console.log(chainTicker + ', ' + filterType)
   return {
     type: SET_OVERVIEW_FILTER,
     payload: {

src/actions/actions/Coins.js → src/actions/actions/coins/Coins.js

@@ -1,71 +1,78 @@
 import { 
   setCoinList,
   setCurrentUserCoins,
- } from '../actionCreators';
-import { 
-  createCoinObj
-} from '../../utils/CoinData/CoinData';
+ } from '../../actionCreators';
 import {
   storeCoins,
   getActiveCoinList
-} from '../../utils/asyncStore/asyncStore';
+} from '../../../utils/asyncStore/asyncStore';
+import { DLIGHT } from '../../../utils/constants/intervalConstants';
+import { initDlightWallet, closeDlightWallet } from '../dlight/dispatchers/LightWalletReduxManager';
 
-// Add coin that exists in default list of coins
-export const addExistingCoin = (fullCoinObj, activeCoins, userName) => {
+// Add coin by saving it to localstorage, and optionally intialize dlight backend
+export const addCoin = (fullCoinObj, activeCoins, userName, channels) => {
   let coinIndex = activeCoins.findIndex(x => x.id === fullCoinObj.id);
+  let dlightInit = channels.includes(DLIGHT) ? [initDlightWallet(fullCoinObj)] : []
 
   if (coinIndex > -1) {
     if (activeCoins[coinIndex].users.includes(userName)) {
-      throw new Error("Coin already added for user " + userName);
+      // Do nothing except for conditionally enable dlight backend
+      return new Promise((resolve, reject) => {
+        Promise.all(dlightInit)
+        .then(() => {
+          resolve(setCoinList(activeCoins))
+        })
+        .catch(err => reject(err))
+      });
     }
     else {
       activeCoins[coinIndex].users.push(userName);
       return new Promise((resolve, reject) => {
         storeCoins(activeCoins)
-        .then((res) => {
-          if (res === true) {
-            resolve(setCoinList(activeCoins))
-          }
-          else {
-            resolve(false);
-          }
+        .then(() => {
+          return Promise.all(dlightInit)
+        })
+        .then(() => {
+          resolve(setCoinList(activeCoins))
         })
+        .catch(err => reject(err))
       });
     }
   }
   else {
     activeCoins.push({...fullCoinObj, users: [userName]});
     return new Promise((resolve, reject) => {
       storeCoins(activeCoins)
-      .then((res) => {
-        if (res === true) {
-          resolve(setCoinList(activeCoins))
-        }
-        else {
-          resolve(false);
-        }
+      .then(() => {
+        return Promise.all(dlightInit)
+      })
+      .then(() => {
+        resolve(setCoinList(activeCoins))
       })
+      .catch(err => reject(err))
     });
   }
 }
 
 // Remove a user's name from an active coin
-export const removeExistingCoin = (coinID, activeCoins, userName) => {
+export const removeExistingCoin = (coinID, activeCoins, userName, closeSocket, deleteWallet = false) => {
   let coinIndex = activeCoins.findIndex(x => x.id === coinID);
 
   if (coinIndex > -1 && activeCoins[coinIndex].users.includes(userName)) {
     let userIndex = activeCoins[coinIndex].users.findIndex(n => n === userName);
-    activeCoins[coinIndex].users.splice(userIndex, 1);
+    let dlightClose = closeSocket ? [closeDlightWallet(activeCoins[coinIndex], deleteWallet)] : []
+
+    activeCoins[coinIndex].users.splice(userIndex, 1)
+
     return new Promise((resolve, reject) => {
       storeCoins(activeCoins)
-      .then((res) => {
-        if (res === true) {
-          resolve(setCoinList(activeCoins))
-        }
-        else {
-          resolve(false);
-        }
+      .then(() => {
+        return Promise.all(dlightClose)
+      })
+      .then(() => {
+        resolve(setCoinList(activeCoins))
       })
+      .catch(err => reject(err))
     });
   }
   else {