@polkadot/extension-base 0.42.4 → 0.42.5-3

package/background/handlers/State.cjs

@@ -17,6 +17,8 @@ var _getId = require("@polkadot/extension-base/utils/getId");
 
 var _extensionChains = require("@polkadot/extension-chains");
 
+var _defaults = require("@polkadot/networks/defaults");
+
 var _uiSettings = _interopRequireDefault(require("@polkadot/ui-settings"));
 
 var _util = require("@polkadot/util");
@@ -53,6 +55,51 @@ 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);
+        }
+
+        defs[name] = {
+          def,
+          index,
+          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);
+  });
+}
+
 var _authUrls = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("authUrls");
 
 var _authRequests = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("authRequests");
@@ -189,11 +236,7 @@ class State {
     };
 
     (0, _classPrivateFieldLooseBase2.default)(this, _providers)[_providers] = providers;
-
-    (0, _classPrivateFieldLooseBase2.default)(this, _metaStore)[_metaStore].all((_key, def) => {
-      (0, _extensionChains.addMetadata)(def);
-    }); // retrieve previously set authorizations
-
+    extractMetadata((0, _classPrivateFieldLooseBase2.default)(this, _metaStore)[_metaStore]); // retrieve previously set authorizations
 
     const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);
@@ -217,12 +260,12 @@ class State {
   }
 
   get allAuthRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _authRequests)[_authRequests]).map(_ref => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _authRequests)[_authRequests]).map(_ref3 => {
       let {
         id,
         request,
         url
-      } = _ref;
+      } = _ref3;
       return {
         id,
         request,
@@ -232,12 +275,12 @@ class State {
   }
 
   get allMetaRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _metaRequests)[_metaRequests]).map(_ref2 => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _metaRequests)[_metaRequests]).map(_ref4 => {
       let {
         id,
         request,
         url
-      } = _ref2;
+      } = _ref4;
       return {
         id,
         request,
@@ -247,13 +290,13 @@ class State {
   }
 
   get allSignRequests() {
-    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _signRequests)[_signRequests]).map(_ref3 => {
+    return Object.values((0, _classPrivateFieldLooseBase2.default)(this, _signRequests)[_signRequests]).map(_ref5 => {
       let {
         account,
         id,
         request,
         url
-      } = _ref3;
+      } = _ref5;
       return {
         account,
         id,
@@ -426,12 +469,12 @@ class State {
     return Promise.resolve((0, _classPrivateFieldLooseBase2.default)(this, _providers)[_providers][key].meta);
   }
 
-  rpcSubscribe(_ref4, cb, port) {
+  rpcSubscribe(_ref6, cb, port) {
     let {
       method,
       params,
       type
-    } = _ref4;
+    } = _ref6;
 
     const provider = (0, _classPrivateFieldLooseBase2.default)(this, _injectedProviders)[_injectedProviders].get(port);
 

package/background/handlers/State.js

@@ -5,6 +5,7 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 import { BehaviorSubject } from 'rxjs';
 import { getId } from '@polkadot/extension-base/utils/getId';
 import { addMetadata, knownMetadata } from '@polkadot/extension-chains';
+import { knownGenesis } from '@polkadot/networks/defaults';
 import settings from '@polkadot/ui-settings';
 import { assert } from '@polkadot/util';
 import { MetadataStore } from "../../stores/index.js";
@@ -34,6 +35,45 @@ 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);
+        }
+
+        defs[name] = {
+          def,
+          index,
+          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));
+}
+
 var _authUrls = /*#__PURE__*/_classPrivateFieldLooseKey("authUrls");
 
 var _authRequests = /*#__PURE__*/_classPrivateFieldLooseKey("authRequests");
@@ -169,11 +209,7 @@ export default class State {
     };
 
     _classPrivateFieldLooseBase(this, _providers)[_providers] = providers;
-
-    _classPrivateFieldLooseBase(this, _metaStore)[_metaStore].all((_key, def) => {
-      addMetadata(def);
-    }); // retrieve previously set authorizations
-
+    extractMetadata(_classPrivateFieldLooseBase(this, _metaStore)[_metaStore]); // retrieve previously set authorizations
 
     const authString = localStorage.getItem(AUTH_URLS_KEY) || '{}';
     const previousAuth = JSON.parse(authString);

package/detectPackage.cjs

@@ -0,0 +1,15 @@
+"use strict";
+
+var _packageInfo = require("@polkadot/extension-chains/packageInfo");
+
+var _packageInfo2 = require("@polkadot/extension-dapp/packageInfo");
+
+var _packageInfo3 = require("@polkadot/extension-inject/packageInfo");
+
+var _util = require("@polkadot/util");
+
+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]);

package/detectPackage.d.ts

@@ -0,0 +1 @@
+export {};

package/detectPackage.js

@@ -0,0 +1,8 @@
+// Copyright 2017-2021 @polkadot/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+import { packageInfo as chainsInfo } from '@polkadot/extension-chains/packageInfo';
+import { packageInfo as dappInfo } from '@polkadot/extension-dapp/packageInfo';
+import { packageInfo as injectInfo } from '@polkadot/extension-inject/packageInfo';
+import { detectPackage } from '@polkadot/util';
+import { packageInfo } from "./packageInfo.js";
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [chainsInfo, dappInfo, injectInfo]);

package/index.cjs

@@ -1,4 +1,15 @@
-// Copyright 2019-2021 @polkadot/extension-base authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-// no direct exports
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "packageInfo", {
+  enumerable: true,
+  get: function () {
+    return _packageInfo.packageInfo;
+  }
+});
+
+require("./detectPackage.cjs");
+
+var _packageInfo = require("./packageInfo.cjs");

package/index.d.ts

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

package/index.js

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

package/package.json

@@ -12,29 +12,33 @@
     "type": "git",
     "url": "https://github.com/polkadot-js/extension.git"
   },
-  "sideEffects": false,
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
   "type": "module",
-  "version": "0.42.4",
+  "version": "0.42.5-3",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.5",
-    "@polkadot/api": "^7.1.1",
-    "@polkadot/extension-chains": "^0.42.4",
-    "@polkadot/extension-dapp": "^0.42.4",
-    "@polkadot/extension-inject": "^0.42.4",
+    "@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/keyring": "^8.2.2",
-    "@polkadot/phishing": "^0.6.582",
-    "@polkadot/rpc-provider": "^7.1.1",
-    "@polkadot/types": "^7.1.1",
-    "@polkadot/ui-keyring": "^0.87.7",
-    "@polkadot/ui-settings": "^0.87.7",
+    "@polkadot/networks": "^8.2.2",
+    "@polkadot/phishing": "^0.6.584",
+    "@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/util": "^8.2.2",
     "@polkadot/util-crypto": "^8.2.2",
     "eventemitter3": "^4.0.7",
-    "rxjs": "^7.4.0"
+    "rxjs": "^7.5.1"
   },
   "devDependencies": {
-    "@polkadot/extension-mocks": "^0.42.4"
+    "@polkadot/extension-mocks": "^0.42.5-3"
   },
   "exports": {
     ".": {
@@ -92,6 +96,11 @@
       "require": "./defaults.cjs",
       "default": "./defaults.js"
     },
+    "./detectPackage": {
+      "types": "./detectPackage.d.ts",
+      "require": "./detectPackage.cjs",
+      "default": "./detectPackage.js"
+    },
     "./package.json": "./package.json",
     "./packageInfo": {
       "types": "./packageInfo.d.ts",

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.4'
+  version: '0.42.5-3'
 };
 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.4'
+  version: '0.42.5-3'
 };