@polkadot/extension-base 0.42.6 → 0.42.7

package/background/RequestBytesSign.js

@@ -4,7 +4,6 @@ import { wrapBytes } from '@polkadot/extension-dapp/wrapBytes';
 import { u8aToHex } from '@polkadot/util';
 export default class RequestBytesSign {
   constructor(payload) {
-    this.payload = void 0;
     this.payload = payload;
   }
 

package/background/RequestExtrinsicSign.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 export default class RequestExtrinsicSign {
   constructor(payload) {
-    this.payload = void 0;
     this.payload = payload;
   }
 

package/background/handlers/Extension.js

@@ -1,5 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { ALLOWED_PATH, PASSWORD_EXPIRY_MS } from '@polkadot/extension-base/defaults';
@@ -38,22 +36,13 @@ function isJsonPayload(value) {
   return value.genesisHash !== undefined;
 }
 
-var _cachedUnlocks = /*#__PURE__*/_classPrivateFieldLooseKey("cachedUnlocks");
-
-var _state = /*#__PURE__*/_classPrivateFieldLooseKey("state");
-
 export default class Extension {
+  #cachedUnlocks;
+  #state;
+
   constructor(state) {
-    Object.defineProperty(this, _cachedUnlocks, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _state, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _cachedUnlocks)[_cachedUnlocks] = {};
-    _classPrivateFieldLooseBase(this, _state)[_state] = state;
+    this.#cachedUnlocks = {};
+    this.#state = state;
   }
 
   accountsCreateExternal({
@@ -162,11 +151,11 @@ export default class Extension {
     const {
       address
     } = pair;
-    const savedExpiry = _classPrivateFieldLooseBase(this, _cachedUnlocks)[_cachedUnlocks][address] || 0;
+    const savedExpiry = this.#cachedUnlocks[address] || 0;
     const remainingTime = savedExpiry - Date.now();
 
     if (remainingTime < 0) {
-      _classPrivateFieldLooseBase(this, _cachedUnlocks)[_cachedUnlocks][address] = 0;
+      this.#cachedUnlocks[address] = 0;
       pair.lock();
       return 0;
     }
@@ -224,8 +213,7 @@ export default class Extension {
   authorizeApprove({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getAuthRequest(id);
-
+    const queued = this.#state.getAuthRequest(id);
     assert(queued, 'Unable to find request');
     const {
       resolve
@@ -236,15 +224,14 @@ export default class Extension {
 
   getAuthList() {
     return {
-      list: _classPrivateFieldLooseBase(this, _state)[_state].authUrls
+      list: this.#state.authUrls
     };
   }
 
   authorizeReject({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getAuthRequest(id);
-
+    const queued = this.#state.getAuthRequest(id);
     assert(queued, 'Unable to find request');
     const {
       reject
@@ -256,9 +243,7 @@ export default class Extension {
 
   authorizeSubscribe(id, port) {
     const cb = createSubscription(id, port);
-
-    const subscription = _classPrivateFieldLooseBase(this, _state)[_state].authSubject.subscribe(requests => cb(requests));
-
+    const subscription = this.#state.authSubject.subscribe(requests => cb(requests));
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
       subscription.unsubscribe();
@@ -269,33 +254,29 @@ export default class Extension {
   metadataApprove({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getMetaRequest(id);
-
+    const queued = this.#state.getMetaRequest(id);
     assert(queued, 'Unable to find request');
     const {
       request,
       resolve
     } = queued;
-
-    _classPrivateFieldLooseBase(this, _state)[_state].saveMetadata(request);
-
+    this.#state.saveMetadata(request);
     resolve(true);
     return true;
   }
 
   metadataGet(genesisHash) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].knownMetadata.find(result => result.genesisHash === genesisHash) || null;
+    return this.#state.knownMetadata.find(result => result.genesisHash === genesisHash) || null;
   }
 
   metadataList() {
-    return _classPrivateFieldLooseBase(this, _state)[_state].knownMetadata;
+    return this.#state.knownMetadata;
   }
 
   metadataReject({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getMetaRequest(id);
-
+    const queued = this.#state.getMetaRequest(id);
     assert(queued, 'Unable to find request');
     const {
       reject
@@ -306,9 +287,7 @@ export default class Extension {
 
   metadataSubscribe(id, port) {
     const cb = createSubscription(id, port);
-
-    const subscription = _classPrivateFieldLooseBase(this, _state)[_state].metaSubject.subscribe(requests => cb(requests));
-
+    const subscription = this.#state.metaSubject.subscribe(requests => cb(requests));
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
       subscription.unsubscribe();
@@ -400,8 +379,7 @@ export default class Extension {
     password,
     savePass
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getSignRequest(id);
-
+    const queued = this.#state.getSignRequest(id);
     assert(queued, 'Unable to find request');
     const {
       reject,
@@ -437,8 +415,7 @@ export default class Extension {
 
     if (isJsonPayload(payload)) {
       // Get the metadata for the genesisHash
-      const currentMetadata = _classPrivateFieldLooseBase(this, _state)[_state].knownMetadata.find(meta => meta.genesisHash === payload.genesisHash); // set the registry before calling the sign function
-
+      const currentMetadata = this.#state.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash); // set the registry before calling the sign function
 
       registry.setSignedExtensions(payload.signedExtensions, currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.userExtensions);
 
@@ -450,7 +427,7 @@ export default class Extension {
     const result = request.sign(registry, pair);
 
     if (savePass) {
-      _classPrivateFieldLooseBase(this, _cachedUnlocks)[_cachedUnlocks][address] = Date.now() + PASSWORD_EXPIRY_MS;
+      this.#cachedUnlocks[address] = Date.now() + PASSWORD_EXPIRY_MS;
     } else {
       pair.lock();
     }
@@ -466,8 +443,7 @@ export default class Extension {
     id,
     signature
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getSignRequest(id);
-
+    const queued = this.#state.getSignRequest(id);
     assert(queued, 'Unable to find request');
     const {
       resolve
@@ -482,8 +458,7 @@ export default class Extension {
   signingCancel({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getSignRequest(id);
-
+    const queued = this.#state.getSignRequest(id);
     assert(queued, 'Unable to find request');
     const {
       reject
@@ -495,8 +470,7 @@ export default class Extension {
   signingIsLocked({
     id
   }) {
-    const queued = _classPrivateFieldLooseBase(this, _state)[_state].getSignRequest(id);
-
+    const queued = this.#state.getSignRequest(id);
     assert(queued, 'Unable to find request');
     const address = queued.request.payload.address;
     const pair = keyring.getPair(address);
@@ -511,9 +485,7 @@ export default class Extension {
 
   signingSubscribe(id, port) {
     const cb = createSubscription(id, port);
-
-    const subscription = _classPrivateFieldLooseBase(this, _state)[_state].signSubject.subscribe(requests => cb(requests));
-
+    const subscription = this.#state.signSubject.subscribe(requests => cb(requests));
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
       subscription.unsubscribe();
@@ -583,7 +555,7 @@ export default class Extension {
 
   toggleAuthorization(url) {
     return {
-      list: _classPrivateFieldLooseBase(this, _state)[_state].toggleAuthorization(url)
+      list: this.#state.toggleAuthorization(url)
     };
   } // Weird thought, the eslint override is not needed in Tabs
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -679,7 +651,7 @@ export default class Extension {
         return this.seedValidate(request);
 
       case 'pri(settings.notification)':
-        return _classPrivateFieldLooseBase(this, _state)[_state].setNotification(request);
+        return this.#state.setNotification(request);
 
       case 'pri(signing.approve.password)':
         return this.signingApprovePassword(request);

package/background/handlers/State.js

@@ -1,5 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2019-2022 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { BehaviorSubject } from 'rxjs';
@@ -76,146 +74,29 @@ function extractMetadata(store) {
   });
 }
 
-var _authUrls = /*#__PURE__*/_classPrivateFieldLooseKey("authUrls");
-
-var _authRequests = /*#__PURE__*/_classPrivateFieldLooseKey("authRequests");
-
-var _metaStore = /*#__PURE__*/_classPrivateFieldLooseKey("metaStore");
-
-var _injectedProviders = /*#__PURE__*/_classPrivateFieldLooseKey("injectedProviders");
-
-var _metaRequests = /*#__PURE__*/_classPrivateFieldLooseKey("metaRequests");
-
-var _notification = /*#__PURE__*/_classPrivateFieldLooseKey("notification");
-
-var _providers = /*#__PURE__*/_classPrivateFieldLooseKey("providers");
-
-var _signRequests = /*#__PURE__*/_classPrivateFieldLooseKey("signRequests");
-
-var _windows = /*#__PURE__*/_classPrivateFieldLooseKey("windows");
-
 export default class State {
-  // Map of providers currently injected in tabs
-  // Map of all providers exposed by the extension, they are retrievable by key
-  constructor(providers = {}) {
-    Object.defineProperty(this, _authUrls, {
-      writable: true,
-      value: {}
-    });
-    Object.defineProperty(this, _authRequests, {
-      writable: true,
-      value: {}
-    });
-    Object.defineProperty(this, _metaStore, {
-      writable: true,
-      value: new MetadataStore()
-    });
-    Object.defineProperty(this, _injectedProviders, {
-      writable: true,
-      value: new Map()
-    });
-    Object.defineProperty(this, _metaRequests, {
-      writable: true,
-      value: {}
-    });
-    Object.defineProperty(this, _notification, {
-      writable: true,
-      value: settings.notification
-    });
-    Object.defineProperty(this, _providers, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _signRequests, {
-      writable: true,
-      value: {}
-    });
-    Object.defineProperty(this, _windows, {
-      writable: true,
-      value: []
-    });
-    this.authSubject = new BehaviorSubject([]);
-    this.metaSubject = new BehaviorSubject([]);
-    this.signSubject = new BehaviorSubject([]);
-
-    this.authComplete = (id, resolve, reject) => {
-      const complete = result => {
-        const isAllowed = result === true;
-
-        const {
-          idStr,
-          request: {
-            origin
-          },
-          url
-        } = _classPrivateFieldLooseBase(this, _authRequests)[_authRequests][id];
-
-        _classPrivateFieldLooseBase(this, _authUrls)[_authUrls][this.stripUrl(url)] = {
-          count: 0,
-          id: idStr,
-          isAllowed,
-          origin,
-          url
-        };
-        this.saveCurrentAuthList();
-        delete _classPrivateFieldLooseBase(this, _authRequests)[_authRequests][id];
-        this.updateIconAuth(true);
-      };
+  #authUrls = {};
+  #authRequests = {};
+  #metaStore = new MetadataStore(); // Map of providers currently injected in tabs
 
-      return {
-        reject: error => {
-          complete(error);
-          reject(error);
-        },
-        resolve: result => {
-          complete(result);
-          resolve(result);
-        }
-      };
-    };
+  #injectedProviders = new Map();
+  #metaRequests = {};
+  #notification = settings.notification; // Map of all providers exposed by the extension, they are retrievable by key
 
-    this.metaComplete = (id, resolve, reject) => {
-      const complete = () => {
-        delete _classPrivateFieldLooseBase(this, _metaRequests)[_metaRequests][id];
-        this.updateIconMeta(true);
-      };
+  #providers;
+  #signRequests = {};
+  #windows = [];
+  authSubject = new BehaviorSubject([]);
+  metaSubject = new BehaviorSubject([]);
+  signSubject = new BehaviorSubject([]);
 
-      return {
-        reject: error => {
-          complete();
-          reject(error);
-        },
-        resolve: result => {
-          complete();
-          resolve(result);
-        }
-      };
-    };
-
-    this.signComplete = (id, resolve, reject) => {
-      const complete = () => {
-        delete _classPrivateFieldLooseBase(this, _signRequests)[_signRequests][id];
-        this.updateIconSign(true);
-      };
-
-      return {
-        reject: error => {
-          complete();
-          reject(error);
-        },
-        resolve: result => {
-          complete();
-          resolve(result);
-        }
-      };
-    };
-
-    _classPrivateFieldLooseBase(this, _providers)[_providers] = providers;
-    extractMetadata(_classPrivateFieldLooseBase(this, _metaStore)[_metaStore]); // retrieve previously set authorizations
+  constructor(providers = {}) {
+    this.#providers = providers;
+    extractMetadata(this.#metaStore); // retrieve previously set authorizations
 
     const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);
-    _classPrivateFieldLooseBase(this, _authUrls)[_authUrls] = previousAuth;
+    this.#authUrls = previousAuth;
   }
 
   get knownMetadata() {
@@ -223,19 +104,19 @@ export default class State {
   }
 
   get numAuthRequests() {
-    return Object.keys(_classPrivateFieldLooseBase(this, _authRequests)[_authRequests]).length;
+    return Object.keys(this.#authRequests).length;
   }
 
   get numMetaRequests() {
-    return Object.keys(_classPrivateFieldLooseBase(this, _metaRequests)[_metaRequests]).length;
+    return Object.keys(this.#metaRequests).length;
   }
 
   get numSignRequests() {
-    return Object.keys(_classPrivateFieldLooseBase(this, _signRequests)[_signRequests]).length;
+    return Object.keys(this.#signRequests).length;
   }
 
   get allAuthRequests() {
-    return Object.values(_classPrivateFieldLooseBase(this, _authRequests)[_authRequests]).map(({
+    return Object.values(this.#authRequests).map(({
       id,
       request,
       url
@@ -247,7 +128,7 @@ export default class State {
   }
 
   get allMetaRequests() {
-    return Object.values(_classPrivateFieldLooseBase(this, _metaRequests)[_metaRequests]).map(({
+    return Object.values(this.#metaRequests).map(({
       id,
       request,
       url
@@ -259,7 +140,7 @@ export default class State {
   }
 
   get allSignRequests() {
-    return Object.values(_classPrivateFieldLooseBase(this, _signRequests)[_signRequests]).map(({
+    return Object.values(this.#signRequests).map(({
       account,
       id,
       request,
@@ -273,27 +154,95 @@ export default class State {
   }
 
   get authUrls() {
-    return _classPrivateFieldLooseBase(this, _authUrls)[_authUrls];
+    return this.#authUrls;
   }
 
   popupClose() {
-    _classPrivateFieldLooseBase(this, _windows)[_windows].forEach(id => withErrorLog(() => chrome.windows.remove(id)));
-
-    _classPrivateFieldLooseBase(this, _windows)[_windows] = [];
+    this.#windows.forEach(id => withErrorLog(() => chrome.windows.remove(id)));
+    this.#windows = [];
   }
 
   popupOpen() {
-    _classPrivateFieldLooseBase(this, _notification)[_notification] !== 'extension' && chrome.windows.create(_classPrivateFieldLooseBase(this, _notification)[_notification] === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
+    this.#notification !== 'extension' && chrome.windows.create(this.#notification === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
       if (window) {
-        _classPrivateFieldLooseBase(this, _windows)[_windows].push(window.id || 0);
+        this.#windows.push(window.id || 0);
       }
     });
   }
 
+  authComplete = (id, resolve, reject) => {
+    const complete = result => {
+      const isAllowed = result === true;
+      const {
+        idStr,
+        request: {
+          origin
+        },
+        url
+      } = this.#authRequests[id];
+      this.#authUrls[this.stripUrl(url)] = {
+        count: 0,
+        id: idStr,
+        isAllowed,
+        origin,
+        url
+      };
+      this.saveCurrentAuthList();
+      delete this.#authRequests[id];
+      this.updateIconAuth(true);
+    };
+
+    return {
+      reject: error => {
+        complete(error);
+        reject(error);
+      },
+      resolve: result => {
+        complete(result);
+        resolve(result);
+      }
+    };
+  };
+
   saveCurrentAuthList() {
-    localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(_classPrivateFieldLooseBase(this, _authUrls)[_authUrls]));
+    localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.#authUrls));
   }
 
+  metaComplete = (id, resolve, reject) => {
+    const complete = () => {
+      delete this.#metaRequests[id];
+      this.updateIconMeta(true);
+    };
+
+    return {
+      reject: error => {
+        complete();
+        reject(error);
+      },
+      resolve: result => {
+        complete();
+        resolve(result);
+      }
+    };
+  };
+  signComplete = (id, resolve, reject) => {
+    const complete = () => {
+      delete this.#signRequests[id];
+      this.updateIconSign(true);
+    };
+
+    return {
+      reject: error => {
+        complete();
+        reject(error);
+      },
+      resolve: result => {
+        complete();
+        resolve(result);
+      }
+    };
+  };
+
   stripUrl(url) {
     assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);
     const parts = url.split('/');
@@ -315,12 +264,11 @@ export default class State {
   }
 
   toggleAuthorization(url) {
-    const entry = _classPrivateFieldLooseBase(this, _authUrls)[_authUrls][url];
-
+    const entry = this.#authUrls[url];
     assert(entry, `The source ${url} is not known`);
-    _classPrivateFieldLooseBase(this, _authUrls)[_authUrls][url].isAllowed = !entry.isAllowed;
+    this.#authUrls[url].isAllowed = !entry.isAllowed;
     this.saveCurrentAuthList();
-    return _classPrivateFieldLooseBase(this, _authUrls)[_authUrls];
+    return this.#authUrls;
   }
 
   updateIconAuth(shouldClose) {
@@ -341,18 +289,18 @@ export default class State {
   async authorizeUrl(url, request) {
     const idStr = this.stripUrl(url); // Do not enqueue duplicate authorization requests.
 
-    const isDuplicate = Object.values(_classPrivateFieldLooseBase(this, _authRequests)[_authRequests]).some(request => request.idStr === idStr);
+    const isDuplicate = Object.values(this.#authRequests).some(request => request.idStr === idStr);
     assert(!isDuplicate, `The source ${url} has a pending authorization request`);
 
-    if (_classPrivateFieldLooseBase(this, _authUrls)[_authUrls][idStr]) {
+    if (this.#authUrls[idStr]) {
       // this url was seen in the past
-      assert(_classPrivateFieldLooseBase(this, _authUrls)[_authUrls][idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
+      assert(this.#authUrls[idStr].isAllowed, `The source ${url} is not allowed to interact with this extension`);
       return false;
     }
 
     return new Promise((resolve, reject) => {
       const id = getId();
-      _classPrivateFieldLooseBase(this, _authRequests)[_authRequests][id] = { ...this.authComplete(id, resolve, reject),
+      this.#authRequests[id] = { ...this.authComplete(id, resolve, reject),
         id,
         idStr,
         request,
@@ -364,8 +312,7 @@ export default class State {
   }
 
   ensureUrlAuthorized(url) {
-    const entry = _classPrivateFieldLooseBase(this, _authUrls)[_authUrls][this.stripUrl(url)];
-
+    const entry = this.#authUrls[this.stripUrl(url)];
     assert(entry, `The source ${url} has not been enabled yet`);
     assert(entry.isAllowed, `The source ${url} is not allowed to interact with this extension`);
     return true;
@@ -374,7 +321,7 @@ export default class State {
   injectMetadata(url, request) {
     return new Promise((resolve, reject) => {
       const id = getId();
-      _classPrivateFieldLooseBase(this, _metaRequests)[_metaRequests][id] = { ...this.metaComplete(id, resolve, reject),
+      this.#metaRequests[id] = { ...this.metaComplete(id, resolve, reject),
         id,
         request,
         url
@@ -385,54 +332,52 @@ export default class State {
   }
 
   getAuthRequest(id) {
-    return _classPrivateFieldLooseBase(this, _authRequests)[_authRequests][id];
+    return this.#authRequests[id];
   }
 
   getMetaRequest(id) {
-    return _classPrivateFieldLooseBase(this, _metaRequests)[_metaRequests][id];
+    return this.#metaRequests[id];
   }
 
   getSignRequest(id) {
-    return _classPrivateFieldLooseBase(this, _signRequests)[_signRequests][id];
+    return this.#signRequests[id];
   } // List all providers the extension is exposing
 
 
   rpcListProviders() {
-    return Promise.resolve(Object.keys(_classPrivateFieldLooseBase(this, _providers)[_providers]).reduce((acc, key) => {
-      acc[key] = _classPrivateFieldLooseBase(this, _providers)[_providers][key].meta;
+    return Promise.resolve(Object.keys(this.#providers).reduce((acc, key) => {
+      acc[key] = this.#providers[key].meta;
       return acc;
     }, {}));
   }
 
   rpcSend(request, port) {
-    const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
-
+    const provider = this.#injectedProviders.get(port);
     assert(provider, 'Cannot call pub(rpc.subscribe) before provider is set');
     return provider.send(request.method, request.params);
   } // Start a provider, return its meta
 
 
   rpcStartProvider(key, port) {
-    assert(Object.keys(_classPrivateFieldLooseBase(this, _providers)[_providers]).includes(key), `Provider ${key} is not exposed by extension`);
+    assert(Object.keys(this.#providers).includes(key), `Provider ${key} is not exposed by extension`);
 
-    if (_classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port)) {
-      return Promise.resolve(_classPrivateFieldLooseBase(this, _providers)[_providers][key].meta);
+    if (this.#injectedProviders.get(port)) {
+      return Promise.resolve(this.#providers[key].meta);
     } // Instantiate the provider
 
 
-    _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].set(port, _classPrivateFieldLooseBase(this, _providers)[_providers][key].start()); // Close provider connection when page is closed
-
+    this.#injectedProviders.set(port, this.#providers[key].start()); // Close provider connection when page is closed
 
     port.onDisconnect.addListener(() => {
-      const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
+      const provider = this.#injectedProviders.get(port);
 
       if (provider) {
         withErrorLog(() => provider.disconnect());
       }
 
-      _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].delete(port);
+      this.#injectedProviders.delete(port);
     });
-    return Promise.resolve(_classPrivateFieldLooseBase(this, _providers)[_providers][key].meta);
+    return Promise.resolve(this.#providers[key].meta);
   }
 
   rpcSubscribe({
@@ -440,15 +385,13 @@ export default class State {
     params,
     type
   }, cb, port) {
-    const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
-
+    const provider = this.#injectedProviders.get(port);
     assert(provider, 'Cannot call pub(rpc.subscribe) before provider is set');
     return provider.subscribe(type, method, params, cb);
   }
 
   rpcSubscribeConnected(_request, cb, port) {
-    const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
-
+    const provider = this.#injectedProviders.get(port);
     assert(provider, 'Cannot call pub(rpc.subscribeConnected) before provider is set');
     cb(null, provider.isConnected); // Immediately send back current isConnected
 
@@ -457,27 +400,25 @@ export default class State {
   }
 
   rpcUnsubscribe(request, port) {
-    const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
-
+    const provider = this.#injectedProviders.get(port);
     assert(provider, 'Cannot call pub(rpc.unsubscribe) before provider is set');
     return provider.unsubscribe(request.type, request.method, request.subscriptionId);
   }
 
   saveMetadata(meta) {
-    _classPrivateFieldLooseBase(this, _metaStore)[_metaStore].set(meta.genesisHash, meta);
-
+    this.#metaStore.set(meta.genesisHash, meta);
     addMetadata(meta);
   }
 
   setNotification(notification) {
-    _classPrivateFieldLooseBase(this, _notification)[_notification] = notification;
+    this.#notification = notification;
     return true;
   }
 
   sign(url, request, account) {
     const id = getId();
     return new Promise((resolve, reject) => {
-      _classPrivateFieldLooseBase(this, _signRequests)[_signRequests][id] = { ...this.signComplete(id, resolve, reject),
+      this.#signRequests[id] = { ...this.signComplete(id, resolve, reject),
         account,
         id,
         request,

package/background/handlers/Tabs.js

@@ -1,5 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { PHISHING_PAGE_REDIRECT } from '@polkadot/extension-base/defaults';
@@ -39,19 +37,15 @@ function transformAccounts(accounts, anyType = false) {
   }));
 }
 
-var _state = /*#__PURE__*/_classPrivateFieldLooseKey("state");
-
 export default class Tabs {
+  #state;
+
   constructor(state) {
-    Object.defineProperty(this, _state, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _state)[_state] = state;
+    this.#state = state;
   }
 
   authorize(url, request) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].authorizeUrl(url, request);
+    return this.#state.authorizeUrl(url, request);
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 
@@ -81,7 +75,7 @@ export default class Tabs {
   bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
-    return _classPrivateFieldLooseBase(this, _state)[_state].sign(url, new RequestBytesSign(request), {
+    return this.#state.sign(url, new RequestBytesSign(request), {
       address,
       ...pair.meta
     });
@@ -90,19 +84,19 @@ export default class Tabs {
   extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
-    return _classPrivateFieldLooseBase(this, _state)[_state].sign(url, new RequestExtrinsicSign(request), {
+    return this.#state.sign(url, new RequestExtrinsicSign(request), {
       address,
       ...pair.meta
     });
   }
 
   metadataProvide(url, request) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].injectMetadata(url, request);
+    return this.#state.injectMetadata(url, request);
   } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 
   metadataList(url) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].knownMetadata.map(({
+    return this.#state.knownMetadata.map(({
       genesisHash,
       specVersion
     }) => ({
@@ -112,15 +106,15 @@ export default class Tabs {
   }
 
   rpcListProviders() {
-    return _classPrivateFieldLooseBase(this, _state)[_state].rpcListProviders();
+    return this.#state.rpcListProviders();
   }
 
   rpcSend(request, port) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].rpcSend(request, port);
+    return this.#state.rpcSend(request, port);
   }
 
   rpcStartProvider(key, port) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].rpcStartProvider(key, port);
+    return this.#state.rpcStartProvider(key, port);
   }
 
   async rpcSubscribe(request, id, port) {
@@ -128,7 +122,7 @@ export default class Tabs {
 
     const cb = (_error, data) => innerCb(data);
 
-    const subscriptionId = await _classPrivateFieldLooseBase(this, _state)[_state].rpcSubscribe(request, cb, port);
+    const subscriptionId = await this.#state.rpcSubscribe(request, cb, port);
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
       withErrorLog(() => this.rpcUnsubscribe({ ...request,
@@ -143,8 +137,7 @@ export default class Tabs {
 
     const cb = (_error, data) => innerCb(data);
 
-    _classPrivateFieldLooseBase(this, _state)[_state].rpcSubscribeConnected(request, cb, port);
-
+    this.#state.rpcSubscribeConnected(request, cb, port);
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
     });
@@ -152,7 +145,7 @@ export default class Tabs {
   }
 
   async rpcUnsubscribe(request, port) {
-    return _classPrivateFieldLooseBase(this, _state)[_state].rpcUnsubscribe(request, port);
+    return this.#state.rpcUnsubscribe(request, port);
   }
 
   redirectPhishingLanding(phishingWebsite) {
@@ -187,7 +180,7 @@ export default class Tabs {
     }
 
     if (type !== 'pub(authorize.tab)') {
-      _classPrivateFieldLooseBase(this, _state)[_state].ensureUrlAuthorized(url);
+      this.#state.ensureUrlAuthorized(url);
     }
 
     switch (type) {

package/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "0.42.6",
+  "version": "0.42.7",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -178,19 +178,19 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/api": "^7.4.1",
-    "@polkadot/extension-chains": "^0.42.6",
-    "@polkadot/extension-dapp": "^0.42.6",
-    "@polkadot/extension-inject": "^0.42.6",
-    "@polkadot/keyring": "^8.3.2",
-    "@polkadot/networks": "^8.3.2",
-    "@polkadot/phishing": "^0.8.38",
-    "@polkadot/rpc-provider": "^7.4.1",
-    "@polkadot/types": "^7.4.1",
-    "@polkadot/ui-keyring": "^0.89.2",
-    "@polkadot/ui-settings": "^0.89.2",
-    "@polkadot/util": "^8.3.2",
-    "@polkadot/util-crypto": "^8.3.2",
+    "@polkadot/api": "^7.5.1",
+    "@polkadot/extension-chains": "^0.42.7",
+    "@polkadot/extension-dapp": "^0.42.7",
+    "@polkadot/extension-inject": "^0.42.7",
+    "@polkadot/keyring": "^8.3.3",
+    "@polkadot/networks": "^8.3.3",
+    "@polkadot/phishing": "^0.8.71",
+    "@polkadot/rpc-provider": "^7.5.1",
+    "@polkadot/types": "^7.5.1",
+    "@polkadot/ui-keyring": "^0.89.3",
+    "@polkadot/ui-settings": "^0.89.3",
+    "@polkadot/util": "^8.3.3",
+    "@polkadot/util-crypto": "^8.3.3",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.2"
   }

package/packageInfo.cjs

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.42.6'
+  version: '0.42.7'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/extension-base',
   path: new URL('.', import.meta.url).pathname,
   type: 'esm',
-  version: '0.42.6'
+  version: '0.42.7'
 };

package/page/Injected.js

@@ -6,10 +6,6 @@ import PostMessageProvider from "./PostMessageProvider.js";
 import Signer from "./Signer.js";
 export default class {
   constructor(sendRequest) {
-    this.accounts = void 0;
-    this.metadata = void 0;
-    this.provider = void 0;
-    this.signer = void 0;
     this.accounts = new Accounts(sendRequest);
     this.metadata = new Metadata(sendRequest);
     this.provider = new PostMessageProvider(sendRequest);

package/page/PostMessageProvider.js

@@ -1,5 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import EventEmitter from 'eventemitter3';
@@ -13,37 +11,22 @@ let sendRequest;
  * @description Extension provider to be used by dapps
  */
 
-var _eventemitter = /*#__PURE__*/_classPrivateFieldLooseKey("eventemitter");
-
-var _isConnected = /*#__PURE__*/_classPrivateFieldLooseKey("isConnected");
-
-var _subscriptions = /*#__PURE__*/_classPrivateFieldLooseKey("subscriptions");
-
 export default class PostMessageProvider {
-  // Whether or not the actual extension background provider is connected
-  // Subscription IDs are (historically) not guaranteed to be globally unique;
+  #eventemitter; // Whether or not the actual extension background provider is connected
+
+  #isConnected = false; // 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
-  // {[(type,subscriptionId)]: callback}
+
+  #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) {
-    Object.defineProperty(this, _eventemitter, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _isConnected, {
-      writable: true,
-      value: false
-    });
-    Object.defineProperty(this, _subscriptions, {
-      writable: true,
-      value: {}
-    });
-    _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter] = new EventEmitter();
+    this.#eventemitter = new EventEmitter();
     sendRequest = _sendRequest;
   }
   /**
@@ -90,7 +73,7 @@ export default class PostMessageProvider {
 
 
   get isConnected() {
-    return _classPrivateFieldLooseBase(this, _isConnected)[_isConnected];
+    return this.#isConnected;
   }
 
   listProviders() {
@@ -105,10 +88,9 @@ export default class PostMessageProvider {
 
 
   on(type, sub) {
-    _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter].on(type, sub);
-
+    this.#eventemitter.on(type, sub);
     return () => {
-      _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter].removeListener(type, sub);
+      this.#eventemitter.removeListener(type, sub);
     };
   } // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -126,7 +108,7 @@ export default class PostMessageProvider {
       }, res => {
         subscription.callback(null, res);
       });
-      _classPrivateFieldLooseBase(this, _subscriptions)[_subscriptions][`${type}::${id}`] = callback;
+      this.#subscriptions[`${type}::${id}`] = callback;
       return id;
     }
 
@@ -142,19 +124,17 @@ export default class PostMessageProvider {
 
   async startProvider(key) {
     // Disconnect from the previous provider
-    _classPrivateFieldLooseBase(this, _isConnected)[_isConnected] = false;
-
-    _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter].emit('disconnected');
-
+    this.#isConnected = false;
+    this.#eventemitter.emit('disconnected');
     const meta = await sendRequest('pub(rpc.startProvider)', key); // eslint-disable-next-line @typescript-eslint/no-floating-promises
 
     sendRequest('pub(rpc.subscribeConnected)', null, connected => {
-      _classPrivateFieldLooseBase(this, _isConnected)[_isConnected] = connected;
+      this.#isConnected = connected;
 
       if (connected) {
-        _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter].emit('connected');
+        this.#eventemitter.emit('connected');
       } else {
-        _classPrivateFieldLooseBase(this, _eventemitter)[_eventemitter].emit('disconnected');
+        this.#eventemitter.emit('disconnected');
       }
 
       return true;
@@ -179,12 +159,12 @@ export default class PostMessageProvider {
     // 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 (isUndefined(_classPrivateFieldLooseBase(this, _subscriptions)[_subscriptions][subscription])) {
+    if (isUndefined(this.#subscriptions[subscription])) {
       l.debug(() => `Unable to find active subscription=${subscription}`);
       return false;
     }
 
-    delete _classPrivateFieldLooseBase(this, _subscriptions)[_subscriptions][subscription];
+    delete this.#subscriptions[subscription];
     return this.send(method, [id]);
   }
 

package/stores/Base.js

@@ -1,6 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
-
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 const lastError = type => {
@@ -11,15 +8,11 @@ const lastError = type => {
   }
 };
 
-var _prefix = /*#__PURE__*/_classPrivateFieldLooseKey("prefix");
-
 export default class BaseStore {
+  #prefix;
+
   constructor(prefix) {
-    Object.defineProperty(this, _prefix, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _prefix)[_prefix] = prefix ? `${prefix}:` : '';
+    this.#prefix = prefix ? `${prefix}:` : '';
   }
 
   all(update) {
@@ -39,8 +32,8 @@ export default class BaseStore {
       for (let i = 0; i < entries.length; i++) {
         const [key, value] = entries[i];
 
-        if (key.startsWith(_classPrivateFieldLooseBase(this, _prefix)[_prefix])) {
-          map[key.replace(_classPrivateFieldLooseBase(this, _prefix)[_prefix], '')] = value;
+        if (key.startsWith(this.#prefix)) {
+          map[key.replace(this.#prefix, '')] = value;
         }
       }
 
@@ -49,7 +42,7 @@ export default class BaseStore {
   }
 
   get(_key, update) {
-    const key = `${_classPrivateFieldLooseBase(this, _prefix)[_prefix]}${_key}`;
+    const key = `${this.#prefix}${_key}`;
     chrome.storage.local.get([key], result => {
       lastError('get');
       update(result[key]);
@@ -57,7 +50,7 @@ export default class BaseStore {
   }
 
   remove(_key, update) {
-    const key = `${_classPrivateFieldLooseBase(this, _prefix)[_prefix]}${_key}`;
+    const key = `${this.#prefix}${_key}`;
     chrome.storage.local.remove(key, () => {
       lastError('remove');
       update && update();
@@ -65,7 +58,7 @@ export default class BaseStore {
   }
 
   set(_key, value, update) {
-    const key = `${_classPrivateFieldLooseBase(this, _prefix)[_prefix]}${_key}`;
+    const key = `${this.#prefix}${_key}`;
     chrome.storage.local.set({
       [key]: value
     }, () => {