Split AssetsController into TokensController and CollectiblesController

MetaMask · Jul 9, 2021 · 4698667 · 4698667
1 parent df45133
commit 4698667
Show file tree

Hide file tree

Showing 51 changed files with 181 additions and 118 deletions.
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
@@ -777,7 +777,7 @@ const mapStateToProps = state => ({
 	thirdPartyApiMode: state.privacy.thirdPartyApiMode,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	dappTransactionModalVisible: state.modals.dappTransactionModalVisible,
 	approveModalVisible: state.modals.approveModalVisible,
 	swapsTransactions: state.engine.backgroundState.TransactionController.swapsTransactions || {},

diff --git a/app/components/UI/AccountApproval/index.js b/app/components/UI/AccountApproval/index.js
@@ -212,7 +212,7 @@ class AccountApproval extends PureComponent {
 
 const mapStateToProps = state => ({
 	accountsLength: Object.keys(state.engine.backgroundState.AccountTrackerController.accounts || {}).length,
-	tokensLength: state.engine.backgroundState.AssetsController.tokens.length,
+	tokensLength: state.engine.backgroundState.TokensController.tokens.length,
 	networkType: state.engine.backgroundState.NetworkController.provider.type,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId
 });

diff --git a/app/components/UI/AccountApproval/index.test.js b/app/components/UI/AccountApproval/index.test.js
@@ -19,7 +19,7 @@ describe('AccountApproval', () => {
 							type: ROPSTEN
 						}
 					},
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					},
 					PreferencesController: {

diff --git a/app/components/UI/AddCustomCollectible/index.js b/app/components/UI/AddCustomCollectible/index.js
@@ -94,9 +94,9 @@ class AddCustomCollectible extends PureComponent {
 			this.handleNotCollectibleOwner();
 			return;
 		}
-		const { AssetsController } = Engine.context;
+		const { CollectiblesController } = Engine.context;
 		const { address, tokenId } = this.state;
-		AssetsController.addCollectible(address, tokenId);
+		CollectiblesController.addCollectible(address, tokenId);
 
 		AnalyticsV2.trackEvent(AnalyticsV2.ANALYTICS_EVENTS.COLLECTIBLE_ADDED, this.getAnalyticsParams());
 

diff --git a/app/components/UI/AddCustomToken/index.js b/app/components/UI/AddCustomToken/index.js
@@ -70,9 +70,9 @@ export default class AddCustomToken extends PureComponent {
 
 	addToken = async () => {
 		if (!(await this.validateCustomToken())) return;
-		const { AssetsController } = Engine.context;
+		const { TokensController } = Engine.context;
 		const { address, symbol, decimals } = this.state;
-		await AssetsController.addToken(address, symbol, decimals);
+		await TokensController.addToken(address, symbol, decimals);
 
 		AnalyticsV2.trackEvent(AnalyticsV2.ANALYTICS_EVENTS.TOKEN_ADDED, this.getAnalyticsParams());
 

diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
@@ -731,7 +731,7 @@ const mapStateToProps = state => ({
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker,
 	transaction: getNormalizedTxState(state),
 	accountsLength: Object.keys(state.engine.backgroundState.AccountTrackerController.accounts || {}).length,
-	tokensLength: state.engine.backgroundState.AssetsController.tokens.length,
+	tokensLength: state.engine.backgroundState.TokensController.tokens.length,
 	providerType: state.engine.backgroundState.NetworkController.provider.type,
 	primaryCurrency: state.settings.primaryCurrency,
 	activeTabUrl: getActiveTabUrl(state),

diff --git a/app/components/UI/ApproveTransactionReview/index.test.js b/app/components/UI/ApproveTransactionReview/index.test.js
@@ -22,7 +22,7 @@ describe('ApproveTransactionModal', () => {
 							type: 'ETH'
 						}
 					},
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					}
 				}

diff --git a/app/components/UI/CollectibleContractElement/index.js b/app/components/UI/CollectibleContractElement/index.js
@@ -108,9 +108,9 @@ function CollectibleContractElement({
 	}, []);
 
 	const removeCollectible = () => {
-		const { AssetsController } = Engine.context;
+		const { CollectiblesController } = Engine.context;
 		removeFavoriteCollectible(selectedAddress, chainId, collectibleToRemove.current);
-		AssetsController.removeAndIgnoreCollectible(
+		CollectiblesController.removeAndIgnoreCollectible(
 			collectibleToRemove.current.address,
 			collectibleToRemove.current.tokenId
 		);
@@ -227,7 +227,7 @@ CollectibleContractElement.propTypes = {
 };
 
 const mapStateToProps = state => ({
-	collectibleContracts: state.engine.backgroundState.AssetsController.collectibleContracts,
+	collectibleContracts: state.engine.backgroundState.CollectiblesController.collectibleContracts,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress
 });

diff --git a/app/components/UI/CollectibleContractOverview/index.js b/app/components/UI/CollectibleContractOverview/index.js
@@ -140,7 +140,7 @@ class CollectibleContractOverview extends PureComponent {
 }
 
 const mapStateToProps = state => ({
-	collectibles: state.engine.backgroundState.AssetsController.collectibles
+	collectibles: state.engine.backgroundState.CollectiblesController.collectibles
 });
 
 const mapDispatchToProps = dispatch => ({

diff --git a/app/components/UI/CollectibleContractOverview/index.test.js b/app/components/UI/CollectibleContractOverview/index.test.js
@@ -10,7 +10,7 @@ describe('CollectibleContractOverview', () => {
 		const initialState = {
 			engine: {
 				backgroundState: {
-					AssetsController: {
+					CollectiblesController: {
 						collectibles: []
 					}
 				}

diff --git a/app/components/UI/CollectibleContracts/index.js b/app/components/UI/CollectibleContracts/index.js
@@ -188,8 +188,8 @@ CollectibleContracts.propTypes = {
 };
 
 const mapStateToProps = state => ({
-	collectibleContracts: state.engine.backgroundState.AssetsController.collectibleContracts,
-	collectibles: state.engine.backgroundState.AssetsController.collectibles,
+	collectibleContracts: state.engine.backgroundState.CollectiblesController.collectibleContracts,
+	collectibles: state.engine.backgroundState.CollectiblesController.collectibles,
 	favoriteCollectibles: favoritesCollectiblesObjectSelector(state)
 });
 

diff --git a/app/components/UI/CollectibleContracts/index.test.js b/app/components/UI/CollectibleContracts/index.test.js
@@ -21,7 +21,7 @@ describe('CollectibleContracts', () => {
 					PreferencesController: {
 						selectedAddress: '0x1'
 					},
-					AssetsController: {
+					CollectiblesController: {
 						collectibleContracts: [
 							{
 								name: 'name',

diff --git a/app/components/UI/Collectibles/index.js b/app/components/UI/Collectibles/index.js
@@ -109,8 +109,11 @@ export default class Collectibles extends PureComponent {
 	};
 
 	removeCollectible = () => {
-		const { AssetsController } = Engine.context;
-		AssetsController.removeAndIgnoreCollectible(this.collectibleToRemove.address, this.collectibleToRemove.tokenId);
+		const { CollectiblesController } = Engine.context;
+		CollectiblesController.removeAndIgnoreCollectible(
+			this.collectibleToRemove.address,
+			this.collectibleToRemove.tokenId
+		);
 		Alert.alert(strings('wallet.collectible_removed_title'), strings('wallet.collectible_removed_desc'));
 	};
 

diff --git a/app/components/UI/DrawerView/index.js b/app/components/UI/DrawerView/index.js
@@ -1089,9 +1089,9 @@ const mapStateToProps = state => ({
 	wizard: state.wizard,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId,
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	tokenBalances: state.engine.backgroundState.TokenBalancesController.contractBalances,
-	collectibles: state.engine.backgroundState.AssetsController.collectibles,
+	collectibles: state.engine.backgroundState.CollectiblesController.collectibles,
 	seedphraseBackedUp: state.user.seedphraseBackedUp
 });
 

diff --git a/app/components/UI/EthInput/index.js b/app/components/UI/EthInput/index.js
@@ -690,9 +690,9 @@ const mapStateToProps = state => ({
 	currentCurrency: state.engine.backgroundState.CurrencyRateController.currentCurrency,
 	contractExchangeRates: state.engine.backgroundState.TokenRatesController.contractExchangeRates,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	tokenBalances: state.engine.backgroundState.TokenBalancesController.contractBalances,
-	collectibles: state.engine.backgroundState.AssetsController.collectibles,
+	collectibles: state.engine.backgroundState.CollectiblesController.collectibles,
 	transaction: getNormalizedTxState(state),
 	primaryCurrency: state.settings.primaryCurrency,
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker

diff --git a/app/components/UI/Notification/TransactionNotification/index.js b/app/components/UI/Notification/TransactionNotification/index.js
@@ -375,11 +375,11 @@ const mapStateToProps = state => ({
 	transactions: state.engine.backgroundState.TransactionController.transactions,
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId,
-	tokens: state.engine.backgroundState.AssetsController.tokens.reduce((tokens, token) => {
+	tokens: state.engine.backgroundState.TokensController.tokens.reduce((tokens, token) => {
 		tokens[token.address] = token;
 		return tokens;
 	}, {}),
-	collectibleContracts: state.engine.backgroundState.AssetsController.collectibleContracts,
+	collectibleContracts: state.engine.backgroundState.CollectiblesController.collectibleContracts,
 	contractExchangeRates: state.engine.backgroundState.TokenRatesController.contractExchangeRates,
 	conversionRate: state.engine.backgroundState.CurrencyRateController.conversionRate,
 	currentCurrency: state.engine.backgroundState.CurrencyRateController.currentCurrency,

diff --git a/app/components/UI/PaymentRequest/index.js b/app/components/UI/PaymentRequest/index.js
@@ -700,7 +700,7 @@ const mapStateToProps = state => ({
 	contractExchangeRates: state.engine.backgroundState.TokenRatesController.contractExchangeRates,
 	searchEngine: state.settings.searchEngine,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	primaryCurrency: state.settings.primaryCurrency,
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker,
 	chainId: state.engine.backgroundState.NetworkController.provider.chainId

diff --git a/app/components/UI/SearchTokenAutocomplete/index.js b/app/components/UI/SearchTokenAutocomplete/index.js
@@ -67,9 +67,9 @@ export default class SearchTokenAutocomplete extends PureComponent {
 	};
 
 	addToken = async () => {
-		const { AssetsController } = Engine.context;
+		const { TokensController } = Engine.context;
 		const { address, symbol, decimals } = this.state.selectedAsset;
-		await AssetsController.addToken(address, symbol, decimals);
+		await TokensController.addToken(address, symbol, decimals);
 
 		AnalyticsV2.trackEvent(AnalyticsV2.ANALYTICS_EVENTS.TOKEN_ADDED, this.getAnalyticsParams());
 

diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
@@ -224,15 +224,15 @@ async function resetAndStartPolling({ slippage, sourceToken, destinationToken, s
 	if (!sourceToken || !destinationToken) {
 		return;
 	}
-	const { SwapsController, TokenRatesController, AssetsController } = Engine.context;
+	const { SwapsController, TokenRatesController, TokensController } = Engine.context;
 	const contractExchangeRates = TokenRatesController.state.contractExchangeRates;
 	// ff the token is not in the wallet, we'll add it
 	if (
 		!isSwapsNativeAsset(destinationToken) &&
 		!(safeToChecksumAddress(destinationToken.address) in contractExchangeRates)
 	) {
 		const { address, symbol, decimals } = destinationToken;
-		await AssetsController.addToken(address, symbol, decimals);
+		await TokensController.addToken(address, symbol, decimals);
 		await new Promise(resolve =>
 			setTimeout(() => {
 				resolve();

diff --git a/app/components/UI/Swaps/index.js b/app/components/UI/Swaps/index.js
@@ -341,9 +341,9 @@ function SwapsAmountView({
 			return;
 		}
 		if (!isSwapsNativeAsset(sourceToken) && !isTokenInBalances && !balanceAsUnits?.isZero()) {
-			const { AssetsController } = Engine.context;
+			const { TokensController } = Engine.context;
 			const { address, symbol, decimals } = sourceToken;
-			await AssetsController.addToken(address, symbol, decimals);
+			await TokensController.addToken(address, symbol, decimals);
 		}
 		return navigation.navigate(
 			'SwapsQuotesView',

diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js
@@ -293,8 +293,8 @@ class Tokens extends PureComponent {
 	};
 
 	removeToken = () => {
-		const { AssetsController } = Engine.context;
-		AssetsController.removeAndIgnoreToken(this.tokenToRemove.address);
+		const { TokensController } = Engine.context;
+		TokensController.removeAndIgnoreToken(this.tokenToRemove.address);
 		Alert.alert(strings('wallet.token_removed_title'), strings('wallet.token_removed_desc'));
 	};
 

diff --git a/app/components/UI/Tokens/index.test.js b/app/components/UI/Tokens/index.test.js
@@ -11,7 +11,7 @@ describe('Tokens', () => {
 		const initialState = {
 			engine: {
 				backgroundState: {
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					},
 					TokenRatesController: {
@@ -44,7 +44,7 @@ describe('Tokens', () => {
 		const initialState = {
 			engine: {
 				backgroundState: {
-					AssetsController: {
+					TokensController: {
 						tokens: [
 							{ symbol: 'ETH', address: '0x0', decimals: 18, isETH: true },
 							{ symbol: 'BAT', address: '0x01', decimals: 18 },
@@ -75,7 +75,7 @@ describe('Tokens', () => {
 			}
 		};
 
-		const wrapper = shallow(<Tokens tokens={initialState.engine.backgroundState.AssetsController.tokens} />, {
+		const wrapper = shallow(<Tokens tokens={initialState.engine.backgroundState.TokensController.tokens} />, {
 			context: { store: mockStore(initialState) }
 		});
 		// ETH and BAT should display
@@ -86,7 +86,7 @@ describe('Tokens', () => {
 		const initialState = {
 			engine: {
 				backgroundState: {
-					AssetsController: {
+					TokensController: {
 						tokens: [
 							{ symbol: 'ETH', address: '0x0', decimals: 18, isETH: true },
 							{ symbol: 'BAT', address: '0x01', decimals: 18 },
@@ -117,7 +117,7 @@ describe('Tokens', () => {
 			}
 		};
 
-		const wrapper = shallow(<Tokens tokens={initialState.engine.backgroundState.AssetsController.tokens} />, {
+		const wrapper = shallow(<Tokens tokens={initialState.engine.backgroundState.TokensController.tokens} />, {
 			context: { store: mockStore(initialState) }
 		});
 		// All three should display

diff --git a/app/components/UI/TransactionEditor/index.js b/app/components/UI/TransactionEditor/index.js
@@ -659,11 +659,11 @@ class TransactionEditor extends PureComponent {
 
 const mapStateToProps = state => ({
 	accounts: state.engine.backgroundState.AccountTrackerController.accounts,
-	collectibles: state.engine.backgroundState.AssetsController.collectibles,
+	collectibles: state.engine.backgroundState.CollectiblesController.collectibles,
 	contractBalances: state.engine.backgroundState.TokenBalancesController.contractBalances,
 	networkType: state.engine.backgroundState.NetworkController.provider.type,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	ticker: state.engine.backgroundState.NetworkController.provider.ticker,
 	transaction: getNormalizedTxState(state),
 	activeTabUrl: getActiveTabUrl(state)

diff --git a/app/components/UI/TransactionEditor/index.test.js b/app/components/UI/TransactionEditor/index.test.js
@@ -23,8 +23,10 @@ describe('TransactionEditor', () => {
 					PreferencesController: {
 						selectedAddress: '0x0'
 					},
-					AssetsController: {
-						tokens: [],
+					TokensController: {
+						tokens: []
+					},
+					CollectiblesController: {
 						collectibles: []
 					},
 					NetworkController: {

diff --git a/app/components/UI/TransactionReview/TransactionReviewSummary/index.test.js b/app/components/UI/TransactionReview/TransactionReviewSummary/index.test.js
@@ -17,7 +17,7 @@ describe('TransactionReviewSummary', () => {
 						currentCurrency: 'usd',
 						conversionRate: 0.1
 					},
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					},
 					NetworkController: {

diff --git a/app/components/UI/TransactionReview/index.js b/app/components/UI/TransactionReview/index.js
@@ -364,7 +364,7 @@ class TransactionReview extends PureComponent {
 
 const mapStateToProps = state => ({
 	accounts: state.engine.backgroundState.AccountTrackerController.accounts,
-	tokens: state.engine.backgroundState.AssetsController.tokens,
+	tokens: state.engine.backgroundState.TokensController.tokens,
 	currentCurrency: state.engine.backgroundState.CurrencyRateController.currentCurrency,
 	contractExchangeRates: state.engine.backgroundState.TokenRatesController.contractExchangeRates,
 	conversionRate: state.engine.backgroundState.CurrencyRateController.conversionRate,

diff --git a/app/components/UI/TransactionReview/index.test.js b/app/components/UI/TransactionReview/index.test.js
@@ -17,7 +17,7 @@ describe('TransactionReview', () => {
 					AccountTrackerController: {
 						accounts: []
 					},
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					},
 					CurrencyRateController: {

diff --git a/app/components/UI/Transactions/index.js b/app/components/UI/Transactions/index.js
@@ -372,13 +372,13 @@ class Transactions extends PureComponent {
 
 const mapStateToProps = state => ({
 	accounts: state.engine.backgroundState.AccountTrackerController.accounts,
-	collectibleContracts: state.engine.backgroundState.AssetsController.collectibleContracts,
+	collectibleContracts: state.engine.backgroundState.CollectiblesController.collectibleContracts,
 	contractExchangeRates: state.engine.backgroundState.TokenRatesController.contractExchangeRates,
 	conversionRate: state.engine.backgroundState.CurrencyRateController.conversionRate,
 	currentCurrency: state.engine.backgroundState.CurrencyRateController.currentCurrency,
 	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
 	thirdPartyApiMode: state.privacy.thirdPartyApiMode,
-	tokens: state.engine.backgroundState.AssetsController.tokens.reduce((tokens, token) => {
+	tokens: state.engine.backgroundState.TokensController.tokens.reduce((tokens, token) => {
 		tokens[token.address] = token;
 		return tokens;
 	}, {})

diff --git a/app/components/UI/Transactions/index.test.js b/app/components/UI/Transactions/index.test.js
@@ -19,12 +19,15 @@ describe('Transactions', () => {
 					AccountTrackerController: {
 						accounts: {}
 					},
-					AssetsController: {
+					TokensController: {
 						tokens: []
 					},
 					TokenRatesController: {
 						contractExchangeRates: {}
 					},
+					CollectiblesController: {
+						collectibleContracts: {}
+					},
 					CurrencyRateController: {
 						currentCurrency: 'USD',
 						conversionRate: 1

diff --git a/app/components/UI/WatchAssetRequest/index.js b/app/components/UI/WatchAssetRequest/index.js
@@ -131,15 +131,15 @@ class WatchAssetRequest extends PureComponent {
 	};
 
 	componentWillUnmount = async () => {
-		const { AssetsController } = Engine.context;
+		const { TokensController } = Engine.context;
 		const { suggestedAssetMeta } = this.props;
-		await AssetsController.rejectWatchAsset(suggestedAssetMeta.id);
+		await TokensController.rejectWatchAsset(suggestedAssetMeta.id);
 	};
 
 	onConfirm = async () => {
 		const { onConfirm, suggestedAssetMeta } = this.props;
-		const { AssetsController } = Engine.context;
-		await AssetsController.acceptWatchAsset(suggestedAssetMeta.id);
+		const { TokensController } = Engine.context;
+		await TokensController.acceptWatchAsset(suggestedAssetMeta.id);
 		AnalyticsV2.trackEvent(AnalyticsV2.ANALYTICS_EVENTS.TOKEN_ADDED, this.getAnalyticsParams());
 		onConfirm && onConfirm();
 	};