@polkadot/extension-base 0.45.1 → 0.45.3

package/background/RequestBytesSign.d.ts

@@ -1,7 +1,7 @@
 import type { KeyringPair } from '@polkadot/keyring/types';
 import type { SignerPayloadRaw } from '@polkadot/types/types';
 import type { HexString } from '@polkadot/util/types';
-import type { RequestSign } from './types';
+import type { RequestSign } from './types.js';
 import { TypeRegistry } from '@polkadot/types';
 export default class RequestBytesSign implements RequestSign {
     readonly payload: SignerPayloadRaw;

package/background/RequestBytesSign.js

@@ -1,7 +1,6 @@
 import { wrapBytes } from '@polkadot/extension-dapp/wrapBytes';
 import { u8aToHex } from '@polkadot/util';
 export default class RequestBytesSign {
-    payload;
     constructor(payload) {
         this.payload = payload;
     }
@@ -10,4 +9,4 @@ export default class RequestBytesSign {
             signature: u8aToHex(pair.sign(wrapBytes(this.payload.data)))
         };
     }
-}
+}

package/background/RequestExtrinsicSign.d.ts

@@ -1,7 +1,7 @@
 import type { KeyringPair } from '@polkadot/keyring/types';
 import type { SignerPayloadJSON } from '@polkadot/types/types';
 import type { HexString } from '@polkadot/util/types';
-import type { RequestSign } from './types';
+import type { RequestSign } from './types.js';
 import { TypeRegistry } from '@polkadot/types';
 export default class RequestExtrinsicSign implements RequestSign {
     readonly payload: SignerPayloadJSON;

package/background/RequestExtrinsicSign.js

@@ -1,5 +1,4 @@
 export default class RequestExtrinsicSign {
-    payload;
     constructor(payload) {
         this.payload = payload;
     }
@@ -8,4 +7,4 @@ export default class RequestExtrinsicSign {
             .createType('ExtrinsicPayload', this.payload, { version: this.payload.version })
             .sign(pair);
     }
-}
+}

