arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00
Code Issues Releases Wiki Activity

fixed token balance + decimal regexp

Browse Source
This commit is contained in:
Szymon Lesisz 2018-05-07 18:04:04 +02:00
parent 3dabc7dda6
commit 9020ecc176
5 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/actions/DiscoveryActions.js
View File

@ -192,11 +192,6 @@ const begin = (device: TrezorDevice, network: string): AsyncAction => {
const discoverAddress = (device: TrezorDevice, discoveryProcess: Discovery): AsyncAction => {
return async (dispatch: Dispatch, getState: GetState): Promise<void> => {
//const hdKey = discoveryProcess.hdKey
console.log("TYPEOF", typeof discoveryProcess.hdKey.derive, discoveryProcess.hdKey)
console.log("TYPEOF", typeof discoveryProcess.hdKey.derive === typeof HDKey);
const derivedKey = discoveryProcess.hdKey.derive(`m/${discoveryProcess.accountIndex}`);
const path = discoveryProcess.basePath.concat(discoveryProcess.accountIndex);
const publicAddress: string = EthereumjsUtil.publicToAddress(derivedKey.publicKey, true).toString('hex');
@ -300,9 +295,9 @@ const discoverAddress = (device: TrezorDevice, discoveryProcess: Discovery): Asy
// ];
for (let i = 0; i < userTokens.length; i++) {
const tokenBalance = await getTokenBalanceAsync(web3instance.erc20, userTokens[i].address, ethAddress);
const tokenBalance: string = await getTokenBalanceAsync(web3instance.erc20, userTokens[i]);
if (discoveryProcess.interrupted) return;
dispatch( setTokenBalance(userTokens[i].address, ethAddress, tokenBalance.toString()) )
dispatch( setTokenBalance(userTokens[i].address, ethAddress, tokenBalance) )
}
const nonce: number = await getNonceAsync(web3instance.web3, ethAddress);

6
src/js/actions/SendFormActions.js
View File

@ -86,7 +86,7 @@ export type SendFormAction = {
};
//const numberRegExp = new RegExp('^([0-9]{0,10}\\.)?[0-9]{1,18}$');
const numberRegExp: RegExp = new RegExp('^(0|0\\.([0-9]+)?|[1-9]+\\.?([0-9]+)?|\\.[0-9]+)$');
const numberRegExp: RegExp = new RegExp('^(0|0\\.([0-9]+)?|[1-9][0-9]*\\.?([0-9]+)?|\\.[0-9]+)$');
const calculateFee = (gasPrice: string, gasLimit: string): string => {
return EthereumjsUnits.convert( new BigNumber(gasPrice).times(gasLimit), 'gwei', 'ether');
@ -289,7 +289,7 @@ export const validation = (): ThunkAction => {
if (token) {
if (parseInt(token.decimals) > 0) {
//decimalRegExp = new RegExp('^(0|0\\.([0-9]{0,' + token.decimals + '})?|[1-9]+\\.?([0-9]{0,' + token.decimals + '})?|\\.[0-9]{1,' + token.decimals + '})$');
decimalRegExp = new RegExp('^(0|0\\.([0-9]{0,' + token.decimals + '})?|[1-9]+\\.?([0-9]{0,' + token.decimals + '})?|\\.[0-9]{1,' + token.decimals + '})$');
decimalRegExp = new RegExp('^(0|0\\.([0-9]{0,' + token.decimals + '})?|[1-9][0-9]*\\.?([0-9]{0,' + token.decimals + '})?|\\.[0-9]{1,' + token.decimals + '})$');
} else {
// decimalRegExp = new RegExp('^(0|0\\.?|[1-9]+\\.?)$');
decimalRegExp = new RegExp('^[0-9]+$');
@ -307,7 +307,7 @@ export const validation = (): ThunkAction => {
}
} else {
decimalRegExp = new RegExp('^(0|0\\.([0-9]{0,18})?|[1-9]+\\.?([0-9]{0,18})?|\\.[0-9]{0,18})$');
decimalRegExp = new RegExp('^(0|0\\.([0-9]{0,18})?|[1-9][0-9]*\\.?([0-9]{0,18})?|\\.[0-9]{0,18})$');
if (!state.amount.match(decimalRegExp)) {
errors.amount = `Maximum 18 decimals allowed`;
} else if (new BigNumber(state.total).greaterThan(account.balance)) {

1
src/js/actions/SummaryActions.js
View File

@ -6,7 +6,6 @@ import * as SUMMARY from './constants/summary';
import * as TOKEN from './constants/token';
import * as ADDRESS from './constants/address';
import { resolveAfter } from '../utils/promiseUtils';
import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions';
import { initialState } from '../reducers/SummaryReducer';
import { findSelectedDevice } from '../reducers/TrezorConnectReducer';

12
src/js/actions/TokenActions.js
View File

@ -70,9 +70,7 @@ export const add = (token: NetworkToken, account: Account): AsyncAction => {
const web3instance = getState().web3.find(w3 => w3.network === account.network);
if (!web3instance) return;
dispatch({
type: TOKEN.ADD,
payload: {
const tkn: Token = {
loaded: false,
deviceState: account.deviceState,
network: account.network,
@ -83,10 +81,14 @@ export const add = (token: NetworkToken, account: Account): AsyncAction => {
decimals: token.decimals,
balance: '0'
}
dispatch({
type: TOKEN.ADD,
payload: tkn
});
const tokenBalance = await getTokenBalanceAsync(web3instance.erc20, token.address, account.address);
dispatch( setBalance(token.address, account.address, tokenBalance.toString()) )
const tokenBalance = await getTokenBalanceAsync(web3instance.erc20, tkn);
dispatch( setBalance(token.address, account.address, tokenBalance) )
}
}

46
src/js/actions/Web3Actions.js
View File

@ -11,6 +11,7 @@ import * as ADDRESS from './constants/address';
import * as WEB3 from './constants/web3';
import * as PENDING from './constants/pendingTx';
import * as AddressActions from '../actions/AddressActions';
import * as TokenActions from '../actions/TokenActions';
import type {
Dispatch,
@ -23,6 +24,7 @@ import type { ContractFactory } from 'web3';
import type { Account } from '../reducers/AccountsReducer';
import type { PendingTx } from '../reducers/PendingTxReducer';
import type { Web3Instance } from '../reducers/Web3Reducer';
import type { Token } from '../reducers/TokensReducer';
export type Web3Action = {
type: typeof WEB3.READY,
@ -171,6 +173,11 @@ export function init(web3: ?Web3, coinIndex: number = 0): AsyncAction {
dispatch( getNonce(addr) );
}
const tokens = getState().tokens.filter(t => t.network === network);
for (const token of tokens) {
dispatch( getTokenBalance(token) );
}
dispatch( getGasPrice(network) );
const pending = getState().pending.filter(p => p.network === network);
@ -281,6 +288,32 @@ export function getBalance(account: Account): AsyncAction {
}
}
export function getTokenBalance(token: Token): AsyncAction {
return async (dispatch: Dispatch, getState: GetState): Promise<void> => {
const web3instance = getState().web3.filter(w3 => w3.network === token.network)[0];
const web3 = web3instance.web3;
const contract = web3instance.erc20.at(token.address);
console.warn("Get bal", token)
contract.balanceOf(token.ethAddress, (error: ?Error, balance: ?BigNumber) => {
if (balance) {
const newBalance: string = balance.dividedBy( Math.pow(10, token.decimals) ).toString();
if (newBalance !== token.balance) {
dispatch(TokenActions.setBalance(
token.address,
token.ethAddress,
newBalance
));
}
console.log("BALANCE!", balance, newBalance);
}
});
}
}
export function getNonce(account: Account): AsyncAction {
return async (dispatch: Dispatch, getState: GetState): Promise<void> => {
@ -359,15 +392,18 @@ export const getBalanceAsync = (web3: Web3, address: string): Promise<any> => {
});
}
export const getTokenBalanceAsync = (erc20: any, token: string, address: string): Promise<string> => {
export const getTokenBalanceAsync = (erc20: ContractFactory, token: Token): Promise<string> => {
return new Promise((resolve, reject) => {
const contr = erc20.at(token);
contr.balanceOf(address, (error: Error, result) => {
const contract = erc20.at(token.address);
contract.balanceOf(token.ethAddress, (error: ?Error, balance: ?BigNumber) => {
if (error) {
reject(error);
} else {
resolve(result);
} else if (balance) {
const newBalance: string = balance.dividedBy( Math.pow(10, token.decimals) ).toString();
resolve(newBalance);
}
});
});