Stop nesting interfaces and add necessary type exports

packages/ethereum-types/src/index.ts

@@ -326,24 +326,21 @@ export interface ContractNetworkData {
 
 export interface StandardContractOutput {
     abi: ContractAbi;
-    evm: {
+    evm: EvmOutput;
-        bytecode: {
+}
-            object: string;
+
-            sourceMap: string;
+export interface EvmOutput {
-        };
+    bytecode: EvmBytecodeOutput;
-        deployedBytecode: {
+    deployedBytecode: EvmBytecodeOutput;
-            object: string;
+}
-            sourceMap: string;
+
-        };
+export interface EvmBytecodeOutput {
-    };
+    object: string;
+    sourceMap: string;
 }
 
 export interface ContractVersionData {
-    compiler: {
+    compiler: CompilerOpts;
-        name: 'solc';
-        version: string;
-        settings: CompilerSettings;
-    };
     sources: {
         [sourceName: string]: {
             id: number;
@@ -356,6 +353,12 @@ export interface ContractVersionData {
     compilerOutput: StandardContractOutput;
 }
 
+export interface CompilerOpts {
+    name: 'solc';
+    version: string;
+    settings: CompilerSettings;
+}
+
 /**
  * This type defines the schema of the artifact.json file generated by Sol-compiler
  * schemaVersion: The version of the artifact schema
@@ -384,10 +387,7 @@ export interface GeneratedCompilerOptions {
 // Copied from the solc.js library types
 export interface CompilerSettings {
     remappings?: string[];
-    optimizer?: {
+    optimizer?: OptimizerSettings;
-        enabled: boolean;
-        runs?: number;
-    };
     evmVersion?: 'homestead' | 'tangerineWhistle' | 'spuriousDragon' | 'byzantium' | 'constantinople';
     metadata?: CompilerSettingsMetadata;
     libraries?: {
@@ -406,6 +406,11 @@ export interface CompilerSettingsMetadata {
     useLiteralContent: true;
 }
 
+export interface OptimizerSettings {
+    enabled: boolean;
+    runs?: number;
+}
+
 export interface Source {
     id: number;
 }

packages/sol-compiler/src/index.ts

@@ -1,2 +1,8 @@
 export { Compiler } from './compiler';
-export { CompilerOptions, CompilerSettings, OutputField } from 'ethereum-types';
+export {
+    CompilerOptions,
+    CompilerSettings,
+    OutputField,
+    CompilerSettingsMetadata,
+    OptimizerSettings,
+} from 'ethereum-types';