arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-01-03 21:00:55 +00:00
Code Issues Releases Wiki Activity

update "rippleGetAccountInfo" and "ethereumGetAccountInfo" params

Browse Source
This commit is contained in:
Szymon Lesisz 2019-01-04 14:32:14 +01:00
parent acd2c0f4c6
commit 4f1ba157e1
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/actions/Web3Actions.js
View File

@ -120,15 +120,16 @@ export const initWeb3 = (network: string, urlIndex: number = 0): PromiseAction<W
web3.currentProvider.on('error', onEnd); web3.currentProvider.on('error', onEnd);
}); });
export const discoverAccount = (address: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => { export const discoverAccount = (descriptor: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
const instance: Web3Instance = await dispatch(initWeb3(network)); const instance: Web3Instance = await dispatch(initWeb3(network));
const balance = await instance.web3.eth.getBalance(address); const balance = await instance.web3.eth.getBalance(descriptor);
const nonce = await instance.web3.eth.getTransactionCount(address); const nonce = await instance.web3.eth.getTransactionCount(descriptor);
return { return {
address, descriptor,
transactions: 0, transactions: 0,
block: 0, block: 0,
balance: EthereumjsUnits.convert(balance, 'wei', 'ether'), balance: EthereumjsUnits.convert(balance, 'wei', 'ether'),
availableBalance: EthereumjsUnits.convert(balance, 'wei', 'ether'),
nonce, nonce,
}; };
}; };

10
src/actions/ethereum/BlockchainActions.js
View File

@ -16,14 +16,15 @@ import type { NetworkToken } from 'reducers/LocalStorageReducer';
import * as Web3Actions from 'actions/Web3Actions'; import * as Web3Actions from 'actions/Web3Actions';
import * as AccountsActions from 'actions/AccountsActions'; import * as AccountsActions from 'actions/AccountsActions';
export const discoverAccount = (device: TrezorDevice, address: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => { export const discoverAccount = (device: TrezorDevice, descriptor: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
// get data from connect // get data from connect
const txs = await TrezorConnect.ethereumGetAccountInfo({ const txs = await TrezorConnect.ethereumGetAccountInfo({
account: { account: {
address, descriptor,
block: 0, block: 0,
transactions: 0, transactions: 0,
balance: '0', balance: '0',
availableBalance: '0',
nonce: 0, nonce: 0,
}, },
coin: network, coin: network,
@ -34,12 +35,13 @@ export const discoverAccount = (device: TrezorDevice, address: string, network:
} }
// blockbook web3 fallback // blockbook web3 fallback
const web3account = await dispatch(Web3Actions.discoverAccount(address, network)); const web3account = await dispatch(Web3Actions.discoverAccount(descriptor, network));
return { return {
address, descriptor,
transactions: txs.payload.transactions, transactions: txs.payload.transactions,
block: txs.payload.block, block: txs.payload.block,
balance: web3account.balance, balance: web3account.balance,
availableBalance: web3account.balance,
nonce: web3account.nonce, nonce: web3account.nonce,
}; };
}; };

1
src/actions/ethereum/SendFormActions.js
View File

@ -559,6 +559,7 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
blockHeight: 0, blockHeight: 0,
blockHash: undefined, blockHash: undefined,
timestamp: undefined,
}; };
dispatch(BlockchainActions.onNotification({ dispatch(BlockchainActions.onNotification({

2
src/actions/ripple/DiscoveryActions.js
View File

@ -66,7 +66,7 @@ export const discoverAccount = (device: TrezorDevice, discoveryProcess: Discover
deviceID: device.features ? device.features.device_id : '0', deviceID: device.features ? device.features.device_id : '0',
deviceState: device.state || '0', deviceState: device.state || '0',
accountPath: account.path || [], accountPath: account.path || [],
descriptor: account.address, descriptor: account.descriptor,
balance: toDecimalAmount(account.balance, network.decimals), balance: toDecimalAmount(account.balance, network.decimals),
availableBalance: toDecimalAmount(account.availableBalance, network.decimals), availableBalance: toDecimalAmount(account.availableBalance, network.decimals),