@polkadot/extension-base 0.48.1 → 0.49.1

package/README.md

@@ -7,4 +7,6 @@ Functions, classes and other utilities used in `@polkadot/extension`. These incl
 
 They are primarily meant to be used in `@polkadot/extension`, and can be broken without any notice to cater for `@polkadot/extension`'s needs.
 
-They are exported here if you wish to use part of them in the development of your own extension. Don't forget to add `process.env.EXTENSION_PREFIX` to separate ports and stores from the current extension's ones.
+They are exported here if you wish to use part of them in the development of your 
+own extension. Don't forget to add `process.env.EXTENSION_PREFIX` to separate 
+ports and stores from the current extension's ones.

package/background/handlers/Extension.js

@@ -1,7 +1,7 @@
 import { ALLOWED_PATH, PASSWORD_EXPIRY_MS } from '@polkadot/extension-base/defaults';
 import { metadataExpand } from '@polkadot/extension-chains';
 import { TypeRegistry } from '@polkadot/types';
-import keyring from '@polkadot/ui-keyring';
+import { keyring } from '@polkadot/ui-keyring';
 import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/accounts';
 import { assert, isHex } from '@polkadot/util';
 import { keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
@@ -74,19 +74,20 @@ export default class Extension {
             exportedJson: await keyring.backupAccounts(addresses, password)
         };
     }
