@subwallet/extension-base 0.6.7-2wr → 0.6.8-1

package/background/handlers/State.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { addMetadata, knownMetadata } from '@subwallet/extension-chains';
 import { BehaviorSubject } from 'rxjs';
@@ -22,15 +23,12 @@ const NORMAL_WINDOW_OPTS = {
   url: NOTIFICATION_URL
 };
 export let NotificationOptions;
-
 (function (NotificationOptions) {
   NotificationOptions[NotificationOptions["None"] = 0] = "None";
   NotificationOptions[NotificationOptions["Normal"] = 1] = "Normal";
   NotificationOptions[NotificationOptions["PopUp"] = 2] = "PopUp";
 })(NotificationOptions || (NotificationOptions = {}));
-
 const AUTH_URLS_KEY = 'authUrls';
-
 function extractMetadata(store) {
   store.allMap(map => {
     const knownEntries = Object.entries(knownGenesis);
@@ -38,18 +36,17 @@ function extractMetadata(store) {
     const removals = [];
     Object.entries(map).forEach(([key, def]) => {
       const entry = knownEntries.find(([, hashes]) => hashes.includes(def.genesisHash));
-
       if (entry) {
         const [name, hashes] = entry;
-        const index = hashes.indexOf(def.genesisHash); // flatten the known metadata based on the genesis index
-        // (lower is better/newer)
+        const index = hashes.indexOf(def.genesisHash);
 
+        // flatten the known metadata based on the genesis index
+        // (lower is better/newer)
         if (!defs[name] || defs[name].index > index) {
           if (defs[name]) {
             // remove the old version of the metadata
             removals.push(defs[name].key);
           }
-
           defs[name] = {
             def,
             index,
@@ -71,48 +68,44 @@ function extractMetadata(store) {
     }) => addMetadata(def));
   });
 }
-
 export default class State {
   #authUrls = {};
   #authRequests = {};
-  #metaStore = new MetadataStore(); // Map of providers currently injected in tabs
+  #metaStore = new MetadataStore();
 
+  // Map of providers currently injected in tabs
   #injectedProviders = new Map();
   #metaRequests = {};
-  #notification = settings.notification; // Map of all providers exposed by the extension, they are retrievable by key
+  #notification = settings.notification;
 
+  // Map of all providers exposed by the extension, they are retrievable by key
   #providers;
   #signRequests = {};
   #windows = [];
   authSubject = new BehaviorSubject([]);
   metaSubject = new BehaviorSubject([]);
   signSubject = new BehaviorSubject([]);
-
   constructor(providers = {}) {
     this.#providers = providers;
-    extractMetadata(this.#metaStore); // retrieve previously set authorizations
+    extractMetadata(this.#metaStore);
 
+    // retrieve previously set authorizations
     const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);
     this.#authUrls = previousAuth;
   }
-
   get knownMetadata() {
     return knownMetadata();
   }
-
   get numAuthRequests() {
     return Object.keys(this.#authRequests).length;
   }
-
   get numMetaRequests() {
     return Object.keys(this.#metaRequests).length;
   }
-
   get numSignRequests() {
     return Object.keys(this.#signRequests).length;
   }
-
   get allAuthRequests() {
     return Object.values(this.#authRequests).map(({
       id,
@@ -124,7 +117,6 @@ export default class State {
       url
     }));
   }
-
   get allMetaRequests() {
     return Object.values(this.#metaRequests).map(({
       id,
@@ -136,7 +128,6 @@ export default class State {
       url
     }));
   }
-
   get allSignRequests() {
     return Object.values(this.#signRequests).map(({
       account,
@@ -150,20 +141,16 @@ export default class State {
       url
     }));
   }
-
   get authUrls() {
     return this.#authUrls;
   }
-
   getPopup() {
     return this.#windows;
   }
-
   popupClose() {
     this.#windows.forEach(id => withErrorLog(() => chrome.windows.remove(id)));
     this.#windows = [];
   }
-
   popupOpen() {
     if (this.#notification !== 'extension') {
       if (this.#notification === 'window') {
@@ -173,16 +160,14 @@ export default class State {
           }
         });
       }
-
       chrome.windows.getCurrent(win => {
-        const popupOptions = { ...POPUP_WINDOW_OPTS
+        const popupOptions = {
+          ...POPUP_WINDOW_OPTS
         };
-
         if (win) {
           popupOptions.left = (win.left || 0) + (win.width || 0) - (POPUP_WINDOW_OPTS.width || 0) - 20;
           popupOptions.top = (win.top || 0) + 80;
         }
-
         chrome.windows.create(popupOptions, window => {
           if (window) {
             this.#windows.push(window.id || 0);
@@ -191,7 +176,6 @@ export default class State {
       });
     }
   }
-
   authComplete = (id, resolve, reject) => {
     const complete = result => {
       const isAllowed = result === true;
@@ -215,7 +199,6 @@ export default class State {
       delete this.#authRequests[id];
       this.updateIconAuth(true);
     };
-
     return {
       reject: error => {
         complete(error);
@@ -227,17 +210,14 @@ export default class State {
       }
     };
   };
-
   saveCurrentAuthList() {
     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();
@@ -254,7 +234,6 @@ export default class State {
       delete this.#signRequests[id];
       this.updateIconSign(true);
     };
-
     return {
       reject: error => {
         complete();
@@ -266,13 +245,11 @@ export default class State {
       }
     };
   };
-
   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('/');
     return parts[2];
   }
-
   updateIcon(shouldClose) {
     const authCount = this.numAuthRequests;
     const metaCount = this.numMetaRequests;
@@ -281,12 +258,10 @@ export default class State {
     withErrorLog(() => chrome.browserAction.setBadgeText({
       text
     }));
-
     if (shouldClose && text === '') {
       this.popupClose();
     }
   }
-
   toggleAuthorization(url) {
     const entry = this.#authUrls[url];
     assert(entry, `The source ${url} is not known`);
@@ -294,37 +269,33 @@ export default class State {
     this.saveCurrentAuthList();
     return this.#authUrls;
   }
-
   updateIconAuth(shouldClose) {
     this.authSubject.next(this.allAuthRequests);
     this.updateIcon(shouldClose);
   }
-
   updateIconMeta(shouldClose) {
     this.metaSubject.next(this.allMetaRequests);
     this.updateIcon(shouldClose);
   }
-
   updateIconSign(shouldClose) {
     this.signSubject.next(this.allSignRequests);
     this.updateIcon(shouldClose);
   }
-
   async authorizeUrl(url, request) {
-    const idStr = this.stripUrl(url); // Do not enqueue duplicate authorization requests.
+    const idStr = this.stripUrl(url);
 
+    // Do not enqueue duplicate authorization requests.
     const isDuplicate = Object.values(this.#authRequests).some(request => request.idStr === idStr);
     assert(!isDuplicate, `The source ${url} has a pending authorization request`);
-
     if (this.#authUrls[idStr]) {
       // this url was seen in the past
       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();
-      this.#authRequests[id] = { ...this.authComplete(id, resolve, reject),
+      this.#authRequests[id] = {
+        ...this.authComplete(id, resolve, reject),
         id,
         idStr,
         request,
@@ -334,18 +305,17 @@ export default class State {
       this.popupOpen();
     });
   }
-
   ensureUrlAuthorized(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;
   }
-
   injectMetadata(url, request) {
     return new Promise((resolve, reject) => {
       const id = getId();
-      this.#metaRequests[id] = { ...this.metaComplete(id, resolve, reject),
+      this.#metaRequests[id] = {
+        ...this.metaComplete(id, resolve, reject),
         id,
         request,
         url
@@ -354,56 +324,49 @@ export default class State {
       this.popupOpen();
     });
   }
-
   getAuthRequest(id) {
     return this.#authRequests[id];
   }
-
   getMetaRequest(id) {
     return this.#metaRequests[id];
   }
-
   getSignRequest(id) {
     return this.#signRequests[id];
-  } // List all providers the extension is exposing
-
+  }
 
+  // List all providers the extension is exposing
   rpcListProviders() {
     return Promise.resolve(Object.keys(this.#providers).reduce((acc, key) => {
       acc[key] = this.#providers[key].meta;
       return acc;
     }, {}));
   }
-
   rpcSend(request, 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
-
+  }
 
+  // Start a provider, return its meta
   rpcStartProvider(key, port) {
     assert(Object.keys(this.#providers).includes(key), `Provider ${key} is not exposed by extension`);
-
     if (this.#injectedProviders.get(port)) {
       return Promise.resolve(this.#providers[key].meta);
-    } // Instantiate the provider
-
+    }
 
-    this.#injectedProviders.set(port, this.#providers[key].start()); // Close provider connection when page is closed
+    // Instantiate the provider
+    this.#injectedProviders.set(port, this.#providers[key].start());
 
+    // Close provider connection when page is closed
     port.onDisconnect.addListener(() => {
       const provider = this.#injectedProviders.get(port);
-
       if (provider) {
         withErrorLog(() => provider.disconnect());
       }
-
       this.#injectedProviders.delete(port);
     });
     return Promise.resolve(this.#providers[key].meta);
   }
-
   rpcSubscribe({
     method,
     params,
@@ -413,36 +376,31 @@ export default class State {
     assert(provider, 'Cannot call pub(rpc.subscribe) before provider is set');
     return provider.subscribe(type, method, params, cb);
   }
-
   rpcSubscribeConnected(_request, cb, 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
-
     provider.on('connected', () => cb(null, true));
     provider.on('disconnected', () => cb(null, false));
   }
-
   rpcUnsubscribe(request, 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) {
     this.#metaStore.set(meta.genesisHash, meta);
     addMetadata(meta);
   }
-
   setNotification(notification) {
     this.#notification = notification;
     return true;
   }
-
   sign(url, request, account) {
     const id = getId();
     return new Promise((resolve, reject) => {
-      this.#signRequests[id] = { ...this.signComplete(id, resolve, reject),
+      this.#signRequests[id] = {
+        ...this.signComplete(id, resolve, reject),
         account,
         id,
         request,
@@ -452,5 +410,4 @@ export default class State {
       this.popupOpen();
     });
   }
-
 }

package/background/handlers/Tabs.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { canDerive } from '@subwallet/extension-base/utils';
 import { checkIfDenied } from '@polkadot/phishing';
@@ -10,7 +11,6 @@ import RequestBytesSign from "../RequestBytesSign.js";
 import RequestExtrinsicSign from "../RequestExtrinsicSign.js";
 import { withErrorLog } from "./helpers.js";
 import { createSubscription, unsubscribe } from "./subscriptions.js";
-
 function transformAccounts(accounts, anyType = false) {
   return Object.values(accounts).filter(({
     json: {
@@ -39,26 +39,23 @@ function transformAccounts(accounts, anyType = false) {
     type
   }));
 }
-
 export default class Tabs {
   #state;
-
   constructor(state) {
     this.#state = state;
   }
-
   authorize(url, request) {
     return this.#state.authorizeUrl(url, request);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   accountsList(url, {
     anyType
   }) {
     return transformAccounts(accountsObservable.subject.getValue(), anyType);
-  } // FIXME This looks very much like what we have in Extension
-
+  }
 
+  // FIXME This looks very much like what we have in Extension
   accountsSubscribe(url, id, port) {
     const cb = createSubscription(id, port);
     const subscription = accountsObservable.subject.subscribe(accounts => cb(transformAccounts(accounts)));
@@ -68,13 +65,11 @@ export default class Tabs {
     });
     return true;
   }
-
   getSigningPair(address) {
     const pair = keyring.getPair(address);
     assert(pair, 'Unable to find keypair');
     return pair;
   }
-
   bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
@@ -83,7 +78,6 @@ export default class Tabs {
       ...pair.meta
     });
   }
-
   extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
@@ -92,12 +86,11 @@ export default class Tabs {
       ...pair.meta
     });
   }
-
   metadataProvide(url, request) {
     return this.#state.injectMetadata(url, request);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   metadataList(url) {
     return this.#state.knownMetadata.map(({
       genesisHash,
@@ -107,50 +100,40 @@ export default class Tabs {
       specVersion
     }));
   }
-
   rpcListProviders() {
     return this.#state.rpcListProviders();
   }
-
   rpcSend(request, port) {
     return this.#state.rpcSend(request, port);
   }
-
   rpcStartProvider(key, port) {
     return this.#state.rpcStartProvider(key, port);
   }
-
   async rpcSubscribe(request, id, port) {
     const innerCb = createSubscription(id, port);
-
     const cb = (_error, data) => innerCb(data);
-
     const subscriptionId = await this.#state.rpcSubscribe(request, cb, port);
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
-      withErrorLog(() => this.rpcUnsubscribe({ ...request,
+      withErrorLog(() => this.rpcUnsubscribe({
+        ...request,
         subscriptionId
       }, port));
     });
     return true;
   }
-
   rpcSubscribeConnected(request, id, port) {
     const innerCb = createSubscription(id, port);
-
     const cb = (_error, data) => innerCb(data);
-
     this.#state.rpcSubscribeConnected(request, cb, port);
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
     });
     return Promise.resolve(true);
   }
-
   async rpcUnsubscribe(request, port) {
     return this.#state.rpcUnsubscribe(request, port);
   }
-
   redirectPhishingLanding(phishingWebsite) {
     const nonFragment = phishingWebsite.split('#')[0];
     const encodedWebsite = encodeURIComponent(nonFragment);
@@ -165,66 +148,47 @@ export default class Tabs {
       })));
     });
   }
-
   async redirectIfPhishing(url) {
     const isInDenyList = await checkIfDenied(url);
-
     if (isInDenyList) {
       this.redirectPhishingLanding(url);
       return true;
     }
-
     return false;
   }
-
   async handle(id, type, request, url, port) {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
     }
-
     switch (type) {
       case 'pub(authorize.tab)':
         return this.authorize(url, request);
-
       case 'pub(accounts.list)':
         return this.accountsList(url, request);
-
       case 'pub(accounts.subscribe)':
         return this.accountsSubscribe(url, id, port);
-
       case 'pub(bytes.sign)':
         return this.bytesSign(url, request);
-
       case 'pub(extrinsic.sign)':
         return this.extrinsicSign(url, request);
-
       case 'pub(metadata.list)':
         return this.metadataList(url);
-
       case 'pub(metadata.provide)':
         return this.metadataProvide(url, request);
-
       case 'pub(rpc.listProviders)':
         return this.rpcListProviders();
-
       case 'pub(rpc.send)':
         return this.rpcSend(request, port);
-
       case 'pub(rpc.startProvider)':
         return this.rpcStartProvider(request, port);
-
       case 'pub(rpc.subscribe)':
         return this.rpcSubscribe(request, id, port);
-
       case 'pub(rpc.subscribeConnected)':
         return this.rpcSubscribeConnected(request, id, port);
-
       case 'pub(rpc.unsubscribe)':
         return this.rpcUnsubscribe(request, port);
-
       default:
         throw new Error(`Unable to handle message of type ${type}`);
     }
   }
-
 }

package/background/handlers/helpers.js

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 export function withErrorLog(fn) {
   try {
     const p = fn();
-
     if (p && typeof p === 'object' && typeof p.catch === 'function') {
       p.catch(console.error);
     }

package/background/handlers/index.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { assert } from '@polkadot/util';
 import { PORT_EXTENSION } from "../../defaults.js";
 import Extension from "./Extension.js";
@@ -22,17 +23,18 @@ export default function handler({
   const promise = isExtension ? extension.handle(id, message, request, port) : tabs.handle(id, message, request, from, port);
   promise.then(response => {
     console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
+
     // between the start and the end of the promise, the user may have closed
     // the tab, in which case port will be undefined
-
     assert(port, 'Port has been disconnected');
     port.postMessage({
       id,
       response
     });
   }).catch(error => {
-    console.log(`[err] ${source}:: ${error.message}`); // only send message back to port if it's still connected
+    console.log(`[err] ${source}:: ${error.message}`);
 
+    // only send message back to port if it's still connected
     if (port) {
       port.postMessage({
         error: error.message,

package/background/handlers/subscriptions.js

@@ -1,7 +1,9 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const subscriptions = {}; // return a subscription callback, that will send the data to the caller via the port
 
+const subscriptions = {};
+
+// return a subscription callback, that will send the data to the caller via the port
 export function createSubscription(id, port) {
   subscriptions[id] = port;
   return subscription => {
@@ -15,8 +17,9 @@ export function createSubscription(id, port) {
 }
 export function isSubscriptionRunning(id) {
   return !!subscriptions[id];
-} // clear a previous subscriber
+}
 
+// clear a previous subscriber
 export function unsubscribe(id) {
   if (subscriptions[id]) {
     console.log(`Unsubscribing from ${id}`);

package/bundle.js

@@ -1,3 +1,4 @@
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 export { packageInfo } from "./packageInfo.js";