aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/website/ts/blockchain.ts17
-rw-r--r--packages/website/ts/utils/configs.ts7
2 files changed, 18 insertions, 6 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index a42b19cff..7a0d546b4 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -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,12 +604,11 @@ 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 = {
iconUrl,
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 4a08929cf..20efc66be 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -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: {