-    accountsForget({ address }) {
+    async accountsForget({ address }) {
         const authorizedAccountsDiff = [];
         // cycle through authUrls and prepare the array of diff
         Object.entries(this.__internal__state.authUrls).forEach(([url, urlInfo]) => {
-            if (!urlInfo.authorizedAccounts.includes(address)) {
-                return;
+            // Note that urlInfo.authorizedAccounts may be undefined if this website entry
+            // was created before the "account authorization per website" functionality was introduced
+            if (urlInfo.authorizedAccounts?.includes(address)) {
+                authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
             }
-            authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
         });
-        this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
+        await this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
         // cycle through default account selection for auth and remove any occurrence of the account
         const newDefaultAuthAccounts = this.__internal__state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
-        this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
+        await this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
         keyring.forgetAccount(address);
         return true;
     }
@@ -138,8 +139,8 @@ export default class Extension {
         resolve({ authorizedAccounts, result: true });
         return true;
     }
-    authorizeUpdate({ authorizedAccounts, url }) {
-        return this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+    async authorizeUpdate({ authorizedAccounts, url }) {
+        return await this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
     }
     getAuthList() {
         return { list: this.__internal__state.authUrls };
@@ -154,11 +155,11 @@ export default class Extension {
         });
         return true;
     }
-    metadataApprove({ id }) {
+    async metadataApprove({ id }) {
         const queued = this.__internal__state.getMetaRequest(id);
         assert(queued, 'Unable to find request');
         const { request, resolve } = queued;
-        this.__internal__state.saveMetadata(request);
+        await this.__internal__state.saveMetadata(request);
         resolve(true);
         return true;
     }
@@ -329,7 +330,7 @@ export default class Extension {
         return true;
     }
     windowOpen(path) {
-        const url = `${chrome.extension.getURL('index.html')}#${path}`;
+        const url = `${chrome.runtime.getURL('index.html')}#${path}`;
         if (!ALLOWED_PATH.includes(path)) {
             console.error('Not allowed to open the url:', url);
             return false;
@@ -369,8 +370,9 @@ export default class Extension {
         keyring.addPair(childPair, password);
         return true;
     }
-    removeAuthorization(url) {
-        return { list: this.__internal__state.removeAuthorization(url) };
+    async removeAuthorization(url) {
+        const remAuth = await this.__internal__state.removeAuthorization(url);
+        return { list: remAuth };
     }
     deleteAuthRequest(requestId) {
         return this.__internal__state.deleteAuthRequest(requestId);
@@ -422,7 +424,7 @@ export default class Extension {
             case 'pri(accounts.validate)':
                 return this.accountsValidate(request);
             case 'pri(metadata.approve)':
-                return this.metadataApprove(request);
+                return await this.metadataApprove(request);
             case 'pri(metadata.get)':
                 return this.metadataGet(request);
             case 'pri(metadata.list)':

package/background/handlers/State.d.ts

@@ -45,6 +45,7 @@ export default class State {
     readonly signSubject: BehaviorSubject<SigningRequest[]>;
     defaultAuthAccountSelection: string[];
     constructor(providers?: Providers);
+    init(): Promise<void>;
     get knownMetadata(): MetadataDef[];
     get numAuthRequests(): number;
     get numMetaRequests(): number;
@@ -53,6 +54,7 @@ export default class State {
     get allMetaRequests(): MetadataRequest[];
     get allSignRequests(): SigningRequest[];
     get authUrls(): AuthUrls;
+    private set authUrls(value);
     private popupClose;
     private popupOpen;
     private authComplete;
@@ -61,16 +63,16 @@ export default class State {
     deleteAuthRequest(requestId: string): void;
     private saveCurrentAuthList;
     private saveDefaultAuthAccounts;
-    updateDefaultAuthAccounts(newList: string[]): void;
+    updateDefaultAuthAccounts(newList: string[]): Promise<void>;
     private metaComplete;
     private signComplete;
     stripUrl(url: string): string;
     private updateIcon;
-    removeAuthorization(url: string): AuthUrls;
+    removeAuthorization(url: string): Promise<AuthUrls>;
     private updateIconAuth;
     private updateIconMeta;
     private updateIconSign;
-    updateAuthorizedAccounts(authorizedAccountDiff: AuthorizedAccountsDiff): void;
+    updateAuthorizedAccounts(authorizedAccountDiff: AuthorizedAccountsDiff): Promise<void>;
     authorizeUrl(url: string, request: RequestAuthorizeTab): Promise<AuthResponse>;
     ensureUrlAuthorized(url: string): boolean;
     injectMetadata(url: string, request: MetadataDef): Promise<boolean>;
@@ -83,7 +85,7 @@ export default class State {
     rpcSubscribe({ method, params, type }: RequestRpcSubscribe, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): Promise<number | string>;
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;
     rpcUnsubscribe(request: RequestRpcUnsubscribe, port: chrome.runtime.Port): Promise<boolean>;
-    saveMetadata(meta: MetadataDef): void;
+    saveMetadata(meta: MetadataDef): Promise<void>;
     setNotification(notification: string): boolean;
     sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
 }

package/background/handlers/State.js

@@ -1,12 +1,12 @@
 import { BehaviorSubject } from 'rxjs';
 import { addMetadata, knownMetadata } from '@polkadot/extension-chains';
 import { knownGenesis } from '@polkadot/networks/defaults';
-import settings from '@polkadot/ui-settings';
+import { settings } from '@polkadot/ui-settings';
 import { assert } from '@polkadot/util';
 import { MetadataStore } from '../../stores/index.js';
 import { getId } from '../../utils/getId.js';
 import { withErrorLog } from './helpers.js';
-const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
+const NOTIFICATION_URL = chrome.runtime.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
     focused: true,
     height: 621,
@@ -29,8 +29,8 @@ export var NotificationOptions;
 })(NotificationOptions || (NotificationOptions = {}));
 const AUTH_URLS_KEY = 'authUrls';
 const DEFAULT_AUTH_ACCOUNTS = 'defaultAuthAccounts';
-function extractMetadata(store) {
-    store.allMap((map) => {
+async function extractMetadata(store) {
+    await store.allMap(async (map) => {
         const knownEntries = Object.entries(knownGenesis);
         const defs = {};
         const removals = [];
@@ -56,7 +56,9 @@ function extractMetadata(store) {
                 defs[key] = { def, index: 0, key };
             }
         });
-        removals.forEach((key) => store.remove(key));
+        for (const key of removals) {
+            await store.remove(key);
+        }
         Object.values(defs).forEach(({ def }) => addMetadata(def));
     });
 }
@@ -79,13 +81,17 @@ export default class State {
     defaultAuthAccountSelection = [];
     constructor(providers = {}) {
         this.__internal__providers = providers;
-        extractMetadata(this.__internal__metaStore);
+    }
+    async init() {
+        await extractMetadata(this.__internal__metaStore);
         // retrieve previously set authorizations
-        const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
+        const storageAuthUrls = await chrome.storage.local.get(AUTH_URLS_KEY);
+        const authString = storageAuthUrls?.[AUTH_URLS_KEY] || '{}';
         const previousAuth = JSON.parse(authString);
         this.__internal__authUrls = previousAuth;
         // retrieve previously set default auth accounts
-        const defaultAuthString = localStorage.getItem(DEFAULT_AUTH_ACCOUNTS) || '[]';
+        const storageDefaultAuthAccounts = await chrome.storage.local.get(DEFAULT_AUTH_ACCOUNTS);
+        const defaultAuthString = storageDefaultAuthAccounts?.[DEFAULT_AUTH_ACCOUNTS] || '[]';
         const previousDefaultAuth = JSON.parse(defaultAuthString);
         this.defaultAuthAccountSelection = previousDefaultAuth;
     }
@@ -119,6 +125,9 @@ export default class State {
     get authUrls() {
         return this.__internal__authUrls;
     }
+    set authUrls(urls) {
+        this.__internal__authUrls = urls;
+    }
     popupClose() {
         this.__internal__windows.forEach((id) => withErrorLog(() => chrome.windows.remove(id)));
         this.__internal__windows = [];
@@ -134,7 +143,7 @@ export default class State {
             });
     }
     authComplete = (id, resolve, reject) => {
-        const complete = (authorizedAccounts = []) => {
+        const complete = async (authorizedAccounts = []) => {
             const { idStr, request: { origin }, url } = this.__internal__authRequests[id];
             this.__internal__authUrls[this.stripUrl(url)] = {
                 authorizedAccounts,
@@ -143,18 +152,20 @@ export default class State {
                 origin,
                 url
             };
-            this.saveCurrentAuthList();
-            this.updateDefaultAuthAccounts(authorizedAccounts);
+            await this.saveCurrentAuthList();
+            await this.updateDefaultAuthAccounts(authorizedAccounts);
             delete this.__internal__authRequests[id];
             this.updateIconAuth(true);
         };
         return {
-            reject: (error) => {
-                complete();
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            reject: async (error) => {
+                await complete();
                 reject(error);
             },
-            resolve: ({ authorizedAccounts, result }) => {
-                complete(authorizedAccounts);
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            resolve: async ({ authorizedAccounts, result }) => {
+                await complete(authorizedAccounts);
                 resolve({ authorizedAccounts, result });
             }
         };
@@ -184,15 +195,15 @@ export default class State {
         delete this.__internal__authRequests[requestId];
         this.updateIconAuth(true);
     }
-    saveCurrentAuthList() {
-        localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.__internal__authUrls));
+    async saveCurrentAuthList() {
+        await chrome.storage.local.set({ [AUTH_URLS_KEY]: JSON.stringify(this.__internal__authUrls) });
     }
-    saveDefaultAuthAccounts() {
-        localStorage.setItem(DEFAULT_AUTH_ACCOUNTS, JSON.stringify(this.defaultAuthAccountSelection));
+    async saveDefaultAuthAccounts() {
+        await chrome.storage.local.set({ [DEFAULT_AUTH_ACCOUNTS]: JSON.stringify(this.defaultAuthAccountSelection) });
     }
-    updateDefaultAuthAccounts(newList) {
+    async updateDefaultAuthAccounts(newList) {
         this.defaultAuthAccountSelection = newList;
-        this.saveDefaultAuthAccounts();
+        await this.saveDefaultAuthAccounts();
     }
     metaComplete = (id, resolve, reject) => {
         const complete = () => {
@@ -240,16 +251,16 @@ export default class State {
             : metaCount
                 ? 'Meta'
                 : (signCount ? `${signCount}` : ''));
-        withErrorLog(() => chrome.browserAction.setBadgeText({ text }));
+        withErrorLog(() => chrome.action.setBadgeText({ text }));
         if (shouldClose && text === '') {
             this.popupClose();
         }
     }
-    removeAuthorization(url) {
+    async removeAuthorization(url) {
         const entry = this.__internal__authUrls[url];
         assert(entry, `The source ${url} is not known`);
         delete this.__internal__authUrls[url];
-        this.saveCurrentAuthList();
+        await this.saveCurrentAuthList();
         return this.__internal__authUrls;
     }
     updateIconAuth(shouldClose) {
@@ -264,11 +275,11 @@ export default class State {
         this.signSubject.next(this.allSignRequests);
         this.updateIcon(shouldClose);
     }
-    updateAuthorizedAccounts(authorizedAccountDiff) {
+    async updateAuthorizedAccounts(authorizedAccountDiff) {
         authorizedAccountDiff.forEach(([url, authorizedAccountDiff]) => {
             this.__internal__authUrls[url].authorizedAccounts = authorizedAccountDiff;
         });
-        this.saveCurrentAuthList();
+        await this.saveCurrentAuthList();
     }
     async authorizeUrl(url, request) {
         const idStr = this.stripUrl(url);
@@ -372,8 +383,8 @@ export default class State {
         assert(provider, 'Cannot call pub(rpc.unsubscribe) before provider is set');
         return provider.unsubscribe(request.type, request.method, request.subscriptionId);
     }
-    saveMetadata(meta) {
-        this.__internal__metaStore.set(meta.genesisHash, meta);
+    async saveMetadata(meta) {
+        await this.__internal__metaStore.set(meta.genesisHash, meta);
         addMetadata(meta);
     }
     setNotification(notification) {

package/background/handlers/Tabs.js

@@ -1,5 +1,5 @@
 import { checkIfDenied } from '@polkadot/phishing';
-import keyring from '@polkadot/ui-keyring';
+import { keyring } from '@polkadot/ui-keyring';
 import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/accounts';
 import { assert, isNumber } from '@polkadot/util';
 import { PHISHING_PAGE_REDIRECT } from '../../defaults.js';
@@ -124,7 +124,7 @@ export default class Tabs {
     redirectPhishingLanding(phishingWebsite) {
         const nonFragment = phishingWebsite.split('#')[0];
         const encodedWebsite = encodeURIComponent(nonFragment);
-        const url = `${chrome.extension.getURL('index.html')}#${PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
+        const url = `${chrome.runtime.getURL('index.html')}#${PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
         chrome.tabs.query({ url: nonFragment }, (tabs) => {
             tabs
                 .map(({ id }) => id)

package/background/handlers/index.js

@@ -5,6 +5,7 @@ import State from './State.js';
 import Tabs from './Tabs.js';
 export { withErrorLog } from './helpers.js';
 const state = new State();
+await state.init();
 const extension = new Extension(state);
 const tabs = new Tabs(state);
 export default function handler({ id, message, request }, port, extensionPortName = PORT_EXTENSION) {

package/cjs/background/handlers/Extension.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const defaults_1 = require("@polkadot/extension-base/defaults");
 const extension_chains_1 = require("@polkadot/extension-chains");
 const types_1 = require("@polkadot/types");
-const ui_keyring_1 = tslib_1.__importDefault(require("@polkadot/ui-keyring"));
+const ui_keyring_1 = require("@polkadot/ui-keyring");
 const accounts_1 = require("@polkadot/ui-keyring/observable/accounts");
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
@@ -37,19 +36,19 @@ class Extension {
         }));
     }
     accountsCreateExternal({ address, genesisHash, name }) {
-        ui_keyring_1.default.addExternal(address, { genesisHash, name });
+        ui_keyring_1.keyring.addExternal(address, { genesisHash, name });
         return true;
     }
     accountsCreateHardware({ accountIndex, address, addressOffset, genesisHash, hardwareType, name }) {
-        ui_keyring_1.default.addHardware(address, hardwareType, { accountIndex, addressOffset, genesisHash, name });
+        ui_keyring_1.keyring.addHardware(address, hardwareType, { accountIndex, addressOffset, genesisHash, name });
         return true;
     }
     accountsCreateSuri({ genesisHash, name, password, suri, type }) {
-        ui_keyring_1.default.addUri(getSuri(suri, type), password, { genesisHash, name }, type);
+        ui_keyring_1.keyring.addUri(getSuri(suri, type), password, { genesisHash, name }, type);
         return true;
     }
     accountsChangePassword({ address, newPass, oldPass }) {
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find pair');
         try {
             if (!pair.isLocked) {
@@ -60,37 +59,38 @@ class Extension {
         catch {
             throw new Error('oldPass is invalid');
         }
-        ui_keyring_1.default.encryptAccount(pair, newPass);
+        ui_keyring_1.keyring.encryptAccount(pair, newPass);
         return true;
     }
     accountsEdit({ address, name }) {
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find pair');
-        ui_keyring_1.default.saveAccountMeta(pair, { ...pair.meta, name });
+        ui_keyring_1.keyring.saveAccountMeta(pair, { ...pair.meta, name });
         return true;
     }
     accountsExport({ address, password }) {
-        return { exportedJson: ui_keyring_1.default.backupAccount(ui_keyring_1.default.getPair(address), password) };
+        return { exportedJson: ui_keyring_1.keyring.backupAccount(ui_keyring_1.keyring.getPair(address), password) };
     }
     async accountsBatchExport({ addresses, password }) {
         return {
-            exportedJson: await ui_keyring_1.default.backupAccounts(addresses, password)
+            exportedJson: await ui_keyring_1.keyring.backupAccounts(addresses, password)
         };
     }
-    accountsForget({ address }) {
+    async accountsForget({ address }) {
         const authorizedAccountsDiff = [];
         // cycle through authUrls and prepare the array of diff
         Object.entries(this.__internal__state.authUrls).forEach(([url, urlInfo]) => {
-            if (!urlInfo.authorizedAccounts.includes(address)) {
-                return;
+            // Note that urlInfo.authorizedAccounts may be undefined if this website entry
+            // was created before the "account authorization per website" functionality was introduced
+            if (urlInfo.authorizedAccounts?.includes(address)) {
+                authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
             }
-            authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
         });
-        this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
+        await this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
         // cycle through default account selection for auth and remove any occurrence of the account
         const newDefaultAuthAccounts = this.__internal__state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
-        this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
-        ui_keyring_1.default.forgetAccount(address);
+        await this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
+        ui_keyring_1.keyring.forgetAccount(address);
         return true;
     }
     refreshAccountPasswordCache(pair) {
@@ -105,20 +105,20 @@ class Extension {
         return remainingTime;
     }
     accountsShow({ address, isShowing }) {
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find pair');
-        ui_keyring_1.default.saveAccountMeta(pair, { ...pair.meta, isHidden: !isShowing });
+        ui_keyring_1.keyring.saveAccountMeta(pair, { ...pair.meta, isHidden: !isShowing });
         return true;
     }
     accountsTie({ address, genesisHash }) {
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find pair');
-        ui_keyring_1.default.saveAccountMeta(pair, { ...pair.meta, genesisHash });
+        ui_keyring_1.keyring.saveAccountMeta(pair, { ...pair.meta, genesisHash });
         return true;
     }
     accountsValidate({ address, password }) {
         try {
-            ui_keyring_1.default.backupAccount(ui_keyring_1.default.getPair(address), password);
+            ui_keyring_1.keyring.backupAccount(ui_keyring_1.keyring.getPair(address), password);
             return true;
         }
         catch {
@@ -141,8 +141,8 @@ class Extension {
         resolve({ authorizedAccounts, result: true });
         return true;
     }
-    authorizeUpdate({ authorizedAccounts, url }) {
-        return this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+    async authorizeUpdate({ authorizedAccounts, url }) {
+        return await this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
     }
     getAuthList() {
         return { list: this.__internal__state.authUrls };
@@ -157,11 +157,11 @@ class Extension {
         });
         return true;
     }
-    metadataApprove({ id }) {
+    async metadataApprove({ id }) {
         const queued = this.__internal__state.getMetaRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { request, resolve } = queued;
-        this.__internal__state.saveMetadata(request);
+        await this.__internal__state.saveMetadata(request);
         resolve(true);
         return true;
     }
@@ -189,7 +189,7 @@ class Extension {
     }
     jsonRestore({ file, password }) {
         try {
-            ui_keyring_1.default.restoreAccount(file, password);
+            ui_keyring_1.keyring.restoreAccount(file, password);
         }
         catch (error) {
             throw new Error(error.message);
@@ -197,7 +197,7 @@ class Extension {
     }
     batchRestore({ file, password }) {
         try {
-            ui_keyring_1.default.restoreAccounts(file, password);
+            ui_keyring_1.keyring.restoreAccounts(file, password);
         }
         catch (error) {
             throw new Error(error.message);
@@ -205,7 +205,7 @@ class Extension {
     }
     jsonGetAccountInfo(json) {
         try {
-            const { address, meta: { genesisHash, name }, type } = ui_keyring_1.default.createFromJson(json);
+            const { address, meta: { genesisHash, name }, type } = ui_keyring_1.keyring.createFromJson(json);
             return {
                 address,
                 genesisHash,
@@ -221,7 +221,7 @@ class Extension {
     seedCreate({ length = SEED_DEFAULT_LENGTH, seed: _seed, type }) {
         const seed = _seed || (0, util_crypto_1.mnemonicGenerate)(length);
         return {
-            address: ui_keyring_1.default.createFromUri(getSuri(seed, type), {}, type).address,
+            address: ui_keyring_1.keyring.createFromUri(getSuri(seed, type), {}, type).address,
             seed
         };
     }
@@ -236,7 +236,7 @@ class Extension {
             (0, util_1.assert)((0, util_crypto_1.mnemonicValidate)(phrase), 'Not a valid mnemonic seed');
         }
         return {
-            address: ui_keyring_1.default.createFromUri(getSuri(suri, type), {}, type).address,
+            address: ui_keyring_1.keyring.createFromUri(getSuri(suri, type), {}, type).address,
             suri
         };
     }
@@ -244,7 +244,7 @@ class Extension {
         const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject, request, resolve } = queued;
-        const pair = ui_keyring_1.default.getPair(queued.account.address);
+        const pair = ui_keyring_1.keyring.getPair(queued.account.address);
         if (!pair) {
             reject(new Error('Unable to find pair'));
             return false;
@@ -313,7 +313,7 @@ class Extension {
         const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const address = queued.request.payload.address;
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find pair');
         const remainingTime = this.refreshAccountPasswordCache(pair);
         return {
@@ -332,7 +332,7 @@ class Extension {
         return true;
     }
     windowOpen(path) {
-        const url = `${chrome.extension.getURL('index.html')}#${path}`;
+        const url = `${chrome.runtime.getURL('index.html')}#${path}`;
         if (!defaults_1.ALLOWED_PATH.includes(path)) {
             console.error('Not allowed to open the url:', url);
             return false;
@@ -341,7 +341,7 @@ class Extension {
         return true;
     }
     derive(parentAddress, suri, password, metadata) {
-        const parentPair = ui_keyring_1.default.getPair(parentAddress);
+        const parentPair = ui_keyring_1.keyring.getPair(parentAddress);
         try {
             parentPair.decodePkcs8(password);
         }
@@ -369,11 +369,12 @@ class Extension {
             parentAddress,
             suri
         });
-        ui_keyring_1.default.addPair(childPair, password);
+        ui_keyring_1.keyring.addPair(childPair, password);
         return true;
     }
-    removeAuthorization(url) {
-        return { list: this.__internal__state.removeAuthorization(url) };
+    async removeAuthorization(url) {
+        const remAuth = await this.__internal__state.removeAuthorization(url);
+        return { list: remAuth };
     }
     deleteAuthRequest(requestId) {
         return this.__internal__state.deleteAuthRequest(requestId);
@@ -425,7 +426,7 @@ class Extension {
             case 'pri(accounts.validate)':
                 return this.accountsValidate(request);
             case 'pri(metadata.approve)':
-                return this.metadataApprove(request);
+                return await this.metadataApprove(request);
             case 'pri(metadata.get)':
                 return this.metadataGet(request);
             case 'pri(metadata.list)':

package/cjs/background/handlers/State.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationOptions = void 0;
-const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const extension_chains_1 = require("@polkadot/extension-chains");
 const defaults_1 = require("@polkadot/networks/defaults");
-const ui_settings_1 = tslib_1.__importDefault(require("@polkadot/ui-settings"));
+const ui_settings_1 = require("@polkadot/ui-settings");
 const util_1 = require("@polkadot/util");
 const index_js_1 = require("../../stores/index.js");
 const getId_js_1 = require("../../utils/getId.js");
 const helpers_js_1 = require("./helpers.js");
-const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
+const NOTIFICATION_URL = chrome.runtime.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
     focused: true,
     height: 621,
@@ -33,8 +32,8 @@ var NotificationOptions;
 })(NotificationOptions || (exports.NotificationOptions = NotificationOptions = {}));
 const AUTH_URLS_KEY = 'authUrls';
 const DEFAULT_AUTH_ACCOUNTS = 'defaultAuthAccounts';
-function extractMetadata(store) {
-    store.allMap((map) => {
+async function extractMetadata(store) {
+    await store.allMap(async (map) => {
         const knownEntries = Object.entries(defaults_1.knownGenesis);
         const defs = {};
         const removals = [];
@@ -60,7 +59,9 @@ function extractMetadata(store) {
                 defs[key] = { def, index: 0, key };
             }
         });
-        removals.forEach((key) => store.remove(key));
+        for (const key of removals) {
+            await store.remove(key);
+        }
         Object.values(defs).forEach(({ def }) => (0, extension_chains_1.addMetadata)(def));
     });
 }
@@ -71,7 +72,7 @@ class State {
     // Map of providers currently injected in tabs
     __internal__injectedProviders = new Map();
     __internal__metaRequests = {};
-    __internal__notification = ui_settings_1.default.notification;
+    __internal__notification = ui_settings_1.settings.notification;
     // Map of all providers exposed by the extension, they are retrievable by key
     __internal__providers;
     __internal__signRequests = {};
@@ -83,13 +84,17 @@ class State {
     defaultAuthAccountSelection = [];
     constructor(providers = {}) {
         this.__internal__providers = providers;
-        extractMetadata(this.__internal__metaStore);
+    }
+    async init() {
+        await extractMetadata(this.__internal__metaStore);
         // retrieve previously set authorizations
-        const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
+        const storageAuthUrls = await chrome.storage.local.get(AUTH_URLS_KEY);
+        const authString = storageAuthUrls?.[AUTH_URLS_KEY] || '{}';
         const previousAuth = JSON.parse(authString);
         this.__internal__authUrls = previousAuth;
         // retrieve previously set default auth accounts
-        const defaultAuthString = localStorage.getItem(DEFAULT_AUTH_ACCOUNTS) || '[]';
+        const storageDefaultAuthAccounts = await chrome.storage.local.get(DEFAULT_AUTH_ACCOUNTS);
+        const defaultAuthString = storageDefaultAuthAccounts?.[DEFAULT_AUTH_ACCOUNTS] || '[]';
         const previousDefaultAuth = JSON.parse(defaultAuthString);
         this.defaultAuthAccountSelection = previousDefaultAuth;
     }
@@ -123,6 +128,9 @@ class State {
     get authUrls() {
         return this.__internal__authUrls;
     }
+    set authUrls(urls) {
+        this.__internal__authUrls = urls;
+    }
     popupClose() {
         this.__internal__windows.forEach((id) => (0, helpers_js_1.withErrorLog)(() => chrome.windows.remove(id)));
         this.__internal__windows = [];
@@ -138,7 +146,7 @@ class State {
             });
     }
     authComplete = (id, resolve, reject) => {
-        const complete = (authorizedAccounts = []) => {
+        const complete = async (authorizedAccounts = []) => {
             const { idStr, request: { origin }, url } = this.__internal__authRequests[id];
             this.__internal__authUrls[this.stripUrl(url)] = {
                 authorizedAccounts,
@@ -147,18 +155,20 @@ class State {
                 origin,
                 url
             };
-            this.saveCurrentAuthList();
-            this.updateDefaultAuthAccounts(authorizedAccounts);
+            await this.saveCurrentAuthList();
+            await this.updateDefaultAuthAccounts(authorizedAccounts);
             delete this.__internal__authRequests[id];
             this.updateIconAuth(true);
         };
         return {
-            reject: (error) => {
-                complete();
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            reject: async (error) => {
+                await complete();
                 reject(error);
             },
-            resolve: ({ authorizedAccounts, result }) => {
-                complete(authorizedAccounts);
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            resolve: async ({ authorizedAccounts, result }) => {
+                await complete(authorizedAccounts);
                 resolve({ authorizedAccounts, result });
             }
         };
@@ -188,15 +198,15 @@ class State {
         delete this.__internal__authRequests[requestId];
         this.updateIconAuth(true);
     }
-    saveCurrentAuthList() {
-        localStorage.setItem(AUTH_URLS_KEY, JSON.stringify(this.__internal__authUrls));
+    async saveCurrentAuthList() {
+        await chrome.storage.local.set({ [AUTH_URLS_KEY]: JSON.stringify(this.__internal__authUrls) });
     }
-    saveDefaultAuthAccounts() {
-        localStorage.setItem(DEFAULT_AUTH_ACCOUNTS, JSON.stringify(this.defaultAuthAccountSelection));
+    async saveDefaultAuthAccounts() {
+        await chrome.storage.local.set({ [DEFAULT_AUTH_ACCOUNTS]: JSON.stringify(this.defaultAuthAccountSelection) });
     }
-    updateDefaultAuthAccounts(newList) {
+    async updateDefaultAuthAccounts(newList) {
         this.defaultAuthAccountSelection = newList;
-        this.saveDefaultAuthAccounts();
+        await this.saveDefaultAuthAccounts();
     }
     metaComplete = (id, resolve, reject) => {
         const complete = () => {
@@ -244,16 +254,16 @@ class State {
             : metaCount
                 ? 'Meta'
                 : (signCount ? `${signCount}` : ''));
-        (0, helpers_js_1.withErrorLog)(() => chrome.browserAction.setBadgeText({ text }));
+        (0, helpers_js_1.withErrorLog)(() => chrome.action.setBadgeText({ text }));
         if (shouldClose && text === '') {
             this.popupClose();
         }
     }
-    removeAuthorization(url) {
+    async removeAuthorization(url) {
         const entry = this.__internal__authUrls[url];
         (0, util_1.assert)(entry, `The source ${url} is not known`);
         delete this.__internal__authUrls[url];
-        this.saveCurrentAuthList();
+        await this.saveCurrentAuthList();
         return this.__internal__authUrls;
     }
     updateIconAuth(shouldClose) {
@@ -268,11 +278,11 @@ class State {
         this.signSubject.next(this.allSignRequests);
         this.updateIcon(shouldClose);
     }
-    updateAuthorizedAccounts(authorizedAccountDiff) {
+    async updateAuthorizedAccounts(authorizedAccountDiff) {
         authorizedAccountDiff.forEach(([url, authorizedAccountDiff]) => {
             this.__internal__authUrls[url].authorizedAccounts = authorizedAccountDiff;
         });
-        this.saveCurrentAuthList();
+        await this.saveCurrentAuthList();
     }
     async authorizeUrl(url, request) {
         const idStr = this.stripUrl(url);
@@ -376,8 +386,8 @@ class State {
         (0, util_1.assert)(provider, 'Cannot call pub(rpc.unsubscribe) before provider is set');
         return provider.unsubscribe(request.type, request.method, request.subscriptionId);
     }
-    saveMetadata(meta) {
-        this.__internal__metaStore.set(meta.genesisHash, meta);
+    async saveMetadata(meta) {
+        await this.__internal__metaStore.set(meta.genesisHash, meta);
         (0, extension_chains_1.addMetadata)(meta);
     }
     setNotification(notification) {

package/cjs/background/handlers/Tabs.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const phishing_1 = require("@polkadot/phishing");
-const ui_keyring_1 = tslib_1.__importDefault(require("@polkadot/ui-keyring"));
+const ui_keyring_1 = require("@polkadot/ui-keyring");
 const accounts_1 = require("@polkadot/ui-keyring/observable/accounts");
 const util_1 = require("@polkadot/util");
 const defaults_js_1 = require("../../defaults.js");
@@ -70,7 +70,7 @@ class Tabs {
         return true;
     }
     getSigningPair(address) {
-        const pair = ui_keyring_1.default.getPair(address);
+        const pair = ui_keyring_1.keyring.getPair(address);
         (0, util_1.assert)(pair, 'Unable to find keypair');
         return pair;
     }
@@ -127,7 +127,7 @@ class Tabs {
     redirectPhishingLanding(phishingWebsite) {
         const nonFragment = phishingWebsite.split('#')[0];
         const encodedWebsite = encodeURIComponent(nonFragment);
-        const url = `${chrome.extension.getURL('index.html')}#${defaults_js_1.PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
+        const url = `${chrome.runtime.getURL('index.html')}#${defaults_js_1.PHISHING_PAGE_REDIRECT}/${encodedWebsite}`;
         chrome.tabs.query({ url: nonFragment }, (tabs) => {
             tabs
                 .map(({ id }) => id)

package/cjs/background/handlers/index.js

@@ -10,6 +10,7 @@ const Tabs_js_1 = tslib_1.__importDefault(require("./Tabs.js"));
 var helpers_js_1 = require("./helpers.js");
 Object.defineProperty(exports, "withErrorLog", { enumerable: true, get: function () { return helpers_js_1.withErrorLog; } });
 const state = new State_js_1.default();
+await state.init();
 const extension = new Extension_js_1.default(state);
 const tabs = new Tabs_js_1.default(state);
 function handler({ id, message, request }, port, extensionPortName = defaults_js_1.PORT_EXTENSION) {

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/extension-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.48.1' };
+exports.packageInfo = { name: '@polkadot/extension-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.49.1' };

package/cjs/stores/Accounts.js

@@ -9,13 +9,13 @@ class AccountsStore extends Base_js_1.default {
             ? `${defaults_js_1.EXTENSION_PREFIX}accounts`
             : null);
     }
-    set(key, value, update) {
+    async 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);
+        await super.set(key, value, update);
     }
 }
 exports.default = AccountsStore;

package/cjs/stores/Base.js

@@ -11,15 +11,17 @@ class BaseStore {
     constructor(prefix) {
         this.__internal__prefix = prefix ? `${prefix}:` : '';
     }
-    all(update) {
-        this.allMap((map) => {
-            Object.entries(map).forEach(([key, value]) => {
-                update(key, value);
-            });
+    async all(update) {
+        await this.allMap(async (map) => {
+            const entries = Object.entries(map);
+            for (const [key, value] of entries) {
+                // eslint-disable-next-line @typescript-eslint/await-thenable
+                await update(key, value);
+            }
         });
     }
-    allMap(update) {
-        chrome.storage.local.get(null, (result) => {
+    async allMap(update) {
+        await chrome.storage.local.get(null).then(async (result) => {
             lastError('all');
             const entries = Object.entries(result);
             const map = {};
@@ -29,28 +31,39 @@ class BaseStore {
                     map[key.replace(this.__internal__prefix, '')] = value;
                 }
             }
-            update(map);
+            await update(map);
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within allMap: ${message}`);
         });
     }
-    get(key, update) {
+    async get(key, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.get([prefixedKey], (result) => {
+        await chrome.storage.local.get([prefixedKey]).then(async (result) => {
             lastError('get');
-            update(result[prefixedKey]);
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            await update(result[prefixedKey]);
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within get: ${message}`);
         });
     }
-    remove(key, update) {
+    async remove(key, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.remove(prefixedKey, () => {
+        await chrome.storage.local.remove(prefixedKey).then(async () => {
             lastError('remove');
-            update && update();
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            update && await update();
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within remove: ${message}`);
         });
     }
-    set(key, value, update) {
+    async set(key, value, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.set({ [prefixedKey]: value }, () => {
+        await chrome.storage.local.set({ [prefixedKey]: value }).then(async () => {
             lastError('set');
-            update && update();
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            update && await update();
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within set: ${message}`);
         });
     }
 }

package/package.json

@@ -18,7 +18,7 @@
     "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "0.48.1",
+  "version": "0.49.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -217,19 +217,19 @@
     }
   },
   "dependencies": {
-    "@polkadot/api": "^12.0.2",
-    "@polkadot/extension-chains": "0.48.1",
-    "@polkadot/extension-dapp": "0.48.1",
-    "@polkadot/extension-inject": "0.48.1",
-    "@polkadot/keyring": "^12.6.2",
-    "@polkadot/networks": "^12.6.2",
-    "@polkadot/phishing": "^0.22.10",
-    "@polkadot/rpc-provider": "^12.0.2",
-    "@polkadot/types": "^12.0.2",
-    "@polkadot/ui-keyring": "^3.6.6",
-    "@polkadot/ui-settings": "^3.6.6",
-    "@polkadot/util": "^12.6.2",
-    "@polkadot/util-crypto": "^12.6.2",
+    "@polkadot/api": "^12.2.1",
+    "@polkadot/extension-chains": "0.49.1",
+    "@polkadot/extension-dapp": "0.49.1",
+    "@polkadot/extension-inject": "0.49.1",
+    "@polkadot/keyring": "^13.0.2",
+    "@polkadot/networks": "^13.0.2",
+    "@polkadot/phishing": "^0.23.1",
+    "@polkadot/rpc-provider": "^12.2.1",
+    "@polkadot/types": "^12.2.1",
+    "@polkadot/ui-keyring": "^3.7.1",
+    "@polkadot/ui-settings": "^3.7.1",
+    "@polkadot/util": "^13.0.2",
+    "@polkadot/util-crypto": "^13.0.2",
     "eventemitter3": "^5.0.1",
     "rxjs": "^7.8.1",
     "tslib": "^2.6.2"

package/packageInfo.js

@@ -1 +1 @@
-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.48.1' };
+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.49.1' };

package/stores/Accounts.d.ts

@@ -2,5 +2,5 @@ import type { KeyringJson, KeyringStore } from '@polkadot/ui-keyring/types';
 import BaseStore from './Base.js';
 export default class AccountsStore extends BaseStore<KeyringJson> implements KeyringStore {
     constructor();
-    set(key: string, value: KeyringJson, update?: () => void): void;
+    set(key: string, value: KeyringJson, update?: () => void): Promise<void>;
 }

package/stores/Accounts.js

@@ -6,12 +6,12 @@ export default class AccountsStore extends BaseStore {
             ? `${EXTENSION_PREFIX}accounts`
             : null);
     }
-    set(key, value, update) {
+    async 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);
+        await super.set(key, value, update);
     }
 }

package/stores/Base.d.ts

@@ -1,9 +1,9 @@
 export default abstract class BaseStore<T> {
     #private;
     constructor(prefix: string | null);
-    all(update: (key: string, value: T) => void): void;
-    allMap(update: (value: Record<string, T>) => void): void;
-    get(key: string, update: (value: T) => void): void;
-    remove(key: string, update?: () => void): void;
-    set(key: string, value: T, update?: () => void): void;
+    all(update: (key: string, value: T) => void): Promise<void>;
+    allMap(update: (value: Record<string, T>) => Promise<void>): Promise<void>;
+    get(key: string, update: (value: T) => void): Promise<void>;
+    remove(key: string, update?: () => void): Promise<void>;
+    set(key: string, value: T, update?: () => void): Promise<void>;
 }

package/stores/Base.js

@@ -9,15 +9,17 @@ export default class BaseStore {
     constructor(prefix) {
         this.__internal__prefix = prefix ? `${prefix}:` : '';
     }
-    all(update) {
-        this.allMap((map) => {
-            Object.entries(map).forEach(([key, value]) => {
-                update(key, value);
-            });
+    async all(update) {
+        await this.allMap(async (map) => {
+            const entries = Object.entries(map);
+            for (const [key, value] of entries) {
+                // eslint-disable-next-line @typescript-eslint/await-thenable
+                await update(key, value);
+            }
         });
     }
-    allMap(update) {
-        chrome.storage.local.get(null, (result) => {
+    async allMap(update) {
+        await chrome.storage.local.get(null).then(async (result) => {
             lastError('all');
             const entries = Object.entries(result);
             const map = {};
@@ -27,28 +29,39 @@ export default class BaseStore {
                     map[key.replace(this.__internal__prefix, '')] = value;
                 }
             }
-            update(map);
+            await update(map);
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within allMap: ${message}`);
         });
     }
-    get(key, update) {
+    async get(key, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.get([prefixedKey], (result) => {
+        await chrome.storage.local.get([prefixedKey]).then(async (result) => {
             lastError('get');
-            update(result[prefixedKey]);
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            await update(result[prefixedKey]);
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within get: ${message}`);
         });
     }
-    remove(key, update) {
+    async remove(key, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.remove(prefixedKey, () => {
+        await chrome.storage.local.remove(prefixedKey).then(async () => {
             lastError('remove');
-            update && update();
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            update && await update();
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within remove: ${message}`);
         });
     }
-    set(key, value, update) {
+    async set(key, value, update) {
         const prefixedKey = `${this.__internal__prefix}${key}`;
-        chrome.storage.local.set({ [prefixedKey]: value }, () => {
+        await chrome.storage.local.set({ [prefixedKey]: value }).then(async () => {
             lastError('set');
-            update && update();
+            // eslint-disable-next-line @typescript-eslint/await-thenable
+            update && await update();
+        }).catch(({ message }) => {
+            console.error(`BaseStore error within set: ${message}`);
         });
     }
 }