Skip to content

fix: tokenId at alchemy #6742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanbinrui merged 4 commits into from
Jul 12, 2022
Merged

fix: tokenId at alchemy #6742

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2675685
fix: tokenId at alchemy
lelenei Jul 11, 2022
920dcf2
fix: long long number to string
lelenei Jul 11, 2022
492c9f4
Merge remote-tracking branch 'origin/release/2.10.0' into lelenei/mf-…
lelenei Jul 11, 2022
06b518d
fix: use web3.utils.hexToNumberString
lelenei Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions packages/web3-providers/src/alchemy/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
import { ChainId as ChainId_FLOW, SchemaType as SchemaType_FLOW } from '@masknet/web3-shared-flow'
import { first } from 'lodash-unified'
import urlcat from 'urlcat'
import { hexToNumberString, isHex } from 'web3-utils'
import type { NonFungibleTokenAPI } from '..'
import { fetchJSON } from '../helpers'
import { Alchemy_EVM_NetworkMap, Alchemy_FLOW_NetworkMap, FILTER_WORDS } from './constants'
Expand Down Expand Up @@ -146,8 +147,10 @@ function createNftToken_EVM(
asset: AlchemyNFT_EVM,
): NonFungibleAsset<ChainId_EVM, SchemaType_EVM> {
const contractAddress = asset.contract?.address
const tokenId = asset.id?.tokenId ?? ''

let tokenId = asset.id.tokenId
if (isHex(asset.id.tokenId)) {
tokenId = hexToNumberString(asset.id.tokenId)
}
return {
id: `${contractAddress}_${tokenId}`,
chainId,
Expand Down Expand Up @@ -198,6 +201,10 @@ function createNFTAsset_EVM(
contractMetadataResponse?: AlchemyResponse_EVM_Contact_Metadata,
ownersResponse?: AlchemyResponse_EVM_Owners,
): NonFungibleAsset<ChainId_EVM, SchemaType_EVM> {
let tokenId = metaDataResponse.id.tokenId
if (isHex(metaDataResponse.id.tokenId)) {
tokenId = hexToNumberString(metaDataResponse.id.tokenId)
}
return {
id: metaDataResponse.contract?.address,
chainId,
Expand All @@ -206,7 +213,7 @@ function createNFTAsset_EVM(
metaDataResponse?.id?.tokenMetadata?.tokenType === 'ERC721'
? SchemaType_EVM.ERC721
: SchemaType_EVM.ERC1155,
tokenId: metaDataResponse.id?.tokenId,
tokenId,
address: metaDataResponse.contract?.address,
metadata: {
chainId,
Expand Down Expand Up @@ -252,12 +259,16 @@ function createNftToken_FLOW(
chainId: ChainId_FLOW,
asset: AlchemyNFT_FLOW,
): NonFungibleAsset<ChainId_FLOW, SchemaType_FLOW> {
let tokenId = asset.id.tokenId
if (isHex(asset.id.tokenId)) {
tokenId = hexToNumberString(asset.id.tokenId)
}
return {
id: asset.contract?.address,
chainId,
type: TokenType.NonFungible,
schema: SchemaType_FLOW.NonFungible,
tokenId: asset.id?.tokenId ?? '',
tokenId,
address: asset.contract?.address,
metadata: {
chainId,
Expand Down Expand Up @@ -295,12 +306,16 @@ function createNFTAsset_FLOW(
ownerAddress: string,
metaDataResponse: AlchemyResponse_FLOW_Metadata,
): NonFungibleAsset<ChainId_FLOW, SchemaType_FLOW> {
let tokenId = metaDataResponse.id.tokenId
if (isHex(metaDataResponse.id.tokenId)) {
tokenId = hexToNumberString(metaDataResponse.id.tokenId)
}
return {
id: metaDataResponse.contract?.address,
chainId,
type: TokenType.NonFungible,
schema: SchemaType_FLOW.NonFungible,
tokenId: metaDataResponse.id?.tokenId ?? '',
tokenId,
address: metaDataResponse.contract?.address,
metadata: {
chainId,
Expand Down