aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2018-01-11 02:35:37 +0800
committerGitHub <noreply@github.com>2018-01-11 02:35:37 +0800
commitde943c5f305402bc64a6b3273c59669faa62a60d (patch)
tree936eae17521984e5ccc28057973461e707322326 /packages/web3-wrapper
parente6a783aff803c276392efec93571d24fc96feb6e (diff)
parente34b0af25133629ad4c177c4d7d5050bd6ac19b8 (diff)
downloaddexon-0x-contracts-de943c5f305402bc64a6b3273c59669faa62a60d.tar.gz
dexon-0x-contracts-de943c5f305402bc64a6b3273c59669faa62a60d.tar.zst
dexon-0x-contracts-de943c5f305402bc64a6b3273c59669faa62a60d.zip
Merge pull request #307 from 0xProject/feature/web3-type-roots
Base tsconfig.json
Diffstat (limited to 'packages/web3-wrapper')
-rw-r--r--packages/web3-wrapper/package.json2
-rw-r--r--packages/web3-wrapper/src/index.ts2
-rw-r--r--packages/web3-wrapper/tsconfig.json10
3 files changed, 4 insertions, 10 deletions
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index e7269d277..13e32e991 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -26,7 +26,7 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "~2.6.1",
- "web3-typescript-typings": "^0.7.2"
+ "web3-typescript-typings": "^0.9.0"
},
"dependencies": {
"@0xproject/utils": "^0.1.2",
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index 8fa38e987..c4826f2be 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -33,7 +33,7 @@ export class Web3Wrapper {
public getContractDefaults(): Partial<TxData> {
return this._defaults;
}
- public setProvider(provider: Web3.Provider, networkId: number) {
+ public setProvider(provider: Web3.Provider) {
this._web3.setProvider(provider);
}
public isAddress(address: string): boolean {
diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json
index 0aa8c3dde..3d967d05f 100644
--- a/packages/web3-wrapper/tsconfig.json
+++ b/packages/web3-wrapper/tsconfig.json
@@ -1,13 +1,7 @@
{
+ "extends": "../../tsconfig",
"compilerOptions": {
- "module": "commonjs",
- "target": "es5",
- "lib": ["es2017", "dom"],
- "outDir": "lib",
- "sourceMap": true,
- "declaration": true,
- "noImplicitAny": true,
- "strictNullChecks": true
+ "outDir": "lib"
},
"include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"]
}