fix: use addresses from decentraland-transactions (decentraland#316)

Triex · May 31, 2021 · 19789b6 · 19789b6
1 parent b779db2
commit 19789b6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 36 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -22,8 +22,8 @@
     "connected-react-router": "^6.6.1",
     "date-fns": "^2.8.1",
     "dcl-tslint-config-standard": "^2.0.0",
-    "decentraland-dapps": "^12.3.1",
-    "decentraland-transactions": "^1.7.1",
+    "decentraland-dapps": "^12.5.0",
+    "decentraland-transactions": "^1.9.1",
     "decentraland-ui": "^3.4.2",
     "dotenv": "^8.2.0",
     "graphql": "^14.5.8",

diff --git a/webapp/src/modules/vendor/decentraland/ContractService.ts b/webapp/src/modules/vendor/decentraland/ContractService.ts
@@ -1,4 +1,5 @@
 import { ChainId, Network } from '@dcl/schemas'
+import { getContract, ContractName as CN } from 'decentraland-transactions'
 import {
   Contract,
   ContractService as ContractServiceInterface
@@ -19,39 +20,39 @@ const contracts = ({
   [AppNetwork.ROPSTEN]: [
     {
       name: ContractName.MANA,
-      address: '0x2a8fd99c19271f4f04b1b7b9c4f7cf264b626edb',
+      address: getContract(CN.MANAToken, ChainId.ETHEREUM_ROPSTEN).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_ROPSTEN
     },
     {
       name: ContractName.MARKETPLACE,
-      address: '0x5424912699dabaa5f2998750c1c66e73d67ad219',
+      address: getContract(CN.Marketplace, ChainId.ETHEREUM_ROPSTEN).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_ROPSTEN
     },
     {
       name: ContractName.BIDS,
-      address: '0x250fa138c0a994799c7a49df3097dc71e37b3d6f',
+      address: getContract(CN.Bid, ChainId.ETHEREUM_ROPSTEN).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_ROPSTEN
     },
     {
       name: ContractName.MANA,
-      address: '0x882Da5967c435eA5cC6b09150d55E8304B838f45',
+      address: getContract(CN.MANAToken, ChainId.MATIC_MUMBAI).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
       chainId: ChainId.MATIC_MUMBAI
     },
     {
       name: ContractName.MARKETPLACE,
-      address: '0x4D005B77334E36cD53843e9bABDf10340862C7f2',
+      address: getContract(CN.Marketplace, ChainId.MATIC_MUMBAI).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
@@ -61,39 +62,39 @@ const contracts = ({
   [AppNetwork.MAINNET]: [
     {
       name: ContractName.MANA,
-      address: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
+      address: getContract(CN.MANAToken, ChainId.ETHEREUM_MAINNET).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_MAINNET
     },
     {
       name: ContractName.MARKETPLACE,
-      address: '0x8e5660b4ab70168b5a6feea0e0315cb49c8cd539',
+      address: getContract(CN.Marketplace, ChainId.ETHEREUM_MAINNET).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_MAINNET
     },
     {
       name: ContractName.BIDS,
-      address: '0xe479dfd9664c693b2e2992300930b00bfde08233',
+      address: getContract(CN.Bid, ChainId.ETHEREUM_MAINNET).address,
       vendor: 'decentraland',
       category: null,
       network: Network.ETHEREUM,
       chainId: ChainId.ETHEREUM_ROPSTEN
     },
     {
       name: ContractName.MANA,
-      address: '0xA1c57f48F0Deb89f569dFbE6E2B7f46D33606fD4',
+      address: getContract(CN.MANAToken, ChainId.MATIC_MAINNET).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
       chainId: ChainId.MATIC_MAINNET
     },
     {
       name: ContractName.MARKETPLACE,
-      address: '0x0000000000000000000000000000000000000000', // TODO: add contract address
+      address: getContract(CN.Marketplace, ChainId.MATIC_MAINNET).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,