Extension - Add/Remove Chains (Smoldot v.0.3.x)

packages/connect-extension-protocol/src/index.ts

@@ -68,7 +68,7 @@ export interface ProviderMessageData {
   /** The name of the blockchain network the app is talking to **/
   chainName: string;
   /** What action the `ExtensionMessageRouter` should take **/
-  action: 'forward' | 'connect' | 'disconnect' | 'spec';
+  action: 'forward' | 'connect' | 'disconnect';
   /** The message the `ExtensionMessageRouter` should forward to the background **/
   message?: MessageToManager;
 }

packages/connect/src/ExtensionProvider/ExtensionProvider.ts

@@ -219,7 +219,7 @@ export class ExtensionProvider implements ProviderInterface {
     const someMsg: ProviderMessageData = {
       appName: this.#appName,
       chainName: this.#chainName,
-      action: 'spec',
+      action: 'forward',
       origin: EXTENSION_PROVIDER_ORIGIN,
       message: {
         type: 'spec',

projects/extension/src/background/AppMediator.ts

@@ -240,7 +240,7 @@ export class AppMediator extends (EventEmitter as { new(): StateEmitter }) {
   }
 
   #handleRpcRequest = (msg: MessageToManager): void => {
-    if (msg.type !== 'rpc') {
+    if (msg.type !== 'rpc' && msg.type !== 'spec') {
       console.warn(`Unrecognised message type ${msg.type} received from content script`);
       return;
     }
@@ -261,14 +261,14 @@ export class AppMediator extends (EventEmitter as { new(): StateEmitter }) {
     }
     const chainName = this.#chainName as string;
 
-    if (parsed.method === 'spec' && chainName) {
+    if (msg.type === 'spec' && chainName) {
       // When params[0] (chainSpecs in the current case is empty) then this is a
       // known relay chain and specs should be retrieved from inside the extension
       let chainSpec: string;
       if (Object.keys(relayChains).includes(chainName)) {
         chainSpec = relayChains[chainName];
       } else {
-        chainSpec = parsed.params[0] as string;
+        chainSpec = msg.payload;
       }
       this.#addChain(chainName, chainSpec).catch(console.error);
     } else {

projects/extension/src/content/ExtensionMessageRouter.ts

@@ -45,18 +45,6 @@ export class ExtensionMessageRouter {
     window.removeEventListener('message', this.#handleMessage);
   }
 
-  #sendSpecs = (message: ProviderMessage): void => {
-    const {data: { chainName }} = message;
-    const port = this.#ports[chainName];
-    if (!port) {
-      // this is probably someone trying to abuse the extension.
-      console.warn(`App requested to send message to ${chainName} - no port found`);
-      return;
-    }
-    debug(`SENDING SPECS TO ${chainName} PORT`, message);
-    port.postMessage(message);
-  }
-
   #establishNewConnection = (message: ProviderMessage): void => {
     const data = message.data;
     const port = chrome.runtime.connect({ name: `${data.appName}::${data.chainName}` });
@@ -124,12 +112,6 @@ export class ExtensionMessageRouter {
       return this.#establishNewConnection(message);
     }
 
-    if (data.action === 'spec') {
-      console.log('data action: ', data.action);
-      console.log('message', message.data)
-      return this.#sendSpecs(message);
-    }
-
     if (data.action === 'disconnect') {
       return this.#disconnectPort(message);
     }
@@ -142,7 +124,7 @@ export class ExtensionMessageRouter {
         return;
       }
 
-      if (innerMessage.type === 'rpc') {
+      if (innerMessage.type === 'rpc' || innerMessage.type === 'spec') {
         return this.#forwardRpcMessage(message);
       }