diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-08-24 18:50:45 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-08-24 18:50:45 +0800 |
| commit | 31ce891beb185ce45d5a8d1a6f5d4540e34fb6cc (patch) | |
| tree | 0f053124709fc320cb414e1ddf200edeedda57fd | |
| parent | 4e517b32f851570f15f9aa2b993ada3112ea8705 (diff) | |
| parent | 6f29239211320a626fa8d4ce5e51d8003a4aec45 (diff) | |
| download | dexon-0x-contracts-31ce891beb185ce45d5a8d1a6f5d4540e34fb6cc.tar.gz dexon-0x-contracts-31ce891beb185ce45d5a8d1a6f5d4540e34fb6cc.tar.zst dexon-0x-contracts-31ce891beb185ce45d5a8d1a6f5d4540e34fb6cc.zip | |
Merge branch 'master' into development
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/contract_wrappers/contract_wrapper.ts | 2 | ||||
| -rw-r--r-- | src/contract_wrappers/token_wrapper.ts | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 73ca9370a..df161b3a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # CHANGELOG -v0.10.2 - _Aug 24, 2017_ +v0.10.4 - _Aug 24, 2017_ ------------------------ - * Hot fixed checksummed addresses in artifacts + * Fixed a bug where checksummed addresses were being pulled from artifacts and not lower-cased. (#135) v0.10.1 - _Aug 24, 2017_ ------------------------ diff --git a/package.json b/package.json index 996e8aec1..4c8eb20f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.10.2", + "version": "0.10.4", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", diff --git a/src/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts index 1cce1b235..7efa229a5 100644 --- a/src/contract_wrappers/contract_wrapper.ts +++ b/src/contract_wrappers/contract_wrapper.ts @@ -22,7 +22,7 @@ export class ContractWrapper { if (!_.isUndefined(address)) { contractAddress = address; } else if (!_.isUndefined(artifactNetworkConfigs)) { - contractAddress = artifactNetworkConfigs.address; + contractAddress = artifactNetworkConfigs.address.toLowerCase(); } if (!_.isUndefined(contractAddress)) { diff --git a/src/contract_wrappers/token_wrapper.ts b/src/contract_wrappers/token_wrapper.ts index ae1c7fa43..8c1bf6b52 100644 --- a/src/contract_wrappers/token_wrapper.ts +++ b/src/contract_wrappers/token_wrapper.ts @@ -252,7 +252,7 @@ export class TokenWrapper extends ContractWrapper { if (_.isUndefined(proxyNetworkConfigsIfExists)) { throw new Error(ZeroExError.ContractNotDeployedOnNetwork); } - const proxyAddress = proxyNetworkConfigsIfExists.address; + const proxyAddress = proxyNetworkConfigsIfExists.address.toLowerCase(); return proxyAddress; } } |