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

Move ERC721 token URI parsing into try catch block #818

Closed
wants to merge 1 commit into from
Closed

Move ERC721 token URI parsing into try catch block #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
131 changes: 131 additions & 0 deletions src/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,4 +537,135 @@ describe('ERC721Standard', () => {
};
await expect(result).rejects.toThrow("This isn't a valid ERC721 contract");
});


it('should get correct details including tokenURI and image for a given contract (that supports the ERC721 metadata interface) when the tokenURI is invalid', async () => {
nock('https://mainnet.infura.io:443', { encodedQueryParams: true })
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 24,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0x01ffc9a75b5e139f00000000000000000000000000000000000000000000000000000000',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 24,
result:
'0x0000000000000000000000000000000000000000000000000000000000000001',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 23,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0x01ffc9a780ac58cd00000000000000000000000000000000000000000000000000000000',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 23,
result:
'0x0000000000000000000000000000000000000000000000000000000000000001',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 25,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0x95d89b41',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 25,
result:
'0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000044241594300000000000000000000000000000000000000000000000000000000',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 26,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0x06fdde03',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 26,
result:
'0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000011426f7265644170655961636874436c7562000000000000000000000000000000',
})
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 27,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0x01ffc9a75b5e139f00000000000000000000000000000000000000000000000000000000',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 27,
result:
'0x0000000000000000000000000000000000000000000000000000000000000001',
});

nock('https://mainnet.infura.io:443', { encodedQueryParams: true })
.post('/v3/341eacb578dd44a1a049cbc5f6fd4035', {
jsonrpc: '2.0',
id: 28,
method: 'eth_call',
params: [
{
to: '0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
data: '0xc87b56dd0000000000000000000000000000000000000000000000000000000000000003',
},
'latest',
],
})
.reply(200, {
jsonrpc: '2.0',
id: 28,
result:
'0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000037697066733a2f2f68747470733a2f2f4870506e6d586d73704d6a776958794e367a533445397a63636172694752336a7863615774712f33000000000000000000',
});

const expectedResult = {
name: 'BoredApeYachtClub',
standard: 'ERC721',
symbol: 'BAYC',
tokenURI: "ipfs://https://HpPnmXmspMjwiXyN6zS4E9zccariGR3jxcaWtq/3",
image: undefined,
};

const details = await erc721Standard.getDetails(
'0x36697e362Ee7E9CA977b7550B3e4f955fc5BF27d',
IPFS_DEFAULT_GATEWAY_URL,
'3',
);

expect(details).toMatchObject(expectedResult);
});
});
11 changes: 6 additions & 5 deletions src/assets/Standards/CollectibleStandards/ERC721/ERC721Standard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,13 @@ export class ERC721Standard {
]);

if (tokenId) {
tokenURI = await this.getTokenURI(address, tokenId);
if (tokenURI.startsWith('ipfs://')) {
tokenURI = getFormattedIpfsUrl(ipfsGateway, tokenURI, true);
}

try {
tokenURI = await this.getTokenURI(address, tokenId);

if (tokenURI.startsWith('ipfs://')) {
tokenURI = getFormattedIpfsUrl(ipfsGateway, tokenURI, true);
}

const response = await timeoutFetch(tokenURI);
const object = await response.json();
image = object?.image;
Expand Down