m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix issue where ens resolution stops working after sw is terminated (#16335)

Browse Source 
* fix issue where ens resolution stops working after sw is terminated
This commit is contained in:
Alex Donesky 2022-11-02 16:19:32 -05:00 committed by GitHub
parent a9839688fb
commit adad036466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/ducks/ens.js
View File

@ -43,7 +43,7 @@ export const ensInitialState = initialState;
const name = 'ENS'; const name = 'ENS';
let provider = null; let web3Provider = null;
const slice = createSlice({ const slice = createSlice({
name, name,
@ -115,7 +115,7 @@ const slice = createSlice({
builder.addCase(CHAIN_CHANGED, (state, action) => { builder.addCase(CHAIN_CHANGED, (state, action) => {
if (action.payload !== state.currentChainId) { if (action.payload !== state.currentChainId) {
state.stage = 'UNINITIALIZED'; state.stage = 'UNINITIALIZED';
provider = null; web3Provider = null;
} }
}); });
}, },
@ -142,14 +142,17 @@ export function initializeEnsSlice() {
const ensAddress = networkMap[network]; const ensAddress = networkMap[network];
const networkIsSupported = Boolean(ensAddress); const networkIsSupported = Boolean(ensAddress);
if (networkIsSupported) { if (networkIsSupported) {
provider = new ethers.providers.Web3Provider(global.ethereumProvider, { web3Provider = new ethers.providers.Web3Provider(
chainId: parseInt(network, 10), global.ethereumProvider,
name: networkName, {
ensAddress, chainId: parseInt(network, 10),
}); name: networkName,
ensAddress,
},
);
dispatch(enableEnsLookup(network)); dispatch(enableEnsLookup(network));
} else { } else {
provider = null; web3Provider = null;
dispatch(disableEnsLookup()); dispatch(disableEnsLookup());
} }
}; };
@ -177,7 +180,13 @@ export function lookupEnsName(ensName) {
let address; let address;
let error; let error;
try { try {
address = await provider.resolveName(trimmedEnsName); // the writable property on the 'provider' object on the 'web3Provider' flips to false when stale
// This helps handle the case where the provider is becomes unresponsive if/when, in MV3, the service worker dies after the ENS slice is instantiated
const isProviderActive = web3Provider.provider?.writable;
if (!isProviderActive) {
await dispatch(initializeEnsSlice());
}
address = await web3Provider.resolveName(trimmedEnsName);
} catch (err) { } catch (err) {
error = err; error = err;
} }