diff options
author | Fabio Berger <me@fabioberger.com> | 2017-08-23 23:37:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-23 23:37:31 +0800 |
commit | bd7102efbee0833bd0274edbe248db27b53aa950 (patch) | |
tree | b1463dd08c613aefddbe0d53ee85ee2cbaf84cc6 | |
parent | d837e27739614ce6a132e8583409425f726bef89 (diff) | |
parent | f7010dfa3a4bbd00ba1f08b1bed411c6a60008a4 (diff) | |
download | dexon-0x-contracts-bd7102efbee0833bd0274edbe248db27b53aa950.tar.gz dexon-0x-contracts-bd7102efbee0833bd0274edbe248db27b53aa950.tar.zst dexon-0x-contracts-bd7102efbee0833bd0274edbe248db27b53aa950.zip |
Merge pull request #130 from 0xProject/addProxyAddressMethod
Add public TokenTransferProxy address getter
-rw-r--r-- | CHANGELOG.md | 5 | ||||
-rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 3 | ||||
-rw-r--r-- | src/contract_wrappers/token_transfer_proxy_wrapper.ts | 10 | ||||
-rw-r--r-- | test/token_transfer_proxy_wrapper_test.ts (renamed from test/proxy_wrapper_test.ts) | 0 |
4 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cdda5785..3ca451d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,16 @@ v0.9.4 - _TBD_ ------------------------ * Add clear error message when checksummed address is passed to a public method (#124) * Fixes the description of `shouldThrowOnInsufficientBalanceOrAllowance` in docs (#127) + * Add `zeroEx.proxy.getContractAddressAsync` to public interface (#130) v0.9.3 - _Aug 22, 2017_ ------------------------ - * Update contract artifacts to include latest Kovan and Mainnet deploys. + * Update contract artifacts to include latest Kovan and Mainnet deploys (#118) v0.9.2 - _Aug 21, 2017_ ------------------------ * *This version was unpublished because of a publishing issue.* - * Update contract artifacts to include latest Kovan and Mainnet deploys. + * Update contract artifacts to include latest Kovan and Mainnet deploys (#118) v0.9.1 - _Aug. 16, 2017_ ------------------------ diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index d5e272c12..7994ee72f 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -623,7 +623,8 @@ export class ExchangeWrapper extends ContractWrapper { */ public async getContractAddressAsync(): Promise<string> { const exchangeInstance = await this._getExchangeContractAsync(); - return exchangeInstance.address; + const exchangeAddress = exchangeInstance.address; + return exchangeAddress; } private async _invalidateContractInstancesAsync(): Promise<void> { await this.stopWatchingAllEventsAsync(); diff --git a/src/contract_wrappers/token_transfer_proxy_wrapper.ts b/src/contract_wrappers/token_transfer_proxy_wrapper.ts index 39263efac..da17d79ff 100644 --- a/src/contract_wrappers/token_transfer_proxy_wrapper.ts +++ b/src/contract_wrappers/token_transfer_proxy_wrapper.ts @@ -27,6 +27,16 @@ export class TokenTransferProxyWrapper extends ContractWrapper { const authorizedAddresses = await tokenTransferProxyContractInstance.getAuthorizedAddresses.call(); return authorizedAddresses; } + /** + * Retrieves the Ethereum address of the TokenTransferProxy contract deployed on the network + * that the user-passed web3 provider is connected to. + * @returns The Ethereum address of the TokenTransferProxy contract being used. + */ + public async getContractAddressAsync(): Promise<string> { + const proxyInstance = await this._getTokenTransferProxyContractAsync(); + const proxyAddress = proxyInstance.address; + return proxyAddress; + } private _invalidateContractInstance(): void { delete this._tokenTransferProxyContractIfExists; } diff --git a/test/proxy_wrapper_test.ts b/test/token_transfer_proxy_wrapper_test.ts index 8faef0b30..8faef0b30 100644 --- a/test/proxy_wrapper_test.ts +++ b/test/token_transfer_proxy_wrapper_test.ts |