Skip to content

Simplify Ethereum Provider Context #186

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

Merged
merged 3 commits into from
Nov 3, 2025
Merged

Simplify Ethereum Provider Context #186

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9ca3f2
Simplify Ethereum provider context
nop33 Oct 29, 2025
5b676b0
Remove useless code
nop33 Oct 29, 2025
6c95d0f
Revert "Remove useless code"
nop33 Oct 30, 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
162 changes: 55 additions & 107 deletions bridge_ui/src/contexts/EthereumProviderContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,72 +137,68 @@ export const EthereumProviderProvider = ({
}
}, [ethereumProvider, walletConnectProvider]);

const getSignerFromProvider = useCallback((provider: ethers.providers.Web3Provider) => {
try {
const signer = provider.getSigner();

setSigner(signer);

signer.getAddress().then((address) => {
setSignerAddress(address);
}).catch(() => {
setProviderError(t("An error occurred while getting the signer address"));
});
} catch (error) {
console.error(error);
}
}, [t])

const updateProvider = useCallback((provider: ethers.providers.Web3Provider) => {
setProviderError(null);
setProvider(provider);
getSignerFromProvider(provider);

provider.getNetwork().then((network) => {
setChainId(network.chainId);
})
.catch(() => {
setProviderError(t("An error occurred while getting the network"));
});
}, [getSignerFromProvider, t])


const handleChainChanged = useCallback((chainId) => {
try {
setChainId(BigNumber.from(chainId).toNumber());
} catch (e) {
console.error(e);
}
}, [])

const connect = useCallback(
(connectType: ConnectType, wormholeChainId: ChainId) => {
setConnectType(connectType);

if (connectType === ConnectType.METAMASK) {
detectEthereumProvider()
.then((detectedProvider) => {
if (detectedProvider) {
setEthereumProvider(detectedProvider);
const provider = new ethers.providers.Web3Provider(
// @ts-ignore
detectedProvider,
"any"
);
// @ts-ignore
const provider = new ethers.providers.Web3Provider(detectedProvider, "any");

provider
.send("eth_requestAccounts", [])
.then(() => {
setProviderError(null);
setProvider(provider);
provider
.getNetwork()
.then((network) => {
setChainId(network.chainId);
})
.catch(() => {
setProviderError(
t("An error occurred while getting the network")
);
});
const signer = provider.getSigner();
setSigner(signer);
signer
.getAddress()
.then((address) => {
setSignerAddress(address);
})
.catch(() => {
setProviderError(
t("An error occurred while getting the signer address")
);
});
updateProvider(provider)

// TODO: try using ethers directly
// @ts-ignore
if (detectedProvider && detectedProvider.on) {
// @ts-ignore
detectedProvider.on("chainChanged", (chainId) => {
try {
setChainId(BigNumber.from(chainId).toNumber());
} catch (e) {}
});
detectedProvider.on("chainChanged", handleChainChanged);
// @ts-ignore
detectedProvider.on("accountsChanged", (accounts) => {
try {
const signer = provider.getSigner();
setSigner(signer);
signer
.getAddress()
.then((address) => {
setSignerAddress(address);
})
.catch(() => {
setProviderError(
t("An error occurred while getting the signer address")
);
});
} catch (e) {}
});
detectedProvider.on("accountsChanged", (accounts) => getSignerFromProvider(provider));
}
})
.catch(() => {
Expand Down Expand Up @@ -233,62 +229,14 @@ export const EthereumProviderProvider = ({
.enable()
.then(() => {
QRCodeModal.close()
setProviderError(null);
const provider = new ethers.providers.Web3Provider(
walletConnectProvider,
"any"
);
provider
.getNetwork()
.then((network) => {
setChainId(network.chainId);
})
.catch(() => {
setProviderError(t("An error occurred while getting the network"));
});
walletConnectProvider.on(
"accountsChanged",
(accounts: string[]) => {
try {
const signer = provider.getSigner();
setSigner(signer);
signer
.getAddress()
.then((address) => {
setSignerAddress(address);
})
.catch(() => {
setProviderError(
t("An error occurred while getting the signer address")
);
});
} catch (error) {
console.error(error);
}
}
);
walletConnectProvider.on(
"disconnect",
() => { disconnect() }
);
walletConnectProvider.on(
'chainChanged',
(hexChainId) => setChainId(BigNumber.from(hexChainId).toNumber())
);
setProvider(provider);
const signer = provider.getSigner();
setSigner(signer);
signer
.getAddress()
.then((address) => {
setSignerAddress(address);
})
.catch((error) => {
setProviderError(
t("An error occurred while getting the signer address")
);
console.error(error);
});

const provider = new ethers.providers.Web3Provider(walletConnectProvider, "any");

updateProvider(provider)

walletConnectProvider.on("accountsChanged", (accounts) => getSignerFromProvider(provider));
walletConnectProvider.on("disconnect", disconnect);
walletConnectProvider.on('chainChanged', handleChainChanged);
})
.catch((error) => {
if (error.message !== "User closed modal") {
Expand All @@ -299,7 +247,7 @@ export const EthereumProviderProvider = ({
})
}
},
[disconnect, t]
[disconnect, getSignerFromProvider, handleChainChanged, t, updateProvider]
);

const contextValue = useMemo(
Expand Down
Loading