mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-04 23:14:56 +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>
229 lines
7.0 KiB
JavaScript
229 lines
7.0 KiB
JavaScript
import { cloneDeep } from 'lodash';
|
|
|
|
const version = 48;
|
|
|
|
/**
|
|
* 1. Delete NetworkController.settings
|
|
* 2a. Migrate NetworkController.provider to Rinkeby if set to type 'rpc' or
|
|
* 'localhost'.
|
|
* 2b. Re-key provider.rpcTarget to provider.rpcUrl
|
|
* 3. Add localhost network to frequentRpcListDetail.
|
|
* 4. Delete CachedBalancesController.cachedBalances
|
|
* 5. Convert transactions metamaskNetworkId to decimal if they are hex
|
|
* 6. Convert address book keys from decimal to hex
|
|
* 7. Delete localhost key in IncomingTransactionsController
|
|
* 8. Merge 'localhost' tokens into 'rpc' tokens
|
|
*/
|
|
export default {
|
|
version,
|
|
async migrate(originalVersionedData) {
|
|
const versionedData = cloneDeep(originalVersionedData);
|
|
versionedData.meta.version = version;
|
|
const state = versionedData.data;
|
|
versionedData.data = transformState(state);
|
|
return versionedData;
|
|
},
|
|
};
|
|
|
|
const hexRegEx = /^0x[0-9a-f]+$/iu;
|
|
const chainIdRegEx = /^0x[1-9a-f]+[0-9a-f]*$/iu;
|
|
|
|
function transformState(state = {}) {
|
|
// 1. Delete NetworkController.settings
|
|
delete state.NetworkController?.settings;
|
|
|
|
// 2. Migrate NetworkController.provider to Rinkeby or rename rpcTarget key
|
|
const provider = state.NetworkController?.provider || {};
|
|
const isCustomRpcWithInvalidChainId =
|
|
provider.type === 'rpc' &&
|
|
(typeof provider.chainId !== 'string' ||
|
|
!chainIdRegEx.test(provider.chainId));
|
|
if (isCustomRpcWithInvalidChainId || provider.type === 'localhost') {
|
|
state.NetworkController.provider = {
|
|
type: 'rinkeby',
|
|
rpcUrl: '',
|
|
chainId: '0x4',
|
|
nickname: '',
|
|
rpcPrefs: {},
|
|
ticker: 'ETH',
|
|
};
|
|
} else if (state.NetworkController?.provider) {
|
|
if ('rpcTarget' in state.NetworkController.provider) {
|
|
const rpcUrl = state.NetworkController.provider.rpcTarget;
|
|
state.NetworkController.provider.rpcUrl = rpcUrl;
|
|
}
|
|
delete state.NetworkController?.provider?.rpcTarget;
|
|
}
|
|
|
|
// 3. Add localhost network to frequentRpcListDetail.
|
|
if (!state.PreferencesController) {
|
|
state.PreferencesController = {};
|
|
}
|
|
if (!state.PreferencesController.frequentRpcListDetail) {
|
|
state.PreferencesController.frequentRpcListDetail = [];
|
|
}
|
|
state.PreferencesController.frequentRpcListDetail.unshift({
|
|
rpcUrl: 'http://localhost:8545',
|
|
chainId: '0x539',
|
|
ticker: 'ETH',
|
|
nickname: 'Localhost 8545',
|
|
rpcPrefs: {},
|
|
});
|
|
|
|
// 4. Delete CachedBalancesController.cachedBalances
|
|
delete state.CachedBalancesController?.cachedBalances;
|
|
|
|
// 5. Convert transactions metamaskNetworkId to decimal if they are hex
|
|
const transactions = state.TransactionController?.transactions;
|
|
if (Array.isArray(transactions)) {
|
|
transactions.forEach((transaction) => {
|
|
const metamaskNetworkId = transaction?.metamaskNetworkId;
|
|
if (
|
|
typeof metamaskNetworkId === 'string' &&
|
|
hexRegEx.test(metamaskNetworkId)
|
|
) {
|
|
transaction.metamaskNetworkId = parseInt(
|
|
metamaskNetworkId,
|
|
16,
|
|
).toString(10);
|
|
}
|
|
});
|
|
}
|
|
|
|
// 6. Convert address book keys from decimal to hex
|
|
const addressBook = state.AddressBookController?.addressBook || {};
|
|
Object.keys(addressBook).forEach((networkKey) => {
|
|
if (/^\d+$/iu.test(networkKey)) {
|
|
const chainId = `0x${parseInt(networkKey, 10).toString(16)}`;
|
|
updateChainIds(addressBook[networkKey], chainId);
|
|
|
|
if (addressBook[chainId]) {
|
|
mergeAddressBookKeys(addressBook, networkKey, chainId);
|
|
} else {
|
|
addressBook[chainId] = addressBook[networkKey];
|
|
}
|
|
delete addressBook[networkKey];
|
|
}
|
|
});
|
|
|
|
// 7. Delete localhost key in IncomingTransactionsController
|
|
delete state.IncomingTransactionsController
|
|
?.incomingTxLastFetchedBlocksByNetwork?.localhost;
|
|
|
|
// 8. Merge 'localhost' tokens into 'rpc' tokens
|
|
const accountTokens = state.PreferencesController?.accountTokens;
|
|
if (accountTokens) {
|
|
Object.keys(accountTokens).forEach((account) => {
|
|
const localhostTokens = accountTokens[account]?.localhost || [];
|
|
|
|
if (localhostTokens.length > 0) {
|
|
const rpcTokens = accountTokens[account].rpc || [];
|
|
|
|
if (rpcTokens.length > 0) {
|
|
accountTokens[account].rpc = mergeTokenArrays(
|
|
localhostTokens,
|
|
rpcTokens,
|
|
);
|
|
} else {
|
|
accountTokens[account].rpc = localhostTokens;
|
|
}
|
|
}
|
|
delete accountTokens[account]?.localhost;
|
|
});
|
|
}
|
|
|
|
return state;
|
|
}
|
|
|
|
/**
|
|
* Merges the two given keys for the given address book in place.
|
|
*
|
|
* @param addressBook
|
|
* @param networkKey
|
|
* @param chainIdKey
|
|
*/
|
|
function mergeAddressBookKeys(addressBook, networkKey, chainIdKey) {
|
|
const networkKeyEntries = addressBook[networkKey] || {};
|
|
// For the new entries, start by copying the existing entries for the chainId
|
|
const newEntries = { ...addressBook[chainIdKey] };
|
|
|
|
// For each address of the old/networkId key entries
|
|
Object.keys(networkKeyEntries).forEach((address) => {
|
|
if (newEntries[address] && typeof newEntries[address] === 'object') {
|
|
const mergedEntry = {};
|
|
|
|
// Collect all keys from both entries and merge the corresponding chainId
|
|
// entry with the networkId entry
|
|
new Set([
|
|
...Object.keys(newEntries[address]),
|
|
...Object.keys(networkKeyEntries[address] || {}),
|
|
]).forEach((key) => {
|
|
// Use non-empty value for the current key, if any
|
|
mergedEntry[key] =
|
|
newEntries[address][key] || networkKeyEntries[address]?.[key] || '';
|
|
});
|
|
|
|
newEntries[address] = mergedEntry;
|
|
} else if (
|
|
networkKeyEntries[address] &&
|
|
typeof networkKeyEntries[address] === 'object'
|
|
) {
|
|
// If there is no corresponding chainId entry, just use the networkId entry
|
|
// directly
|
|
newEntries[address] = networkKeyEntries[address];
|
|
}
|
|
});
|
|
|
|
addressBook[chainIdKey] = newEntries;
|
|
}
|
|
|
|
/**
|
|
* Updates the chainId key values to the given chainId in place for all values
|
|
* of the given networkEntries object.
|
|
*
|
|
* @param networkEntries
|
|
* @param chainId
|
|
*/
|
|
function updateChainIds(networkEntries, chainId) {
|
|
Object.values(networkEntries).forEach((entry) => {
|
|
if (entry && typeof entry === 'object') {
|
|
entry.chainId = chainId;
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Merges the two given, non-empty arrays of token objects and returns a new
|
|
* array.
|
|
*
|
|
* @param localhostTokens
|
|
* @param rpcTokens
|
|
* @returns {Array<object>}
|
|
*/
|
|
function mergeTokenArrays(localhostTokens, rpcTokens) {
|
|
const localhostTokensMap = tokenArrayToMap(localhostTokens);
|
|
const rpcTokensMap = tokenArrayToMap(rpcTokens);
|
|
|
|
const mergedTokens = [];
|
|
new Set([
|
|
...Object.keys(localhostTokensMap),
|
|
...Object.keys(rpcTokensMap),
|
|
]).forEach((tokenAddress) => {
|
|
mergedTokens.push({
|
|
...localhostTokensMap[tokenAddress],
|
|
...rpcTokensMap[tokenAddress],
|
|
});
|
|
});
|
|
|
|
return mergedTokens;
|
|
|
|
function tokenArrayToMap(array) {
|
|
return array.reduce((map, token) => {
|
|
if (token?.address && typeof token?.address === 'string') {
|
|
map[token.address] = token;
|
|
}
|
|
return map;
|
|
}, {});
|
|
}
|
|
}
|