mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-01 21:57:06 +01:00
31d5c1cf22
* Version v10.18.4 * Fix default currency symbol for `wallet_addEthereumChain` + improve warnings for data that doesn't match our validation expectations (#15201) * set more appropriate default for ticker symbol when wallet_addEthereumChain is called * throw error to dapp when site suggests network with same chainId but different ticker symbol from already added network, instead of showing error and disabled notification to user * Fix Provider Tracking Metrics (#15082) * fix filetype audit (#15334) * Remove decentralized 4byte function signature registry since it contains incorrect signatures and we can't algorithmically check for best option when 4byte.directory is down (#15300) * remove decentralized 4byte function signature registry since it is griefed and we can't algorithmically check for best option when 4byte is down * add migration * remove nock of on chain registry call in getMethodDataAsync test * remove audit exclusion (#15346) * Updates `eth-lattice-keyring` to v0.10.0 (#15261) This is mainly associated with an update in GridPlus SDK and enables better strategies for fetching calldata decoder data. `eth-lattice-keyring` changes: GridPlus/eth-lattice-keyring@v0.7.3...v0.10.0 `gridplus-sdk` changes (which includes a codebase rewrite): GridPlus/gridplus-sdk@v1.2.3...v2.2.2 * Fix 'block link explorer on custom networks' (#13870) * Created a logic for the 'Add a block explorer URL' Removed unused message Message logic rollback Modified history push operation WIP: Pushing before rebasing Applied requested changes Removed unintenionally added code * Lint fix * Metrics fixed * Stop injecting provider on docs.google.com (#15459) * Fix setting of gasPrice when on non-eip 1559 networks (#15628) * Fix setting of gasPrice when on non-eip 1559 networks * Fix unit tests * Fix logic * Update ui/ducks/send/send.test.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> Co-authored-by: Mark Stacey <markjstacey@gmail.com> * [GridPlus] Bumps `eth-lattice-keyring` to v0.11.0 (#15490) * [GridPlus] Bumps `gridplus-sdk` to v2.2.4 (#15561) * remove exclusions for mismatched object jsdoc type casing (#15351) * Improve `tokenId` parsing and clean up `useAssetDetails` hook (#15304) * Fix state creation in setupSentryGetStateGlobal (#15635) * filter breadcrumbs for improved clarity while debugging sentry errors (#15639) * Update v10.18.4 changelog (#15645) * Auto generated changelog * Update 10.18.4 changelog * Run lavamoat:auto * Call metrics event for wallet type selection at the right time (#15591) * Fix Sentry in LavaMoat contexts (#15672) Our Sentry setup relies upon application state, but it wasn't able to access it in LavaMoat builds because it's running in a separate Compartment. A patch has been introduced to the LavaMoat runtime to allow the root Compartment to mutate the `rootGlobals` object, which is accessible from outside the compartment as well. This lets us expose application state to our Sentry integration. * Fix Sentry deduplication of events that were never sent (#15677) The Sentry `Dedupe` integration has been filtering out our events, even when they were never sent due to our `beforeSend` handler. It was wrongly identifying them as duplicates because it has no knowledge of `beforeSend` or whether they were actually sent or not. To resolve this, the filtering we were doing in `beforeSend` has been moved to a Sentry integration. This integration is installed ahead of the `Dedupe` integration, so `Dedupe` should never find out about any events that we filter out, and thus will never consider them as sent when they were not. * Replace `lavamoat-runtime.js` patch (#15682) A patch made in #15672 was found to be unnecessary. Instead of setting a `rootGlobals` object upon construction of the root compartment, we are now creating a `sentryHooks` object in the initial top-level compartment. I hadn't realized at the time that the root compartment would inherit all properties of the initial compartment `globalThis`. This accomplishes the same goals as #15672 except without needing a patch. * Update v10.18.4 changelog * Fix lint issues * Update yarn.lock * Update `depcheck` to latest version (#15690) `depcheck` has been updated to the latest version. This version pins `@babel/parser` to v7.16.4 because of unresolved bugs in v7.16.5 that result in `depcheck` failing to parse TypeScript files correctly. We had a Yarn resolution in place to ensure `@babel/parser@7.16.4` was being used already. That resolution is no longer needed so it has been removed. This should resove the issue the dev team has been seeing lately where `yarn` and `yarn-deduplicate` disagree about the state the lockfile should be in. * Update yarn.lock * Update LavaMoat policy * deduplicate * Update LavaMoat build policy Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com> Co-authored-by: Alex Donesky <adonesky@gmail.com> Co-authored-by: Brad Decker <bhdecker84@gmail.com> Co-authored-by: Alex Miller <asmiller1989@gmail.com> Co-authored-by: Filip Sekulic <filip.sekulic@consensys.net> Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com> Co-authored-by: Dan J Miller <danjm.com@gmail.com> Co-authored-by: Mark Stacey <markjstacey@gmail.com> Co-authored-by: seaona <54408225+seaona@users.noreply.github.com> Co-authored-by: seaona <mariona@gmx.es> Co-authored-by: PeterYinusa <peter.yinusa@consensys.net>
142 lines
4.7 KiB
JavaScript
142 lines
4.7 KiB
JavaScript
import { omit, pick } from 'lodash';
|
|
import { MESSAGE_TYPE } from '../../../../shared/constants/app';
|
|
import {
|
|
rejectPendingApproval,
|
|
resolvePendingApproval,
|
|
} from '../../../store/actions';
|
|
import addEthereumChain from './add-ethereum-chain';
|
|
import switchEthereumChain from './switch-ethereum-chain';
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
import snapConfirm from './flask/snap-confirm/snap-confirm';
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
const APPROVAL_TEMPLATES = {
|
|
[MESSAGE_TYPE.ADD_ETHEREUM_CHAIN]: addEthereumChain,
|
|
[MESSAGE_TYPE.SWITCH_ETHEREUM_CHAIN]: switchEthereumChain,
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
[MESSAGE_TYPE.SNAP_CONFIRM]: snapConfirm,
|
|
///: END:ONLY_INCLUDE_IN
|
|
};
|
|
|
|
export const TEMPLATED_CONFIRMATION_MESSAGE_TYPES = Object.keys(
|
|
APPROVAL_TEMPLATES,
|
|
);
|
|
|
|
const ALLOWED_TEMPLATE_KEYS = [
|
|
'content',
|
|
'approvalText',
|
|
'cancelText',
|
|
'onApprove',
|
|
'onCancel',
|
|
'networkDisplay',
|
|
];
|
|
|
|
/**
|
|
* @typedef {object} PendingApproval
|
|
* @property {string} id - The randomly generated id of the approval
|
|
* @property {string} origin - The origin of the site requesting this approval
|
|
* @property {number} time - The time the approval was requested
|
|
* @property {string} type - The type of approval being requested
|
|
* @property {object} requestData - The data submitted with the request
|
|
*/
|
|
|
|
/**
|
|
* getTemplateAlerts calls the getAlerts function exported by the template if
|
|
* it exists, and then returns the result of that function. In the confirmation
|
|
* page the alerts returned from the getAlerts method will be set into the
|
|
* alertState state object.
|
|
*
|
|
* @param {object} pendingApproval - the object representing the confirmation
|
|
*/
|
|
export async function getTemplateAlerts(pendingApproval) {
|
|
const fn = APPROVAL_TEMPLATES[pendingApproval.type]?.getAlerts;
|
|
const results = fn ? await fn(pendingApproval) : [];
|
|
if (!Array.isArray(results)) {
|
|
throw new Error(`Template alerts must be an array, received: ${results}`);
|
|
}
|
|
if (results.some((result) => result?.id === undefined)) {
|
|
throw new Error(
|
|
`Template alert entries must be objects with an id key. Received: ${results}`,
|
|
);
|
|
}
|
|
return results;
|
|
}
|
|
|
|
/**
|
|
* The function call to return state must be a promise returning function
|
|
* this "NOOP" is here to conform to the requirements for templates without
|
|
* state.
|
|
*/
|
|
async function emptyState() {
|
|
return {};
|
|
}
|
|
|
|
/**
|
|
* getTemplateState calls the getState function exported by the template if
|
|
* it exists, and then returns the result of that function. In the confirmation
|
|
* page the object returned from the getState method will be set into the
|
|
* confirmationState state object. Note, this state is not consumed by the page
|
|
* itself.
|
|
*
|
|
* @param {object} pendingApproval - the object representing the confirmation
|
|
*/
|
|
export async function getTemplateState(pendingApproval) {
|
|
const fn = APPROVAL_TEMPLATES[pendingApproval.type]?.getState ?? emptyState;
|
|
const result = await fn(pendingApproval);
|
|
if (typeof result !== 'object' || Array.isArray(result)) {
|
|
throw new Error(`Template state must be an object, received: ${result}`);
|
|
} else if (result === null || result === undefined) {
|
|
return {};
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* We do not want to pass the entire dispatch function to the template.
|
|
* This function should return an object of actions that we generally consider
|
|
* to be safe for templates to invoke. In the future we could put these behind
|
|
* permission sets so that snaps that wish to manipulate state must ask for
|
|
* explicit permission to do so.
|
|
*
|
|
* @param {Function} dispatch - Redux dispatch function
|
|
*/
|
|
function getAttenuatedDispatch(dispatch) {
|
|
return {
|
|
rejectPendingApproval: (...args) =>
|
|
dispatch(rejectPendingApproval(...args)),
|
|
resolvePendingApproval: (...args) =>
|
|
dispatch(resolvePendingApproval(...args)),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Returns the templated values to be consumed in the confirmation page
|
|
*
|
|
* @param {object} pendingApproval - The pending confirmation object
|
|
* @param {Function} t - Translation function
|
|
* @param {Function} dispatch - Redux dispatch function
|
|
*/
|
|
export function getTemplateValues(pendingApproval, t, dispatch) {
|
|
const fn = APPROVAL_TEMPLATES[pendingApproval.type]?.getValues;
|
|
if (!fn) {
|
|
throw new Error(
|
|
`MESSAGE_TYPE: '${pendingApproval.type}' is not specified in approval templates`,
|
|
);
|
|
}
|
|
|
|
const safeActions = getAttenuatedDispatch(dispatch);
|
|
const values = fn(pendingApproval, t, safeActions);
|
|
const extraneousKeys = omit(values, ALLOWED_TEMPLATE_KEYS);
|
|
const safeValues = pick(values, ALLOWED_TEMPLATE_KEYS);
|
|
if (extraneousKeys.length > 0) {
|
|
throw new Error(
|
|
`Received extraneous keys from ${
|
|
pendingApproval.type
|
|
}.getValues. These keys are not passed to the confirmation page: ${Object.keys(
|
|
extraneousKeys,
|
|
)}`,
|
|
);
|
|
}
|
|
return safeValues;
|
|
}
|