Merge pull request #155 from Synthetixio/fix/handleSwitchChain

casting networkId to number for handleSwitchChain
Synthetixio · Jan 27, 2022 · 3e5a177 · 3e5a177
2 parents d74de5c + 1306a8c
commit 3e5a177
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/packages/contracts-interface/src/synthetix.d.ts b/packages/contracts-interface/src/synthetix.d.ts
@@ -95,32 +95,32 @@ declare module 'synthetix' {
 		: TargetsRecord;
 
 	export const chainIdMapping = {
-		'1': {
+		1: {
 			useOvm: false,
 			fork: false,
 			network: 'mainnet',
 		},
-		'5': {
+		5: {
 			useOvm: false,
 			fork: false,
 			network: 'goerli',
 		},
-		'10': {
+		10: {
 			useOvm: true,
 			fork: false,
 			network: 'mainnet',
 		},
-		'42': {
+		42: {
 			useOvm: false,
 			fork: false,
 			network: 'kovan',
 		},
-		'69': {
+		69: {
 			useOvm: true,
 			fork: false,
 			network: 'kovan',
 		},
-		'31337': {
+		31337: {
 			useOvm: false,
 			fork: true,
 			network: 'mainnet',
@@ -132,12 +132,12 @@ declare module 'synthetix' {
 		},
 	} as const;
 	export const networkToChainId = {
-		mainnet: '1',
-		goerli: '5',
-		'mainnet-ovm': '10',
-		kovan: '42',
-		'kovan-ovm': '69',
-		'mainnet-fork': '31337',
+		mainnet: 1,
+		goerli: 5,
+		'mainnet-ovm': 10,
+		kovan: 42,
+		'kovan-ovm': 69,
+		'mainnet-fork': 31337,
 		'goerli-ovm': '-1',
 	} as const;
 	// eslint-disable-next-line

diff --git a/packages/contracts-interface/src/types.ts b/packages/contracts-interface/src/types.ts
@@ -14,19 +14,23 @@ import {
 import { Synths } from '../generated/mainnet';
 
 export const NetworkIdByName = {
-	mainnet: '1',
-	goerli: '5',
-	kovan: '42',
-	'mainnet-ovm': '10',
-	'kovan-ovm': '69',
+	mainnet: 1,
+	goerli: 5,
+	'mainnet-ovm': 10,
+	kovan: 42,
+	'kovan-ovm': 69,
+	'mainnet-fork': 31337,
+	'goerli-ovm': '-1',
 } as const;
 
 export const NetworkNameById = {
-	'1': 'mainnet',
-	'5': 'goerli',
-	'42': 'kovan',
-	'10': 'mainnet-ovm',
-	'69': 'kovan-ovm',
+	1: 'mainnet',
+	5: 'goerli',
+	42: 'kovan',
+	10: 'mainnet-ovm',
+	69: 'kovan-ovm',
+	31337: 'mainnet-fork',
+	'-1': 'goerli-ovm',
 } as const;
 
 export type NetworkIdByNameType = typeof NetworkIdByName;

diff --git a/packages/providers/src/index.ts b/packages/providers/src/index.ts
@@ -30,22 +30,20 @@ const getOptimismProvider = ({
 /**
  * @dev if the new network is not added already, for instance in meta mask, this will throw an error. Call `wallet_addEthereumChain`
  * @param web3Provider
- * @param network
  * @param isOVM
- * @returns null or undefined
  */
 const handleSwitchChain = async (
 	web3Provider: ethersProviders.Web3Provider,
 	isOVM: boolean
-): Promise<null | undefined> => {
-	if (!web3Provider.provider?.request) return;
+): Promise<boolean> => {
+	if (!web3Provider.provider?.request) return false;
 	const newNetworkId = getCorrespondingNetwork(isOVM);
 	const formattedChainId = utils.hexStripZeros(BigNumber.from(newNetworkId).toHexString());
-	// If request was successful, null is returned
-	return web3Provider.provider.request({
+	const success = await web3Provider.provider.request({
 		method: 'wallet_switchEthereumChain',
 		params: [{ chainId: formattedChainId }],
 	});
+	return success === null ? true : false;
 };
 
 const getCorrespondingNetwork = (isOVM: boolean) => {

diff --git a/packages/queries/src/queries/ovm-bridge/useGetBridgeDataQuery.ts b/packages/queries/src/queries/ovm-bridge/useGetBridgeDataQuery.ts
@@ -42,7 +42,7 @@ const useGetBridgeDataQuery = (
 					// @ts-ignore
 					layerTwoProvider: l2provider,
 					layerTwoNetworkId: isFromL2
-						? parseInt(ctx.networkId)
+						? Number(ctx.networkId)
 						: L1_TO_L2_NETWORK_MAPPER[ctx.networkId],
 				});