Temporarily pretend as if new WETH contracts are already whitelisted by tokenRegistry and put hacks behind the shouldDeprecateOldWethToken flag

This commit is contained in:
Fabio Berger
2017-12-17 19:18:33 -05:00
parent 89f368a8b8
commit 951fbc9b76
2 changed files with 18 additions and 6 deletions

View File

@@ -158,6 +158,12 @@ export class Blockchain {
}
public async isAddressInTokenRegistryAsync(tokenAddress: string): Promise<boolean> {
utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
// HACK: temporarily whitelist the new WETH token address `as if` they were
// already in the tokenRegistry.
if (configs.shouldDeprecateOldWethToken &&
tokenAddress === configs.newWrappedEthers[this.networkId]) {
return true;
}
const tokenIfExists = await this.zeroEx.tokenRegistry.getTokenIfExistsAsync(tokenAddress);
return !_.isUndefined(tokenIfExists);
}
@@ -598,11 +604,10 @@ export class Blockchain {
// new canonical WETH.
// TODO: Remove this hack once we've updated the TokenRegistries
let address = t.address;
if (t.symbol === 'WETH') {
if (this.networkId === 1) {
address = '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8';
} else if (this.networkId === 42) {
address = '0x739e78d6bebbdf24105a5145fa04436589d1cbd9';
if (configs.shouldDeprecateOldWethToken && t.symbol === 'WETH') {
const newEtherTokenAddressIfExists = configs.newWrappedEthers[this.networkId];
if (!_.isUndefined(newEtherTokenAddressIfExists)) {
address = newEtherTokenAddressIfExists;
}
}
const token: Token = {

View File

@@ -19,6 +19,13 @@ export const configs = {
lastLocalStorageFillClearanceDate: '2017-11-22',
lastLocalStorageTrackedTokenClearanceDate: '2017-12-13',
isMainnetEnabled: true,
shouldDeprecateOldWethToken: true,
// newWrappedEthers is temporary until we remove the shouldDeprecateOldWethToken flag
// and add the new WETHs to the tokenRegistry
newWrappedEthers: {
1: '0xe495bcacaf29a0eb00fb67b86e9cd2a994dd55d8',
42: '0x739e78d6bebbdf24105a5145fa04436589d1cbd9',
} as {[networkId: string]: string},
outdatedWrappedEthers: [
{
42: {