@polkadot/extension-base 0.42.5-3 → 0.42.5-7

package/background/handlers/State.cjs

@@ -56,47 +56,50 @@ exports.NotificationOptions = NotificationOptions;
 const AUTH_URLS_KEY = 'authUrls';
 
 function extractMetadata(store) {
-  const knownEntries = Object.entries(_defaults.knownGenesis);
-  const defs = {};
-  const removals = [];
-  store.all((key, def) => {
-    const entry = knownEntries.find(_ref => {
-      let [, hashes] = _ref;
-      return hashes.includes(def.genesisHash);
-    });
-
-    if (entry) {
-      const [name, hashes] = entry;
-      const index = hashes.indexOf(def.genesisHash); // flatten the known metadata based on the genesis index
-      // (lower is better/newer)
-
-      if (!defs[name] || defs[name].index > index) {
-        if (defs[name]) {
-          // remove the old version of the metadata
-          removals.push(defs[name].key);
+  store.allMap(map => {
+    const knownEntries = Object.entries(_defaults.knownGenesis);
+    const defs = {};
+    const removals = [];
+    Object.entries(map).forEach(_ref => {
+      let [key, def] = _ref;
+      const entry = knownEntries.find(_ref2 => {
+        let [, hashes] = _ref2;
+        return hashes.includes(def.genesisHash);
+      });
+
+      if (entry) {
+        const [name, hashes] = entry;
+        const index = hashes.indexOf(def.genesisHash); // flatten the known metadata based on the genesis index
+        // (lower is better/newer)
+
+        if (!defs[name] || defs[name].index > index) {
+          if (defs[name]) {
+            // remove the old version of the metadata
+            removals.push(defs[name].key);
+          }
+
+          defs[name] = {
+            def,
+            index,
+            key
+          };
         }
-
-        defs[name] = {
+      } else {
+        // this is not a known entry, so we will just apply it
+        defs[key] = {
           def,
-          index,
+          index: 0,
           key
         };
       }
-    } else {
-      // this is not a known entry, so we will just apply it
-      defs[key] = {
-        def,
-        index: 0,
-        key
-      };
-    }
-  });
-  removals.forEach(key => store.remove(key));
-  Object.values(defs).forEach(_ref2 => {
-    let {
-      def
-    } = _ref2;
-    return (0, _extensionChains.addMetadata)(def);
+    });
+    removals.forEach(key => store.remove(key));
+    Object.values(defs).forEach(_ref3 => {
+      let {
+        def
+      } = _ref3;
+      return (0, _extensionChains.addMetadata)(def);
+    });
   });
 }
 
@@ -260,12 +263,12 @@ class State {
   }
 
   get allAuthRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _authRequests)[_authRequests]).map(_ref3 => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _authRequests)[_authRequests]).map(_ref4 => {
       let {
         id,
         request,
         url
-      } = _ref3;
+      } = _ref4;
       return {
         id,
         request,
@@ -275,12 +278,12 @@ class State {
   }
 
   get allMetaRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _metaRequests)[_metaRequests]).map(_ref4 => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _metaRequests)[_metaRequests]).map(_ref5 => {
       let {
         id,
         request,
         url
-      } = _ref4;
+      } = _ref5;
       return {
         id,
         request,
@@ -290,13 +293,13 @@ class State {
   }
 
   get allSignRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _signRequests)[_signRequests]).map(_ref5 => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _signRequests)[_signRequests]).map(_ref6 => {
       let {
         account,
         id,
         request,
         url
-      } = _ref5;
+      } = _ref6;
       return {
         account,
         id,
@@ -469,12 +472,12 @@ class State {
     return Promise.resolve((0, _classPrivateFieldLooseBase2.default)(this, _providers)[_providers][key].meta);
   }
 
-  rpcSubscribe(_ref6, cb, port) {
+  rpcSubscribe(_ref7, cb, port) {
     let {
       method,
       params,
       type
-    } = _ref6;
+    } = _ref7;
 
     const provider = (0, _classPrivateFieldLooseBase2.default)(this, _injectedProviders)[_injectedProviders].get(port);
 

package/background/handlers/State.js

@@ -36,42 +36,44 @@ export let NotificationOptions;
 const AUTH_URLS_KEY = 'authUrls';
 
 function extractMetadata(store) {
-  const knownEntries = Object.entries(knownGenesis);
-  const defs = {};
-  const removals = [];
-  store.all((key, def) => {
-    const entry = knownEntries.find(([, hashes]) => hashes.includes(def.genesisHash));
-
-    if (entry) {
-      const [name, hashes] = entry;
-      const index = hashes.indexOf(def.genesisHash); // flatten the known metadata based on the genesis index
-      // (lower is better/newer)
-
-      if (!defs[name] || defs[name].index > index) {
-        if (defs[name]) {
-          // remove the old version of the metadata
-          removals.push(defs[name].key);
+  store.allMap(map => {
+    const knownEntries = Object.entries(knownGenesis);
+    const defs = {};
+    const removals = [];
+    Object.entries(map).forEach(([key, def]) => {
+      const entry = knownEntries.find(([, hashes]) => hashes.includes(def.genesisHash));
+
+      if (entry) {
+        const [name, hashes] = entry;
+        const index = hashes.indexOf(def.genesisHash); // flatten the known metadata based on the genesis index
+        // (lower is better/newer)
+
+        if (!defs[name] || defs[name].index > index) {
+          if (defs[name]) {
+            // remove the old version of the metadata
+            removals.push(defs[name].key);
+          }
+
+          defs[name] = {
+            def,
+            index,
+            key
+          };
         }
-
-        defs[name] = {
+      } else {
+        // this is not a known entry, so we will just apply it
+        defs[key] = {
           def,
-          index,
+          index: 0,
           key
         };
       }
-    } else {
-      // this is not a known entry, so we will just apply it
-      defs[key] = {
-        def,
-        index: 0,
-        key
-      };
-    }
+    });
+    removals.forEach(key => store.remove(key));
+    Object.values(defs).forEach(({
+      def
+    }) => addMetadata(def));
   });
-  removals.forEach(key => store.remove(key));
-  Object.values(defs).forEach(({
-    def
-  }) => addMetadata(def));
 }
 
 var _authUrls = /*#__PURE__*/_classPrivateFieldLooseKey("authUrls");

package/bundle.cjs

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "packageInfo", {
+  enumerable: true,
+  get: function () {
+    return _packageInfo.packageInfo;
+  }
+});
+
+var _packageInfo = require("./packageInfo.cjs");

package/bundle.d.ts

@@ -0,0 +1 @@
+export { packageInfo } from './packageInfo';

package/bundle.js

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

package/cjs/dirname.d.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/extension-chains authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+declare const __dirname: string | undefined;
+
+export default __dirname;

package/cjs/dirname.js

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/extension-chains authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+module.exports = typeof __dirname === 'string'
+  ? __dirname.replace('/cjs', '')
+  : undefined;

package/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/detectPackage.cjs

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _packageInfo = require("@polkadot/extension-chains/packageInfo");
 
 var _packageInfo2 = require("@polkadot/extension-dapp/packageInfo");
@@ -8,8 +10,10 @@ var _packageInfo3 = require("@polkadot/extension-inject/packageInfo");
 
 var _util = require("@polkadot/util");
 
+var _dirname2 = _interopRequireDefault(require("./cjs/dirname"));
+
 var _packageInfo4 = require("./packageInfo.cjs");
 
 // Copyright 2017-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-(0, _util.detectPackage)(_packageInfo4.packageInfo, typeof __dirname !== 'undefined' && __dirname, [_packageInfo.packageInfo, _packageInfo2.packageInfo, _packageInfo3.packageInfo]);
+(0, _util.detectPackage)(_packageInfo4.packageInfo, typeof _dirname2.default !== 'undefined' && _dirname2.default, [_packageInfo.packageInfo, _packageInfo2.packageInfo, _packageInfo3.packageInfo]);

package/detectPackage.js

@@ -4,5 +4,6 @@ import { packageInfo as chainsInfo } from '@polkadot/extension-chains/packageInf
 import { packageInfo as dappInfo } from '@polkadot/extension-dapp/packageInfo';
 import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo';
 import { detectPackage } from '@polkadot/util';
+import __dirname from "./cjs/dirname.js";
 import { packageInfo } from "./packageInfo.js";
 detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [chainsInfo, dappInfo, injectInfo]);

package/index.cjs

@@ -3,13 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "packageInfo", {
-  enumerable: true,
-  get: function () {
-    return _packageInfo.packageInfo;
-  }
-});
 
-require("./detectPackage.cjs");
+var _bundle = require("./bundle.cjs");
 
-var _packageInfo = require("./packageInfo.cjs");
+Object.keys(_bundle).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _bundle[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _bundle[key];
+    }
+  });
+});

package/index.d.ts

@@ -1,2 +1 @@
-import './detectPackage';
-export { packageInfo } from './packageInfo';
+export * from './bundle';

package/index.js

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

package/package.json

@@ -17,28 +17,28 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "0.42.5-3",
+  "version": "0.42.5-7",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.16.5",
+    "@babel/runtime": "^7.16.7",
     "@polkadot/api": "^7.1.2-1",
-    "@polkadot/extension-chains": "^0.42.5-3",
-    "@polkadot/extension-dapp": "^0.42.5-3",
-    "@polkadot/extension-inject": "^0.42.5-3",
+    "@polkadot/extension-chains": "^0.42.5-7",
+    "@polkadot/extension-dapp": "^0.42.5-7",
+    "@polkadot/extension-inject": "^0.42.5-7",
     "@polkadot/keyring": "^8.2.2",
     "@polkadot/networks": "^8.2.2",
-    "@polkadot/phishing": "^0.6.584",
+    "@polkadot/phishing": "^0.6.597",
     "@polkadot/rpc-provider": "^7.1.2-1",
     "@polkadot/types": "^7.1.2-1",
-    "@polkadot/ui-keyring": "^0.87.8-1",
-    "@polkadot/ui-settings": "^0.87.8-1",
+    "@polkadot/ui-keyring": "^0.87.8-2",
+    "@polkadot/ui-settings": "^0.87.8-2",
     "@polkadot/util": "^8.2.2",
     "@polkadot/util-crypto": "^8.2.2",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.1"
   },
   "devDependencies": {
-    "@polkadot/extension-mocks": "^0.42.5-3"
+    "@polkadot/extension-mocks": "^0.42.5-7"
   },
   "exports": {
     ".": {
@@ -91,6 +91,16 @@
       "require": "./background/types.cjs",
       "default": "./background/types.js"
     },
+    "./bundle": {
+      "types": "./bundle.d.ts",
+      "require": "./bundle.cjs",
+      "default": "./bundle.js"
+    },
+    "./cjs/dirname": {
+      "types": "./cjs/dirname.d.ts",
+      "default": "./cjs/dirname.js"
+    },
+    "./cjs/package.json": "./cjs/package.json",
     "./defaults": {
       "types": "./defaults.d.ts",
       "require": "./defaults.cjs",

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.42.5-3'
+  version: '0.42.5-7'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -3,5 +3,5 @@
 // Auto-generated by @polkadot/dev, do not edit
 export const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.42.5-3'
+  version: '0.42.5-7'
 };

package/stores/Base.cjs

@@ -33,15 +33,29 @@ class BaseStore {
   }
 
   all(update) {
+    this.allMap(map => {
+      Object.entries(map).forEach(_ref => {
+        let [key, value] = _ref;
+        update(key, value);
+      });
+    });
+  }
+
+  allMap(update) {
     chrome.storage.local.get(null, result => {
       lastError('all');
-      Object.entries(result).filter(_ref => {
-        let [key] = _ref;
-        return key.startsWith((0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix]);
-      }).forEach(_ref2 => {
-        let [key, value] = _ref2;
-        update(key.replace((0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix], ''), value);
-      });
+      const entries = Object.entries(result);
+      const map = {};
+
+      for (let i = 0; i < entries.length; i++) {
+        const [key, value] = entries[i];
+
+        if (key.startsWith((0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix])) {
+          map[key.replace((0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix], '')] = value;
+        }
+      }
+
+      update(map);
     });
   }
 

package/stores/Base.d.ts

@@ -2,6 +2,7 @@ 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;

package/stores/Base.js

@@ -23,11 +23,28 @@ export default class BaseStore {
   }
 
   all(update) {
+    this.allMap(map => {
+      Object.entries(map).forEach(([key, value]) => {
+        update(key, value);
+      });
+    });
+  }
+
+  allMap(update) {
     chrome.storage.local.get(null, result => {
       lastError('all');
-      Object.entries(result).filter(([key]) => key.startsWith(_classPrivateFieldLooseBase(this, _prefix)[_prefix])).forEach(([key, value]) => {
-        update(key.replace(_classPrivateFieldLooseBase(this, _prefix)[_prefix], ''), value);
-      });
+      const entries = Object.entries(result);
+      const map = {};
+
+      for (let i = 0; i < entries.length; i++) {
+        const [key, value] = entries[i];
+
+        if (key.startsWith(_classPrivateFieldLooseBase(this, _prefix)[_prefix])) {
+          map[key.replace(_classPrivateFieldLooseBase(this, _prefix)[_prefix], '')] = value;
+        }
+      }
+
+      update(map);
     });
   }