Update CENNZnet Extension with unique origin

package.json

@@ -12,9 +12,9 @@
     "@polkadot/keyring": "^6.0.5",
     "@polkadot/networks": "^6.0.5",
     "@polkadot/types": "^4.4.2-1",
-    "@polkadot/util": "^6.0.5",
-    "@polkadot/util-crypto": "^6.0.5",
-    "@polkadot/x-fetch": "^6.0.5",
+    "@polkadot/util": "6.0.5",
+    "@polkadot/util-crypto": "6.0.5",
+    "@polkadot/x-fetch": "6.0.5",
     "babel-core": "^7.0.0-bridge.0",
     "safe-buffer": "^5.2.1",
     "typescript": "^4.2.4"
@@ -44,6 +44,7 @@
     "sinon-chrome": "^3.0.1",
     "stylelint": "^13.12.0",
     "stylelint-config-recommended": "^4.0.0",
-    "stylelint-config-styled-components": "^0.1.1"
+    "stylelint-config-styled-components": "^0.1.1",
+    "yarn-audit-fix": "^9.3.10"
   }
 }

packages/extension-base/src/background/types.ts

@@ -140,7 +140,7 @@ export type MessageTypesWithNullRequest = NullKeys<RequestTypes>
 export interface TransportRequestMessage<TMessageType extends MessageTypes> {
   id: string;
   message: TMessageType;
-  origin: 'page' | 'extension';
+  origin: string;
   request: RequestTypes[TMessageType];
 }
 

packages/extension-base/src/defaults.ts

@@ -2,17 +2,21 @@
 // SPDX-License-Identifier: Apache-2.0
 
 const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'] as const;
-const PORT_CONTENT = 'content';
+const PORT_CONTENT = 'cennznet-content';
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
-const PORT_EXTENSION = 'extension';
+const PORT_EXTENSION = 'cennznet-extension';
 const PASSWORD_EXPIRY_MIN = 15;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;
+const MESSAGE_ORIGIN_PAGE = 'cennznet-page';
+const MESSAGE_ORIGIN_CONTENT = 'cennznet-content';
 
 export {
   ALLOWED_PATH,
   PASSWORD_EXPIRY_MIN,
   PASSWORD_EXPIRY_MS,
   PHISHING_PAGE_REDIRECT,
   PORT_CONTENT,
-  PORT_EXTENSION
+  PORT_EXTENSION,
+  MESSAGE_ORIGIN_PAGE,
+  MESSAGE_ORIGIN_CONTENT
 };

packages/extension-base/src/packageInfo.ts

@@ -1,7 +1,6 @@
-// Copyright 2017-2021 @cennznet/extension-base authors & contributors
+// Copyright 2017-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto-generated by @polkadot/dev, do not edit
 
-// eslint-disable-next-line header/header
 export const packageInfo = { name: '@cennznet/extension-base', version: '0.38.3' };

packages/extension-base/src/page/index.ts

@@ -3,6 +3,8 @@
 
 import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportRequestMessage, TransportResponseMessage } from '../background/types';
 
+import { MESSAGE_ORIGIN_PAGE } from '@cennznet/extension-base/defaults';
+
 import Injected from './Injected';
 
 // when sending a message from the injector to the extension, we
@@ -40,7 +42,7 @@ export function sendMessage<TMessageType extends MessageTypes> (message: TMessag
     const transportRequestMessage: TransportRequestMessage<TMessageType> = {
       id,
       message,
-      origin: 'page',
+      origin: MESSAGE_ORIGIN_PAGE,
       request: request || null as RequestTypes[TMessageType]
     };
 

packages/extension-chains/src/packageInfo.ts

@@ -1,7 +1,6 @@
-// Copyright 2017-2021 @cennznet/extension-chains authors & contributors
+// Copyright 2017-2021 @polkadot/extension-chains authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto-generated by @polkadot/dev, do not edit
 
-// eslint-disable-next-line header/header
 export const packageInfo = { name: '@cennznet/extension-chains', version: '0.38.3' };

packages/extension-dapp/src/packageInfo.ts

@@ -1,7 +1,6 @@
-// Copyright 2017-2021 @cennznet/extension-dapp authors & contributors
+// Copyright 2017-2021 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto-generated by @polkadot/dev, do not edit
 
-// eslint-disable-next-line header/header
 export const packageInfo = { name: '@cennznet/extension-dapp', version: '0.38.3' };

packages/extension-inject/src/packageInfo.ts

@@ -1,7 +1,6 @@
-// Copyright 2017-2021 @cennznet/extension-inject authors & contributors
+// Copyright 2017-2021 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto-generated by @polkadot/dev, do not edit
 
-// eslint-disable-next-line header/header
 export const packageInfo = { name: '@cennznet/extension-inject', version: '0.38.3' };

packages/extension/src/content.ts

@@ -3,21 +3,21 @@
 
 import type { Message } from '@cennznet/extension-base/types';
 
-import { PORT_CONTENT } from '@cennznet/extension-base/defaults';
+import { MESSAGE_ORIGIN_CONTENT, MESSAGE_ORIGIN_PAGE, PORT_CONTENT } from '@cennznet/extension-base/defaults';
 import chrome from '@cennznet/extension-inject/chrome';
 
 // connect to the extension
 const port = chrome.runtime.connect({ name: PORT_CONTENT });
 
 // send any messages from the extension back to the page
 port.onMessage.addListener((data): void => {
-  window.postMessage({ ...data, origin: 'content' }, '*');
+  window.postMessage({ ...data, origin: MESSAGE_ORIGIN_CONTENT }, '*');
 });
 
 // all messages from the page, pass them to the extension
 window.addEventListener('message', ({ data, source }: Message): void => {
   // only allow messages from our window, by the inject
-  if (source !== window || data.origin !== 'page') {
+  if (source !== window || data.origin !== MESSAGE_ORIGIN_PAGE) {
     return;
   }
 

packages/extension/src/packageInfo.ts

@@ -1,7 +1,6 @@
-// Copyright 2017-2021 @cennznet/extension authors & contributors
+// Copyright 2017-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto-generated by @polkadot/dev, do not edit
 
-// eslint-disable-next-line header/header
 export const packageInfo = { name: '@cennznet/extension', version: '0.38.3' };

packages/extension/src/page.ts

@@ -3,13 +3,14 @@
 
 import type { Message } from '@cennznet/extension-base/types';
 
+import { MESSAGE_ORIGIN_CONTENT } from '@cennznet/extension-base/defaults';
 import { enable, handleResponse, redirectIfPhishing } from '@cennznet/extension-base/page';
 import { injectExtension } from '@cennznet/extension-inject';
 
 // setup a response listener (events created by the loader for extension responses)
 window.addEventListener('message', ({ data, source }: Message): void => {
   // only allow messages from our window, by the loader
-  if (source !== window || data.origin !== 'content') {
+  if (source !== window || data.origin !== MESSAGE_ORIGIN_CONTENT) {
     return;
   }