Merge branch 'main' into 231011-update-readme-with-eth-json-rpc-provider

Author: MajorLift

packages/assets-controllers/src/AssetsContractController.test.ts

@@ -46,6 +46,7 @@ async function setupAssetContractControllers() {
     network: 'mainnet',
     infuraProjectId: '341eacb578dd44a1a049cbc5f6fd4035',
     chainId: BUILT_IN_NETWORKS.mainnet.chainId,
+    ticker: BUILT_IN_NETWORKS.mainnet.ticker,
   } as const;
 
   const messenger: NetworkControllerMessenger =
@@ -835,6 +836,7 @@ describe('AssetsContractController', () => {
     mockNetworkWithDefaultChainId({
       networkClientConfiguration: {
         chainId: BUILT_IN_NETWORKS.sepolia.chainId,
+        ticker: BUILT_IN_NETWORKS.sepolia.ticker,
         type: NetworkClientType.Infura,
         network: 'sepolia',
         infuraProjectId: networkClientConfiguration.infuraProjectId,

packages/assets-controllers/src/AssetsContractControllerWithNetworkClientId.test.ts

@@ -702,6 +702,7 @@ describe('AssetsContractController with NetworkClientId', () => {
     mockNetworkWithDefaultChainId({
       networkClientConfiguration: {
         chainId: BUILT_IN_NETWORKS.sepolia.chainId,
+        ticker: BUILT_IN_NETWORKS.sepolia.ticker,
         type: NetworkClientType.Infura,
         network: 'sepolia',
         infuraProjectId: networkClientConfiguration.infuraProjectId,

packages/controller-utils/src/constants.ts

@@ -91,6 +91,7 @@ export const BUILT_IN_NETWORKS = {
   [NetworkType.rpc]: {
     chainId: undefined,
     blockExplorerUrl: undefined,
+    ticker: undefined,
     rpcPrefs: undefined,
   },
 } as const;

packages/network-controller/src/NetworkController.ts

@@ -1190,6 +1190,7 @@ export class NetworkController extends BaseControllerV2<
           type: NetworkClientType.Custom,
           chainId,
           rpcUrl,
+          ticker,
         });
     }
 
@@ -1380,6 +1381,7 @@ export class NetworkController extends BaseControllerV2<
         network,
         infuraProjectId: this.#infuraProjectId,
         chainId: BUILT_IN_NETWORKS[network].chainId,
+        ticker: BUILT_IN_NETWORKS[network].ticker,
       };
       return [
         NetworkClientType.Infura,
@@ -1415,6 +1417,7 @@ export class NetworkController extends BaseControllerV2<
           type: NetworkClientType.Custom,
           chainId: networkConfiguration.chainId,
           rpcUrl: networkConfiguration.rpcUrl,
+          ticker: networkConfiguration.ticker,
         };
         return [
           NetworkClientType.Custom,
@@ -1454,6 +1457,7 @@ export class NetworkController extends BaseControllerV2<
         chainId: providerConfig.chainId,
         rpcUrl: providerConfig.rpcUrl,
         type: NetworkClientType.Custom,
+        ticker: providerConfig.ticker,
       };
       return [
         [NetworkClientType.Custom, networkClientId, networkClientConfiguration],

packages/network-controller/src/create-auto-managed-network-client.test.ts

@@ -19,12 +19,14 @@ describe('createAutoManagedNetworkClient', () => {
       type: NetworkClientType.Custom,
       rpcUrl: 'https://test.chain',
       chainId: '0x1337',
+      ticker: 'ETH',
     } as const,
     {
       type: NetworkClientType.Infura,
       network: NetworkType.mainnet,
       chainId: BUILT_IN_NETWORKS[NetworkType.mainnet].chainId,
       infuraProjectId: 'some-infura-project-id',
+      ticker: BUILT_IN_NETWORKS[NetworkType.mainnet].ticker,
     } as const,
   ];
   for (const networkClientConfiguration of networkClientConfigurations) {

packages/network-controller/src/types.ts

@@ -24,6 +24,7 @@ export enum NetworkClientType {
 export type CustomNetworkClientConfiguration = {
   chainId: Hex;
   rpcUrl: string;
+  ticker: string;
   type: NetworkClientType.Custom;
 };
 
@@ -35,6 +36,7 @@ export type InfuraNetworkClientConfiguration = {
   chainId: Hex;
   network: InfuraNetworkType;
   infuraProjectId: string;
+  ticker: string;
   type: NetworkClientType.Infura;
 };