feat: use amoy instead of mumbai (#2216)

decentraland · Apr 15, 2024 · d885f30 · d885f30
1 parent 71be90e
commit d885f30
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 48 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 @@
     "dcl-catalyst-commons": "^9.0.1",
     "decentraland-connect": "^6.3.1",
     "decentraland-crypto-fetch": "^1.0.3",
-    "decentraland-dapps": "^19.5.2",
-    "decentraland-transactions": "^2.3.2",
+    "decentraland-dapps": "^19.5.3",
+    "decentraland-transactions": "^2.6.0",
     "decentraland-ui": "^5.17.1",
     "ethers": "^5.6.8",
     "graphql": "^14.7.0",

diff --git a/webapp/src/components/AssetCard/AssetCard.spec.tsx b/webapp/src/components/AssetCard/AssetCard.spec.tsx
@@ -69,7 +69,7 @@ describe('AssetCard', () => {
         } as Asset['data']['wearable']
       },
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI,
+      chainId: ChainId.MATIC_AMOY,
       firstListedAt: null
     }
   })

diff --git a/webapp/src/components/Modals/BuyWithCryptoModal/utils.ts b/webapp/src/components/Modals/BuyWithCryptoModal/utils.ts
@@ -156,8 +156,8 @@ export const DEFAULT_CHAINS = [
 
 export const TESTNET_DEFAULT_CHAINS = [
   {
-    chainId: ChainId.MATIC_MUMBAI.toString(),
-    networkName: 'Polygon Mumbai',
+    chainId: ChainId.MATIC_AMOY.toString(),
+    networkName: 'Polygon Amoy',
     nativeCurrency: {
       name: 'MATIC',
       symbol: 'MATIC',

diff --git a/webapp/src/components/SuccessPage/SuccessPage.container.ts b/webapp/src/components/SuccessPage/SuccessPage.container.ts
@@ -19,7 +19,7 @@ const mapState = (state: RootState): MapStateProps => {
   const isLoadingTx = Boolean(transaction && transaction.status !== TransactionStatus.CONFIRMED)
   return {
     isLoading: isLoadingTx,
-    mintedTokenId: getTokenIdFromLogs(ChainId.MATIC_MUMBAI, transaction?.receipt?.logs),
+    mintedTokenId: getTokenIdFromLogs(ChainId.MATIC_AMOY, transaction?.receipt?.logs),
     profile: address ? getProfileOfAddress(state, address) : undefined
   }
 }

diff --git a/webapp/src/modules/contract/reducer.spec.ts b/webapp/src/modules/contract/reducer.spec.ts
@@ -67,7 +67,7 @@ describe('when upsert contracts action is received', () => {
       const contract = {
         address: 'address',
         name: 'some name',
-        chainId: ChainId.MATIC_MUMBAI
+        chainId: ChainId.MATIC_AMOY
       } as Contract
 
       const newContract = {
@@ -93,7 +93,7 @@ describe('when upsert contracts action is received', () => {
     it('should insert it into the store', () => {
       const newContract = {
         address: 'address',
-        chainId: ChainId.MATIC_MUMBAI,
+        chainId: ChainId.MATIC_AMOY,
         name: 'some other name'
       } as Contract
 

diff --git a/webapp/src/modules/contract/sagas.spec.ts b/webapp/src/modules/contract/sagas.spec.ts
@@ -54,7 +54,7 @@ describe('when handling the fetch contracts request', () => {
       const marketplaceMatic: Contract = {
         address: 'marketplaceMaticAddress',
         category: null,
-        chainId: ChainId.MATIC_MUMBAI,
+        chainId: ChainId.MATIC_AMOY,
         name: contractNames.MARKETPLACE,
         network: Network.MATIC,
         vendor: VendorName.DECENTRALAND
@@ -81,7 +81,7 @@ describe('when handling the fetch contracts request', () => {
       const bidsMatic: Contract = {
         address: 'bidsEthereumAddress',
         category: null,
-        chainId: ChainId.MATIC_MUMBAI,
+        chainId: ChainId.MATIC_AMOY,
         name: contractNames.BIDS,
         network: Network.MATIC,
         vendor: VendorName.DECENTRALAND
@@ -99,7 +99,7 @@ describe('when handling the fetch contracts request', () => {
       const manaMatic: Contract = {
         address: 'manaMaticAddress',
         category: null,
-        chainId: ChainId.MATIC_MUMBAI,
+        chainId: ChainId.MATIC_AMOY,
         name: contractNames.MANA,
         network: Network.MATIC,
         vendor: VendorName.DECENTRALAND
@@ -108,7 +108,7 @@ describe('when handling the fetch contracts request', () => {
       const collectionStore: Contract = {
         address: 'collectionStoreAddress',
         category: null,
-        chainId: ChainId.MATIC_MUMBAI,
+        chainId: ChainId.MATIC_AMOY,
         name: contractNames.COLLECTION_STORE,
         network: Network.MATIC,
         vendor: VendorName.DECENTRALAND
@@ -221,15 +221,15 @@ describe('when handling the fetch contracts request', () => {
               authorizedAddress: marketplaceMatic.address,
               contractAddress: manaMatic.address,
               contractName: ContractName.MANAToken,
-              chainId: ChainId.MATIC_MUMBAI,
+              chainId: ChainId.MATIC_AMOY,
               type: AuthorizationType.ALLOWANCE
             },
             {
               address,
               authorizedAddress: legacyMarketplace.address,
               contractAddress: manaMatic.address,
               contractName: ContractName.MANAToken,
-              chainId: ChainId.MATIC_MUMBAI,
+              chainId: ChainId.MATIC_AMOY,
               type: AuthorizationType.ALLOWANCE
             },
             {
@@ -245,15 +245,15 @@ describe('when handling the fetch contracts request', () => {
               authorizedAddress: bidsEthereum.address,
               contractAddress: manaMatic.address,
               contractName: ContractName.MANAToken,
-              chainId: ChainId.MATIC_MUMBAI,
+              chainId: ChainId.MATIC_AMOY,
               type: AuthorizationType.ALLOWANCE
             },
             {
               address,
               authorizedAddress: collectionStore.address,
               contractAddress: manaMatic.address,
               contractName: ContractName.MANAToken,
-              chainId: ChainId.MATIC_MUMBAI,
+              chainId: ChainId.MATIC_AMOY,
               type: AuthorizationType.ALLOWANCE
             }
           ])

diff --git a/webapp/src/modules/contract/utils.spec.ts b/webapp/src/modules/contract/utils.spec.ts
@@ -38,7 +38,7 @@ describe('when calling upsertContracts', () => {
     describe('and newContracts has a contract', () => {
       describe('and that contract has an upper cased address', () => {
         beforeEach(() => {
-          newContracts = [{ address: 'ADDRESS', chainId: ChainId.MATIC_MUMBAI } as Contract]
+          newContracts = [{ address: 'ADDRESS', chainId: ChainId.MATIC_AMOY } as Contract]
         })
 
         it('should return an array with the new contract with its address lower cased', () => {
@@ -58,7 +58,7 @@ describe('when calling upsertContracts', () => {
       storedContracts = [
         {
           address: 'address',
-          chainId: ChainId.MATIC_MUMBAI,
+          chainId: ChainId.MATIC_AMOY,
           name: 'name'
         } as Contract
       ]
@@ -79,7 +79,7 @@ describe('when calling upsertContracts', () => {
         newContracts = [
           {
             address: 'ADDRESS',
-            chainId: ChainId.MATIC_MUMBAI,
+            chainId: ChainId.MATIC_AMOY,
             name: 'name'
           } as Contract
         ]
@@ -95,7 +95,7 @@ describe('when calling upsertContracts', () => {
         newContracts = [
           {
             address: 'other address',
-            chainId: ChainId.MATIC_MUMBAI,
+            chainId: ChainId.MATIC_AMOY,
             name: 'name'
           } as Contract
         ]
@@ -127,7 +127,7 @@ describe('when calling upsertContracts', () => {
         newContracts = [
           {
             address: 'ADDRESS',
-            chainId: ChainId.MATIC_MUMBAI,
+            chainId: ChainId.MATIC_AMOY,
             name: 'different name'
           } as Contract
         ]
@@ -145,9 +145,9 @@ describe('when calling getContractKey', () => {
     expect(
       getContractKey({
         address: 'address',
-        chainId: ChainId.MATIC_MUMBAI
+        chainId: ChainId.MATIC_AMOY
       } as Contract)
-    ).toEqual('address-80001')
+    ).toEqual('address-80002')
   })
 })
 
@@ -156,9 +156,9 @@ describe('when calling getContractKeyFromNFT', () => {
     expect(
       getContractKeyFromNFT({
         contractAddress: 'address',
-        chainId: ChainId.MATIC_MUMBAI
+        chainId: ChainId.MATIC_AMOY
       } as NFT)
-    ).toEqual('address-80001')
+    ).toEqual('address-80002')
   })
 })
 
@@ -169,9 +169,9 @@ describe('when calling getAuthorizationKey', () => {
         address: 'address',
         authorizedAddress: 'authorizedAddress',
         contractAddress: 'contractAddress',
-        chainId: ChainId.MATIC_MUMBAI
+        chainId: ChainId.MATIC_AMOY
       } as Authorization)
-    ).toEqual('address-authorizedAddress-contractAddress-80001')
+    ).toEqual('address-authorizedAddress-contractAddress-80002')
   })
 })
 

diff --git a/webapp/src/modules/nft/sagas.spec.ts b/webapp/src/modules/nft/sagas.spec.ts
@@ -117,7 +117,7 @@ describe('when handling the fetch NFTs request action', () => {
         {
           id: 'anID',
           contractAddress: 'aContractAddress',
-          chainId: ChainId.MATIC_MUMBAI
+          chainId: ChainId.MATIC_AMOY
         }
       ] as NFT[]
       const accounts = [{ address: 'someAddress' }] as Account[]

diff --git a/webapp/src/modules/vendor/decentraland/contracts.ts b/webapp/src/modules/vendor/decentraland/contracts.ts
@@ -484,20 +484,20 @@ const localContracts = {
     },
     {
       name: ContractName.MANA,
-      address: getContract(CN.MANAToken, ChainId.MATIC_MUMBAI).address,
+      address: getContract(CN.MANAToken, ChainId.MATIC_AMOY).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI
+      chainId: ChainId.MATIC_AMOY
     },
     {
       name: ContractName.MARKETPLACE,
-      address: getContract(CN.MarketplaceV2, ChainId.MATIC_MUMBAI).address,
+      address: getContract(CN.MarketplaceV2, ChainId.MATIC_AMOY).address,
       label: 'MarketplaceV2',
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI
+      chainId: ChainId.MATIC_AMOY
     },
     {
       name: ContractName.LEGACY_MARKETPLACE,
@@ -506,23 +506,23 @@ const localContracts = {
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI
+      chainId: ChainId.MATIC_AMOY
     },
     {
       name: CN.CollectionStore,
-      address: getContract(CN.CollectionStore, ChainId.MATIC_MUMBAI).address,
+      address: getContract(CN.CollectionStore, ChainId.MATIC_AMOY).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI
+      chainId: ChainId.MATIC_AMOY
     },
     {
       name: ContractName.BIDS,
-      address: getContract(CN.BidV2, ChainId.MATIC_MUMBAI).address,
+      address: getContract(CN.BidV2, ChainId.MATIC_AMOY).address,
       vendor: 'decentraland',
       category: null,
       network: Network.MATIC,
-      chainId: ChainId.MATIC_MUMBAI
+      chainId: ChainId.MATIC_AMOY
     }
   ],
   [AppNetwork.GOERLI]: [

diff --git a/webapp/src/modules/vendor/decentraland/marketplace/api.ts b/webapp/src/modules/vendor/decentraland/marketplace/api.ts
@@ -12,7 +12,7 @@ export class MarketplaceAPI extends BaseAPI {
       [ChainId.ETHEREUM_MAINNET]: 'eth-mainnet',
       [ChainId.ETHEREUM_SEPOLIA]: 'eth-sepolia',
       [ChainId.MATIC_MAINNET]: 'matic-mainnet',
-      [ChainId.MATIC_MUMBAI]: 'matic-mumbai',
+      [ChainId.MATIC_AMOY]: 'matic-amoy',
       [ChainId.BSC_MAINNET]: 'bsc-mainnet',
       [ChainId.AVALANCHE_MAINNET]: 'avalanche-mainnet',
       [ChainId.OPTIMISM_MAINNET]: 'optimism-mainnet',