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

Re-validating chain id when rpc url changes [custom network form] (#10982)

Browse Source
This commit is contained in:
ryanml 2021-05-05 21:03:51 -07:00 committed by Dan Miller
parent 5f1a0f7a69
commit 4016bb535b
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui/pages/settings/networks-tab/network-form/network-form.component.js
View File

@ -139,6 +139,20 @@ export default class NetworkForm extends PureComponent {
return parseInt(chainId, 16).toString(10);
}
/**
* Prefixes a given id with '0x' if the prefix does not exist
*
* @param {string} chainId - The chainId to prefix
* @returns {string} The chainId, prefixed with '0x'
*/
prefixChainId(chainId) {
let prefixedChainId = chainId;
if (!chainId.startsWith('0x')) {
prefixedChainId = `0x${parseInt(chainId, 10).toString(16)}`;
}
return prefixedChainId;
}
onSubmit = async () => {
this.setState({
isSubmitting: true,
@ -162,11 +176,7 @@ export default class NetworkForm extends PureComponent {
} = this.state;
const formChainId = stateChainId.trim().toLowerCase();
// Ensure chainId is a 0x-prefixed, lowercase hex string
let chainId = formChainId;
if (!chainId.startsWith('0x')) {
chainId = `0x${parseInt(chainId, 10).toString(16)}`;
}
const chainId = this.prefixChainId(formChainId);
if (!(await this.validateChainIdOnSubmit(formChainId, chainId, rpcUrl))) {
this.setState({
@ -317,6 +327,10 @@ export default class NetworkForm extends PureComponent {
});
};
hasError = (errorKey, errorVal) => {
return this.state.errors[errorKey] === errorVal;
};
validateChainIdOnChange = (chainIdArg = '') => {
const chainId = chainIdArg.trim();
let errorMessage = '';
@ -392,6 +406,8 @@ export default class NetworkForm extends PureComponent {
this.setErrorTo('chainId', errorMessage);
return false;
}
this.setErrorTo('chainId', '');
return true;
};
@ -416,9 +432,16 @@ export default class NetworkForm extends PureComponent {
};
validateUrlRpcUrl = (url, stateKey) => {
const { t } = this.context;
const { rpcUrls } = this.props;
const { chainId: stateChainId } = this.state;
const isValidUrl = validUrl.isWebUri(url) && url !== '';
const chainIdFetchFailed = this.hasError(
'chainId',
t('failedToFetchChainId'),
);
if (!validUrl.isWebUri(url) && url !== '') {
if (!isValidUrl) {
this.setErrorTo(
stateKey,
this.context.t(
@ -430,6 +453,13 @@ export default class NetworkForm extends PureComponent {
} else {
this.setErrorTo(stateKey, '');
}
// Re-validate the chain id if it could not be found with previous rpc url
if (stateChainId && isValidUrl && chainIdFetchFailed) {
const formChainId = stateChainId.trim().toLowerCase();
const chainId = this.prefixChainId(formChainId);
this.validateChainIdOnSubmit(formChainId, chainId, url);
}
};
renderWarning() {