diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-08 17:51:46 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-12-08 17:51:46 +0800 |
commit | b362e2c28e9cafa7335bced17ec61fba93b018e6 (patch) | |
tree | 6a6c65f2a3a17ff93b566fa0c0e7d92032d1a7a0 /packages/0x.js/src/contract_wrappers/contract_wrapper.ts | |
parent | 5401c69163f8fd384038a3ef8c760ec95c661035 (diff) | |
download | dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar.gz dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar.bz2 dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar.lz dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar.xz dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.tar.zst dexon-sol-tools-b362e2c28e9cafa7335bced17ec61fba93b018e6.zip |
Refactor networkId out of web3Wrapper
Diffstat (limited to 'packages/0x.js/src/contract_wrappers/contract_wrapper.ts')
-rw-r--r-- | packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts index 0b6fc031a..d56b8632d 100644 --- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts @@ -32,6 +32,7 @@ const CONTRACT_NAME_TO_NOT_FOUND_ERROR: {[contractName: string]: ZeroExError} = export class ContractWrapper { protected _web3Wrapper: Web3Wrapper; + private _networkId: number; private _abiDecoder?: AbiDecoder; private _blockAndLogStreamer: BlockAndLogStreamer|undefined; private _blockAndLogStreamInterval: NodeJS.Timer; @@ -39,8 +40,9 @@ export class ContractWrapper { private _filterCallbacks: {[filterToken: string]: EventCallback<ContractEventArgs>}; private _onLogAddedSubscriptionToken: string|undefined; private _onLogRemovedSubscriptionToken: string|undefined; - constructor(web3Wrapper: Web3Wrapper, abiDecoder?: AbiDecoder) { + constructor(web3Wrapper: Web3Wrapper, networkId: number, abiDecoder?: AbiDecoder) { this._web3Wrapper = web3Wrapper; + this._networkId = networkId; this._abiDecoder = abiDecoder; this._filters = {}; this._filterCallbacks = {}; @@ -104,11 +106,10 @@ export class ContractWrapper { ): Promise<Web3.ContractInstance> { let contractAddress: string; if (_.isUndefined(addressIfExists)) { - const networkId = this._web3Wrapper.getNetworkId(); - if (_.isUndefined(artifact.networks[networkId])) { + if (_.isUndefined(artifact.networks[this._networkId])) { throw new Error(ZeroExError.ContractNotDeployedOnNetwork); } - contractAddress = artifact.networks[networkId].address.toLowerCase(); + contractAddress = artifact.networks[this._networkId].address.toLowerCase(); } else { contractAddress = addressIfExists; } @@ -123,8 +124,7 @@ export class ContractWrapper { } protected _getContractAddress(artifact: Artifact, addressIfExists?: string): string { if (_.isUndefined(addressIfExists)) { - const networkId = this._web3Wrapper.getNetworkId(); - const contractAddress = artifact.networks[networkId].address; + const contractAddress = artifact.networks[this._networkId].address; if (_.isUndefined(contractAddress)) { throw new Error(ZeroExError.ExchangeContractDoesNotExist); } |