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

Jump to bottom

fix: Remove fallback #6837

Merged
merged 3 commits into from
Jul 20, 2023
Merged

fix: Remove fallback #6837

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b9c516
remove fallback
tommasini Jul 19, 2023
8edd237
Merge branch 'main' into fix/822-remove-fallback
tommasini Jul 20, 2023
9ae37a8
Merge branch 'main' into fix/822-remove-fallback
Cal-L Jul 20, 2023
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
53 changes: 52 additions & 1 deletion patches/@metamask+assets-controllers+5.0.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@metamask/assets-controllers/dist/AccountTrackerController.js b/node_modules/@metamask/assets-controllers/dist/AccountTrackerController.js
index 130e3dc..2fd96bb 100644
index 130e3dc..137f2f7 100644
--- a/node_modules/@metamask/assets-controllers/dist/AccountTrackerController.js
+++ b/node_modules/@metamask/assets-controllers/dist/AccountTrackerController.js
@@ -30,7 +30,7 @@ class AccountTrackerController extends base_controller_1.BaseController {
Expand Down Expand Up @@ -110,6 +110,57 @@ index 332c87d..b634fde 100644
/**
* Enumerate assets assigned to an owner.
*
diff --git a/node_modules/@metamask/assets-controllers/dist/NftController.js b/node_modules/@metamask/assets-controllers/dist/NftController.js
index 83210c8..6cd15aa 100644
--- a/node_modules/@metamask/assets-controllers/dist/NftController.js
+++ b/node_modules/@metamask/assets-controllers/dist/NftController.js
@@ -127,21 +127,7 @@ class NftController extends base_controller_1.BaseController {
useProxy: true,
}),
});
- // if an openSeaApiKey is set we should attempt to refetch calling directly to OpenSea
- if (!nftInformation && this.openSeaApiKey) {
- nftInformation = yield (0, controller_utils_1.fetchWithErrorHandling)({
- url: this.getNftApi({
- contractAddress,
- tokenId,
- useProxy: false,
- }),
- options: {
- headers: { 'X-API-KEY': this.openSeaApiKey },
- },
- // catch 403 errors (in case API key is down we don't want to blow up)
- errorCodesToCatch: [403],
- });
- }
+
// if we were still unable to fetch the data we return out the default/null of `NftMetadata`
if (!nftInformation) {
return {
diff --git a/node_modules/@metamask/assets-controllers/dist/NftDetectionController.js b/node_modules/@metamask/assets-controllers/dist/NftDetectionController.js
index 38ddb4a..7045f80 100644
--- a/node_modules/@metamask/assets-controllers/dist/NftDetectionController.js
+++ b/node_modules/@metamask/assets-controllers/dist/NftDetectionController.js
@@ -94,19 +94,6 @@ class NftDetectionController extends base_controller_1.BaseController {
url: this.getOwnerNftApi({ address, offset, useProxy: true }),
timeout: 15000,
});
- if (openSeaApiKey && !nftApiResponse) {
- nftApiResponse = yield (0, controller_utils_1.fetchWithErrorHandling)({
- url: this.getOwnerNftApi({
- address,
- offset,
- useProxy: false,
- }),
- options: { headers: { 'X-API-KEY': openSeaApiKey } },
- timeout: 15000,
- // catch 403 errors (in case API key is down we don't want to blow up)
- errorCodesToCatch: [403],
- });
- }
if (!nftApiResponse) {
return nfts;
}
diff --git a/node_modules/@metamask/assets-controllers/dist/Standards/ERC20Standard.js b/node_modules/@metamask/assets-controllers/dist/Standards/ERC20Standard.js
index 9ddbc28..b8fb35a 100644
--- a/node_modules/@metamask/assets-controllers/dist/Standards/ERC20Standard.js
Expand Down
Loading