on master help sign in
fix local network detection
commit12605e63b7c77bd8cac55c2137f67ba241cf37db authordillon <dpett122@gmail.com> dateFri 9 Jun 2023, 12:37 (3 years ago) parent9155372
4 files changed+23−8
src/lib/constants.ts+3−1 src/lib/flags.js+1−1 src/lib/network.js+18−5 src/views/Login/LoginSelector.tsx+1−1
src/lib/constants.ts+3−1
@@ -230,6 +230,7 @@ const EIP1559_TRANSACTION_TYPE = 2;
230230// https://chainlist.org/?testnets=true
231231const ETHEREUM_MAINNET_CHAIN_ID = '0x1';
232232const ETHEREUM_GOERLI_CHAIN_ID = '0x5';
233+const ETHEREUM_LOCAL_CHAIN_ID = '0x539';
233234
234235export {
235236 CHECK_BLOCK_EVERY_MS,
@@ -281,5 +282,6 @@ export {
281282 LOCKUP_TOOLTIP,
282283 INITIAL_NETWORK_KEY_REVISION,
283284 ETHEREUM_MAINNET_CHAIN_ID,
284− ETHEREUM_GOERLI_CHAIN_ID
285+ ETHEREUM_GOERLI_CHAIN_ID,
286+ ETHEREUM_LOCAL_CHAIN_ID,
285287};
src/lib/flags.js+1−1
@@ -1,7 +1,7 @@
11import { version } from '../../package.json';
22
33// are we running bridge in a development build
4−export const isDevelopment = import.meta.env.DEV === 'development';
4+export const isDevelopment = import.meta.env.DEV === true;
55export const isGoerli = import.meta.env.VITE_GOERLI === 'true';
66export const isMainnet = import.meta.env.VITE_MAINNET === 'true';
77export const versionLabel =
src/lib/network.js+18−5
@@ -1,5 +1,9 @@
1−import { isMainnet } from "./flags";
2−import { ETHEREUM_GOERLI_CHAIN_ID, ETHEREUM_MAINNET_CHAIN_ID, } from './constants';
1+import { isDevelopment, isGoerli, isMainnet } from './flags';
2+import {
3+ ETHEREUM_GOERLI_CHAIN_ID,
4+ ETHEREUM_LOCAL_CHAIN_ID,
5+ ETHEREUM_MAINNET_CHAIN_ID,
6+} from './constants';
37
48const NETWORK_TYPES = {
59 OFFLINE: Symbol('OFFLINE'),
@@ -31,7 +35,16 @@ const chainIdToNetworkType = chainId => {
3135};
3236
3337const expectedChainId = () => {
34− return isMainnet ? ETHEREUM_MAINNET_CHAIN_ID : ETHEREUM_GOERLI_CHAIN_ID;
35−}
38+ return isGoerli
39+ ? ETHEREUM_GOERLI_CHAIN_ID
40+ : isDevelopment && !isMainnet
41+ ? ETHEREUM_LOCAL_CHAIN_ID
42+ : ETHEREUM_MAINNET_CHAIN_ID;
43+};
3644
37−export { NETWORK_TYPES, expectedChainId, renderNetworkType, chainIdToNetworkType };
45+export {
46+ NETWORK_TYPES,
47+ expectedChainId,
48+ renderNetworkType,
49+ chainIdToNetworkType,
50+};
src/views/Login/LoginSelector.tsx+1−1
@@ -99,7 +99,7 @@ export default function LoginSelector({
9999 /**
100100 * Ensure wallet is connected to expected chain
101101 */
102− if (window.ethereum.chainId !== expectedChainId() ) {
102+ if (window.ethereum.chainId !== expectedChainId()) {
103103 console.log(`unexpected chain: ${window.ethereum.chainId}`);
104104 await window.ethereum.request({
105105 method: 'wallet_switchEthereumChain',