Skip to content

Commit

Permalink
fix default network loading
Browse files Browse the repository at this point in the history
  • Loading branch information
H34D committed Feb 21, 2023
1 parent 899d9b0 commit 3a0f3b6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 24 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -28,7 +28,7 @@
},
"author": "hide-on-bush",
"dependencies": {
"@masa-finance/masa-sdk": "^1.5.2",
"@masa-finance/masa-sdk": "^1.5.3",
"@metamask/providers": "^10.2.1",
"babel-loader": "^9.1.2",
"babel-plugin-import": "^1.13.6",
Expand Down
17 changes: 3 additions & 14 deletions src/helpers/masa.ts
Expand Up @@ -37,24 +37,13 @@ export const createNewMasa = async ({
);
if (!environment) return null;

let defaultNetwork;

try {
const chainId: number = await newSigner.getChainId();
console.log({ NETWORK: chainId });
defaultNetwork = getNetworkNameByChainId(chainId);
} catch (error) {
if (error instanceof Error) {
console.warn('Network detection failed!', error.message);
}
}

if (!defaultNetwork) return null;
const chainId: number = await newSigner.getChainId();
console.log({ NETWORK: chainId });

return new Masa({
wallet: newSigner,
apiUrl: environment.apiUrl,
defaultNetwork,
defaultNetwork: getNetworkNameByChainId(chainId),
environment: environment.environment,
arweave: {
host: arweaveConfig?.host || 'arweave.net',
Expand Down
7 changes: 4 additions & 3 deletions src/helpers/networks.ts
Expand Up @@ -54,7 +54,8 @@ export const getNetworkNameByChainId = (chainId: number): NetworkName => {
return 'bsc';

default:
throw new Error(`Unsupported network! ${chainId}`);
console.warn('Network detection failed!', chainId);
return 'unknown';
}
};

Expand Down Expand Up @@ -155,9 +156,9 @@ const goerliNetwork: Network = {
},
};

export const SupportedNetworks: {
export const SupportedNetworks: Partial<{
[key in NetworkName]: Network;
} = {
}> = {
// ETH
ethereum: ethereumNetwork,
goerli: goerliNetwork,
Expand Down
2 changes: 1 addition & 1 deletion src/provider/masa-context-provider.tsx
Expand Up @@ -217,7 +217,7 @@ export const MasaContextProvider = ({
[addNetwork]
);

const context = {
const context: MasaShape = {
setProvider,
provider,
isModalOpen,
Expand Down
2 changes: 1 addition & 1 deletion src/provider/masa-context.tsx
Expand Up @@ -66,6 +66,6 @@ export interface MasaShape {
) => Promise<GenerateGreenResult | undefined>;
network?: ethers.providers.Network | null;
switchNetwork?: (chainId: number) => void;
SupportedNetworks?: { [index in NetworkName]: Network };
SupportedNetworks?: Partial<{ [index in NetworkName]: Network }>;
networkName?: NetworkName;
}
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -2123,10 +2123,10 @@
dependencies:
ethers "~5.7.2"

"@masa-finance/masa-sdk@^1.5.2":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-1.5.2.tgz#490404baf6aac599b7e7d498dcc6d8432e46341b"
integrity sha512-gp1VAw1D8z5uzi8A8ah8BkCJ8ETNV0c3UDeU7MGaa2RQhLH3z+nRtHlMI31GhUZNuy3JfliG/2RqM3LJXz2L3g==
"@masa-finance/masa-sdk@^1.5.3":
version "1.5.3"
resolved "https://registry.yarnpkg.com/@masa-finance/masa-sdk/-/masa-sdk-1.5.3.tgz#8492920b718348bf872665592dcef62efe156732"
integrity sha512-cqSPGlwEXWZJ3aVhgb7Oe8WK7RkWRE+uXF32H24JlVpHx3f1+DRUDxjPR3xhOCd5SmKhkqHgn1qJ5d7pVbV+8A==
dependencies:
"@masa-finance/masa-contracts-identity" "^1.2.1"
"@masa-finance/masa-token" "^1.0.0"
Expand Down

0 comments on commit 3a0f3b6

Please sign in to comment.