Skip to content

Commit 743cc7e

Browse files
guanbinruiswkatmasknuanyang233Jack-Works
authored
[Release] Hotfix 2.24.7 => 2.24.8 (patch) (#11563)
* chore: bump version to 2.24.8 * fix: mf-6128 add XLayer Chain (#11564) * fixup! fix: mf-6128 add XLayer Chain (#11565) * chore: rename XLayer to X Layer (#11566) * fix: correct x layer contract address (#11567) * fixup! fix: correct x layer contract address (#11569) * fix: scam sniffer (#11568) * fix: polyfill is missing regenerator-runtime tslib and reflect-metadata * chore: remove console.log * fix: scam sniffer --------- Co-authored-by: Jack Works <[email protected]> * fix: history for X Layer is not avaliable for now (#11570) --------- Co-authored-by: Wukong Sun <[email protected]> Co-authored-by: nuanyang233 <[email protected]> Co-authored-by: Jack Works <[email protected]>
1 parent 27d368e commit 743cc7e

File tree

25 files changed

+93
-96
lines changed

25 files changed

+93
-96
lines changed

Diff for: ‎cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@
338338
"wmatic",
339339
"xdai",
340340
"xlarge",
341+
"xlayer",
341342
"zerion",
342343
"zilliqa",
343344
"zksync",

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"yarn": ">=999.0.0",
99
"npm": ">=999.0.0"
1010
},
11-
"version": "2.24.7",
11+
"version": "2.24.8",
1212
"private": true,
1313
"license": "AGPL-3.0-or-later",
1414
"scripts": {

Diff for: ‎packages/mask/popups/pages/Wallet/components/AssetsList/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ const AssetItem = memo(function AssetItem({ asset, onItemClick, ...rest }: Asset
9999
const providerURL = network?.isCustomized ? network.rpcUrl : undefined
100100
const [seen, ref] = useEverSeen<HTMLLIElement>()
101101
// Debank might not provide asset from current custom network
102-
// TODO Temporarily get X1 Testnet balance via rpc
102+
// TODO Temporarily get XLayer balance via rpc
103103
const tryRpc =
104104
(!asset.balance || isZero(asset.balance)) &&
105-
(network?.isCustomized || network?.chainId === ChainId.X1_Testnet) &&
105+
(network?.isCustomized || network?.chainId === ChainId.XLayer) &&
106106
seen
107107
const { data: rpcBalance, isPending } = useFungibleTokenBalance(
108108
NetworkPluginID.PLUGIN_EVM,

Diff for: ‎packages/plugins/RedPacket/src/SiteAdaptor/RedPacketHistoryList.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { type NetworkPluginID } from '@masknet/shared-base'
33
import { makeStyles } from '@masknet/theme'
44
import { useChainContext } from '@masknet/web3-hooks-base'
55
import { type RedPacketJSONPayload } from '@masknet/web3-providers/types'
6+
import { ChainId } from '@masknet/web3-shared-evm'
67
import { List } from '@mui/material'
78
import { memo } from 'react'
89
import { useRedPacketTrans } from '../locales/index.js'
@@ -47,7 +48,13 @@ export const RedPacketHistoryList = memo(function RedPacketHistoryList({ onSelec
4748

4849
if (isPending) return <LoadingStatus className={classes.placeholder} iconSize={30} />
4950

50-
if (!histories?.length) return <EmptyStatus className={classes.placeholder}>{t.search_no_result()}</EmptyStatus>
51+
if (!histories?.length) {
52+
return (
53+
<EmptyStatus className={classes.placeholder}>
54+
{ChainId.XLayer === chainId ? t.coming_soon() : t.search_no_result()}
55+
</EmptyStatus>
56+
)
57+
}
5158

5259
return (
5360
<div className={classes.root}>

Diff for: ‎packages/plugins/RedPacket/src/base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const base: Plugin.Shared.Definition = {
3636
ChainId.Astar,
3737
ChainId.Scroll,
3838
ChainId.Metis,
39-
ChainId.X1_Testnet,
39+
ChainId.XLayer,
4040
],
4141
},
4242
[NetworkPluginID.PLUGIN_FLOW]: { supportedChainIds: [] },

Diff for: ‎packages/plugins/RedPacket/src/locales/en-US.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"search": "Search",
88
"loading_token": "Loading token...",
99
"search_no_result": "No results",
10+
"coming_soon": "Coming soon",
1011
"nft_already_added": "The collectible has already been added.",
1112
"nft_invalid_owner": "The collectible does not belong to you.",
1213
"nft_max_shares": "The maximum number of NFTs to be sold in NFT lucky drop contract is {{- amount}}.",

Diff for: ‎packages/plugins/ScamSniffer/src/SiteAdaptor/index.tsx

+8-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ function Renderer(
2020
project: ScamResult
2121
}>,
2222
) {
23-
usePluginWrapper(true)
2423
return <ScamAlert result={props.project} />
2524
}
2625

@@ -53,7 +52,7 @@ const site: Plugin.SiteAdaptor.Definition = {
5352
}),
5453
[id?.postID, author?.userId, nickname, links, content],
5554
)
56-
const { data: scamProject, isLoading } = useQuery({
55+
const { data: scamProject, isFetching } = useQuery({
5756
queryKey: ['scam-sniffer', 'check-post', id?.postID, nickname, author?.userId, links, content],
5857
enabled: isTwitter,
5958
queryFn: () => {
@@ -64,18 +63,20 @@ const site: Plugin.SiteAdaptor.Definition = {
6463
const origins = links.map((link) => new URL(link).origin)
6564
const queries = useQueries({
6665
queries: origins.map((origin) => ({
67-
enabled: !scamProject && !isLoading,
66+
enabled: !scamProject && !isFetching,
6867
queryKey: ['scam-sniffer', 'check-url', origin],
6968
queryFn: async () => {
7069
const url = urlcat('https://domain-api.scamsniffer.io/check', {
7170
url: origin,
7271
api_key: API_KEY,
7372
})
7473
const res = await fetchJSON<CheckResult>(url)
74+
7575
return res
7676
},
7777
})),
7878
})
79+
7980
const firstHit = first(
8081
compact(queries.filter((x) => x.isSuccess && x.data.status === 'BLOCKED').map((x) => x.data)),
8182
)
@@ -90,10 +91,11 @@ const site: Plugin.SiteAdaptor.Definition = {
9091
matchType: 'sim',
9192
} satisfies ScamResult
9293
}, [firstHit?.host, firstHit?.url, author?.userId, nickname])
93-
94-
if (!isTwitter) return null
9594
const project = scamProject || fallbackScamProject
96-
if (!project) return null
95+
96+
usePluginWrapper(!!project)
97+
98+
if (!project || !isTwitter) return null
9799

98100
return <Renderer project={project} />
99101
},

Diff for: ‎packages/plugins/Tips/src/base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const base: Plugin.Shared.Definition = {
3636
ChainId.Scroll,
3737
ChainId.Optimism,
3838
ChainId.Metis,
39-
ChainId.X1_Testnet,
39+
ChainId.XLayer,
4040
],
4141
},
4242
[NetworkPluginID.PLUGIN_FLOW]: { supportedChainIds: [] },

Diff for: ‎packages/plugins/Trader/src/helpers/getEVMAvailableTraderProviders.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ export function getEVMAvailableTraderProviders(networkType?: NetworkType) {
6161
case NetworkType.Conflux:
6262
case NetworkType.Moonbeam:
6363
case NetworkType.CustomNetwork:
64-
case NetworkType.X1:
65-
case NetworkType.X1_Testnet:
64+
case NetworkType.XLayer:
6665
console.error('To be implement network:', networkType)
6766
return EMPTY_LIST
6867
default:

Diff for: ‎packages/plugins/Trader/src/providers/ZeroX.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ function getNativeTokenLabel(networkType: NetworkType) {
5050
case NetworkType.Scroll:
5151
case NetworkType.Moonbeam:
5252
case NetworkType.CustomNetwork:
53-
case NetworkType.X1:
54-
case NetworkType.X1_Testnet:
53+
case NetworkType.XLayer:
5554
return ZRX_NATIVE_TOKEN_ADDRESS
5655
default:
5756
safeUnreachable(networkType)

Diff for: ‎packages/polyfills/config.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ const { list } = compat({
1515
modules: ['core-js/stable'],
1616
})
1717

18+
const ecmascriptPolyfill = list
19+
.map((item) => require.resolve(`core-js/modules/${item}.js`))
20+
.concat(require.resolve('./runtime/transpiler.js'))
21+
.map((x) => `import '${x}'\n`)
22+
.join('')
1823
export default defineConfig([
1924
{
2025
input: 'entry',
@@ -39,11 +44,7 @@ globalThis[Symbol.for('mask_init_polyfill')] = true;
3944
},
4045
plugins: [
4146
virtual({
42-
entry: list
43-
.map((item) => require.resolve(`core-js/modules/${item}.js`))
44-
.concat(require.resolve('./runtime/transpiler.js'))
45-
.map((x) => `import '${x}'\n`)
46-
.join(''),
47+
entry: ecmascriptPolyfill,
4748
}),
4849
...plugins(),
4950
],

Diff for: ‎packages/polyfills/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@masknet/polyfill",
33
"version": "0.0.0",
44
"private": true,
5-
"sideEffects": false,
5+
"sideEffects": ["./runtime/*.js"],
66
"type": "module",
77
"scripts": {
88
"build": "rollup -c"

Diff for: ‎packages/polyfills/rollup.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const lockfilePath = fileURLToPath(new URL('../../pnpm-lock.yaml', import.meta.u
66
const lockfile = await readFile(lockfilePath)
77
const hash = createHash('sha256')
88
hash.update(lockfile)
9-
const polyfillVersion = 'v0' + hash.digest('hex')
9+
const polyfillVersion = 'v1_' + hash.digest('hex')
1010

1111
const versionFilePath = fileURLToPath(new URL('./dist/version.txt', import.meta.url))
1212
const built = (await readFile(versionFilePath, 'utf-8').catch(() => '')) === polyfillVersion

Diff for: ‎packages/web3-constants/evm/ethereum.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"Astar": "0xf5056B96ab242C566002852d0b98ce0BcDf1af51",
2323
"Scroll": "0xbC7d98985966f56A66B0cB5F23d865676dc2ac84",
2424
"Metis": "0xC119574D5Fb333F5AC018658D4d8b5035E16bf39",
25-
"X1": "0x8A42F70047a99298822dD1dbA34b454fc49913F2",
26-
"X1_Testnet": "0x8A42F70047a99298822dD1dbA34b454fc49913F2"
25+
"XLayer": "0x87EDa3a18e8C005e120B235AC52F3305186d5d25",
26+
"XLayer_Testnet": "0x8A42F70047a99298822dD1dbA34b454fc49913F2"
2727
},
2828
"MULTICALL_ADDRESS": {
2929
"Mainnet": "0x1F98415757620B543A52E61c46B32eB19261F984",
@@ -50,8 +50,8 @@
5050
"Astar": "0x1410304B91a280ad083196B0B50e9d8df749d860",
5151
"Scroll": "0x20Ee232E34B87061fE3ba0DB738A3531A3e915BF",
5252
"Metis": "0x6cc1b1058F9153358278C35E0b2D382f1585854B",
53-
"X1": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5",
54-
"X1_Testnet": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5"
53+
"XLayer": "0x8A42F70047a99298822dD1dbA34b454fc49913F2",
54+
"XLayer_Testnet": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5"
5555
},
5656
"ENS_REGISTRAR_ADDRESS": {
5757
"Mainnet": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",

Diff for: ‎packages/web3-constants/evm/nft-red-packet.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"Astar": "0xc3e62b2CC70439C32a381Bfc056aCEd1d7162cef",
1616
"Scroll": "0x727F8030964CCEC6B0E344399c8d8E2B4C837351",
1717
"Metis": "0x812463356F58fc8194645A1838ee6C52D8ca2D26",
18-
"X1": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc",
19-
"X1_Testnet": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc"
18+
"XLayer": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81",
19+
"XLayer_Testnet": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc"
2020
},
2121
"NFT_RED_PACKET_ADDRESS_BLOCK_HEIGHT": {
2222
"Mainnet": 13229711,
@@ -46,7 +46,7 @@
4646
"Astar": 0,
4747
"Scroll": 96705,
4848
"Metis": 1702933,
49-
"X1": 0,
50-
"X1_Testnet": 7319723
49+
"XLayer": 0,
50+
"XLayer_Testnet": 7319723
5151
}
5252
}

Diff for: ‎packages/web3-constants/evm/red-packet.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"Astar": "0x2cF46Db820e279c5fBF778367D49d9C931D54524",
3939
"Scroll": "0x16f61cb37169523635B6761f3C946892fb3c18fB",
4040
"Metis": "0x2cf91AD8C175305EBe6970Bd8f81231585EFbd77",
41-
"X1": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81",
42-
"X1_Testnet": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81"
41+
"XLayer": "0xDb847f1D8099C5b15519ECfd0b0C981d719bccE6",
42+
"XLayer_Testnet": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81"
4343
},
4444
"HAPPY_RED_PACKET_ADDRESS_V4_BLOCK_HEIGHT": {
4545
"Mainnet": 12939427,
@@ -69,7 +69,7 @@
6969
"Astar": 910985,
7070
"Scroll": 96705,
7171
"Metis": 1702860,
72-
"X1": 0,
73-
"X1_Testnet": 7320220
72+
"XLayer": 0,
73+
"XLayer_Testnet": 7320220
7474
}
7575
}

Diff for: ‎packages/web3-constants/evm/rpc.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
"Astar": ["https://astar.api.onfinality.io/public"],
7373
"Scroll": ["https://rpc.scroll.io"],
7474
"Metis": ["https://andromeda.metis.io/?owner=1088"],
75-
"X1": ["https://rpc.x1.tech"],
76-
"X1_Testnet": ["https://testrpc.x1.tech"]
75+
"XLayer": ["https://rpc.xlayer.tech"],
76+
"XLayer_Testnet": ["https://testrpc.xlayer.tech"]
7777
},
7878
"RPC_URLS_OFFICIAL": {
7979
"Mainnet": ["https://mainnet.infura.io/v3/d65858b010d249419cf8687eca12b094"],
@@ -103,8 +103,8 @@
103103
"Astar": ["https://rpc.astar.network:8545"],
104104
"Scroll": ["https://rpc.scroll.io"],
105105
"Metis": ["https://andromeda.metis.io/?owner=1088"],
106-
"X1": ["https://rpc.x1.tech"],
107-
"X1_Testnet": ["https://testrpc.x1.tech"]
106+
"XLayer": ["https://rpc.xlayer.tech"],
107+
"XLayer_Testnet": ["https://testrpc.xlayer.tech"]
108108
},
109109
"RPC_WEIGHTS": {
110110
"Mainnet": [0, 1, 2, 3, 4],
@@ -134,7 +134,7 @@
134134
"Astar": [0, 0, 0, 0, 0],
135135
"Scroll": [0, 0, 0, 0, 0],
136136
"Metis": [0, 0, 0, 0, 0],
137-
"X1": [0, 0, 0, 0, 0],
138-
"X1_Testnet": [0, 0, 0, 0, 0]
137+
"XLayer": [0, 0, 0, 0, 0],
138+
"XLayer_Testnet": [0, 0, 0, 0, 0]
139139
}
140140
}

Diff for: ‎packages/web3-constants/evm/token-list.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"Astar": ["https://tokens.r2d2.to/latest/592/tokens.json"],
2828
"Scroll": ["https://tokens.r2d2.to/latest/534352/tokens.json"],
2929
"Metis": ["https://tokens.r2d2.to/latest/1088/tokens.json"],
30-
"X1": ["https://tokens.r2d2.to/latest/196/tokens.json"],
31-
"X1_Testnet": ["https://tokens.r2d2.to/latest/195/tokens.json"]
30+
"XLayer": ["https://tokens.r2d2.to/latest/196/tokens.json"],
31+
"XLayer_Testnet": ["https://tokens.r2d2.to/latest/195/tokens.json"]
3232
}
3333
}

Diff for: ‎packages/web3-constants/evm/token.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"Astar": "0xaeaaf0e2c81af264101b9129c00f4440ccf0f720",
2626
"Scroll": "0x5300000000000000000000000000000000000004",
2727
"Metis": "0x420000000000000000000000000000000000000A",
28-
"X1": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f",
29-
"X1_Testnet": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f"
28+
"XLayer": "0x5a77f1443d16ee5761d310e38b62f77f726bc71c",
29+
"XLayer_Testnet": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f"
3030
},
3131
"LDO_stETH_ADDRESS": {
3232
"Mainnet": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
@@ -57,8 +57,8 @@
5757
"Aurora": "0xb12bfca5a55806aaf64e99521918a4bf0fc40802",
5858
"Astar": "0x6a2d262D56735DbA19Dd70682B39F6bE9a931D98",
5959
"Scroll": "0x06eFdBFf2a14a7c8E15944D1F4A48F9F95F663A4",
60-
"X1": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39",
61-
"X1_Testnet": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39"
60+
"XLayer": "0x74b7f16337b8972027f6196a17a631ac6de26d22",
61+
"XLayer_Testnet": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39"
6262
},
6363
"USDT_ADDRESS": {
6464
"Mainnet": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
@@ -74,8 +74,8 @@
7474
"Aurora": "0x4988a896b1227218e4a686fde5eabdcabd91571f",
7575
"Astar": "0x3795C36e7D12A8c252A20C5a7B455f7c57b60283",
7676
"Scroll": "0xf55BEC9cafDbE8730f096Aa55dad6D22d44099Df",
77-
"X1": "0xb81fe42de28e7452088b77f3eb9685487734e088",
78-
"X1_Testnet": "0xb81fe42de28e7452088b77f3eb9685487734e088"
77+
"XLayer": "0x1e4a5963abfd975d8c9021ce480b42188849d41d",
78+
"XLayer_Testnet": "0xb81fe42de28e7452088b77f3eb9685487734e088"
7979
},
8080
"aUSDT_ADDRESS": {
8181
"Mainnet": "0x71fc860F7D3A592A4a98740e39dB31d25db65ae8",
@@ -318,8 +318,8 @@
318318
"Astar": "0x0000000000000000000000000000000000000000",
319319
"Scroll": "0x0000000000000000000000000000000000000000",
320320
"Metis": "0x0000000000000000000000000000000000000000",
321-
"X1": "0x0000000000000000000000000000000000000000",
322-
"X1_Testnet": "0x0000000000000000000000000000000000000000"
321+
"XLayer": "0x0000000000000000000000000000000000000000",
322+
"XLayer_Testnet": "0x0000000000000000000000000000000000000000"
323323
},
324324
"WETH_ADDRESS": {
325325
"Mainnet": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",

Diff for: ‎packages/web3-shared/evm/src/assets/x1.png renamed to ‎packages/web3-shared/evm/src/assets/xlayer.png

File renamed without changes.

0 commit comments

Comments
 (0)