Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse ENS caching #970

Merged
merged 6 commits into from
Aug 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 13 additions & 32 deletions app/components/UI/EthereumAddress/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { Text } from 'react-native';
import { InteractionManager, Text } from 'react-native';
import { connect } from 'react-redux';
import ENS from 'ethjs-ens';
import networkMap from 'ethjs-ens/lib/network-map.json';
import Engine from '../../../core/Engine';
import { renderShortAddress, renderFullAddress } from '../../../util/address';
import Logger from '../../../util/Logger';
import doENSReverseLookup from '../../../util/ENSUtils';
import { isValidAddress } from 'ethereumjs-util';

/**
Expand Down Expand Up @@ -58,18 +55,17 @@ class EthereumAddress extends PureComponent {
return formattedAddress;
}

getNetworkEnsSupport = () => {
const { network } = this.props;
return Boolean(networkMap[network]);
};

componentDidMount() {
this.doReverseLookup();
InteractionManager.runAfterInteractions(() => {
this.doReverseLookup();
});
}

componentDidUpdate(prevProps) {
if (prevProps.address !== this.props.address) {
this.formatAndResolveIfNeeded();
requestAnimationFrame(() => {
this.formatAndResolveIfNeeded();
});
}
}

Expand All @@ -82,27 +78,12 @@ class EthereumAddress extends PureComponent {
}

doReverseLookup = async () => {
const { provider } = Engine.context.NetworkController;
const { network, address } = this.props;

const networkHasEnsSupport = this.getNetworkEnsSupport();
if (networkHasEnsSupport) {
this.ens = new ENS({ provider, network });
try {
const name = await this.ens.reverse(address);
const resolvedAddress = await this.ens.lookup(name);
if (address.toLowerCase() === resolvedAddress.toLowerCase()) {
this.setState({ ensName: name });
}
} catch (e) {
// Ignore errors about errors without ENS records
if (e.toString().indexOf('ENS name not defined.') === -1) {
Logger.log('address', this.props.address);
Logger.log('netork', this.props.network);
Logger.error('ENS reverse lookup error', e);
}
}
}
try {
const name = await doENSReverseLookup(address, network);
this.setState({ ensName: name });
// eslint-disable-next-line no-empty
} catch (e) {}
};

render() {
Expand Down
35 changes: 35 additions & 0 deletions app/util/ENSUtils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import Engine from '../core/Engine';
import networkMap from 'ethjs-ens/lib/network-map.json';
import ENS from 'ethjs-ens';

/**
* Utility class with the single responsibility
* of caching ENS names
*/
class ENSCache {
static cache = {};
}

export default async function doENSReverseLookup(address, network) {
const cache = ENSCache.cache[address];
if (cache) {
return Promise.resolve(cache);
}

const { provider } = Engine.context.NetworkController;

const networkHasEnsSupport = Boolean(networkMap[network]);

if (networkHasEnsSupport) {
this.ens = new ENS({ provider, network });
try {
const name = await this.ens.reverse(address);
const resolvedAddress = await this.ens.lookup(name);
if (address.toLowerCase() === resolvedAddress.toLowerCase()) {
ENSCache.cache[address] = name;
return name;
}
// eslint-disable-next-line no-empty
} catch (e) {}
}
}