Merge branch 'master' into erc20Wrapper

# Conflicts:
#	src/0x.js.ts

src/types.ts

@@ -37,8 +37,12 @@ export interface ERC20Contract {
 }
 
 export interface TokenRegistryContract {
-    getTokenMetaData: any;
-    getTokenAddresses: any;
+    getTokenMetaData: {
+        call: (address: string) => Promise<TokenMetadata>;
+    };
+    getTokenAddresses: {
+        call: () => Promise<string[]>;
+    };
 }
 
 export const SolidityTypes = strEnum([
@@ -47,6 +51,9 @@ export const SolidityTypes = strEnum([
 ]);
 export type SolidityTypes = keyof typeof SolidityTypes;
 
+//                          [address, name, symbol, projectUrl, decimals, ipfsHash, swarmHash]
+export type TokenMetadata = [string, string, string, string, BigNumber.BigNumber, string, string];
+
 export interface Token {
     name: string;
     address: string;