From fd27863ada3e5e9e494a7cfcbde08aedaa9731f4 Mon Sep 17 00:00:00 2001 From: Gabriel Diaz Date: Mon, 15 Apr 2024 11:02:50 -0300 Subject: [PATCH 1/3] feat: Use polygon amoy contract --- scripts/generate-snapshots.ts | 8 ++++---- src/contracts-snapshots/index.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/generate-snapshots.ts b/scripts/generate-snapshots.ts index c31d440..7b0f333 100644 --- a/scripts/generate-snapshots.ts +++ b/scripts/generate-snapshots.ts @@ -38,7 +38,7 @@ async function main(): Promise { mainnet: new HTTPProvider('https://rpc.decentraland.org/mainnet?project:catalyst-client-build', opts), sepolia: new HTTPProvider('https://rpc.decentraland.org/sepolia?project:catalyst-client-build', opts), polygon: new HTTPProvider('https://rpc.decentraland.org/polygon?project:catalyst-client-build', opts), - mumbai: new HTTPProvider('https://rpc.decentraland.org/mumbai?project:catalyst-client-build', opts) + amoy: new HTTPProvider('https://rpc.decentraland.org/amoy?project:catalyst-client-build', opts) } async function getDenylists() { @@ -88,11 +88,11 @@ async function main(): Promise { const factory = new ContractFactory(requestManager, listAbi) return (await factory.at(address)) as any } - const [polygon, mumbai] = await Promise.all([ + const [polygon, amoy] = await Promise.all([ getPoisFromContract(await createContract(l2Contracts.polygon.poi, providers.polygon)), - getPoisFromContract(await createContract(l2Contracts.mumbai.poi, providers.mumbai)) + getPoisFromContract(await createContract(l2Contracts.amoy.poi, providers.amoy)) ]) - return { polygon, mumbai } + return { polygon, amoy } } const content = { diff --git a/src/contracts-snapshots/index.ts b/src/contracts-snapshots/index.ts index 0700f84..70cede3 100644 --- a/src/contracts-snapshots/index.ts +++ b/src/contracts-snapshots/index.ts @@ -1,5 +1,5 @@ -import { cache } from './data' import { CatalystServerInfo, L1Network } from '@dcl/catalyst-contracts' +import { cache } from './data' export function getCatalystServersFromCache(network: L1Network): CatalystServerInfo[] { return cache.catalysts[network] @@ -9,6 +9,6 @@ export function getNameDenylistFromCache(network: 'mainnet'): string[] { return cache.nameDenylist[network] } -export function getPoisFromCache(network: 'polygon' | 'mumbai'): string[] { +export function getPoisFromCache(network: 'polygon' | 'amoy'): string[] { return cache.pois[network] } From 0394358ce2b3bad1de063bcc254c81a3f27844e6 Mon Sep 17 00:00:00 2001 From: Gabriel Diaz Date: Mon, 15 Apr 2024 11:03:14 -0300 Subject: [PATCH 2/3] feat: Update @dcl/catalyst-contracts package --- package.json | 2 +- yarn.lock | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index afdef6c..904caf1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/decentraland/catalyst-client#readme", "dependencies": { - "@dcl/catalyst-contracts": "^4.0.2", + "@dcl/catalyst-contracts": "https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz", "@dcl/crypto": "^3.4.0", "@dcl/hashing": "^3.0.0", "@dcl/schemas": "^10.3.0", diff --git a/yarn.lock b/yarn.lock index 535e6be..e709856 100644 --- a/yarn.lock +++ b/yarn.lock @@ -360,6 +360,10 @@ resolved "https://registry.yarnpkg.com/@dcl/catalyst-contracts/-/catalyst-contracts-4.3.1.tgz#ee79b4bf9c07fbe79c35b208323b6e30bf6e2598" integrity sha512-wOaIG/RwsKniQu1wDhigiQHDbfYMSu9Ifk7PToLMA01ellPrF0CZK06vGJLtXlahaXfUbv94N03teS7kYRORLA== +"@dcl/catalyst-contracts@https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz": + version "4.3.2-8681670053.commit-fcfeb80" + resolved "https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz#d02e453f451245acbc37354b781f386b437011d3" + "@dcl/crypto@^3.4.0": version "3.4.5" resolved "https://registry.yarnpkg.com/@dcl/crypto/-/crypto-3.4.5.tgz#95ca2beab46fa3494b4d38f009bf0d49c87ba235" From 28d6fa7f96da06562f3c9f4d4c29e894f2b56c37 Mon Sep 17 00:00:00 2001 From: Gabriel Diaz Date: Tue, 16 Apr 2024 17:20:48 -0300 Subject: [PATCH 3/3] chore: Upgrade @dcl/catalyst-contracts and @dcl/schemas package --- package.json | 4 ++-- yarn.lock | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 904caf1..775c5cd 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,10 @@ }, "homepage": "https://github.com/decentraland/catalyst-client#readme", "dependencies": { - "@dcl/catalyst-contracts": "https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz", + "@dcl/catalyst-contracts": "^4.4.0", "@dcl/crypto": "^3.4.0", "@dcl/hashing": "^3.0.0", - "@dcl/schemas": "^10.3.0", + "@dcl/schemas": "^11.5.0", "@well-known-components/fetch-component": "^2.0.0", "cookie": "^0.5.0", "cross-fetch": "^3.1.5", diff --git a/yarn.lock b/yarn.lock index e709856..6651d39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -355,14 +355,10 @@ dependencies: yaml "^2.3.4" -"@dcl/catalyst-contracts@^4.0.2": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@dcl/catalyst-contracts/-/catalyst-contracts-4.3.1.tgz#ee79b4bf9c07fbe79c35b208323b6e30bf6e2598" - integrity sha512-wOaIG/RwsKniQu1wDhigiQHDbfYMSu9Ifk7PToLMA01ellPrF0CZK06vGJLtXlahaXfUbv94N03teS7kYRORLA== - -"@dcl/catalyst-contracts@https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz": - version "4.3.2-8681670053.commit-fcfeb80" - resolved "https://sdk-team-cdn.decentraland.org/@dcl/catalyst-contracts/branch/feat/add-polygon-amoy-support/dcl-catalyst-contracts-4.3.2-8681670053.commit-fcfeb80.tgz#d02e453f451245acbc37354b781f386b437011d3" +"@dcl/catalyst-contracts@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@dcl/catalyst-contracts/-/catalyst-contracts-4.4.0.tgz#a36a599f5e0c4b15e653650f74fcaa3da1f525ec" + integrity sha512-jA4LU/f0VQI4epwctUZFIxnvnXBSsWGdoDibuV1kIW1nnooqRmCKdN2bbQKYWhWKtwjQfUHvbUKLzA+dD2a1gw== "@dcl/crypto@^3.4.0": version "3.4.5" @@ -395,14 +391,15 @@ resolved "https://registry.yarnpkg.com/@dcl/hashing/-/hashing-3.0.4.tgz#4df2a4cb3a8114765aed34cb57b91c93bf33bfb3" integrity sha512-Cg+MoIOn+BYmQV2q8zSFnNYY+GldlnUazwBnfgrq3i66ZxOaZ65h01btd8OUtSAlfWG4VTNIOHDjtKqmuwJNBg== -"@dcl/schemas@^10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-10.3.0.tgz#345e3710a34e278311606620969f4b020e53052c" - integrity sha512-92CDJjG6T2g437lkXaw8uOzehPqi0QIp3qnD5uSz5UQu4djoMJYwoGB/IL2RX7pFL8ojaBPFashX/FjqHLxP+A== +"@dcl/schemas@^11.5.0": + version "11.5.0" + resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-11.5.0.tgz#b07fe469523348eed4d4bfde1219123c38bdb3ee" + integrity sha512-FkDAsZm6Ydu5PEROup2dLjOcqNwOiUISGhVYQAg6bWIp3kDnAjxguutOXIfxuZrVZELEcIi6+ntbvvfR28FAwg== dependencies: ajv "^8.11.0" ajv-errors "^3.0.0" ajv-keywords "^5.1.0" + mitt "^3.0.1" "@dcl/schemas@^9.2.0": version "9.9.0" @@ -3827,7 +3824,7 @@ minimatch@^6.1.6: dependencies: brace-expansion "^2.0.1" -mitt@^3.0.0: +mitt@^3.0.0, mitt@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1" integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==