aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-20 19:40:48 +0800
committerFabio Berger <me@fabioberger.com>2018-03-20 19:40:48 +0800
commit7d9c357409c25996f9c448dffd69007f69b9d8d6 (patch)
treef16b9facaca4653cdbc4c76dc8ff82786847a5e4
parentabf41b073cfdf72398135c62627111c4259b21e9 (diff)
parentc9b07107f3f9ab4439c6086f8cc48f674aa2cb6a (diff)
downloaddexon-sol-tools-7d9c357409c25996f9c448dffd69007f69b9d8d6.tar.gz
dexon-sol-tools-7d9c357409c25996f9c448dffd69007f69b9d8d6.tar.zst
dexon-sol-tools-7d9c357409c25996f9c448dffd69007f69b9d8d6.zip
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo: Update Kovan Ethertoken Address
-rw-r--r--packages/0x.js/CHANGELOG.md4
-rw-r--r--packages/0x.js/src/artifacts/TokenRegistry.json2
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index b01f3541f..7ce7126cb 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,5 +1,9 @@
# CHANGELOG
+## v0.34.0 - _TBD_
+
+ * Update Kovan EtherToken artifact address to match TokenRegistry.
+
## v0.33.2 - _March 18, 2018_
* Consolidate all `console.log` calls into `logUtils` in the `@0xproject/utils` package (#452)
diff --git a/packages/0x.js/src/artifacts/TokenRegistry.json b/packages/0x.js/src/artifacts/TokenRegistry.json
index 0f583628c..95bee4b1d 100644
--- a/packages/0x.js/src/artifacts/TokenRegistry.json
+++ b/packages/0x.js/src/artifacts/TokenRegistry.json
@@ -538,7 +538,7 @@
"address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6"
},
"42": {
- "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
+ "address": "0xd0a1e359811322d97991e03f863a0c30c2cf029c"
},
"50": {
"address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082"