diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-05 01:56:30 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-10 18:24:31 +0800 |
| commit | 27d9fba785a5a53550be53b12baf9069bda8d160 (patch) | |
| tree | bde34d668e53832dd03dd279992721d56291124b /packages/0x.js | |
| parent | e6a783aff803c276392efec93571d24fc96feb6e (diff) | |
| download | dexon-0x-contracts-27d9fba785a5a53550be53b12baf9069bda8d160.tar.gz dexon-0x-contracts-27d9fba785a5a53550be53b12baf9069bda8d160.tar.zst dexon-0x-contracts-27d9fba785a5a53550be53b12baf9069bda8d160.zip | |
Include web3 types via typeRoots and factor out common parts of tsconfig.json
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 2 | ||||
| -rw-r--r-- | packages/0x.js/src/0x.ts | 7 | ||||
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 3 | ||||
| -rw-r--r-- | packages/0x.js/tsconfig.json | 11 |
4 files changed, 12 insertions, 11 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index b0c646bc5..41dc65467 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -78,7 +78,7 @@ "typedoc": "~0.8.0", "typescript": "~2.6.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.7.2", + "web3-typescript-typings": "^0.9.0", "webpack": "^3.1.0" }, "dependencies": { diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts index 67b75df95..244b77a85 100644 --- a/packages/0x.js/src/0x.ts +++ b/packages/0x.js/src/0x.ts @@ -213,12 +213,17 @@ export class ZeroEx { * @param networkId The id of the network your provider is connected to */ public setProvider(provider: Web3Provider, networkId: number): void { - this._web3Wrapper.setProvider(provider, networkId); + this._web3Wrapper.setProvider(provider); (this.exchange as any)._invalidateContractInstances(); + (this.exchange as any)._setNetworkId(networkId); (this.tokenRegistry as any)._invalidateContractInstance(); + (this.tokenRegistry as any)._setNetworkId(networkId); (this.token as any)._invalidateContractInstances(); + (this.token as any)._setNetworkId(networkId); (this.proxy as any)._invalidateContractInstance(); + (this.proxy as any)._setNetworkId(networkId); (this.etherToken as any)._invalidateContractInstance(); + (this.etherToken as any)._setNetworkId(networkId); } /** * Get user Ethereum addresses available through the supplied web3 provider available for sending transactions. diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts index eb7e042e7..d308d207e 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -177,6 +177,9 @@ export class ContractWrapper { this._onLogStateChanged.bind(this, isRemoved), ); } + private _setNetworkId(networkId: number): void { + this._networkId = networkId; + } private _stopBlockAndLogStream(): void { if (_.isUndefined(this._blockAndLogStreamerIfExists)) { throw new Error(ZeroExError.SubscriptionNotFound); diff --git a/packages/0x.js/tsconfig.json b/packages/0x.js/tsconfig.json index d872fcf54..3d3b7a4f5 100644 --- a/packages/0x.js/tsconfig.json +++ b/packages/0x.js/tsconfig.json @@ -1,21 +1,14 @@ { + "extends": "../../tsconfig", "compilerOptions": { - "module": "commonjs", - "target": "es5", - "lib": ["es2015", "dom"], "outDir": "lib", - "sourceMap": true, - "declaration": true, - "noImplicitAny": true, - "experimentalDecorators": true, - "strictNullChecks": true + "strict": false }, "include": [ "./src/**/*", "./test/**/*", "../../node_modules/types-bn/index.d.ts", "../../node_modules/types-ethereumjs-util/index.d.ts", - "../../node_modules/web3-typescript-typings/index.d.ts", "../../node_modules/chai-typescript-typings/index.d.ts", "../../node_modules/chai-as-promised-typescript-typings/index.d.ts" ] |