diff options
author | Leonid <logvinov.leon@gmail.com> | 2018-01-11 02:35:37 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-11 02:35:37 +0800 |
commit | de943c5f305402bc64a6b3273c59669faa62a60d (patch) | |
tree | 936eae17521984e5ccc28057973461e707322326 /packages/0x.js/src | |
parent | e6a783aff803c276392efec93571d24fc96feb6e (diff) | |
parent | e34b0af25133629ad4c177c4d7d5050bd6ac19b8 (diff) | |
download | dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar.gz dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar.bz2 dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar.lz dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar.xz dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.tar.zst dexon-sol-tools-de943c5f305402bc64a6b3273c59669faa62a60d.zip |
Merge pull request #307 from 0xProject/feature/web3-type-roots
Base tsconfig.json
Diffstat (limited to 'packages/0x.js/src')
-rw-r--r-- | packages/0x.js/src/0x.ts | 7 | ||||
-rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 5 |
2 files changed, 10 insertions, 2 deletions
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..9c4e5dfd3 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -87,7 +87,7 @@ export class ContractWrapper { } const filterToken = filterUtils.generateUUID(); this._filters[filterToken] = filter; - this._filterCallbacks[filterToken] = callback; + this._filterCallbacks[filterToken] = callback as EventCallback<ContractEventArgs>; return filterToken; } protected async _getLogsAsync<ArgsType extends ContractEventArgs>( @@ -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); |