@polkadot/extension-base 0.44.6 → 0.44.8

package/cjs/page/PostMessageProvider.js

@@ -1,111 +1,105 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
-
 var _util = require("@polkadot/util");
-
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const l = (0, _util.logger)('PostMessageProvider');
 // External to class, this.# is not private enough (yet)
 let sendRequest;
+
 /**
  * @name PostMessageProvider
  *
  * @description Extension provider to be used by dapps
  */
-
 class PostMessageProvider {
-  #eventemitter; // Whether or not the actual extension background provider is connected
+  #eventemitter;
+
+  // Whether or not the actual extension background provider is connected
+  #isConnected = false;
 
-  #isConnected = false; // Subscription IDs are (historically) not guaranteed to be globally unique;
+  // Subscription IDs are (historically) not guaranteed to be globally unique;
   // only unique for a given subscription method; which is why we identify
   // the subscriptions based on subscription id + type
-
   #subscriptions = {}; // {[(type,subscriptionId)]: callback}
 
   /**
    * @param {function}  sendRequest  The function to be called to send requests to the node
    * @param {function}  subscriptionNotificationHandler  Channel for receiving subscription messages
    */
-
   constructor(_sendRequest) {
     this.#eventemitter = new _eventemitter.default();
     sendRequest = _sendRequest;
   }
+  get isClonable() {
+    return true;
+  }
+
   /**
    * @description Returns a clone of the object
    */
-
-
   clone() {
     return new PostMessageProvider(sendRequest);
   }
+
   /**
    * @description Manually disconnect from the connection, clearing autoconnect logic
    */
   // eslint-disable-next-line @typescript-eslint/require-await
-
-
   async connect() {
     // FIXME This should see if the extension's state's provider can disconnect
     console.error('PostMessageProvider.disconnect() is not implemented.');
   }
+
   /**
    * @description Manually disconnect from the connection, clearing autoconnect logic
    */
   // eslint-disable-next-line @typescript-eslint/require-await
-
-
   async disconnect() {
     // FIXME This should see if the extension's state's provider can disconnect
     console.error('PostMessageProvider.disconnect() is not implemented.');
   }
+
   /**
    * @summary `true` when this provider supports subscriptions
    */
-
-
   get hasSubscriptions() {
     // FIXME This should see if the extension's state's provider has subscriptions
     return true;
   }
+
   /**
    * @summary Whether the node is connected or not.
    * @return {boolean} true if connected
    */
-
-
   get isConnected() {
     return this.#isConnected;
   }
-
   listProviders() {
     return sendRequest('pub(rpc.listProviders)', undefined);
   }
+
   /**
    * @summary Listens on events after having subscribed using the [[subscribe]] function.
    * @param  {ProviderInterfaceEmitted} type Event
    * @param  {ProviderInterfaceEmitCb}  sub  Callback
    * @return unsubscribe function
    */
-
-
   on(type, sub) {
     this.#eventemitter.on(type, sub);
     return () => {
       this.#eventemitter.removeListener(type, sub);
     };
-  } // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async send(method, params, _, subscription) {
     if (subscription) {
       const {
@@ -122,63 +116,56 @@ class PostMessageProvider {
       this.#subscriptions[`${type}::${id}`] = callback;
       return id;
     }
-
     return sendRequest('pub(rpc.send)', {
       method,
       params
     });
   }
+
   /**
    * @summary Spawn a provider on the extension background.
    */
-
-
   async startProvider(key) {
     // Disconnect from the previous provider
     this.#isConnected = false;
     this.#eventemitter.emit('disconnected');
-    const meta = await sendRequest('pub(rpc.startProvider)', key); // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    const meta = await sendRequest('pub(rpc.startProvider)', key);
 
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     sendRequest('pub(rpc.subscribeConnected)', null, connected => {
       this.#isConnected = connected;
-
       if (connected) {
         this.#eventemitter.emit('connected');
       } else {
         this.#eventemitter.emit('disconnected');
       }
-
       return true;
     });
     return meta;
   }
-
   subscribe(type, method, params, callback) {
     return this.send(method, params, false, {
       callback,
       type
     });
   }
+
   /**
    * @summary Allows unsubscribing to subscriptions made with [[subscribe]].
    */
-
-
   async unsubscribe(type, method, id) {
-    const subscription = `${type}::${id}`; // FIXME This now could happen with re-subscriptions. The issue is that with a re-sub
+    const subscription = `${type}::${id}`;
+
+    // FIXME This now could happen with re-subscriptions. The issue is that with a re-sub
     // the assigned id now does not match what the API user originally received. It has
     // a slight complication in solving - since we cannot rely on the send id, but rather
     // need to find the actual subscription id to map it
-
     if ((0, _util.isUndefined)(this.#subscriptions[subscription])) {
       l.debug(() => `Unable to find active subscription=${subscription}`);
       return false;
     }
-
     delete this.#subscriptions[subscription];
     return this.send(method, [id]);
   }
-
 }
-
 exports.default = PostMessageProvider;

package/cjs/page/Signer.js

@@ -4,41 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // External to class, this.# is not private enough (yet)
 let sendRequest;
 let nextId = 0;
-
 class Signer {
   constructor(_sendRequest) {
     sendRequest = _sendRequest;
   }
-
   async signPayload(payload) {
     const id = ++nextId;
-    const result = await sendRequest('pub(extrinsic.sign)', payload); // we add an internal id (number) - should have a mapping from the
+    const result = await sendRequest('pub(extrinsic.sign)', payload);
+
+    // we add an internal id (number) - should have a mapping from the
     // extension id (string) -> internal id (number) if we wish to provide
     // updated via the update functionality (noop at this point)
-
-    return { ...result,
+    return {
+      ...result,
       id
     };
   }
-
   async signRaw(payload) {
     const id = ++nextId;
     const result = await sendRequest('pub(bytes.sign)', payload);
-    return { ...result,
+    return {
+      ...result,
       id
     };
-  } // NOTE We don't listen to updates at all, if we do we can interpret the
-  // resuklt as provided by the API here
+  }
+
+  // NOTE We don't listen to updates at all, if we do we can interpret the
+  // result as provided by the API here
   // public update (id: number, status: Hash | SubmittableResult): void {
   //   // ignore
   // }
-
-
 }
-
 exports.default = Signer;

package/cjs/page/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,16 +8,15 @@ exports.enable = enable;
 exports.handleResponse = handleResponse;
 exports.redirectIfPhishing = redirectIfPhishing;
 exports.sendMessage = sendMessage;
-
 var _defaults = require("../defaults");
-
 var _getId = require("../utils/getId");
-
 var _Injected = _interopRequireDefault(require("./Injected"));
-
-// Copyright 2019-2022 @polkadot/extension authors & contributors
+// Copyright 2019-2023 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const handlers = {}; // a generic message sender that creates an event, returning a promise that will
+
+const handlers = {};
+
+// a generic message sender that creates an event, returning a promise that will
 // resolve once the event is resolved (by the response listener just below this)
 
 function sendMessage(message, request, subscriber) {
@@ -37,34 +35,30 @@ function sendMessage(message, request, subscriber) {
     };
     window.postMessage(transportRequestMessage, '*');
   });
-} // the enable function, called by the dapp to allow access
-
+}
 
