refactor: rename NetworkWithRpcUrls as NetworkConfig

Author: xavier-brochard

packages/snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snap-solana-wallet.git"
   },
   "source": {
-    "shasum": "g/jfpUCvmwu6piUwA21tuyxrmaZZnZl3JdLeVJysYFM=",
+    "shasum": "cXuI2V4c1TpiEXZ3o44HV+qoSEGR4pz1DvHCxTtz9xo=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
@@ -19,15 +19,19 @@
     "locales": ["locales/en.json"]
   },
   "initialConnections": {
-    "https://portfolio.metamask.io": {}
+    "https://portfolio.metamask.io": {},
+    "http://localhost:3000": {}
   },
   "initialPermissions": {
     "endowment:rpc": {
       "dapps": true,
       "snaps": false
     },
     "endowment:keyring": {
-      "allowedOrigins": ["https://portfolio.metamask.io"]
+      "allowedOrigins": [
+        "https://portfolio.metamask.io",
+        "http://localhost:3000"
+      ]
     },
     "snap_getBip32Entropy": [
       {

packages/snap/src/core/services/config/ConfigProvider.ts

@@ -50,14 +50,14 @@ const EnvStruct = object({
 
 export type Env = Infer<typeof EnvStruct>;
 
-export type NetworkWithRpcUrls = (typeof Networks)[Network] & {
+export type NetworkConfig = (typeof Networks)[Network] & {
   rpcUrls: string[];
   webSocketUrl: string;
 };
 
 export type Config = {
   environment: string;
-  networks: NetworkWithRpcUrls[];
+  networks: NetworkConfig[];
   activeNetworks: Network[];
   explorerBaseUrl: string;
   priceApi: {
@@ -188,10 +188,7 @@ export class ConfigProvider {
     return this.#config;
   }
 
-  public getNetworkBy(
-    key: keyof NetworkWithRpcUrls,
-    value: string,
-  ): NetworkWithRpcUrls {
+  public getNetworkBy(key: keyof NetworkConfig, value: string): NetworkConfig {
     const network = this.get().networks.find((item) => item[key] === value);
     if (!network) {
       throw new Error(`Network ${key} not found`);

packages/snap/src/core/services/subscriptions/WebSocketConnectionService.test.ts

@@ -2,7 +2,7 @@ import type { WebSocketConnection } from '../../../entities';
 import { EventEmitter } from '../../../infrastructure';
 import { Network } from '../../constants/solana';
 import type { ConfigProvider } from '../config';
-import type { Config, NetworkWithRpcUrls } from '../config/ConfigProvider';
+import type { Config, NetworkConfig } from '../config/ConfigProvider';
 import { mockLogger } from '../mocks/logger';
 import type { WebSocketConnectionRepository } from './WebSocketConnectionRepository';
 import { WebSocketConnectionService } from './WebSocketConnectionService';
@@ -42,7 +42,7 @@ describe('WebSocketConnectionService', () => {
       caip2Id: Network.Localnet,
       webSocketUrl: 'wss://some-mock-url4.com/ws/v3/some-id',
     },
-  ] as NetworkWithRpcUrls[];
+  ] as NetworkConfig[];
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -67,7 +67,7 @@ describe('WebSocketConnectionService', () => {
       }),
       getNetworkBy: jest.fn().mockImplementation((key, value) => {
         return mockNetworksConfig.find(
-          (item) => item[key as keyof NetworkWithRpcUrls] === value,
+          (item) => item[key as keyof NetworkConfig] === value,
         );
       }),
     } as unknown as ConfigProvider;

packages/snap/src/core/services/subscriptions/WebSocketConnectionService.ts

@@ -5,7 +5,7 @@ import type { EventEmitter } from '../../../infrastructure';
 import { Network } from '../../constants/solana';
 import type { ILogger } from '../../utils/logger';
 import type { ConfigProvider } from '../config';
-import type { NetworkWithRpcUrls } from '../config/ConfigProvider';
+import type { NetworkConfig } from '../config/ConfigProvider';
 import type { WebSocketConnectionRepository } from './WebSocketConnectionRepository';
 
 /**
@@ -331,7 +331,7 @@ export class WebSocketConnectionService {
    * @param webSocketUrl - The WebSocket URL to get the network for.
    * @returns The network, or null if no network is associated with the connection ID.
    */
-  #findNetworkByWebSocketUrl(webSocketUrl: string): NetworkWithRpcUrls | null {
+  #findNetworkByWebSocketUrl(webSocketUrl: string): NetworkConfig | null {
     return this.#configProvider.getNetworkBy('webSocketUrl', webSocketUrl);
   }
 }