From f0ed0c6a351203bd5dece3469b0223829f7db8b8 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 26 Nov 2018 12:14:31 +1100 Subject: chore: Redeploy Rinkeby using testnet Exchange contract. Add Ganache contract addresses back --- packages/contract-addresses/src/index.ts | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'packages/contract-addresses') 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', + }, }; /** -- cgit v1.2.3 From 494adedeef0e0649c1177756d4f1be3cd18f6eb0 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Tue, 27 Nov 2018 08:18:28 +1100 Subject: chore: Update CHANGELOG --- packages/contract-addresses/CHANGELOG.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'packages/contract-addresses') 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,4 +1,17 @@ [ + { + "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": [ -- cgit v1.2.3 From 9266df43a4b8963be9fa90c4e7bab5e91256b8fd Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Wed, 28 Nov 2018 20:08:34 +1100 Subject: chore: Add Ganache to NetworkId enum --- packages/contract-addresses/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/contract-addresses') diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts index b36997f23..7989631e3 100644 --- a/packages/contract-addresses/src/index.ts +++ b/packages/contract-addresses/src/index.ts @@ -16,6 +16,7 @@ export enum NetworkId { Ropsten = 3, Rinkeby = 4, Kovan = 42, + Ganache = 50, } const networkToAddresses: { [networkId: number]: ContractAddresses } = { -- cgit v1.2.3 From c0b9214138a1f2832417ba2ad352569070827e70 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Wed, 28 Nov 2018 21:49:26 +1100 Subject: Updated CHANGELOGS --- packages/contract-addresses/CHANGELOG.json | 3 ++- packages/contract-addresses/CHANGELOG.md | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'packages/contract-addresses') diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index a671247e2..21ffaf510 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -10,7 +10,8 @@ "note": "Added Ganache snapshot addresses for network 50", "pr": 1318 } - ] + ], + "timestamp": 1543401373 }, { "version": "1.2.0", diff --git a/packages/contract-addresses/CHANGELOG.md b/packages/contract-addresses/CHANGELOG.md index 9801831f7..c006c3b22 100644 --- a/packages/contract-addresses/CHANGELOG.md +++ b/packages/contract-addresses/CHANGELOG.md @@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.0 - _November 28, 2018_ + + * Redeployed Rinkeby with testnet Exchange artifact (#1318) + * Added Ganache snapshot addresses for network 50 (#1318) + ## v1.2.0 - _November 21, 2018_ * Rinkeby Deployment -- cgit v1.2.3 From 4861e480597547527397ca4df52c29e5caa798c8 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Wed, 28 Nov 2018 21:49:55 +1100 Subject: Publish - 0x.js@2.0.6 - @0x/abi-gen-templates@1.0.1 - @0x/abi-gen-wrappers@2.0.0 - @0x/asset-buyer@3.0.2 - @0x/base-contract@3.0.8 - @0x/connect@3.0.8 - @0x/contract-addresses@2.0.0 - @0x/contract-artifacts@1.1.2 - @0x/contract-wrappers@4.1.1 - contracts@2.1.56 - @0x/dev-tools-pages@0.0.8 - @0x/dev-utils@1.0.19 - @0x/fill-scenarios@1.0.14 - @0x/instant@1.0.2 - @0x/metacoin@0.0.30 - @0x/migrations@2.2.0 - @0x/order-utils@3.0.4 - @0x/order-watcher@2.2.6 - @0x/react-docs@1.0.20 - @0x/react-shared@1.0.23 - @0x/sol-compiler@1.1.14 - @0x/sol-cov@2.1.14 - @0x/sol-doc@1.0.9 - @0x/subproviders@2.1.6 - @0x/testnet-faucets@1.0.58 - @0x/web3-wrapper@3.1.6 - @0x/website@0.0.61 --- packages/contract-addresses/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contract-addresses') diff --git a/packages/contract-addresses/package.json b/packages/contract-addresses/package.json index 9f0db4d30..c75ae6efa 100644 --- a/packages/contract-addresses/package.json +++ b/packages/contract-addresses/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contract-addresses", - "version": "1.2.0", + "version": "2.0.0", "engines": { "node": ">=6.12" }, -- cgit v1.2.3