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

Catch failures to redefine window.ethereum #4309

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Catch failures to redefine window.ethereum #4309

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
118 changes: 59 additions & 59 deletions packages/provider-injection/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,63 +158,6 @@ function initEthereum(secureClientSender: TransportSender) {
// If the cached provider changes, we want to change the cached proxy as well
let cachedCurrentProvider: EIP1193Provider;

Object.defineProperty(window, "ethereum", {
get() {
if (!window.walletRouter)
throw new Error("Expected window.walletRouter to be set");

// Provider cache exists
if (
cachedWindowEthereumProxy &&
cachedCurrentProvider === window.walletRouter.currentProvider
) {
return cachedWindowEthereumProxy;
}

cachedWindowEthereumProxy = new Proxy(
window.walletRouter.currentProvider,
{
get(target, prop, receiver) {
// Sites using web3-react force metamask usage by searching the
// providers array, so remove it for specific sites
// https://github.com/Uniswap/web3-react/blob/f5a54af645a4a2e125ee2f5ead6dd1ecd5d01dda/packages/metamask/src/index.ts#L56-L59
if (
window.walletRouter &&
!(prop in window.walletRouter.currentProvider) &&
prop in window.walletRouter
) {
if (
window.location.href.endsWith(".app.uniswap.org") ||
window.location.href === "app.uniswap.org" ||
(
(
window.location.href === "kwenta.io" ||
window.location.href.endsWith(".kwenta.io")
)
&& prop === "providers"
)
) {
return null;
}
return window.walletRouter[prop];
}

return Reflect.get(target, prop, receiver);
},
}
);

cachedCurrentProvider = window.walletRouter.currentProvider;

return cachedWindowEthereumProxy;
},

set(newProvider) {
window.walletRouter?.addProvider(newProvider);
},
});

// EIP-6963: https://eips.ethereum.org/EIPS/eip-6963
const info = {
uuid: uuidV4(),
name: "Backpack",
Expand All @@ -229,8 +172,65 @@ function initEthereum(secureClientSender: TransportSender) {
})
);
}
window.addEventListener("eip6963:requestProvider", announceProvider);
announceProvider();

try {
Object.defineProperty(window, "ethereum", {
get() {
if (!window.walletRouter)
throw new Error("Expected window.walletRouter to be set");

// Provider cache exists
if (
cachedWindowEthereumProxy &&
cachedCurrentProvider === window.walletRouter.currentProvider
) {
return cachedWindowEthereumProxy;
}

cachedWindowEthereumProxy = new Proxy(
window.walletRouter.currentProvider,
{
get(target, prop, receiver) {
// Sites using web3-react force metamask usage by searching the
// providers array, so remove it for specific sites
// https://github.com/Uniswap/web3-react/blob/f5a54af645a4a2e125ee2f5ead6dd1ecd5d01dda/packages/metamask/src/index.ts#L56-L59
if (
window.walletRouter &&
!(prop in window.walletRouter.currentProvider) &&
prop in window.walletRouter
) {
if (
window.location.href.endsWith(".app.uniswap.org") ||
window.location.href === "app.uniswap.org" ||
((window.location.href === "kwenta.io" ||
window.location.href.endsWith(".kwenta.io")) &&
prop === "providers")
) {
return null;
}
return window.walletRouter[prop];
}

return Reflect.get(target, prop, receiver);
},
}
);

cachedCurrentProvider = window.walletRouter.currentProvider;

return cachedWindowEthereumProxy;
},

set(newProvider) {
window.walletRouter?.addProvider(newProvider);
},
});

window.addEventListener("eip6963:requestProvider", announceProvider);
announceProvider();
} catch {
/* empty */
}
}

main();
Loading