feat: Goerli for dev (#570)

* feat: Change Ropsten to Goerli * feat: Rename ropsten occurrences to goerli * chore: Update peer in dev * chore: Update peer url in action envs
decentraland · Aug 16, 2022 · 6668ec8 · 6668ec8
1 parent 093ecff
commit 6668ec8
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.ci/index.ts b/.ci/index.ts
@@ -91,11 +91,11 @@ export = async function main() {
         value:
           env === 'prd' || env === 'stg'
             ? 'https://peer.decentraland.org'
-            : 'https://peer.decentraland.zone',
+            : 'https://peer-ap1.decentraland.zone',
       },
       {
         name: 'CHAIN_NAME',
-        value: env === 'prd' || env === 'stg' ? 'Ethereum Mainnet' : 'Ropsten',
+        value: env === 'prd' || env === 'stg' ? 'Ethereum Mainnet' : 'Goerli',
       },
       {
         name: 'COLLECTIONS_GRAPH_URL',

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -28,8 +28,8 @@ jobs:
           AUTH0_DOMAIN: AUTH0_DOMAIN
           DEFAULT_ETH_ADDRESS: DEFAULT_ETH_ADDRESS
           ANALYTICS_CONNECTION_STRING: ANALYTICS_CONNECTION_STRING
-          PEER_URL: https://peer.decentraland.zone
-          CHAIN_NAME: Ropsten
+          PEER_URL: PEER_URL
+          CHAIN_NAME: Goerli
           THIRD_PARTY_GRAPH_URL: 'http://thid-party-url'
           OPEN_SEA_URL: OPEN_SEA_URL
           OPEN_SEA_API_KEY: OPEN_SEA_API_KEY

diff --git a/src/Collection/Collection.router.spec.ts b/src/Collection/Collection.router.spec.ts
@@ -111,7 +111,7 @@ describe('Collection router', () => {
   })
 
   describe('when upserting a collection', () => {
-    const network = 'ropsten'
+    const network = 'goerli'
     let urn_suffix: string
     let third_party_id: string
     let urn: string

diff --git a/src/Collection/utils.spec.ts b/src/Collection/utils.spec.ts
@@ -14,7 +14,7 @@ import { Collection } from './Collection.model'
 import { getChequeMessageHash, getMergedCollection } from './utils'
 
 describe('when decoding the TP collection URN', () => {
-  const collectionNetwork = 'ropsten'
+  const collectionNetwork = 'goerli'
   const thirdPartyId = `urn:decentraland:${collectionNetwork}:collections-thirdparty:a-third-party-id`
   const collectionURNSuffix = 'a-urn-suffix'
   let fullUrn: string

diff --git a/src/common/matchers.spec.ts b/src/common/matchers.spec.ts
@@ -14,7 +14,7 @@ describe('matchers', () => {
 
     it('should append the other matchers', () => {
       expect(matchers.urn).toBe(
-        'urn:decentraland:(mainnet|ropsten|matic|mumbai):(?:collections-thirdparty:[^:|\\s]+:[^:|\\s]+|collections-v2:0x[a-fA-F0-9]{40})'
+        'urn:decentraland:(mainnet|goerli|matic|mumbai):(?:collections-thirdparty:[^:|\\s]+:[^:|\\s]+|collections-v2:0x[a-fA-F0-9]{40})'
       )
     })
 

diff --git a/src/common/matchers.ts b/src/common/matchers.ts
@@ -1,7 +1,7 @@
 // DCL: urn:decentraland:{network}:collections-v2:{contract-address}
 //  TP: urn:decentraland:{network}:collections-thirdparty:{third-party-name}:{collection-id}(:{item-id})?
 
-const network = '(mainnet|ropsten|matic|mumbai)'
+const network = '(mainnet|goerli|matic|mumbai)'
 const address = '0x[a-fA-F0-9]{40}'
 const urnSlot = '[^:|\\s]+'
 const baseURN = `urn:decentraland:${network}`

diff --git a/src/ethereum/utils.spec.ts b/src/ethereum/utils.spec.ts
@@ -25,9 +25,9 @@ describe('when obtaining the forwarder address', () => {
     })
   })
 
-  describe('when CHAIN_NAME === "Ropsten"', () => {
+  describe('when CHAIN_NAME === "Goerli"', () => {
     it('should return the address of the forwarder in matic mumbai', () => {
-      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_ROPSTEN)
+      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_GOERLI)
 
       expect(getForwarderAddress()).toBe(
         '0x71e56Ad57eca3fAAe5077b7F9ea731a25785fF92'
@@ -47,9 +47,9 @@ describe('when obtaining the collection factory address', () => {
     })
   })
 
-  describe('when CHAIN_NAME === "Ropsten"', () => {
+  describe('when CHAIN_NAME === "Goerli"', () => {
     it('should return the collection factory v3 address on matic mumbai', () => {
-      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_ROPSTEN)
+      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_GOERLI)
 
       expect(getFactoryCollectionAddress()).toBe(
         '0xDDb3781Fff645325C8896AA1F067bAa381607ecc'
@@ -69,9 +69,9 @@ describe('when obtaining the codehash', () => {
     })
   })
 
-  describe('when CHAIN_NAME === "Ropsten"', () => {
+  describe('when CHAIN_NAME === "Goerli"', () => {
     it('should return the codehash for the factory v3 in matic mumbai', async () => {
-      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_ROPSTEN)
+      mockEnv.get.mockReturnValueOnce(ChainName.ETHEREUM_GOERLI)
 
       expect(getFactoryCollectionCodeHash()).toBe(
         '0x7917e9ddbe5e0fd8de84efee3e8089ca7878af7a6aa1a62b4d0b6160821d4de8'

diff --git a/src/ethereum/utils.ts b/src/ethereum/utils.ts
@@ -14,7 +14,7 @@ export function getMappedChainIdForCurrentChainName():
   switch (chainName) {
     case ChainName.ETHEREUM_MAINNET:
       return ChainId.MATIC_MAINNET
-    case ChainName.ETHEREUM_ROPSTEN:
+    case ChainName.ETHEREUM_GOERLI:
       return ChainId.MATIC_MUMBAI
     default:
       throw new Error(