aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-09-04 23:54:54 +0800
committerGitHub <noreply@github.com>2018-09-04 23:54:54 +0800
commita52714bcf32ea67c3bf442aa0c189b4934c87ecc (patch)
treebed57c8775e77c715f29cfae0708938ce86d0494
parent78d4fc59a5ea5e2c3da9c221967dc792445419ae (diff)
parent40e0c829b35e001e8a5625ad36c167eabd2c8d65 (diff)
downloaddexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar.gz
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar.bz2
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar.lz
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar.xz
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.tar.zst
dexon-sol-tools-a52714bcf32ea67c3bf442aa0c189b4934c87ecc.zip
Merge pull request #1052 from 0xProject/feature/remove-types
[typescript-typings] Remove types that were moved to DefinitelyTyped
-rw-r--r--packages/0x.js/package.json1
-rw-r--r--packages/contract-wrappers/package.json1
-rw-r--r--packages/monorepo-scripts/src/doc_gen_configs.ts6
-rw-r--r--packages/sol-cov/package.json3
-rw-r--r--packages/sra-report/package.json1
-rw-r--r--packages/subproviders/package.json3
-rw-r--r--packages/subproviders/src/globals.d.ts18
-rw-r--r--packages/typescript-typings/CHANGELOG.json9
-rw-r--r--packages/typescript-typings/types/detect-node/index.d.ts3
-rw-r--r--packages/typescript-typings/types/eth-lightwallet/index.d.ts54
-rw-r--r--packages/typescript-typings/types/ganache-core/index.d.ts16
-rw-r--r--packages/typescript-typings/types/newman/index.d.ts24
-rw-r--r--packages/typescript-typings/types/web3-provider-engine/index.d.ts62
-rw-r--r--packages/utils/package.json1
-rw-r--r--packages/web3-wrapper/package.json1
-rw-r--r--packages/website/package.json1
-rw-r--r--packages/website/ts/globals.d.ts1
17 files changed, 40 insertions, 165 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index db6e2363e..ce8ed859a 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -47,6 +47,7 @@
"@0xproject/monorepo-scripts": "^1.0.7",
"@0xproject/tslint-config": "^1.0.6",
"@types/lodash": "4.14.104",
+ "@types/web3-provider-engine": "^14.0.0",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 7da839a00..5d5c8069a 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -49,6 +49,7 @@
"@0xproject/subproviders": "^2.0.1",
"@0xproject/tslint-config": "^1.0.6",
"@types/lodash": "4.14.104",
+ "@types/web3-provider-engine": "^14.0.0",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
diff --git a/packages/monorepo-scripts/src/doc_gen_configs.ts b/packages/monorepo-scripts/src/doc_gen_configs.ts
index 102b5d7ca..e3ddeddc9 100644
--- a/packages/monorepo-scripts/src/doc_gen_configs.ts
+++ b/packages/monorepo-scripts/src/doc_gen_configs.ts
@@ -16,10 +16,8 @@ export const docGenConfigs: DocGenConfigs = {
Schema:
'https://github.com/tdegrunt/jsonschema/blob/5c2edd4baba149964aec0f23c87ad12c25a50dfb/lib/index.d.ts#L49',
Uint8Array: 'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array',
- 'Ganache.GanacheOpts':
- 'https://github.com/0xProject/0x-monorepo/blob/ddf85112d7e4eb1581e0d82ce6eedad429641106/packages/typescript-typings/types/ganache-core/index.d.ts#L3',
- 'lightwallet.keystore':
- 'https://github.com/0xProject/0x-monorepo/blob/ddf85112d7e4eb1581e0d82ce6eedad429641106/packages/typescript-typings/types/eth-lightwallet/index.d.ts#L32',
+ GanacheOpts: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ganache-core/index.d.ts#L8',
+ keystore: 'https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/eth-lightwallet/index.d.ts#L36',
},
// If a 0x package re-exports an external package, we should add a link to it's exported items here
EXTERNAL_EXPORT_TO_LINK: {
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 3772d02c5..9cc809955 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -47,7 +47,6 @@
"@0xproject/typescript-typings": "^1.0.5",
"@0xproject/utils": "^1.0.7",
"@0xproject/web3-wrapper": "^2.0.1",
- "@types/solidity-parser-antlr": "^0.2.1",
"ethereum-types": "^1.0.5",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
@@ -67,7 +66,7 @@
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/rimraf": "^2.0.2",
- "@types/solidity-parser-antlr": "^0.2.1",
+ "@types/solidity-parser-antlr": "^0.2.0",
"chai": "^4.0.1",
"copyfiles": "^2.0.0",
"dirty-chai": "^2.0.1",
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 481794d5d..31453969c 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -51,6 +51,7 @@
"@types/mocha": "^2.2.48",
"@types/nock": "^9.1.2",
"@types/node": "^8.0.53",
+ "@types/newman": "^3.9.0",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index d9583b357..100e99449 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -36,6 +36,8 @@
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"@types/hdkey": "^0.7.0",
+ "@types/ganache-core": "^2.1.0",
+ "@types/eth-lightwallet": "^3.0.0",
"bip39": "^2.5.0",
"bn.js": "^4.11.8",
"eth-lightwallet": "^3.0.1",
@@ -55,6 +57,7 @@
"@types/bn.js": "^4.11.0",
"@types/ethereumjs-tx": "^1.0.0",
"@types/hdkey": "^0.7.0",
+ "@types/web3-provider-engine": "^14.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
index 94e63a32d..3cbf84e37 100644
--- a/packages/subproviders/src/globals.d.ts
+++ b/packages/subproviders/src/globals.d.ts
@@ -4,3 +4,21 @@ declare module '*.json' {
export default json;
/* tslint:enable */
}
+declare module 'web3-provider-engine/util/rpc-cache-utils' {
+ class ProviderEngineRpcUtils {
+ public static blockTagForPayload(payload: any): string | null;
+ }
+ export = ProviderEngineRpcUtils;
+}
+declare module 'web3-provider-engine/subproviders/fixture' {
+ import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
+ class FixtureSubprovider {
+ constructor(staticResponses: any);
+ public handleRequest(
+ payload: JSONRPCRequestPayload,
+ next: () => void,
+ end: (err: Error | null, data?: JSONRPCResponsePayload) => void,
+ ): void;
+ }
+ export = FixtureSubprovider;
+}
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
index 8e6b2b3c8..c3f7b1ac2 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "2.0.0",
+ "changes": [
+ {
+ "note": "Remove types for web3-provider-engine, newman, ganache-core, detect-node, eth-lightwallet",
+ "pr": "1052"
+ }
+ ]
+ },
+ {
"timestamp": 1535133899,
"version": "1.0.5",
"changes": [
diff --git a/packages/typescript-typings/types/detect-node/index.d.ts b/packages/typescript-typings/types/detect-node/index.d.ts
deleted file mode 100644
index 4c58b8450..000000000
--- a/packages/typescript-typings/types/detect-node/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module 'detect-node' {
- export const isNode: boolean;
-}
diff --git a/packages/typescript-typings/types/eth-lightwallet/index.d.ts b/packages/typescript-typings/types/eth-lightwallet/index.d.ts
deleted file mode 100644
index 93daa5041..000000000
--- a/packages/typescript-typings/types/eth-lightwallet/index.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-// eth-lightwallet declarations
-
-interface ECSignatureBuffer {
- v: number;
- r: Buffer;
- s: Buffer;
-}
-declare module 'eth-lightwallet' {
- // tslint:disable-next-line:class-name
- export class signing {
- public static signTx(
- keystore: keystore,
- pwDerivedKey: Uint8Array,
- rawTx: string,
- signingAddress: string,
- ): string;
- public static signMsg(
- keystore: keystore,
- pwDerivedKey: Uint8Array,
- rawMsg: string,
- signingAddress: string,
- ): ECSignatureBuffer;
- public static signMsgHash(
- keystore: keystore,
- pwDerivedKey: Uint8Array,
- msgHash: string,
- signingAddress: string,
- ): ECSignatureBuffer;
- public static concatSig(signature: any): string;
- }
- // tslint:disable-next-line:class-name
- export class keystore {
- public static createVault(options: any, callback?: (error: Error, keystore: keystore) => void): keystore;
- public static generateRandomSeed(): string;
- public static isSeedValid(seed: string): boolean;
- public static deserialize(keystore: string): keystore;
- public serialize(): string;
- public keyFromPassword(
- password: string,
- callback?: (error: Error, pwDerivedKey: Uint8Array) => void,
- ): Uint8Array;
- public isDerivedKeyCorrect(pwDerivedKey: Uint8Array): boolean;
- public generateNewAddress(pwDerivedKey: Uint8Array, numberOfAddresses: number): void;
- public getSeed(pwDerivedKey: Uint8Array): string;
- public exportPrivateKey(address: string, pwDerivedKey: Uint8Array): string;
- public getAddresses(): string[];
- }
- interface VaultOptions {
- password: string;
- seedPhrase: string;
- salt?: string;
- hdPathString: string;
- }
-}
diff --git a/packages/typescript-typings/types/ganache-core/index.d.ts b/packages/typescript-typings/types/ganache-core/index.d.ts
deleted file mode 100644
index c07e6a78e..000000000
--- a/packages/typescript-typings/types/ganache-core/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-declare module 'ganache-core' {
- import { Provider } from 'ethereum-types';
- export interface GanacheOpts {
- verbose?: boolean;
- logger?: {
- log(msg: string): void;
- };
- port?: number;
- network_id?: number;
- networkId?: number;
- mnemonic?: string;
- gasLimit?: number;
- }
- // tslint:disable-next-line:completed-docs
- export function provider(opts: GanacheOpts): Provider;
-}
diff --git a/packages/typescript-typings/types/newman/index.d.ts b/packages/typescript-typings/types/newman/index.d.ts
deleted file mode 100644
index bea9ac160..000000000
--- a/packages/typescript-typings/types/newman/index.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-declare module 'newman' {
- export interface NewmanRunSummary {
- run: NewmanRun;
- }
- export interface NewmanRun {
- executions: NewmanRunExecution[];
- }
- export interface NewmanRunExecution {
- item: NewmanRunExecutionItem;
- assertions: NewmanRunExecutionAssertion[];
- }
- export interface NewmanRunExecutionItem {
- name: string;
- }
- export interface NewmanRunExecutionAssertion {
- assertion: string;
- error: NewmanRunExecutionAssertionError;
- }
- export interface NewmanRunExecutionAssertionError {
- message: string;
- }
- // tslint:disable-next-line:completed-docs
- export function run(options: any, callback?: (err: Error | null, summary: NewmanRunSummary) => void): void;
-}
diff --git a/packages/typescript-typings/types/web3-provider-engine/index.d.ts b/packages/typescript-typings/types/web3-provider-engine/index.d.ts
deleted file mode 100644
index 72ef434a7..000000000
--- a/packages/typescript-typings/types/web3-provider-engine/index.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-declare module 'web3-provider-engine' {
- import { Provider, JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
- interface Web3ProviderEngineOptions {
- pollingInterval?: number;
- blockTracker?: any;
- blockTrackerProvider?: any;
- }
- class Web3ProviderEngine implements Provider {
- constructor(options?: Web3ProviderEngineOptions);
- public on(event: string, handler: () => void): void;
- public send(payload: JSONRPCRequestPayload): void;
- public sendAsync(
- payload: JSONRPCRequestPayload,
- callback: (error: null | Error, response: JSONRPCResponsePayload) => void,
- ): void;
- public addProvider(provider: any): void;
- // start block polling
- public start(callback?: () => void): void;
- // stop block polling
- public stop(): void;
- }
- export = Web3ProviderEngine;
-}
-
-declare module 'web3-provider-engine/subproviders/nonce-tracker';
-declare module 'web3-provider-engine/subproviders/hooked-wallet';
-declare module 'web3-provider-engine/subproviders/filters';
-// web3-provider-engine declarations
-declare module 'web3-provider-engine/subproviders/subprovider' {
- class Subprovider {}
- export = Subprovider;
-}
-declare module 'web3-provider-engine/subproviders/rpc' {
- import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
- class RpcSubprovider {
- constructor(options: { rpcUrl: string });
- public handleRequest(
- payload: JSONRPCRequestPayload,
- next: () => void,
- end: (err: Error | null, data?: JSONRPCResponsePayload) => void,
- ): void;
- }
- export = RpcSubprovider;
-}
-declare module 'web3-provider-engine/util/rpc-cache-utils' {
- class ProviderEngineRpcUtils {
- public static blockTagForPayload(payload: any): string | null;
- }
- export = ProviderEngineRpcUtils;
-}
-declare module 'web3-provider-engine/subproviders/fixture' {
- import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types';
- class FixtureSubprovider {
- constructor(staticResponses: any);
- public handleRequest(
- payload: JSONRPCRequestPayload,
- next: () => void,
- end: (err: Error | null, data?: JSONRPCResponsePayload) => void,
- ): void;
- }
- export = FixtureSubprovider;
-}
diff --git a/packages/utils/package.json b/packages/utils/package.json
index d93163e81..15a8516a7 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -28,6 +28,7 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/utils/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^1.0.6",
+ "@types/detect-node": "2.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 6361fbde7..e2770bcc5 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -35,6 +35,7 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^1.0.6",
+ "@types/ganache-core": "^2.1.0",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
diff --git a/packages/website/package.json b/packages/website/package.json
index a7da19c9e..878544d27 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -66,6 +66,7 @@
"@types/accounting": "^0.4.1",
"@types/blockies": "^0.0.0",
"@types/deep-equal": "^1.0.0",
+ "@types/web3-provider-engine": "^14.0.0",
"@types/find-versions": "^2.0.0",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "4.14.104",
diff --git a/packages/website/ts/globals.d.ts b/packages/website/ts/globals.d.ts
index 719c2708a..eb8892aea 100644
--- a/packages/website/ts/globals.d.ts
+++ b/packages/website/ts/globals.d.ts
@@ -10,6 +10,7 @@ declare module '*.json' {
export default json;
/* tslint:enable */
}
+declare module 'web3-provider-engine/subproviders/filters';
// This will be defined by default in TS 2.4
// Source: https://github.com/Microsoft/TypeScript/issues/12364