Add assets-contract actions as allowed actions to downstream controllers

Author: MajorLift

packages/assets-controllers/src/NftController.ts

@@ -44,9 +44,12 @@ import BN from 'bn.js';
 import { v4 as random } from 'uuid';
 
 import type {
-  AssetsContractControllerGetERC1155StandardAction,
-  AssetsContractControllerGetERC20StandardAction,
-  AssetsContractControllerGetERC721StandardAction,
+  AssetsContractControllerGetERC1155BalanceOfAction,
+  AssetsContractControllerGetERC1155TokenURIAction,
+  AssetsContractControllerGetERC721AssetNameAction,
+  AssetsContractControllerGetERC721AssetSymbolAction,
+  AssetsContractControllerGetERC721OwnerOfAction,
+  AssetsContractControllerGetERC721TokenURIAction,
 } from './AssetsContractController';
 import { compareNftMetadata, getFormattedIpfsUrl } from './assetsUtil';
 import { Source } from './constants';
@@ -227,9 +230,12 @@ export type AllowedActions =
   | AccountsControllerGetAccountAction
   | AccountsControllerGetSelectedAccountAction
   | NetworkControllerGetNetworkClientByIdAction
-  | AssetsContractControllerGetERC20StandardAction
-  | AssetsContractControllerGetERC721StandardAction
-  | AssetsContractControllerGetERC1155StandardAction;
+  | AssetsContractControllerGetERC721AssetNameAction
+  | AssetsContractControllerGetERC721AssetSymbolAction
+  | AssetsContractControllerGetERC721TokenURIAction
+  | AssetsContractControllerGetERC721OwnerOfAction
+  | AssetsContractControllerGetERC1155BalanceOfAction
+  | AssetsContractControllerGetERC1155TokenURIAction;
 
 export type AllowedEvents =
   | PreferencesControllerStateChangeEvent
@@ -657,19 +663,25 @@ export class NftController extends BaseController<
   ): Promise<[string, string]> {
     // try ERC721 uri
     try {
-      const uri = await this.messagingSystem
-        .call('AssetsContractController:getERC721Standard', networkClientId)
-        .getTokenURI(contractAddress, tokenId);
+      const uri = await this.messagingSystem.call(
+        'AssetsContractController:getERC721TokenURI',
+        contractAddress,
+        tokenId,
+        networkClientId,
+      );
       return [uri, ERC721];
     } catch {
       // Ignore error
     }
 
     // try ERC1155 uri
     try {
-      const tokenURI = await this.messagingSystem
-        .call('AssetsContractController:getERC1155Standard', networkClientId)
-        .getTokenURI(contractAddress, tokenId);
+      const tokenURI = await this.messagingSystem.call(
+        'AssetsContractController:getERC1155TokenURI',
+        contractAddress,
+        tokenId,
+        networkClientId,
+      );
 
       /**
        * According to EIP1155 the URI value allows for ID substitution
@@ -750,12 +762,16 @@ export class NftController extends BaseController<
       Pick<ApiNftContract, 'collection'>
   > {
     const [name, symbol] = await Promise.all([
-      this.messagingSystem
-        .call('AssetsContractController:getERC721Standard', networkClientId)
-        .getAssetName(contractAddress),
-      this.messagingSystem
-        .call('AssetsContractController:getERC721Standard', networkClientId)
-        .getAssetSymbol(contractAddress),
+      this.messagingSystem.call(
+        'AssetsContractController:getERC721AssetName',
+        contractAddress,
+        networkClientId,
+      ),
+      this.messagingSystem.call(
+        'AssetsContractController:getERC721AssetSymbol',
+        contractAddress,
+        networkClientId,
+      ),
     ]);
 
     return {
@@ -1329,9 +1345,12 @@ export class NftController extends BaseController<
   ): Promise<boolean> {
     // Checks the ownership for ERC-721.
     try {
-      const owner = await this.messagingSystem
-        .call('AssetsContractController:getERC721Standard', networkClientId)
-        .getOwnerOf(nftAddress, tokenId);
+      const owner = await this.messagingSystem.call(
+        'AssetsContractController:getERC721OwnerOf',
+        nftAddress,
+        tokenId,
+        networkClientId,
+      );
       return ownerAddress.toLowerCase() === owner.toLowerCase();
       // eslint-disable-next-line no-empty
     } catch {
@@ -1340,9 +1359,13 @@ export class NftController extends BaseController<
 
     // Checks the ownership for ERC-1155.
     try {
-      const balance = await this.messagingSystem
-        .call('AssetsContractController:getERC1155Standard', networkClientId)
-        .getBalanceOf(ownerAddress, nftAddress, tokenId);
+      const balance = await this.messagingSystem.call(
+        'AssetsContractController:getERC1155BalanceOf',
+        ownerAddress,
+        nftAddress,
+        tokenId,
+        networkClientId,
+      );
       return !balance.isZero();
       // eslint-disable-next-line no-empty
     } catch {

packages/assets-controllers/src/TokenBalancesController.ts

@@ -7,7 +7,7 @@ import type {
 import { BaseController } from '@metamask/base-controller';
 import { safelyExecute, toHex } from '@metamask/controller-utils';
 
-import type { AssetsContractControllerGetERC20StandardAction } from './AssetsContractController';
+import type { AssetsContractControllerGetERC20BalanceOfAction } from './AssetsContractController';
 import type { Token } from './TokenRatesController';
 import type { TokensControllerStateChangeEvent } from './TokensController';
 
@@ -56,8 +56,8 @@ export type TokenBalancesControllerActions =
 
 export type AllowedActions =
   | AccountsControllerGetSelectedAccountAction
-  | AssetsContractControllerGetERC20StandardAction;
-  
+  | AssetsContractControllerGetERC20BalanceOfAction;
+
 export type TokenBalancesControllerStateChangeEvent =
   ControllerStateChangeEvent<
     typeof controllerName,
@@ -203,9 +203,11 @@ export class TokenBalancesController extends BaseController<
     for (const token of this.#tokens) {
       const { address } = token;
       try {
-        const balance = await this.messagingSystem
-          .call('AssetsContractController:getERC20Standard')
-          .getBalanceOf(address, selectedInternalAccount.address);
+        const balance = await this.messagingSystem.call(
+          'AssetsContractController:getERC20BalanceOf',
+          address,
+          selectedInternalAccount.address,
+        );
         newContractBalances[address] = toHex(balance);
         token.hasBalanceError = false;
       } catch (error) {