From 0330b79c4026420e108824f17a5ba8da293ac27a Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Fri, 11 Feb 2022 17:57:10 +0800 Subject: [PATCH 1/2] chore: meson proxy replace ipfs --- packages/mask/src/plugins/Collectible/constants.ts | 1 - packages/mask/src/plugins/Pets/constants.ts | 3 ++- packages/mask/src/plugins/Pets/hooks/useNfts.ts | 4 ++-- packages/plugins/RSS3/src/constants.ts | 4 +++- packages/web3-providers/src/rarible/constants.ts | 1 - packages/web3-providers/src/rarible/utils.ts | 5 ++--- packages/web3-shared/evm/pipes/index.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/constants.ts b/packages/mask/src/plugins/Collectible/constants.ts index 5b04cbf5715c..b87ff123d1a0 100644 --- a/packages/mask/src/plugins/Collectible/constants.ts +++ b/packages/mask/src/plugins/Collectible/constants.ts @@ -26,7 +26,6 @@ export const OpenSeaTestnetURL = 'https://testnets.opensea.io' export const RaribleURL = 'https://api.rarible.com/' export const RaribleChainURL = 'https://ethereum-api.rarible.org/' -export const RaribleIPFSURL = 'https://ipfs.rarible.com/ipfs/' export const RaribleUserURL = 'https://rarible.com/user/' export const RaribleRopstenUserURL = 'https://ropsten.rarible.com/user/' export const RaribleRinkebyUserURL = 'https://rinkeby.rarible.com/user/' diff --git a/packages/mask/src/plugins/Pets/constants.ts b/packages/mask/src/plugins/Pets/constants.ts index 9e16706aabc9..e4ce5cefb9a8 100644 --- a/packages/mask/src/plugins/Pets/constants.ts +++ b/packages/mask/src/plugins/Pets/constants.ts @@ -1,6 +1,7 @@ import { mediaViewerUrl } from '@masknet/shared' import urlcat from 'urlcat' import { ImageType } from './types' +import { resolveIPFSLink } from '@masknet/web3-shared-evm' export const PetsPluginID = 'com.maskbook.pets' export const TWITTER = 'twitter.com' @@ -30,7 +31,7 @@ export const Punk3D = { contract: '0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb', tokenId: '6128', url: urlcat(mediaViewerUrl, { - url: 'https://gateway.pinata.cloud/ipfs/QmZjfo1zKTfQZjqs4CaZJ7pQDZHrUBaozre8Z71c7ZXGMc', + url: resolveIPFSLink('QmZjfo1zKTfQZjqs4CaZJ7pQDZHrUBaozre8Z71c7ZXGMc'), type: 'model/gltf-binary', }), } diff --git a/packages/mask/src/plugins/Pets/hooks/useNfts.ts b/packages/mask/src/plugins/Pets/hooks/useNfts.ts index c0d5db3295c0..ac767c43a89e 100644 --- a/packages/mask/src/plugins/Pets/hooks/useNfts.ts +++ b/packages/mask/src/plugins/Pets/hooks/useNfts.ts @@ -8,13 +8,13 @@ import { isSameAddress, ERC721ContractDetailed, SocketState, + resolveIPFSLink, } from '@masknet/web3-shared-evm' import { Constant, transform } from '@masknet/web3-shared-evm/constants/utils' import { cloneDeep, findLastIndex } from 'lodash-unified' import { delay } from '@masknet/shared-base' import type { User, FilterContract } from '../types' import { Punk3D } from '../constants' -import { RaribleIPFSURL } from '../../Collectible/constants' function useInitNFTs(config: Record | undefined) { return useMemo(() => { @@ -49,7 +49,7 @@ export function useNFTs(user: User | undefined, configNFTs: Record v.tokenId === NFT.tokenId) diff --git a/packages/plugins/RSS3/src/constants.ts b/packages/plugins/RSS3/src/constants.ts index 25fa00087357..74f62a43a17c 100644 --- a/packages/plugins/RSS3/src/constants.ts +++ b/packages/plugins/RSS3/src/constants.ts @@ -1,4 +1,5 @@ import { PluginId } from '@masknet/plugin-infra' +import { resolveIPFSLink } from '@masknet/web3-shared-evm' export const PLUGIN_ID = PluginId.RSS3 export const PLUGIN_META_KEY = `${PluginId.RSS3}:1` @@ -6,4 +7,5 @@ export const PLUGIN_DESCRIPTION = 'Derived from the best out of RSS, RSS3 is an open protocol designed for all our cyber existence in the era of Web 3.0.' export const PLUGIN_NAME = 'RSS3' -export const RSS3_DEFAULT_IMAGE = 'https://rss3.mypinata.cloud/ipfs/QmVFq9qimnudPcs6QkQv8ZVEsvwD3aqETHWtS5yXgdbYY5' +/* cspell:disable-next-line */ +export const RSS3_DEFAULT_IMAGE = resolveIPFSLink('QmVFq9qimnudPcs6QkQv8ZVEsvwD3aqETHWtS5yXgdbYY5') diff --git a/packages/web3-providers/src/rarible/constants.ts b/packages/web3-providers/src/rarible/constants.ts index 603f9c9fe00c..87313aeab648 100644 --- a/packages/web3-providers/src/rarible/constants.ts +++ b/packages/web3-providers/src/rarible/constants.ts @@ -1,6 +1,5 @@ export const RaribleURL = 'https://api.rarible.com/' export const RaribleChainURL = 'https://ethereum-api.rarible.org/' -export const RaribleIPFSURL = 'https://ipfs.rarible.com/ipfs/' export const RaribleUserURL = 'https://rarible.com/user/' export const RaribleRopstenUserURL = 'https://ropsten.rarible.com/user/' export const RaribleMainnetURL = 'https://api-mainnet.rarible.com/marketplace/api/v4/' diff --git a/packages/web3-providers/src/rarible/utils.ts b/packages/web3-providers/src/rarible/utils.ts index d78d6ffad7d8..70f4b7d55166 100644 --- a/packages/web3-providers/src/rarible/utils.ts +++ b/packages/web3-providers/src/rarible/utils.ts @@ -1,7 +1,6 @@ -import { RaribleIPFSURL } from './constants' - +import { resolveIPFSLink } from '@masknet/web3-shared-evm' export function toRaribleImage(url?: string) { if (!url) return '' - if (url.startsWith('ipfs://ipfs/')) return url.replace(/^ipfs:\/\/ipfs\//, RaribleIPFSURL) + if (url.startsWith('ipfs://ipfs/')) return resolveIPFSLink(url.replace(/^ipfs:\/\/ipfs\//, '')) return url } diff --git a/packages/web3-shared/evm/pipes/index.ts b/packages/web3-shared/evm/pipes/index.ts index 6b6c8cf71790..1215abc5d315 100644 --- a/packages/web3-shared/evm/pipes/index.ts +++ b/packages/web3-shared/evm/pipes/index.ts @@ -172,7 +172,7 @@ export function resolveBlockLinkOnExplorer(chainId: ChainId, block: string): str } export function resolveIPFSLink(ipfs: string): string { - return urlcat('https://ipfs.fleek.co/ipfs/:ipfs', { ipfs }) + return urlcat('https://coldcdn.com/api/cdn/mipfseoyvi/ipfs/:ipfs', { ipfs }) } export function resolveDomainLink(domain?: string) { From 676d4ff7e3f95773e68de5569b6fc98906e49ecf Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Fri, 11 Feb 2022 18:02:17 +0800 Subject: [PATCH 2/2] chore: cspell --- packages/mask/src/plugins/Pets/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mask/src/plugins/Pets/constants.ts b/packages/mask/src/plugins/Pets/constants.ts index e4ce5cefb9a8..103364138493 100644 --- a/packages/mask/src/plugins/Pets/constants.ts +++ b/packages/mask/src/plugins/Pets/constants.ts @@ -31,6 +31,7 @@ export const Punk3D = { contract: '0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb', tokenId: '6128', url: urlcat(mediaViewerUrl, { + /* cspell:disable-next-line */ url: resolveIPFSLink('QmZjfo1zKTfQZjqs4CaZJ7pQDZHrUBaozre8Z71c7ZXGMc'), type: 'model/gltf-binary', }),