Skip to content
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

fix: if image starts with 'ipfs://', the return value should be string type #4985

Merged
merged 8 commits into from
Jan 20, 2025
Merged

fix: if image starts with 'ipfs://', the return value should be string type #4985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6249a5a
fixed: return promise value if image starts with 'ipfs://'
GinMu Nov 27, 2024
bb86ab7
Merge branch 'main' into fixed-image-value-at-erc721standard
GinMu Dec 6, 2024
8f63808
Merge branch 'main' into fixed-image-value-at-erc721standard
GinMu Dec 7, 2024
66f6ad3
add test case
GinMu Dec 10, 2024
7c8a725
Merge branch 'main' into fixed-image-value-at-erc721standard
GinMu Dec 10, 2024
bc323f6
Merge branch 'main' into fixed-image-value-at-erc721standard
GinMu Dec 16, 2024
fa03bba
Merge branch 'main' into fixed-image-value-at-erc721standard
GinMu Jan 15, 2025
4d757a5
Merge branch 'main' into fixed-image-value-at-erc721standard
mcmire Jan 20, 2025
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
122 changes: 122 additions & 0 deletions packages/assets-controllers/src/Standards/NftStandards/ERC721/ERC721Standard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,4 +538,126 @@ describe('ERC721Standard', () => {
);
expect(details).toMatchObject(expectedResult);
});

it('should get correct details including tokenURI and image for a given contract (that supports the ERC721 metadata interface) with a tokenID provided when the tokenURI content is hosted on IPFS & image starts with "ipfs://"', async () => {
nock('https://mainnet.infura.io:443', { encodedQueryParams: true })
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 25,
method: 'eth_call',
params: [
{
to: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
data: '0x01ffc9a780ac58cd00000000000000000000000000000000000000000000000000000000',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 25,
result:
'0x0000000000000000000000000000000000000000000000000000000000000001',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 26,
method: 'eth_call',
params: [
{
to: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
data: '0x95d89b41',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 26,
result:
'0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000035050470000000000000000000000000000000000000000000000000000000000',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 27,
method: 'eth_call',
params: [
{
to: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
data: '0x06fdde03',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 27,
result:
'0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d507564677950656e6775696e7300000000000000000000000000000000000000',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 28,
method: 'eth_call',
params: [
{
to: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
data: '0x01ffc9a75b5e139f00000000000000000000000000000000000000000000000000000000',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 28,
result:
'0x0000000000000000000000000000000000000000000000000000000000000001',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 29,
method: 'eth_call',
params: [
{
to: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
data: '0xc87b56dd000000000000000000000000000000000000000000000000000000000000065b',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 29,
result:
'0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000047697066733a2f2f6261667962656962633573676f32706c6d6a6b7132747a6d68726e3534626b336372686e6332337a64326d73673465613761347078726b67666e612f3136323700000000000000000000000000000000000000000000000000',
});

nock(
'https://bafybeibc5sgo2plmjkq2tzmhrn54bk3crhnc23zd2msg4ea7a4pxrkgfna.ipfs.dweb.link',
)
.get('/1627')
.reply(200, () => {
return {
image:
'ipfs://QmNf1UsmdGaMbpatQ6toXSkzDpizaGmC9zfunCyoz1enD5/penguin/1627.png',
};
});

const expectedResult = {
standard: 'ERC721',
tokenURI:
'https://bafybeibc5sgo2plmjkq2tzmhrn54bk3crhnc23zd2msg4ea7a4pxrkgfna.ipfs.dweb.link/1627',
symbol: 'PPG',
name: 'PudgyPenguins',
image:
'https://bafybeiaewpyqaytvogprfiv563tfkjhepkkz5mn57pr5z3kyag62kfuc7a.ipfs.dweb.link/penguin/1627.png',
};

const details = await erc721Standard.getDetails(
'0xBd3531dA5CF5857e7CfAA92426877b022e612cf8',
'dweb.link',
'1627',
);
expect(details).toMatchObject(expectedResult);
});
});
2 changes: 1 addition & 1 deletion packages/assets-controllers/src/Standards/NftStandards/ERC721/ERC721Standard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export class ERC721Standard {
const object = await response.json();
image = object?.image;
if (image?.startsWith('ipfs://')) {
image = getFormattedIpfsUrl(ipfsGateway, image, true);
Copy link
Contributor

@mcmire mcmire Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for the future, the absence of await should have produced a type error, because getFormattedIpfsUrl returns a Promise, whereas the type on image in the return type is string | undefined. However, the type of the image variable here is any, which is happening because the type of object is any. We should give object a type annotation to fix this. But we can do that in a separate PR too.

image = await getFormattedIpfsUrl(ipfsGateway, image, true);
}
} catch {
// ignore
Expand Down
Loading