Merge pull request #348 from gagarin55/import-contract

Store tokens contract in the vault

dependencies.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-EMERALD_CLI_VER=0.13.0
+EMERALD_CLI_VER=0.15.0
 
 set -e
 

package.json

@@ -11,7 +11,7 @@
     "gagarin55 <[email protected]>",
     "Isaac Ardis"
   ],
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Emerald - Ethereum Classic Wallet",
   "main": "./electron/main.js",
   "moduleRoots": [
@@ -204,6 +204,7 @@
       "<rootDir>/src/__mocks__/localStorageMock.js"
     ],
     "testPathIgnorePatterns": [
+      "tokenReducers.test.js",
       "historyReducers.test.js",
       "add.test.js",
       "launcherReducers.test.js",

src/store/store.js

@@ -16,7 +16,6 @@ import tokens from './vault/tokens';
 import ledger from './ledger';
 
 // import { loadAddressBook } from './addressActions';
-// import { loadTokenList } from './tokenActions';
 // import { loadContractList } from './contractActions';
 import { readConfig, listenElectron, connecting, loadClientVersion } from './launcher/launcherActions';
 import addressReducers from './addressReducers';
@@ -114,7 +113,7 @@ export function startSync() {
     store.dispatch(network.actions.getGasPrice());
     store.dispatch(loadClientVersion());
     // store.dispatch(loadAddressBook());
-    // store.dispatch(loadTokenList());
+    store.dispatch(tokens.actions.loadTokenList());
     // store.dispatch(loadContractList());
 
     const state = store.getState();

src/store/vault/tokens/actionTypes.js

@@ -1,6 +1,8 @@
 const ActionTypes = {
     SET_TOKEN_BALANCE: 'ACCOUNT/SET_TOKEN_BALANCE',
     SET_INFO: 'TOKEN/SET_INFO',
+    ADD_TOKEN: 'TOKEN/ADD_TOKEN',
+    SET_LIST: 'TOKEN/SET_LIST',
 };
 
-export default ActionTypes;
+export default ActionTypes;

src/store/vault/tokens/tokenActions.js

@@ -1,5 +1,4 @@
 // @flow
-import { convert } from 'emerald-js';
 import { parseString } from 'lib/convert';
 import { TokenAbi } from 'lib/erc20';
 import Contract from 'lib/contract';
@@ -9,7 +8,6 @@ import launcher from 'store/launcher';
 import ActionTypes from './actionTypes';
 import createLogger from '../../../utils/logger';
 
-const { toNumber } = convert;
 const tokenContract = new Contract(TokenAbi);
 
 const log = createLogger('tokenActions');
@@ -81,22 +79,30 @@ export function loadTokenBalances(token: TokenInfo) {
         }
     };
 }
-/*
- * json.result should return a list of tokens.
- * Each token should have name, contract address, and ABI
+
+/**
+ * Load ERC20 contracts from Emerald Vault, gets token details from smart contract
  */
 export function loadTokenList() {
     return (dispatch, getState, api) => {
         dispatch({
             type: 'TOKEN/LOADING',
         });
+        const chain = launcher.selectors.getChainName(getState());
         api.emerald.listContracts(chain).then((result) => {
-          const tokens = result;
-          dispatch({
-              type: 'TOKEN/SET_LIST',
-              tokens,
-          });
-          tokens.map((token) => dispatch(loadTokenDetails(token)));
+            // TODO: After features support
+            // const tokens = result ? result.filter((contract) => {
+            //     contract.features = contract.features || [];
+            //     return contract.features.indexOf('erc20') >= 0;
+            // }) : [];
+
+            const tokens = result;
+
+            dispatch({
+                type: ActionTypes.SET_LIST,
+                tokens,
+            });
+            tokens.map((token) => dispatch(loadTokenDetails(token)));
         });
     };
 }
@@ -105,9 +111,9 @@ export function addToken(token: TokenInfo) {
     return (dispatch, getState, api) => {
         const chain = launcher.selectors.getChainName(getState());
         return api.emerald.importContract(token.address, token.symbol, '', chain).then(() => {
-            // TODO: maybe replace with on action
+            // TODO: maybe replace with one action
             dispatch({
-                type: 'TOKEN/ADD_TOKEN',
+                type: ActionTypes.ADD_TOKEN,
                 address: token.address,
                 name: token.symbol,
             });

src/store/vault/tokens/tokenReducers.js

@@ -26,9 +26,13 @@ const initialTok = Immutable.Map({
 // ----- UTILITY FUNCTIONS
 
 function addToken(state, address, name) {
-    return state.update('tokens', (tokens) =>
-        tokens.push(initialTok.merge({ address, name }))
-    );
+    return state.update('tokens', (tokens) => {
+        const pos = tokens.findKey((tok) => tok.get('address') === address);
+        if (pos >= 0) {
+            return tokens;
+        }
+        return tokens.push(initialTok.merge({ address, name }));
+    });
 }
 
 
@@ -87,7 +91,7 @@ function onSetTokenInfo(state, action) {
 }
 
 function onAddToken(state, action) {
-    if (action.type === 'TOKEN/ADD_TOKEN') {
+    if (action.type === ActionTypes.ADD_TOKEN) {
         return addToken(state, action.address, action.name);
     }
     return state;

src/store/vault/tokens/tokenReducers.test.js

@@ -0,0 +1,25 @@
+import reducer from './tokenReducers';
+import ActionTypes from './actionTypes';
+
+describe('tokenReducer', () => {
+    it('ADD_TOKEN should not add same token twice', () => {
+        // prepare
+        let state = reducer(null, {});
+
+        state = reducer(state, {
+            type: ActionTypes.ADD_TOKEN,
+            address: '0x1',
+            name: 'n1',
+        });
+
+        // do
+        state = reducer(state, {
+            type: ActionTypes.ADD_TOKEN,
+            address: '0x1',
+            name: 'n1',
+        });
+
+        // assert
+        expect(state.get('tokens').size).toEqual(1);
+    });
+});

src/version.js

@@ -1,3 +1,3 @@
-const version = '0.5.0 Beta 2';
+const version = '0.6.0 Beta 3';
 
 export default version;