2 files changed, 6 insertions, 112 deletions
diff --git a/packages/typescript-typings/types/ethers/index.d.ts b/packages/typescript-typings/types/ethers/index.d.ts
deleted file mode 100644
index 875563ba2..000000000
--- a/packages/typescript-typings/types/ethers/index.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-declare module 'ethers' {
-    import { TxData } from 'ethereum-types';
-
-    export interface TransactionDescription {
-        name: string;
-        signature: string;
-        sighash: string;
-        data: string;
-    }
-    export interface CallDescription extends TransactionDescription {
-        parse: (...args: any[]) => any;
-    }
-    export interface FunctionDescription {
-        (...params: any[]): TransactionDescription | CallDescription;
-        inputs: { names: string[]; types: string[] };
-        outputs: { names: string[]; types: string[] };
-        type: string;
-    }
-    export interface EventDescription {
-        parse: (...args: any[]) => any;
-        inputs: { names: string[]; types: string[] };
-        signature: string;
-        topics: string[];
-    }
-    export class Interface {
-        public functions: { [functionName: string]: FunctionDescription };
-        public events: { [eventName: string]: EventDescription };
-        constructor(abi: any);
-    }
-    export class Contract {
-        public static getDeployTransaction(bytecode: string, abi: any, ...args: any[]): Partial<TxData>;
-        constructor(address: string, abi: any, provider: any);
-    }
-    const enum errors {
-        INVALID_ARGUMENT = 'INVALID_ARGUMENT',
-    }
-
-    export type ParamName = null | string | NestedParamName;
-
-    export interface NestedParamName {
-        name: string | null;
-        names: ParamName[];
-    }
-
-    export const utils: {
-        AbiCoder: {
-            defaultCoder: AbiCoder;
-        };
-    };
-
-    export interface AbiCoder {
-        encode: (names: ParamName[] | string[], types: string[] | any[], args: any[] | undefined) => string;
-        decode: (names: ParamName[] | string[], types: string[] | string, data: string | undefined) => any;
-    }
-}
diff --git a/packages/typescript-typings/types/solc/index.d.ts b/packages/typescript-typings/types/solc/index.d.ts
index 571bae101..f4c05cd7c 100644
--- a/packages/typescript-typings/types/solc/index.d.ts
+++ b/packages/typescript-typings/types/solc/index.d.ts
@@ -1,4 +1,6 @@
 declare module 'solc' {
+    export { ErrorType, ErrorSeverity, SolcError, StandardContractOutput, StandardOutput } from 'ethereum-types';
+    import { SolcError } from 'ethereum-types';
     export interface ContractCompilationResult {
         srcmap: string;
         srcmapRuntime: string;
@@ -87,62 +89,6 @@ declare module 'solc' {
         };
         settings: CompilerSettings;
     }
-    export type ErrorType =
-        | 'JSONError'
-        | 'IOError'
-        | 'ParserError'
-        | 'DocstringParsingError'
-        | 'SyntaxError'
-        | 'DeclarationError'
-        | 'TypeError'
-        | 'UnimplementedFeatureError'
-        | 'InternalCompilerError'
-        | 'Exception'
-        | 'CompilerError'
-        | 'FatalError'
-        | 'Warning';
-    export type ErrorSeverity = 'error' | 'warning';
-    export interface Error {
-        sourceLocation?: {
-            file: string;
-            start: number;
-            end: number;
-        };
-        type: ErrorType;
-        component: 'general' | 'ewasm';
-        severity: ErrorSeverity;
-        message: string;
-        formattedMessage?: string;
-    }
-    import { ContractAbi } from 'ethereum-types';
-    export interface StandardContractOutput {
-        abi: ContractAbi;
-        evm: {
-            bytecode: {
-                object: string;
-                sourceMap: string;
-            };
-            deployedBytecode: {
-                object: string;
-                sourceMap: string;
-            };
-        };
-    }
-    export interface StandardOutput {
-        errors: Error[];
-        sources: {
-            [fileName: string]: {
-                id: number;
-                ast?: object;
-                legacyAST?: object;
-            };
-        };
-        contracts: {
-            [fileName: string]: {
-                [contractName: string]: StandardContractOutput;
-            };
-        };
-    }
     export interface SolcInstance {
         compile(
             sources: InputSources,
@@ -151,6 +97,9 @@ declare module 'solc' {
         ): CompilationResult;
         compileStandardWrapper(input: string, findImports: (importPath: string) => ImportContents): string;
     }
-    export function loadRemoteVersion(versionName: string, cb: (err: Error | null, res?: SolcInstance) => void): void;
+    export function loadRemoteVersion(
+        versionName: string,
+        cb: (err: SolcError | null, res?: SolcInstance) => void,
+    ): void;
     export function setupMethods(solcBin: any): SolcInstance;
 }