aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-addresses
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2019-01-15 10:27:07 +0800
committerGitHub <noreply@github.com>2019-01-15 10:27:07 +0800
commit16a2cf7be68605def2824de4f5c22f0154c2e6ad (patch)
tree94987f2ae5e23591bc743452f07ff35369a9db70 /packages/contract-addresses
parentb4621f6a69378fa780c960bfbbc2ca2d27536575 (diff)
parentb108b1119a890ebefb29226ac404d8dfd09fd859 (diff)
downloaddexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar.gz
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar.bz2
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar.lz
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar.xz
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.tar.zst
dexon-sol-tools-16a2cf7be68605def2824de4f5c22f0154c2e6ad.zip
Merge pull request #1503 from 0xProject/feature/multi-asset-proxy-migration
Add MultiAssetProxy Migration
Diffstat (limited to 'packages/contract-addresses')
-rw-r--r--packages/contract-addresses/CHANGELOG.json9
-rw-r--r--packages/contract-addresses/src/index.ts10
2 files changed, 14 insertions, 5 deletions
diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
index 36684d443..014495351 100644
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "2.2.0",
+ "changes": [
+ {
+ "note": "Added migration for `MultiAssetProxy` contract",
+ "pr": 1503
+ }
+ ]
+ },
+ {
"version": "2.1.0",
"changes": [
{
diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts
index d181a1bec..4f580e825 100644
--- a/packages/contract-addresses/src/index.ts
+++ b/packages/contract-addresses/src/index.ts
@@ -70,15 +70,15 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
},
// 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',
- dutchAuction: '0xdc688d29394a3f1e6f1e5100862776691afaf3d2',
+ exchange: '0x48bacb9266a570d521063ef5dd96e61686dbe788',
+ assetProxyOwner: '0x04b5dadd2c0d6a261bfafbc964e0cac48585def3',
+ forwarder: '0x6000eca38b8b5bba64986182fe2a69c57f6b5414',
+ orderValidator: '0x32eecaf51dfea9618e9bc94e9fbfddb1bbdcba15',
+ dutchAuction: '0x7e3f4e1deb8d3a05d9d2da87d9521268d0ec3239',
},
};