package/background/handlers/Extension.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="chrome" />
-import type { MessageTypes, RequestTypes, ResponseType } from '../types';
-import State from './State';
+import type { MessageTypes, RequestTypes, ResponseType } from '../types.js';
+import State from './State.js';
 export default class Extension {
     #private;
     constructor(state: State);

package/background/handlers/Extension.js

@@ -1,3 +1,5 @@
+var _Extension_cachedUnlocks, _Extension_state;
+import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { ALLOWED_PATH, PASSWORD_EXPIRY_MS } from '@polkadot/extension-base/defaults';
 import { metadataExpand } from '@polkadot/extension-chains';
 import { TypeRegistry } from '@polkadot/types';
@@ -19,16 +21,16 @@ function isJsonPayload(value) {
     return value.genesisHash !== undefined;
 }
 export default class Extension {
-    #cachedUnlocks;
-    #state;
     constructor(state) {
-        this.#cachedUnlocks = {};
-        this.#state = state;
+        _Extension_cachedUnlocks.set(this, void 0);
+        _Extension_state.set(this, void 0);
+        __classPrivateFieldSet(this, _Extension_cachedUnlocks, {}, "f");
+        __classPrivateFieldSet(this, _Extension_state, state, "f");
     }
     transformAccounts(accounts) {
         return Object.values(accounts).map(({ json: { address, meta }, type }) => ({
             address,
-            isDefaultAuthSelected: this.#state.defaultAuthAccountSelection.includes(address),
+            isDefaultAuthSelected: __classPrivateFieldGet(this, _Extension_state, "f").defaultAuthAccountSelection.includes(address),
             ...meta,
             type
         }));
@@ -54,7 +56,7 @@ export default class Extension {
             }
             pair.decodePkcs8(oldPass);
         }
-        catch (error) {
+        catch {
             throw new Error('oldPass is invalid');
         }
         keyring.encryptAccount(pair, newPass);
@@ -77,25 +79,25 @@ export default class Extension {
     accountsForget({ address }) {
         const authorizedAccountsDiff = [];
         // cycle through authUrls and prepare the array of diff
-        Object.entries(this.#state.authUrls).forEach(([url, urlInfo]) => {
+        Object.entries(__classPrivateFieldGet(this, _Extension_state, "f").authUrls).forEach(([url, urlInfo]) => {
             if (!urlInfo.authorizedAccounts.includes(address)) {
                 return;
             }
             authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
         });
-        this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
+        __classPrivateFieldGet(this, _Extension_state, "f").updateAuthorizedAccounts(authorizedAccountsDiff);
         // cycle through default account selection for auth and remove any occurence of the account
-        const newDefaultAuthAccounts = this.#state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
-        this.#state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
+        const newDefaultAuthAccounts = __classPrivateFieldGet(this, _Extension_state, "f").defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
+        __classPrivateFieldGet(this, _Extension_state, "f").updateDefaultAuthAccounts(newDefaultAuthAccounts);
         keyring.forgetAccount(address);
         return true;
     }
     refreshAccountPasswordCache(pair) {
         const { address } = pair;
-        const savedExpiry = this.#cachedUnlocks[address] || 0;
+        const savedExpiry = __classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[address] || 0;
         const remainingTime = savedExpiry - Date.now();
         if (remainingTime < 0) {
-            this.#cachedUnlocks[address] = 0;
+            __classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[address] = 0;
             pair.lock();
             return 0;
         }
@@ -118,7 +120,7 @@ export default class Extension {
             keyring.backupAccount(keyring.getPair(address), password);
             return true;
         }
-        catch (e) {
+        catch {
             return false;
         }
     }
@@ -132,22 +134,22 @@ export default class Extension {
         return true;
     }
     authorizeApprove({ authorizedAccounts, id }) {
-        const queued = this.#state.getAuthRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getAuthRequest(id);
         assert(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ authorizedAccounts, result: true });
         return true;
     }
     authorizeUpdate({ authorizedAccounts, url }) {
-        return this.#state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+        return __classPrivateFieldGet(this, _Extension_state, "f").updateAuthorizedAccounts([[url, authorizedAccounts]]);
     }
     getAuthList() {
-        return { list: this.#state.authUrls };
+        return { list: __classPrivateFieldGet(this, _Extension_state, "f").authUrls };
     }
     // FIXME This looks very much like what we have in accounts
     authorizeSubscribe(id, port) {
         const cb = createSubscription(id, port);
-        const subscription = this.#state.authSubject.subscribe((requests) => cb(requests));
+        const subscription = __classPrivateFieldGet(this, _Extension_state, "f").authSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
             subscription.unsubscribe();
@@ -155,21 +157,21 @@ export default class Extension {
         return true;
     }
     metadataApprove({ id }) {
-        const queued = this.#state.getMetaRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getMetaRequest(id);
         assert(queued, 'Unable to find request');
         const { request, resolve } = queued;
-        this.#state.saveMetadata(request);
+        __classPrivateFieldGet(this, _Extension_state, "f").saveMetadata(request);
         resolve(true);
         return true;
     }
     metadataGet(genesisHash) {
-        return this.#state.knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
+        return __classPrivateFieldGet(this, _Extension_state, "f").knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
     }
     metadataList() {
-        return this.#state.knownMetadata;
+        return __classPrivateFieldGet(this, _Extension_state, "f").knownMetadata;
     }
     metadataReject({ id }) {
-        const queued = this.#state.getMetaRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getMetaRequest(id);
         assert(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Rejected'));
@@ -177,7 +179,7 @@ export default class Extension {
     }
     metadataSubscribe(id, port) {
         const cb = createSubscription(id, port);
-        const subscription = this.#state.metaSubject.subscribe((requests) => cb(requests));
+        const subscription = __classPrivateFieldGet(this, _Extension_state, "f").metaSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
             subscription.unsubscribe();
@@ -238,7 +240,7 @@ export default class Extension {
         };
     }
     signingApprovePassword({ id, password, savePass }) {
-        const queued = this.#state.getSignRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
         assert(queued, 'Unable to find request');
         const { reject, request, resolve } = queued;
         const pair = keyring.getPair(queued.account.address);
@@ -259,7 +261,7 @@ export default class Extension {
         const { payload } = request;
         if (isJsonPayload(payload)) {
             // Get the metadata for the genesisHash
-            const metadata = this.#state.knownMetadata.find(({ genesisHash }) => genesisHash === payload.genesisHash);
+            const metadata = __classPrivateFieldGet(this, _Extension_state, "f").knownMetadata.find(({ genesisHash }) => genesisHash === payload.genesisHash);
             if (metadata) {
                 // we have metadata, expand it and extract the info/registry
                 const expanded = metadataExpand(metadata, false);
@@ -281,7 +283,7 @@ export default class Extension {
             // unlike queued.account.address the following
             // address is encoded with the default prefix
             // which what is used for password caching mapping
-            this.#cachedUnlocks[pair.address] = Date.now() + PASSWORD_EXPIRY_MS;
+            __classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[pair.address] = Date.now() + PASSWORD_EXPIRY_MS;
         }
         else {
             pair.lock();
@@ -293,21 +295,21 @@ export default class Extension {
         return true;
     }
     signingApproveSignature({ id, signature }) {
-        const queued = this.#state.getSignRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
         assert(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ id, signature });
         return true;
     }
     signingCancel({ id }) {
-        const queued = this.#state.getSignRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
         assert(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Cancelled'));
         return true;
     }
     signingIsLocked({ id }) {
-        const queued = this.#state.getSignRequest(id);
+        const queued = __classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
         assert(queued, 'Unable to find request');
         const address = queued.request.payload.address;
         const pair = keyring.getPair(address);
@@ -321,7 +323,7 @@ export default class Extension {
     // FIXME This looks very much like what we have in authorization
     signingSubscribe(id, port) {
         const cb = createSubscription(id, port);
-        const subscription = this.#state.signSubject.subscribe((requests) => cb(requests));
+        const subscription = __classPrivateFieldGet(this, _Extension_state, "f").signSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
             subscription.unsubscribe();
@@ -342,13 +344,13 @@ export default class Extension {
         try {
             parentPair.decodePkcs8(password);
         }
-        catch (e) {
+        catch {
             throw new Error('invalid password');
         }
         try {
             return parentPair.derive(suri, metadata);
         }
-        catch (err) {
+        catch {
             throw new Error(`"${suri}" is not a valid derivation path`);
         }
     }
@@ -370,16 +372,16 @@ export default class Extension {
         return true;
     }
     removeAuthorization(url) {
-        return { list: this.#state.removeAuthorization(url) };
+        return { list: __classPrivateFieldGet(this, _Extension_state, "f").removeAuthorization(url) };
     }
     deleteAuthRequest(requestId) {
-        return this.#state.deleteAuthRequest(requestId);
+        return __classPrivateFieldGet(this, _Extension_state, "f").deleteAuthRequest(requestId);
     }
     updateCurrentTabs({ urls }) {
-        this.#state.udateCurrentTabsUrl(urls);
+        __classPrivateFieldGet(this, _Extension_state, "f").udateCurrentTabsUrl(urls);
     }
     getConnectedTabsUrl() {
-        return this.#state.getConnectedTabsUrl();
+        return __classPrivateFieldGet(this, _Extension_state, "f").getConnectedTabsUrl();
     }
     // Weird thought, the eslint override is not needed in Tabs
     // eslint-disable-next-line @typescript-eslint/require-await
@@ -452,7 +454,7 @@ export default class Extension {
             case 'pri(seed.validate)':
                 return this.seedValidate(request);
             case 'pri(settings.notification)':
-                return this.#state.setNotification(request);
+                return __classPrivateFieldGet(this, _Extension_state, "f").setNotification(request);
             case 'pri(signing.approve.password)':
                 return this.signingApprovePassword(request);
             case 'pri(signing.approve.signature)':
@@ -469,4 +471,5 @@ export default class Extension {
                 throw new Error(`Unable to handle message of type ${type}`);
         }
     }
-}
+}
+_Extension_cachedUnlocks = new WeakMap(), _Extension_state = new WeakMap();

package/background/handlers/State.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="chrome" />
 import type { MetadataDef, ProviderMeta } from '@polkadot/extension-inject/types';
 import type { JsonRpcResponse, ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
-import type { AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning, SigningRequest } from '../types';
+import type { AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning, SigningRequest } from '../types.js';
 import { BehaviorSubject } from 'rxjs';
 interface Resolver<T> {
     reject: (error: Error) => void;