Skip to content
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.

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

Unblock wallet_switchEthereumChain #2634

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/MetaMask/snaps.git"
},
"source": {
"shasum": "3yNS8C8gVjvRlfTPRzm+pIx3RNk8zqFdvE1LzgvM5eQ=",
"shasum": "qSVwFc5TLVX+eQLIYixVYpE/t/koQyZShyfjS+yFjWc=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
Expand Down
21 changes: 20 additions & 1 deletion packages/examples/packages/ethereum-provider/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,23 @@ import {
hexToNumber,
} from '@metamask/utils';

import type { PersonalSignParams, SignTypedDataParams } from './types';
import type {
BaseParams,
PersonalSignParams,
SignTypedDataParams,
} from './types';

/**
* Set the active Ethereum chain for the Snap.
*
* @param chainId - The chain ID to switch to.
*/
async function switchChain(chainId: Hex) {
await ethereum.request({
method: 'wallet_switchEthereumChain',
params: [{ chainId }],
});
}

/**
* Get the current gas price using the `ethereum` global. This is essentially
Expand Down Expand Up @@ -207,6 +223,9 @@ async function signTypedData(message: string, from: string) {
* @see https://docs.metamask.io/snaps/reference/rpc-api/#wallet_invokesnap
*/
export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => {
const { chainId = '0x1' } = (request.params as BaseParams) ?? {};
await switchChain(chainId);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably not a problem, but i think always using mainnet makes it possible in the extension e2e tests that use this snap to try to hit the mainnet infura endpoint, but I think that's probably only the case if something triggers getGasPrice and i'm not certain there is an extension e2e test that does that. Just pointing this out in case I am wrong


switch (request.method) {
case 'getGasPrice':
return await getGasPrice();
Expand Down
8 changes: 7 additions & 1 deletion packages/examples/packages/ethereum-provider/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
export type PersonalSignParams = {
import type { Hex } from '@metamask/utils';

export type BaseParams = {
chainId?: Hex;
};

export type PersonalSignParams = BaseParams & {
message: string;
};

Expand Down
4 changes: 2 additions & 2 deletions packages/snaps-controllers/coverage.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"branches": 93.31,
"branches": 93.34,
"functions": 97.05,
"lines": 98.25,
"statements": 97.98
"statements": 97.99
}
Loading
Loading