diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-11-28 13:06:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 13:06:44 +0800 |
| commit | dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b (patch) | |
| tree | ed8b68485d431d3337173db206ef3751505ee6a2 | |
| parent | 47a87e57f1cfa82375c87829320f30049217d657 (diff) | |
| parent | 494adedeef0e0649c1177756d4f1be3cd18f6eb0 (diff) | |
| download | dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar.gz dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar.bz2 dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar.lz dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar.xz dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.tar.zst dexon-sol-tools-dac0bee95ce01b9d6a3e2eddbd24178bd5f7674b.zip | |
Merge pull request #1318 from 0xProject/bug/testnets/rinkeby-exchange
[testnet][contract-addresses] Rinkeby and Ganache
| -rw-r--r-- | packages/contract-addresses/CHANGELOG.json | 13 | ||||
| -rw-r--r-- | packages/contract-addresses/src/index.ts | 25 |
2 files changed, 31 insertions, 7 deletions
diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index e65351c7e..a671247e2 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,5 +1,18 @@ [ { + "version": "2.0.0", + "changes": [ + { + "note": "Redeployed Rinkeby with testnet Exchange artifact", + "pr": 1318 + }, + { + "note": "Added Ganache snapshot addresses for network 50", + "pr": 1318 + } + ] + }, + { "version": "1.2.0", "changes": [ { diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index 57358dd38..b36997f23 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -40,14 +40,14 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { orderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f', }, 4: { - erc20Proxy: '0x3e809c563c15a295e832e37053798ddc8d6c8dab', - erc721Proxy: '0x8e1ff02637cb5e39f2fa36c14706aa348b065b09', - zrxToken: '0x2727e688b8fd40b198cd5fe6e408e00494a06f07', + exchange: '0xbce0b5f6eb618c565c3e5f5cd69652bbc279f44e', + erc20Proxy: '0x2f5ae4f6106e89b4147651688a92256885c5f410', + erc721Proxy: '0x7656d773e11ff7383a14dcf09a9c50990481cd10', + zrxToken: '0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa', etherToken: '0xc778417e063141139fce010982780140aa0cd5ab', - exchange: '0x22ebc052f43a88efa06379426120718170f2204e', - assetProxyOwner: '0x1da52d1d3a3acfa0a1836b737393b4e9931268fc', - forwarder: '0xd2dbf3250a764eaaa94fa0c84ed87c0edc8ed04e', - orderValidator: '0x39c3fc9f4d8430af2713306ce80c584752d9e1c7', + assetProxyOwner: '0xe1703da878afcebff5b7624a826902af475b9c03', + forwarder: '0x2d40589abbdee84961f3a7656b9af7adb0ee5ab4', + orderValidator: '0x0c5173a51e26b29d6126c686756fb9fbef71f762', }, 42: { erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e', @@ -59,6 +59,17 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = { forwarder: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6', orderValidator: '0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d', }, + // NetworkId 50 represents our Ganache snapshot generated from migrations. + 50: { + exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788', + erc20Proxy: '0x1dc4c1cefef38a777b15aa20260a54e584b16c48', + erc721Proxy: '0x1d7022f5b17d2f8b695918fb48fa1089c9f85401', + zrxToken: '0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c', + etherToken: '0x0b1ba0af832d7c05fd64161e0db78e85978e8082', + assetProxyOwner: '0x34d402f14d58e001d8efbe6585051bf9706aa064', + forwarder: '0xb69e673309512a9d726f87304c6984054f87a93b', + orderValidator: '0xe86bb98fcf9bff3512c74589b78fb168200cc546', + }, }; /** |