@polkadot/extension-dapp 0.44.5 → 0.44.7

package/bundle-polkadot-extension-dapp.js

@@ -20,7 +20,7 @@
     name: '@polkadot/extension-dapp',
     path: (({ url: (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href)) }) && (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))) ? new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))).pathname.substring(0, new URL((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('bundle-polkadot-extension-dapp.js', document.baseURI).href))).pathname.lastIndexOf('/') + 1) : 'auto',
     type: 'esm',
-    version: '0.44.5'
+    version: '0.44.7'
   };
 
   const unwrapBytes = util.u8aUnwrapBytes;
@@ -29,7 +29,10 @@
   const win = window;
   win.injectedWeb3 = win.injectedWeb3 || {};
   function web3IsInjected() {
-    return Object.keys(win.injectedWeb3).length !== 0;
+    return Object.values(win.injectedWeb3).filter(({
+      connect,
+      enable
+    }) => !!(connect || enable)).length !== 0;
   }
   function throwError(method) {
     throw new Error(`${method}: web3Enable(originName) needs to be called before ${method}`);
@@ -50,42 +53,48 @@
       type
     }));
   }
+  function filterAccounts(list, genesisHash, type) {
+    return list.filter(a => (!a.type || !type || type.includes(a.type)) && (!a.genesisHash || !genesisHash || a.genesisHash === genesisHash));
+  }
   exports.isWeb3Injected = web3IsInjected();
   exports.web3EnablePromise = null;
   function getWindowExtensions(originName) {
-    return Promise.all(Object.entries(win.injectedWeb3).map(([name, {
+    return Promise.all(Object.entries(win.injectedWeb3).map(([nameOrHash, {
+      connect,
       enable,
       version
-    }]) => Promise.all([Promise.resolve({
-      name,
-      version
-    }), enable(originName).catch(error => {
-      console.error(`Error initializing ${name}: ${error.message}`);
-    })])));
+    }]) => Promise.resolve().then(() => connect
+    ? connect(originName) : enable
+    ? enable(originName).then(e => util.objectSpread({
+      name: nameOrHash,
+      version: version || 'unknown'
+    }, e)) : Promise.reject(new Error('No connect(..) or enable(...) hook found'))).catch(({
+      message
+    }) => {
+      console.error(`Error initializing ${nameOrHash}: ${message}`);
+    }))).then(exts => exts.filter(e => !!e));
   }
   function web3Enable(originName, compatInits = []) {
     if (!originName) {
       throw new Error('You must pass a name for your app to the web3Enable function');
     }
     const initCompat = compatInits.length ? Promise.all(compatInits.map(c => c().catch(() => false))) : Promise.resolve([true]);
-    exports.web3EnablePromise = documentReadyPromise(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.filter(value => !!value[1]).map(([info, ext]) => {
-      if (!ext.accounts.subscribe) {
-        ext.accounts.subscribe = cb => {
-          ext.accounts.get().then(cb).catch(console.error);
+    exports.web3EnablePromise = documentReadyPromise(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.map(e => {
+      if (!e.accounts.subscribe) {
+        e.accounts.subscribe = cb => {
+          e.accounts.get().then(cb).catch(console.error);
           return () => {
           };
         };
       }
-      return { ...info,
-        ...ext
-      };
+      return e;
     })).catch(() => []).then(values => {
       const names = values.map(({
         name,
         version
       }) => `${name}/${version}`);
       exports.isWeb3Injected = web3IsInjected();
-      console.log(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
+      console.info(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
       return values;
     })));
     return exports.web3EnablePromise;
@@ -93,14 +102,15 @@
   async function web3Accounts({
     accountType,
     extensions,
+    genesisHash,
     ss58Format
   } = {}) {
     if (!exports.web3EnablePromise) {
       return throwError('web3Accounts');
     }
     const accounts = [];
-    const injected = await exports.web3EnablePromise;
-    const retrieved = await Promise.all(injected.filter(({
+    const sources = await exports.web3EnablePromise;
+    const retrieved = await Promise.all(sources.filter(({
       name: source
     }) => !extensions || extensions.includes(source)).map(async ({
       accounts,
@@ -108,9 +118,7 @@
     }) => {
       try {
         const list = await accounts.get();
-        return mapAccounts(source, list.filter(({
-          type
-        }) => type && accountType ? accountType.includes(type) : true), ss58Format);
+        return mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format);
       } catch (error) {
         return [];
       }
@@ -118,14 +126,13 @@
     retrieved.forEach(result => {
       accounts.push(...result);
     });
-    const addresses = accounts.map(({
-      address
-    }) => address);
-    console.log(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}: ${addresses.join(', ')}`);
+    console.info(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}`);
     return accounts;
   }
   async function web3AccountsSubscribe(cb, {
+    accountType,
     extensions,
+    genesisHash,
     ss58Format
   } = {}) {
     if (!exports.web3EnablePromise) {
@@ -133,10 +140,11 @@
     }
     const accounts = {};
     const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, [source, list]) => {
-      result.push(...mapAccounts(source, list, ss58Format));
+      result.push(...mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format));
       return result;
     }, []));
-    const unsubs = (await exports.web3EnablePromise).filter(({
+    const sources = await exports.web3EnablePromise;
+    const unsubs = sources.filter(({
       name: source
     }) => !extensions || extensions.includes(source)).map(({
       accounts: {
@@ -146,8 +154,10 @@
     }) => subscribe(result => {
       accounts[source] = result;
       try {
-        var _triggerUpdate;
-        (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+        const result = triggerUpdate();
+        if (result && util.isPromise(result)) {
+          result.catch(console.error);
+        }
       } catch (error) {
         console.error(error);
       }
@@ -221,6 +231,4 @@
   exports.web3UseRpcProvider = web3UseRpcProvider;
   exports.wrapBytes = wrapBytes;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-
 }));

package/bundle.d.ts

@@ -5,8 +5,8 @@ declare let isWeb3Injected: boolean;
 declare let web3EnablePromise: Promise<InjectedExtension[]> | null;
 export { isWeb3Injected, web3EnablePromise };
 export declare function web3Enable(originName: string, compatInits?: (() => Promise<boolean>)[]): Promise<InjectedExtension[]>;
-export declare function web3Accounts({ accountType, extensions, ss58Format }?: Web3AccountsOptions): Promise<InjectedAccountWithMeta[]>;
-export declare function web3AccountsSubscribe(cb: (accounts: InjectedAccountWithMeta[]) => void | Promise<void>, { extensions, ss58Format }?: Web3AccountsOptions): Promise<Unsubcall>;
+export declare function web3Accounts({ accountType, extensions, genesisHash, ss58Format }?: Web3AccountsOptions): Promise<InjectedAccountWithMeta[]>;
+export declare function web3AccountsSubscribe(cb: (accounts: InjectedAccountWithMeta[]) => void | Promise<void>, { accountType, extensions, genesisHash, ss58Format }?: Web3AccountsOptions): Promise<Unsubcall>;
 export declare function web3FromSource(source: string): Promise<InjectedExtension>;
 export declare function web3FromAddress(address: string): Promise<InjectedExtension>;
 export declare function web3ListRpcProviders(source: string): Promise<ProviderList | null>;

package/bundle.js

@@ -1,26 +1,34 @@
 // Copyright 2019-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { u8aEq } from '@polkadot/util';
+
+import { isPromise, objectSpread, u8aEq } from '@polkadot/util';
 import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
-import { documentReadyPromise } from "./util.js"; // expose utility functions
+import { documentReadyPromise } from "./util.js";
 
+// expose utility functions
 export { packageInfo } from "./packageInfo.js";
-export { unwrapBytes, wrapBytes } from "./wrapBytes.js"; // just a helper (otherwise we cast all-over, so shorter and more readable)
+export { unwrapBytes, wrapBytes } from "./wrapBytes.js";
 
-const win = window; // don't clobber the existing object, but ensure non-undefined
+// just a helper (otherwise we cast all-over, so shorter and more readable)
+const win = window;
 
-win.injectedWeb3 = win.injectedWeb3 || {}; // true when anything has been injected and is available
+// don't clobber the existing object, but ensure non-undefined
+win.injectedWeb3 = win.injectedWeb3 || {};
 
+// true when anything has been injected and is available
 function web3IsInjected() {
-  return Object.keys(win.injectedWeb3).length !== 0;
-} // helper to throw a consistent error when not enabled
-
+  return Object.values(win.injectedWeb3).filter(({
+    connect,
+    enable
+  }) => !!(connect || enable)).length !== 0;
+}
 
+// helper to throw a consistent error when not enabled
 function throwError(method) {
   throw new Error(`${method}: web3Enable(originName) needs to be called before ${method}`);
-} // internal helper to map from Array<InjectedAccount> -> Array<InjectedAccountWithMeta>
-
+}
 
+// internal helper to map from Array<InjectedAccount> -> Array<InjectedAccountWithMeta>
 function mapAccounts(source, list, ss58Format) {
   return list.map(({
     address,
@@ -36,70 +44,80 @@ function mapAccounts(source, list, ss58Format) {
     },
     type
   }));
-} // have we found a properly constructed window.injectedWeb3
+}
 
+// internal helper to filter accounts
+function filterAccounts(list, genesisHash, type) {
+  return list.filter(a => (!a.type || !type || type.includes(a.type)) && (!a.genesisHash || !genesisHash || a.genesisHash === genesisHash));
+}
 
-let isWeb3Injected = web3IsInjected(); // we keep the last promise created around (for queries)
+// have we found a properly constructed window.injectedWeb3
+let isWeb3Injected = web3IsInjected();
 
+// we keep the last promise created around (for queries)
 let web3EnablePromise = null;
 export { isWeb3Injected, web3EnablePromise };
-
 function getWindowExtensions(originName) {
-  return Promise.all(Object.entries(win.injectedWeb3).map(([name, {
+  return Promise.all(Object.entries(win.injectedWeb3).map(([nameOrHash, {
+    connect,
     enable,
     version
-  }]) => Promise.all([Promise.resolve({
-    name,
-    version
-  }), enable(originName).catch(error => {
-    console.error(`Error initializing ${name}: ${error.message}`);
-  })])));
-} // enables all the providers found on the injected window interface
-
+  }]) => Promise.resolve().then(() => connect
+  // new style, returning all info
+  ? connect(originName) : enable
+  // previous interface, leakages on name/version
+  ? enable(originName).then(e => objectSpread({
+    name: nameOrHash,
+    version: version || 'unknown'
+  }, e)) : Promise.reject(new Error('No connect(..) or enable(...) hook found'))).catch(({
+    message
+  }) => {
+    console.error(`Error initializing ${nameOrHash}: ${message}`);
+  }))).then(exts => exts.filter(e => !!e));
+}
 
+// enables all the providers found on the injected window interface
 export function web3Enable(originName, compatInits = []) {
   if (!originName) {
     throw new Error('You must pass a name for your app to the web3Enable function');
   }
-
   const initCompat = compatInits.length ? Promise.all(compatInits.map(c => c().catch(() => false))) : Promise.resolve([true]);
-  web3EnablePromise = documentReadyPromise(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.filter(value => !!value[1]).map(([info, ext]) => {
+  web3EnablePromise = documentReadyPromise(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.map(e => {
     // if we don't have an accounts subscriber, add a single-shot version
-    if (!ext.accounts.subscribe) {
-      ext.accounts.subscribe = cb => {
-        ext.accounts.get().then(cb).catch(console.error);
-        return () => {// no ubsubscribe needed, this is a single-shot
+    if (!e.accounts.subscribe) {
+      e.accounts.subscribe = cb => {
+        e.accounts.get().then(cb).catch(console.error);
+        return () => {
+          // no ubsubscribe needed, this is a single-shot
         };
       };
     }
-
-    return { ...info,
-      ...ext
-    };
+    return e;
   })).catch(() => []).then(values => {
     const names = values.map(({
       name,
       version
     }) => `${name}/${version}`);
     isWeb3Injected = web3IsInjected();
-    console.log(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
+    console.info(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
     return values;
   })));
   return web3EnablePromise;
-} // retrieve all the accounts across all providers
+}
 
+// retrieve all the accounts across all providers
 export async function web3Accounts({
   accountType,
   extensions,
+  genesisHash,
   ss58Format
 } = {}) {
   if (!web3EnablePromise) {
     return throwError('web3Accounts');
   }
-
   const accounts = [];
-  const injected = await web3EnablePromise;
-  const retrieved = await Promise.all(injected.filter(({
+  const sources = await web3EnablePromise;
+  const retrieved = await Promise.all(sources.filter(({
     name: source
   }) => !extensions || extensions.includes(source)).map(async ({
     accounts,
@@ -107,9 +125,7 @@ export async function web3Accounts({
   }) => {
     try {
       const list = await accounts.get();
-      return mapAccounts(source, list.filter(({
-        type
-      }) => type && accountType ? accountType.includes(type) : true), ss58Format);
+      return mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format);
     } catch (error) {
       // cannot handle this one
       return [];
@@ -118,28 +134,25 @@ export async function web3Accounts({
   retrieved.forEach(result => {
     accounts.push(...result);
   });
-  const addresses = accounts.map(({
-    address
-  }) => address);
-  console.log(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}: ${addresses.join(', ')}`);
+  console.info(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}`);
   return accounts;
 }
 export async function web3AccountsSubscribe(cb, {
+  accountType,
   extensions,
+  genesisHash,
   ss58Format
 } = {}) {
   if (!web3EnablePromise) {
     return throwError('web3AccountsSubscribe');
   }
-
   const accounts = {};
-
   const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, [source, list]) => {
-    result.push(...mapAccounts(source, list, ss58Format));
+    result.push(...mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format));
     return result;
   }, []));
-
-  const unsubs = (await web3EnablePromise).filter(({
+  const sources = await web3EnablePromise;
+  const unsubs = sources.filter(({
     name: source
   }) => !extensions || extensions.includes(source)).map(({
     accounts: {
@@ -148,11 +161,11 @@ export async function web3AccountsSubscribe(cb, {
     name: source
   }) => subscribe(result => {
     accounts[source] = result;
-
     try {
-      var _triggerUpdate;
-
-      (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+      const result = triggerUpdate();
+      if (result && isPromise(result)) {
+        result.catch(console.error);
+      }
     } catch (error) {
       console.error(error);
     }
@@ -162,67 +175,60 @@ export async function web3AccountsSubscribe(cb, {
       unsub();
     });
   };
-} // find a specific provider based on the name
+}
 
+// find a specific provider based on the name
 export async function web3FromSource(source) {
   if (!web3EnablePromise) {
     return throwError('web3FromSource');
   }
-
   const sources = await web3EnablePromise;
   const found = source && sources.find(({
     name
   }) => name === source);
-
   if (!found) {
     throw new Error(`web3FromSource: Unable to find an injected ${source}`);
   }
-
   return found;
-} // find a specific provider based on an address
+}
 
+// find a specific provider based on an address
 export async function web3FromAddress(address) {
   if (!web3EnablePromise) {
     return throwError('web3FromAddress');
   }
-
   const accounts = await web3Accounts();
   let found;
-
   if (address) {
     const accountU8a = decodeAddress(address);
     found = accounts.find(account => u8aEq(decodeAddress(account.address), accountU8a));
   }
-
   if (!found) {
     throw new Error(`web3FromAddress: Unable to find injected ${address}`);
   }
-
   return web3FromSource(found.meta.source);
-} // retrieve all providers exposed by one source
+}
 
+// retrieve all providers exposed by one source
 export async function web3ListRpcProviders(source) {
   const {
     provider
   } = await web3FromSource(source);
-
   if (!provider) {
     console.warn(`Extension ${source} does not expose any provider`);
     return null;
   }
-
   return provider.listProviders();
-} // retrieve all providers exposed by one source
+}
 
+// retrieve all providers exposed by one source
 export async function web3UseRpcProvider(source, key) {
   const {
     provider
   } = await web3FromSource(source);
-
   if (!provider) {
     throw new Error(`Extension ${source} does not expose any provider`);
   }
-
   const meta = await provider.startProvider(key);
   return {
     meta,

package/cjs/bundle.js

@@ -30,43 +30,47 @@ Object.defineProperty(exports, "wrapBytes", {
     return _wrapBytes.wrapBytes;
   }
 });
-
 var _util = require("@polkadot/util");
-
 var _utilCrypto = require("@polkadot/util-crypto");
-
 var _util2 = require("./util");
-
 var _packageInfo = require("./packageInfo");
-
 var _wrapBytes = require("./wrapBytes");
-
 // Copyright 2019-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // expose utility functions
+
 // just a helper (otherwise we cast all-over, so shorter and more readable)
-const win = window; // don't clobber the existing object, but ensure non-undefined
+const win = window;
 
-win.injectedWeb3 = win.injectedWeb3 || {}; // true when anything has been injected and is available
+// don't clobber the existing object, but ensure non-undefined
+win.injectedWeb3 = win.injectedWeb3 || {};
 
+// true when anything has been injected and is available
 function web3IsInjected() {
-  return Object.keys(win.injectedWeb3).length !== 0;
-} // helper to throw a consistent error when not enabled
-
+  return Object.values(win.injectedWeb3).filter(_ref => {
+    let {
+      connect,
+      enable
+    } = _ref;
+    return !!(connect || enable);
+  }).length !== 0;
+}
 
+// helper to throw a consistent error when not enabled
 function throwError(method) {
   throw new Error(`${method}: web3Enable(originName) needs to be called before ${method}`);
-} // internal helper to map from Array<InjectedAccount> -> Array<InjectedAccountWithMeta>
-
+}
 
+// internal helper to map from Array<InjectedAccount> -> Array<InjectedAccountWithMeta>
 function mapAccounts(source, list, ss58Format) {
-  return list.map(_ref => {
+  return list.map(_ref2 => {
     let {
       address,
       genesisHash,
       name,
       type
-    } = _ref;
+    } = _ref2;
     return {
       address: address.length === 42 ? address : (0, _utilCrypto.encodeAddress)((0, _utilCrypto.decodeAddress)(address), ss58Format),
       meta: {
@@ -77,102 +81,102 @@ function mapAccounts(source, list, ss58Format) {
       type
     };
   });
-} // have we found a properly constructed window.injectedWeb3
+}
 
+// internal helper to filter accounts
+function filterAccounts(list, genesisHash, type) {
+  return list.filter(a => (!a.type || !type || type.includes(a.type)) && (!a.genesisHash || !genesisHash || a.genesisHash === genesisHash));
+}
 
-let isWeb3Injected = web3IsInjected(); // we keep the last promise created around (for queries)
+// have we found a properly constructed window.injectedWeb3
+let isWeb3Injected = web3IsInjected();
 
+// we keep the last promise created around (for queries)
 exports.isWeb3Injected = isWeb3Injected;
 let web3EnablePromise = null;
 exports.web3EnablePromise = web3EnablePromise;
-
 function getWindowExtensions(originName) {
-  return Promise.all(Object.entries(win.injectedWeb3).map(_ref2 => {
-    let [name, {
+  return Promise.all(Object.entries(win.injectedWeb3).map(_ref3 => {
+    let [nameOrHash, {
+      connect,
       enable,
       version
-    }] = _ref2;
-    return Promise.all([Promise.resolve({
-      name,
-      version
-    }), enable(originName).catch(error => {
-      console.error(`Error initializing ${name}: ${error.message}`);
-    })]);
-  }));
-} // enables all the providers found on the injected window interface
-
+    }] = _ref3;
+    return Promise.resolve().then(() => connect
+    // new style, returning all info
+    ? connect(originName) : enable
+    // previous interface, leakages on name/version
+    ? enable(originName).then(e => (0, _util.objectSpread)({
+      name: nameOrHash,
+      version: version || 'unknown'
+    }, e)) : Promise.reject(new Error('No connect(..) or enable(...) hook found'))).catch(_ref4 => {
+      let {
+        message
+      } = _ref4;
+      console.error(`Error initializing ${nameOrHash}: ${message}`);
+    });
+  })).then(exts => exts.filter(e => !!e));
+}
 
+// enables all the providers found on the injected window interface
 function web3Enable(originName) {
   let compatInits = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-
   if (!originName) {
     throw new Error('You must pass a name for your app to the web3Enable function');
   }
-
   const initCompat = compatInits.length ? Promise.all(compatInits.map(c => c().catch(() => false))) : Promise.resolve([true]);
-  exports.web3EnablePromise = web3EnablePromise = (0, _util2.documentReadyPromise)(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.filter(value => !!value[1]).map(_ref3 => {
-    let [info, ext] = _ref3;
-
+  exports.web3EnablePromise = web3EnablePromise = (0, _util2.documentReadyPromise)(() => initCompat.then(() => getWindowExtensions(originName).then(values => values.map(e => {
     // if we don't have an accounts subscriber, add a single-shot version
-    if (!ext.accounts.subscribe) {
-      ext.accounts.subscribe = cb => {
-        ext.accounts.get().then(cb).catch(console.error);
-        return () => {// no ubsubscribe needed, this is a single-shot
+    if (!e.accounts.subscribe) {
+      e.accounts.subscribe = cb => {
+        e.accounts.get().then(cb).catch(console.error);
+        return () => {
+          // no ubsubscribe needed, this is a single-shot
         };
       };
     }
-
-    return { ...info,
-      ...ext
-    };
+    return e;
   })).catch(() => []).then(values => {
-    const names = values.map(_ref4 => {
+    const names = values.map(_ref5 => {
       let {
         name,
         version
-      } = _ref4;
+      } = _ref5;
       return `${name}/${version}`;
     });
     exports.isWeb3Injected = isWeb3Injected = web3IsInjected();
-    console.log(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
+    console.info(`web3Enable: Enabled ${values.length} extension${values.length !== 1 ? 's' : ''}: ${names.join(', ')}`);
     return values;
   })));
   return web3EnablePromise;
-} // retrieve all the accounts across all providers
-
+}
 
+// retrieve all the accounts across all providers
 async function web3Accounts() {
   let {
     accountType,
     extensions,
+    genesisHash,
     ss58Format
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
   if (!web3EnablePromise) {
     return throwError('web3Accounts');
   }
-
   const accounts = [];
-  const injected = await web3EnablePromise;
-  const retrieved = await Promise.all(injected.filter(_ref5 => {
+  const sources = await web3EnablePromise;
+  const retrieved = await Promise.all(sources.filter(_ref6 => {
     let {
       name: source
-    } = _ref5;
+    } = _ref6;
     return !extensions || extensions.includes(source);
-  }).map(async _ref6 => {
+  }).map(async _ref7 => {
     let {
       accounts,
       name: source
-    } = _ref6;
-
+    } = _ref7;
     try {
       const list = await accounts.get();
-      return mapAccounts(source, list.filter(_ref7 => {
-        let {
-          type
-        } = _ref7;
-        return type && accountType ? accountType.includes(type) : true;
-      }), ss58Format);
+      return mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format);
     } catch (error) {
       // cannot handle this one
       return [];
@@ -181,53 +185,45 @@ async function web3Accounts() {
   retrieved.forEach(result => {
     accounts.push(...result);
   });
-  const addresses = accounts.map(_ref8 => {
-    let {
-      address
-    } = _ref8;
-    return address;
-  });
-  console.log(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}: ${addresses.join(', ')}`);
+  console.info(`web3Accounts: Found ${accounts.length} address${accounts.length !== 1 ? 'es' : ''}`);
   return accounts;
 }
-
 async function web3AccountsSubscribe(cb) {
   let {
+    accountType,
     extensions,
+    genesisHash,
     ss58Format
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
   if (!web3EnablePromise) {
     return throwError('web3AccountsSubscribe');
   }
-
   const accounts = {};
-
-  const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, _ref9) => {
-    let [source, list] = _ref9;
-    result.push(...mapAccounts(source, list, ss58Format));
+  const triggerUpdate = () => cb(Object.entries(accounts).reduce((result, _ref8) => {
+    let [source, list] = _ref8;
+    result.push(...mapAccounts(source, filterAccounts(list, genesisHash, accountType), ss58Format));
     return result;
   }, []));
-
-  const unsubs = (await web3EnablePromise).filter(_ref10 => {
+  const sources = await web3EnablePromise;
+  const unsubs = sources.filter(_ref9 => {
     let {
       name: source
-    } = _ref10;
+    } = _ref9;
     return !extensions || extensions.includes(source);
-  }).map(_ref11 => {
+  }).map(_ref10 => {
     let {
       accounts: {
         subscribe
       },
       name: source
-    } = _ref11;
+    } = _ref10;
     return subscribe(result => {
       accounts[source] = result;
-
       try {
-        var _triggerUpdate;
-
-        (_triggerUpdate = triggerUpdate()) === null || _triggerUpdate === void 0 ? void 0 : _triggerUpdate.catch(console.error);
+        const result = triggerUpdate();
+        if (result && (0, _util.isPromise)(result)) {
+          result.catch(console.error);
+        }
       } catch (error) {
         console.error(error);
       }
@@ -238,74 +234,63 @@ async function web3AccountsSubscribe(cb) {
       unsub();
     });
   };
-} // find a specific provider based on the name
-
+}
 
+// find a specific provider based on the name
 async function web3FromSource(source) {
   if (!web3EnablePromise) {
     return throwError('web3FromSource');
   }
-
   const sources = await web3EnablePromise;
-  const found = source && sources.find(_ref12 => {
+  const found = source && sources.find(_ref11 => {
     let {
       name
-    } = _ref12;
+    } = _ref11;
     return name === source;
   });
-
   if (!found) {
     throw new Error(`web3FromSource: Unable to find an injected ${source}`);
   }
-
   return found;
-} // find a specific provider based on an address
-
+}
 
+// find a specific provider based on an address
 async function web3FromAddress(address) {
   if (!web3EnablePromise) {
     return throwError('web3FromAddress');
   }
-
   const accounts = await web3Accounts();
   let found;
-
   if (address) {
     const accountU8a = (0, _utilCrypto.decodeAddress)(address);
     found = accounts.find(account => (0, _util.u8aEq)((0, _utilCrypto.decodeAddress)(account.address), accountU8a));
   }
-
   if (!found) {
     throw new Error(`web3FromAddress: Unable to find injected ${address}`);
   }
-
   return web3FromSource(found.meta.source);
-} // retrieve all providers exposed by one source
-
+}
 
+// retrieve all providers exposed by one source
 async function web3ListRpcProviders(source) {
   const {
     provider
   } = await web3FromSource(source);
-
   if (!provider) {
     console.warn(`Extension ${source} does not expose any provider`);
     return null;
   }
-
   return provider.listProviders();
-} // retrieve all providers exposed by one source
-
+}
 
+// retrieve all providers exposed by one source
 async function web3UseRpcProvider(source, key) {
   const {
     provider
   } = await web3FromSource(source);
-
   if (!provider) {
     throw new Error(`Extension ${source} does not expose any provider`);
   }
-
   const meta = await provider.startProvider(key);
   return {
     meta,

package/cjs/detectOther.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _packageInfo = require("@polkadot/extension-inject/cjs/packageInfo");
-
 // Copyright 2017-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 var _default = [_packageInfo.packageInfo];

package/cjs/detectPackage.js

@@ -1,14 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _util = require("@polkadot/util");
-
 var _detectOther = _interopRequireDefault(require("./detectOther"));
-
 var _packageInfo = require("./packageInfo");
-
 // Copyright 2017-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 (0, _util.detectPackage)(_packageInfo.packageInfo, null, _detectOther.default);

package/cjs/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _bundle = require("./bundle");
-
 Object.keys(_bundle).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _bundle[key]) return;

package/cjs/packageInfo.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.packageInfo = void 0;
 // Copyright 2017-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 const packageInfo = {
   name: '@polkadot/extension-dapp',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.44.5'
+  version: '0.44.7'
 };
 exports.packageInfo = packageInfo;

package/cjs/util.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.documentReadyPromise = documentReadyPromise;
-
 // Copyright 2019-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 function documentReadyPromise(creator) {
   return new Promise(resolve => {
     if (document.readyState === 'complete') {

package/cjs/wrapBytes.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapBytes = exports.unwrapBytes = exports.isWrapped = exports.PREFIX = exports.POSTFIX = exports.ETHEREUM = void 0;
-
 var _util = require("@polkadot/util");
-
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const ETHEREUM = _util.U8A_WRAP_ETHEREUM;
 exports.ETHEREUM = ETHEREUM;
 const POSTFIX = _util.U8A_WRAP_POSTFIX;

package/detectOther.js

@@ -1,4 +1,5 @@
 // Copyright 2017-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo';
 export default [injectInfo];

package/detectPackage.js

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

package/index.js

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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.44.5",
+  "version": "0.44.7",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -67,10 +67,10 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
-    "@polkadot/extension-inject": "^0.44.5",
-    "@polkadot/util": "^10.1.4",
-    "@polkadot/util-crypto": "^10.1.4"
+    "@babel/runtime": "^7.20.7",
+    "@polkadot/extension-inject": "^0.44.7",
+    "@polkadot/util": "^10.2.1",
+    "@polkadot/util-crypto": "^10.2.1"
   },
   "peerDependencies": {
     "@polkadot/api": "*",

package/packageInfo.js

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

package/util.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension-dapp authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 export function documentReadyPromise(creator) {
   return new Promise(resolve => {
     if (document.readyState === 'complete') {

package/wrapBytes.js

@@ -1,5 +1,6 @@
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { U8A_WRAP_ETHEREUM, U8A_WRAP_POSTFIX, U8A_WRAP_PREFIX, u8aIsWrapped, u8aUnwrapBytes, u8aWrapBytes } from '@polkadot/util';
 export const ETHEREUM = U8A_WRAP_ETHEREUM;
 export const POSTFIX = U8A_WRAP_POSTFIX;