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

TrezorConnect BLOCKCHAIN events returns CoinInfo object

Browse Source
This commit is contained in:
Szymon Lesisz 2018-09-14 16:46:17 +02:00
parent 7790babb3a
commit 892f4fe7c0
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/actions/BlockchainActions.js
View File

@ -86,7 +86,9 @@ export const estimateGasLimit = (network: string, data: string, value: string, g
return await dispatch( Web3Actions.estimateGasLimit(network, { to: '', data, value, gasPrice }) );
}
export const onBlockMined = (network: string): PromiseAction<void> => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
export const onBlockMined = (coinInfo: any): PromiseAction<void> => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
// incoming "coinInfo" from TrezorConnect is CoinInfo | EthereumNetwork type
const network: string = coinInfo.shortcut.toLowerCase();
// try to resolve pending transactions
await dispatch( Web3Actions.resolvePendingTransactions(network) );
@ -119,12 +121,15 @@ export const onBlockMined = (network: string): PromiseAction<void> => async (dis
}
}
// not used for now, waiting for fix in blockbook
export const onNotification = (payload: any): PromiseAction<void> => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
// this event can be triggered multiple times
// 1. check if pair [txid + address] is already in reducer
const network: string = payload.coin.shortcut.toLowerCase();
const address: string = EthereumjsUtil.toChecksumAddress(payload.tx.address);
const txInfo = await dispatch( Web3Actions.getPendingInfo(payload.coin, payload.tx.txid) );
const txInfo = await dispatch( Web3Actions.getPendingInfo(network, payload.tx.txid) );
// const exists = getState().pending.filter(p => p.id === payload.tx.txid && p.address === address);
const exists = getState().pending.filter(p => {
@ -137,7 +142,7 @@ export const onNotification = (payload: any): PromiseAction<void> => async (disp
payload: {
type: 'send',
id: payload.tx.txid,
network: payload.coin,
network,
currency: "tETH",
amount: txInfo.value,
total: "0",
@ -152,7 +157,7 @@ export const onNotification = (payload: any): PromiseAction<void> => async (disp
// dispatch({
// type: PENDING.ADD_UNKNOWN,
// payload: {
// network: payload.coin,
// network,
// ...payload.tx,
// }
// });

4
src/actions/Web3Actions.js
View File

@ -299,7 +299,9 @@ export const estimateGasLimit = (network: string, options: EstimateGasOptions):
return limit;
};
export const disconnect = (network: string): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
export const disconnect = (coinInfo: any): ThunkAction => (dispatch: Dispatch, getState: GetState): void => {
// incoming "coinInfo" from TrezorConnect is CoinInfo | EthereumNetwork type
const network: string = coinInfo.shortcut.toLowerCase();
// check if Web3 was already initialized
const instance = getState().web3.find(w3 => w3.network === network);
if (instance) {

10
src/reducers/BlockchainReducer.js
View File

@ -18,12 +18,13 @@ const find = (state: State, name: string): number => {
}
const connect = (state: State, action: any): State => {
const name = action.payload.coin.shortcut.toLowerCase();
const network: BlockchainNetwork = {
name: action.payload.coin,
name,
connected: true,
}
const newState: State = [...state];
const index: number = find(newState, action.payload.coin);
const index: number = find(newState, name);
if (index >= 0) {
newState[index] = network;
} else {
@ -33,12 +34,13 @@ const connect = (state: State, action: any): State => {
};
const disconnect = (state: State, action: any): State => {
const name = action.payload.coin.shortcut.toLowerCase();
const network: BlockchainNetwork = {
name: action.payload.coin,
name,
connected: false,
}
const newState: State = [...state];
const index: number = find(newState, action.payload.coin);
const index: number = find(newState, name);
if (index >= 0) {
newState[index] = network;
} else {