diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-16 02:37:03 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-16 02:37:03 +0800 |
| commit | b46dd2e0a277340c19fa137a436981cc53c8cb80 (patch) | |
| tree | d2814176fe8ffc5ec6a61534aa77487aae6bcc13 /packages/0x.js/src/artifacts/ZRX.json | |
| parent | 484dd4c33aa5786def1f0b159f5b51f99a585aa8 (diff) | |
| parent | 3eb08735d4d0fe4b046dd6b74f5ed503cf5c64e3 (diff) | |
| download | dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.gz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.bz2 dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.lz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.xz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.zst dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.zip | |
Merge branch 'development' into createWethPage
* development: (54 commits)
Fix redundant spaces
Fix tests
Fix website unused vars
Fix connect unused vars
Fix 0x.js unused vars
Dissallow unused vars/imports
Implement first custom linter rule async-suffix
Reuse intervalutils in website
Add a newline
Name a variable
Add a comment
Fix a conditional
Make migrations deterministic
Fix linter error
Fix linter errors
Add a function to init token balances
Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens
Add DummyToken to gitignore
Add DummyToken to artifacts list
Increase mocha timeout
...
Diffstat (limited to 'packages/0x.js/src/artifacts/ZRX.json')
| -rw-r--r-- | packages/0x.js/src/artifacts/ZRX.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/0x.js/src/artifacts/ZRX.json b/packages/0x.js/src/artifacts/ZRX.json index 7da67fde0..a9fe1799a 100644 --- a/packages/0x.js/src/artifacts/ZRX.json +++ b/packages/0x.js/src/artifacts/ZRX.json @@ -11,7 +11,7 @@ "address": "0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570" }, "50": { - "address": "0x25b8fe1de9daf8ba351890744ff28cf7dfa8f5e3" + "address": "0x1d7022f5b17d2f8b695918fb48fa1089c9f85401" } } } |