Merge pull request #51 from Uniswap/revert-37-master

Revert "Fallback to Token Lists for reverting methods, solves #33"

Author: ianlapham

src/mappings/helpers.ts

@@ -5,11 +5,6 @@ import { ERC20SymbolBytes } from '../types/Factory/ERC20SymbolBytes'
 import { ERC20NameBytes } from '../types/Factory/ERC20NameBytes'
 import { User, Bundle, Token, LiquidityPosition, LiquidityPositionSnapshot, Pair } from '../types/schema'
 import { Factory as FactoryContract } from '../types/templates/Pair/Factory'
-import { 
-  fetchTokenSymbolFromTokenList,
-  fetchTokenNameFromTokenList,
-  fetchTokenDecimalsFromTokenList,
-} from './tokenList'
 
 export const ADDRESS_ZERO = '0x0000000000000000000000000000000000000000'
 export const FACTORY_ADDRESS = '0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f'
@@ -59,6 +54,14 @@ export function isNullEthValue(value: string): boolean {
 }
 
 export function fetchTokenSymbol(tokenAddress: Address): string {
+  // hard coded overrides
+  if (tokenAddress.toHexString() == '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a') {
+    return 'DGD'
+  }
+  if (tokenAddress.toHexString() == '0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9') {
+    return 'AAVE'
+  }
+
   let contract = ERC20.bind(tokenAddress)
   let contractSymbolBytes = ERC20SymbolBytes.bind(tokenAddress)
 
@@ -72,10 +75,6 @@ export function fetchTokenSymbol(tokenAddress: Address): string {
       if (!isNullEthValue(symbolResultBytes.value.toHexString())) {
         symbolValue = symbolResultBytes.value.toString()
       }
-    } else {
-      // Fallback to token list
-      log.warning('Token symbol not defined in ERC20 Contract: {}', [tokenAddress.toHexString()])
-      symbolValue = fetchTokenSymbolFromTokenList(tokenAddress)
     }
   } else {
     symbolValue = symbolResult.value
@@ -85,6 +84,14 @@ export function fetchTokenSymbol(tokenAddress: Address): string {
 }
 
 export function fetchTokenName(tokenAddress: Address): string {
+  // hard coded overrides
+  if (tokenAddress.toHexString() == '0xe0b7927c4af23765cb51314a0e0521a9645f0e2a') {
+    return 'DGD'
+  }
+  if (tokenAddress.toHexString() == '0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9') {
+    return 'Aave Token'
+  }
+
   let contract = ERC20.bind(tokenAddress)
   let contractNameBytes = ERC20NameBytes.bind(tokenAddress)
 
@@ -98,10 +105,6 @@ export function fetchTokenName(tokenAddress: Address): string {
       if (!isNullEthValue(nameResultBytes.value.toHexString())) {
         nameValue = nameResultBytes.value.toString()
       }
-    } else {
-      // Fallback to token list
-      log.warning('Token name not defined in ERC20 Contract: {}',  [tokenAddress.toHexString()])
-      nameValue = fetchTokenNameFromTokenList(tokenAddress)
     }
   } else {
     nameValue = nameResult.value
@@ -132,9 +135,6 @@ export function fetchTokenDecimals(tokenAddress: Address): BigInt {
   let decimalResult = contract.try_decimals()
   if (!decimalResult.reverted) {
     decimalValue = decimalResult.value
-  } else {
-    log.warning('Token decimals not defined in ERC20 Contract: {}', [tokenAddress.toHexString()])
-    return fetchTokenDecimalsFromTokenList(tokenAddress)
   }
   return BigInt.fromI32(decimalValue as i32)
 }
@@ -192,4 +192,3 @@ export function createLiquiditySnapshot(position: LiquidityPosition, event: Ethe
   snapshot.save()
   position.save()
 }
-