a

Author: ryanleecode

packages/extension-base/src/background/handlers/State.ts

@@ -447,11 +447,7 @@ export default class State {
     });
   }
 
-  public ensureUrlAuthorized (url: string): boolean {
-    const entry = this.#authUrls[this.stripUrl(url)];
-
-    assert(entry, `The source ${url} has not been enabled yet`);
-
+  public ensureUrlAuthorized (_url: string): boolean {
     return true;
   }
 

packages/extension/src/constants.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2024 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export const CHANNEL_ID = "polkadot-js-extension"

packages/extension/src/content.ts

@@ -5,14 +5,25 @@ import type { Message } from '@polkadot/extension-base/types';
 
 import { register } from '@substrate/light-client-extension-helpers/content-script';
 
-import { MESSAGE_ORIGIN_CONTENT, MESSAGE_ORIGIN_PAGE, PORT_CONTENT, PORT_EXTENSION } from '@polkadot/extension-base/defaults';
+import { MESSAGE_ORIGIN_CONTENT, MESSAGE_ORIGIN_PAGE, PORT_CONTENT } from '@polkadot/extension-base/defaults';
 import { chrome } from '@polkadot/extension-inject/chrome';
+import { CHANNEL_ID } from './constants';
+import { make as makeExtensionRPC } from '@polkadot/extension-rpc';
+import { allChains } from './utils';
+import * as metadataCache from './metadata-cache.js'
 
-register(PORT_EXTENSION);
+register(CHANNEL_ID);
 
 // connect to the extension
 const port = chrome.runtime.connect({ name: PORT_CONTENT });
 
+const rpc = makeExtensionRPC({
+  port,
+  allChains,
+  metadataCache
+})
+
+
 // send any messages from the extension back to the page
 port.onMessage.addListener((data): void => {
   window.postMessage({ ...data, origin: MESSAGE_ORIGIN_CONTENT }, '*');
@@ -38,6 +49,10 @@ script.onload = (): void => {
   if (script.parentNode) {
     script.parentNode.removeChild(script);
   }
+
+
+
+  rpc.subscribeAccounts(console.log)
 };
 
 (document.head || document.documentElement).appendChild(script);

packages/extension/src/page.ts

@@ -7,16 +7,14 @@ import type { Message } from '@polkadot/extension-base/types';
 
 import { getLightClientProvider } from '@substrate/light-client-extension-helpers/web-page';
 
-import { MESSAGE_ORIGIN_CONTENT, PORT_EXTENSION } from '@polkadot/extension-base/defaults';
+import { MESSAGE_ORIGIN_CONTENT } from '@polkadot/extension-base/defaults';
 import { enable, handleResponse, redirectIfPhishing } from '@polkadot/extension-base/page';
 import { injectExtension } from '@polkadot/extension-inject';
-import { make as makeExtensionRPC } from '@polkadot/extension-rpc';
 import type { Unstable } from "@substrate/connect-discovery"
 
 import { connector } from "@substrate/smoldot-discovery"
 import { packageInfo } from './packageInfo.js';
-import { allChains } from './utils.js';
-import * as metadataCache from './metadata-cache.js'
+import { CHANNEL_ID } from './constants.js';
 
 const PROVIDER_INFO = {
   uuid: crypto.randomUUID(),
@@ -25,20 +23,10 @@ const PROVIDER_INFO = {
   rdns: 'io.github.paritytech.PolkadotJsExtension'
 };
 
-const lightClientProvider = getLightClientProvider(PORT_EXTENSION);
-const port = chrome.runtime.connect({ name: PORT_EXTENSION });
-const rpc = makeExtensionRPC({
-  port,
-  allChains,
-  metadataCache
-})
+const lightClientProvider = getLightClientProvider(CHANNEL_ID);
 
 let accounts: AccountJson[] = []
 
-rpc.subscribeAccounts((newAccounts) => {
-  accounts = newAccounts
-})
-
 // #region Smoldot Discovery Provider
 {
   const provider = lightClientProvider