+// the enable function, called by the dapp to allow access
 async function enable(origin) {
   await sendMessage('pub(authorize.tab)', {
     origin
   });
   return new _Injected.default(sendMessage);
-} // redirect users if this page is considered as phishing, otherwise return false
-
+}
 
+// redirect users if this page is considered as phishing, otherwise return false
 async function redirectIfPhishing() {
   const res = await sendMessage('pub(phishing.redirectIfDenied)');
   return res;
 }
-
 function handleResponse(data) {
   const handler = handlers[data.id];
-
   if (!handler) {
     console.error(`Unknown response: ${JSON.stringify(data)}`);
     return;
   }
-
   if (!handler.subscriber) {
     delete handlers[data.id];
   }
-
   if (data.subscription) {
     // eslint-disable-next-line @typescript-eslint/ban-types
     handler.subscriber(data.subscription);

package/cjs/stores/Accounts.js

@@ -1,33 +1,26 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _defaults = require("../defaults");
-
 var _Base = _interopRequireDefault(require("./Base"));
-
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 class AccountsStore extends _Base.default {
   constructor() {
-    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}accounts` : null);
+    super(_defaults.EXTENSION_PREFIX && _defaults.EXTENSION_PREFIX !== 'polkadot{.js}' ? `${_defaults.EXTENSION_PREFIX}accounts` : null);
   }
-
   set(key, value, update) {
     // shortcut, don't save testing accounts in extension storage
     if (key.startsWith('account:') && value.meta && value.meta.isTesting) {
       update && update();
       return;
     }
-
     super.set(key, value, update);
   }
-
 }
-
 exports.default = AccountsStore;

package/cjs/stores/Base.js

@@ -4,24 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const lastError = type => {
   const error = chrome.runtime.lastError;
-
   if (error) {
     console.error(`BaseStore.${type}:: runtime.lastError:`, error);
   }
 };
-
 class BaseStore {
   #prefix;
-
   constructor(prefix) {
     this.#prefix = prefix ? `${prefix}:` : '';
   }
-
   all(update) {
     this.allMap(map => {
       Object.entries(map).forEach(_ref => {
@@ -30,25 +26,20 @@ class BaseStore {
       });
     });
   }
-
   allMap(update) {
     chrome.storage.local.get(null, result => {
       lastError('all');
       const entries = Object.entries(result);
       const map = {};
-
       for (let i = 0; i < entries.length; i++) {
         const [key, value] = entries[i];
-
         if (key.startsWith(this.#prefix)) {
           map[key.replace(this.#prefix, '')] = value;
         }
       }
-
       update(map);
     });
   }
-
   get(_key, update) {
     const key = `${this.#prefix}${_key}`;
     chrome.storage.local.get([key], result => {
@@ -56,7 +47,6 @@ class BaseStore {
       update(result[key]);
     });
   }
-
   remove(_key, update) {
     const key = `${this.#prefix}${_key}`;
     chrome.storage.local.remove(key, () => {
@@ -64,7 +54,6 @@ class BaseStore {
       update && update();
     });
   }
-
   set(_key, value, update) {
     const key = `${this.#prefix}${_key}`;
     chrome.storage.local.set({
@@ -74,7 +63,5 @@ class BaseStore {
       update && update();
     });
   }
-
 }
-
 exports.default = BaseStore;

package/cjs/stores/Metadata.js

@@ -1,23 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _defaults = require("../defaults");
-
 var _Base = _interopRequireDefault(require("./Base"));
-
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 class MetadataStore extends _Base.default {
   constructor() {
-    super(`${_defaults.EXTENSION_PREFIX}metadata`);
+    super(_defaults.EXTENSION_PREFIX && _defaults.EXTENSION_PREFIX !== 'polkadot{.js}' ? `${_defaults.EXTENSION_PREFIX}metadata` : 'metadata');
   }
-
 }
-
 exports.default = MetadataStore;

package/cjs/stores/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,7 +16,5 @@ Object.defineProperty(exports, "MetadataStore", {
     return _Metadata.default;
   }
 });
-
 var _Accounts = _interopRequireDefault(require("./Accounts"));
-
 var _Metadata = _interopRequireDefault(require("./Metadata"));

package/cjs/utils/canDerive.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.canDerive = canDerive;
-
-// Copyright 2019-2022 @polkadot/extension authors & contributors
+// Copyright 2019-2023 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 function canDerive(type) {
   return !!type && ['ed25519', 'sr25519', 'ecdsa', 'ethereum'].includes(type);
 }

package/cjs/utils/getId.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getId = getId;
-
 var _defaults = require("../defaults");
-
-// Copyright 2019-2022 @polkadot/extension authors & contributors
+// Copyright 2019-2023 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-let counter = 0;
 
+let counter = 0;
 function getId() {
   return `${_defaults.EXTENSION_PREFIX}.${Date.now()}.${++counter}`;
 }

package/cjs/utils/index.js

@@ -9,5 +9,4 @@ Object.defineProperty(exports, "canDerive", {
     return _canDerive.canDerive;
   }
 });
-
 var _canDerive = require("./canDerive");

package/defaults.d.ts

@@ -1,10 +1,10 @@
-declare const ALLOWED_PATH: readonly ["/", "/account/import-ledger", "/account/restore-json"];
-declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const EXTENSION_PREFIX: string;
 declare const PORT_CONTENT: string;
 declare const PORT_EXTENSION: string;
 declare const MESSAGE_ORIGIN_PAGE: string;
 declare const MESSAGE_ORIGIN_CONTENT: string;
+declare const ALLOWED_PATH: readonly ["/", "/account/import-ledger", "/account/restore-json"];
+declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const PASSWORD_EXPIRY_MIN = 15;
 declare const PASSWORD_EXPIRY_MS: number;
 export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/defaults.js

@@ -1,12 +1,21 @@
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
+// this _must_ be changed for each extension
+const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
+if (!EXTENSION_PREFIX && !process.env.PORT_PREFIX) {
+  throw new Error('CRITICAL: The extension does not define an own EXTENSION_PREFIX environment variable as part of the build, this is required to ensure that messages are not shared between extensions. Failure to do so will yield messages sent to multiple extensions.');
+}
+const PORT_PREFIX = `${EXTENSION_PREFIX || 'unknown'}-${process.env.PORT_PREFIX || 'unknown'}`;
+const PORT_CONTENT = `${PORT_PREFIX}-content`;
+const PORT_EXTENSION = `${PORT_PREFIX}-extension`;
+const MESSAGE_ORIGIN_PAGE = `${PORT_PREFIX}-page`;
+const MESSAGE_ORIGIN_CONTENT = `${PORT_PREFIX}-content`;
 const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'];
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
-const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
-const PORT_CONTENT = `${EXTENSION_PREFIX}content`;
-const PORT_EXTENSION = `${EXTENSION_PREFIX}extension`;
-const MESSAGE_ORIGIN_PAGE = `${EXTENSION_PREFIX}page`;
-const MESSAGE_ORIGIN_CONTENT = `${EXTENSION_PREFIX}content`;
 const PASSWORD_EXPIRY_MIN = 15;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;
+
+// console.log(`Extension is sending and receiving messages on ${PORT_PREFIX}-*`);
+
 export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/detectOther.js

@@ -1,5 +1,6 @@
-// Copyright 2017-2022 @polkadot/extension-base authors & contributors
+// Copyright 2017-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { packageInfo as chainsInfo } from '@polkadot/extension-chains/packageInfo';
 import { packageInfo as dappInfo } from '@polkadot/extension-dapp/packageInfo';
 import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo';

package/detectPackage.js

@@ -1,6 +1,8 @@
-// Copyright 2017-2022 @polkadot/extension-base authors & contributors
+// Copyright 2017-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 import { detectPackage } from '@polkadot/util';
 import others from "./detectOther.js";
 import { packageInfo } from "./packageInfo.js";

package/index.js

@@ -1,5 +1,7 @@
-// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// Copyright 2019-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Since we inject into pages, we skip this
 // import './detectPackage';
+
 export * from "./bundle.js";

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.44.6",
+  "version": "0.44.8",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -182,21 +182,21 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
-    "@polkadot/api": "^9.2.3",
-    "@polkadot/extension-chains": "^0.44.6",
-    "@polkadot/extension-dapp": "^0.44.6",
-    "@polkadot/extension-inject": "^0.44.6",
-    "@polkadot/keyring": "^10.1.5",
-    "@polkadot/networks": "^10.1.5",
-    "@polkadot/phishing": "^0.18.6",
-    "@polkadot/rpc-provider": "^9.2.3",
-    "@polkadot/types": "^9.2.3",
-    "@polkadot/ui-keyring": "^2.9.6",
-    "@polkadot/ui-settings": "^2.9.6",
-    "@polkadot/util": "^10.1.5",
-    "@polkadot/util-crypto": "^10.1.5",
+    "@babel/runtime": "^7.20.7",
+    "@polkadot/api": "^9.11.1",
+    "@polkadot/extension-chains": "^0.44.8",
+    "@polkadot/extension-dapp": "^0.44.8",
+    "@polkadot/extension-inject": "^0.44.8",
+    "@polkadot/keyring": "^10.2.3",
+    "@polkadot/networks": "^10.2.3",
+    "@polkadot/phishing": "^0.18.13",
+    "@polkadot/rpc-provider": "^9.11.1",
+    "@polkadot/types": "^9.11.1",
+    "@polkadot/ui-keyring": "^2.9.15",
+    "@polkadot/ui-settings": "^2.9.15",
+    "@polkadot/util": "^10.2.3",
+    "@polkadot/util-crypto": "^10.2.3",
     "eventemitter3": "^4.0.7",
-    "rxjs": "^7.5.6"
+    "rxjs": "^7.8.0"
   }
 }

package/packageInfo.js

@@ -1,9 +1,11 @@
-// Copyright 2017-2022 @polkadot/extension-base authors & contributors
+// Copyright 2017-2023 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 export const packageInfo = {
   name: '@polkadot/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '0.44.6'
+  version: '0.44.8'
 };