Bump controllers v30.0.2 #14906
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,9 +54,11 @@ import { | |
| ///: END:ONLY_INCLUDE_IN | ||
|
|
||
| import { | ||
| ASSET_TYPES, | ||
| TRANSACTION_STATUSES, | ||
| TRANSACTION_TYPES, | ||
| } from '../../shared/constants/transaction'; | ||
| import { PHISHING_NEW_ISSUE_URLS } from '../../shared/constants/phishing'; | ||
| import { | ||
| GAS_API_BASE_URL, | ||
| GAS_DEV_API_BASE_URL, | ||
|
|
@@ -85,7 +87,7 @@ import { | |
| POLLING_TOKEN_ENVIRONMENT_TYPES, | ||
| SUBJECT_TYPES, | ||
| } from '../../shared/constants/app'; | ||
| import { EVENT, EVENT_NAMES } from '../../shared/constants/metametrics'; | ||
|
|
||
| import { hexToDecimal } from '../../ui/helpers/utils/conversions.util'; | ||
| import { getTokenValueParam } from '../../ui/helpers/utils/token-util'; | ||
|
|
@@ -245,35 +247,28 @@ export default class MetamaskController extends EventEmitter { | |
| config: { provider: this.provider }, | ||
| state: initState.TokensController, | ||
| }); | ||
|
|
||
| this.assetsContractController = new AssetsContractController( | ||
| { | ||
| onPreferencesStateChange: (listener) => | ||
| this.preferencesController.store.subscribe(listener), | ||
| onNetworkStateChange: (cb) => | ||
| this.networkController.store.subscribe((networkState) => { | ||
| const modifiedNetworkState = { | ||
| ...networkState, | ||
| provider: { | ||
| ...networkState.provider, | ||
| chainId: hexToDecimal(networkState.provider.chainId), | ||
| }, | ||
| }; | ||
| return cb(modifiedNetworkState); | ||
| }), | ||
| }, | ||
| { | ||
| provider: this.provider, | ||
| }, | ||
| initState.AssetsContractController, | ||
| ); | ||
|
|
||
| this.collectiblesController = new CollectiblesController( | ||
| { | ||
|
|
@@ -301,6 +296,21 @@ export default class MetamaskController extends EventEmitter { | |
| getERC1155TokenURI: this.assetsContractController.getERC1155TokenURI.bind( | ||
| this.assetsContractController, | ||
| ), | ||
| onCollectibleAdded: ({ address, symbol, tokenId, standard, source }) => | ||
| this.metaMetricsController.trackEvent({ | ||
| event: EVENT_NAMES.NFT_ADDED, | ||
| category: EVENT.CATEGORIES.WALLET, | ||
| properties: { | ||
| token_contract_address: address, | ||
| token_symbol: symbol, | ||
| asset_type: ASSET_TYPES.COLLECTIBLE, | ||
| token_standard: standard, | ||
| source, | ||
| }, | ||
| sensitiveProperties: { | ||
| tokenId, | ||
| }, | ||
| }), | ||
| }, | ||
| {}, | ||
| initState.CollectiblesController, | ||
|
|
@@ -417,50 +427,23 @@ export default class MetamaskController extends EventEmitter { | |
| const tokenListMessenger = this.controllerMessenger.getRestricted({ | ||
| name: 'TokenListController', | ||
| }); | ||
|
Comment on lines
-439
to
-463
There was a problem hiding this comment.
|
||
|
|
||
| this.tokenListController = new TokenListController({ | ||
| chainId: hexToDecimal(this.networkController.getCurrentChainId()), | ||
| onNetworkStateChange: (cb) => | ||
| this.networkController.store.subscribe((networkState) => { | ||
| const modifiedNetworkState = { | ||
| ...networkState, | ||
| provider: { | ||
| ...networkState.provider, | ||
| chainId: hexToDecimal(networkState.provider.chainId), | ||
| }, | ||
| }; | ||
| return cb(modifiedNetworkState); | ||
| }), | ||
| messenger: tokenListMessenger, | ||
| state: initState.TokenListController, | ||
| }); | ||
|
|
||
| this.phishingController = new PhishingController(); | ||
|
|
||
|
|
@@ -1586,7 +1569,6 @@ export default class MetamaskController extends EventEmitter { | |
| tokensController, | ||
| ), | ||
| updateTokenType: tokensController.updateTokenType.bind(tokensController), | ||
|
There was a problem hiding this comment.
|
||
| setAccountLabel: preferencesController.setAccountLabel.bind( | ||
| preferencesController, | ||
| ), | ||
|
|
@@ -1960,20 +1942,14 @@ export default class MetamaskController extends EventEmitter { | |
| : null, | ||
|
|
||
| /** Token Detection V2 */ | ||
| addDetectedTokens: tokensController.addDetectedTokens.bind( | ||
|
There was a problem hiding this comment.
|
||
| tokensController, | ||
| ), | ||
| addImportedTokens: tokensController.addTokens.bind(tokensController), | ||
| ignoreTokens: tokensController.ignoreTokens.bind(tokensController), | ||
| getBalancesInSingleCall: assetsContractController.getBalancesInSingleCall.bind( | ||
| assetsContractController, | ||
| ), | ||
| }; | ||
| } | ||
|
|
||
|
|
@@ -3342,9 +3318,13 @@ export default class MetamaskController extends EventEmitter { | |
| if (sender.url) { | ||
| const { hostname } = new URL(sender.url); | ||
| // Check if new connection is blocked if phishing detection is on | ||
| const phishingTestResponse = this.phishingController.test(hostname); | ||
| if (usePhishDetect && phishingTestResponse?.result) { | ||
| this.sendPhishingWarning( | ||
| connectionStream, | ||
| hostname, | ||
| phishingTestResponse, | ||
| ); | ||
| return; | ||
| } | ||
| } | ||
|
|
@@ -3422,11 +3402,15 @@ export default class MetamaskController extends EventEmitter { | |
| * @param {*} connectionStream - The duplex stream to the per-page script, | ||
| * for sending the reload attempt to. | ||
| * @param {string} hostname - The hostname that triggered the suspicion. | ||
| * @param {object} phishingTestResponse - Result of calling `phishingController.test`, | ||
| * which is the result of calling eth-phishing-detects detector.check method https://github.com/MetaMask/eth-phishing-detect/blob/master/src/detector.js#L55-L112 | ||
| */ | ||
| sendPhishingWarning(connectionStream, hostname, phishingTestResponse) { | ||
| const newIssueUrl = PHISHING_NEW_ISSUE_URLS[phishingTestResponse?.name]; | ||
|
|
||
| const mux = setupMultiplex(connectionStream); | ||
| const phishingStream = mux.createStream('phishing'); | ||
| phishingStream.write({ hostname, newIssueUrl }); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all instances of
TokensControllers.removeAndIgnoreToken()have been replaced with use ofTokensControllers.ignoreTokens()