@polkadot/extension-base 0.40.5-4 → 0.41.2-2

package/background/handlers/Extension.cjs

@@ -30,10 +30,15 @@ var _subscriptions = require("./subscriptions.cjs");
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 const SEED_DEFAULT_LENGTH = 12;
-const SEED_LENGTHS = [12, 15, 18, 21, 24]; // a global registry to use internally
+const SEED_LENGTHS = [12, 15, 18, 21, 24];
+const ETH_DERIVE_DEFAULT = "/m/44'/60'/0'/0/0"; // a global registry to use internally
 
 const registry = new _types.TypeRegistry();
 
+function getSuri(seed, type) {
+  return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
+}
+
 function transformAccounts(accounts) {
   return Object.values(accounts).map(_ref => {
     let {
@@ -117,7 +122,7 @@ class Extension {
       type
     } = _ref4;
 
-    _uiKeyring.default.addUri(suri, password, {
+    _uiKeyring.default.addUri(getSuri(suri, type), password, {
       genesisHash,
       name
     }, type);
@@ -435,7 +440,7 @@ class Extension {
     } = _ref19;
     const seed = (0, _utilCrypto.mnemonicGenerate)(length);
     return {
-      address: _uiKeyring.default.createFromUri(seed, {}, type).address,
+      address: _uiKeyring.default.createFromUri(getSuri(seed, type), {}, type).address,
       seed
     };
   }
@@ -458,7 +463,7 @@ class Extension {
     }
 
     return {
-      address: _uiKeyring.default.createFromUri(suri, {}, type).address,
+      address: _uiKeyring.default.createFromUri(getSuri(suri, type), {}, type).address,
       suri
     };
   }

package/background/handlers/Extension.js

@@ -11,10 +11,15 @@ import { assert, isHex } from '@polkadot/util';
 import { keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 import { createSubscription, unsubscribe } from "./subscriptions.js";
 const SEED_DEFAULT_LENGTH = 12;
-const SEED_LENGTHS = [12, 15, 18, 21, 24]; // a global registry to use internally
+const SEED_LENGTHS = [12, 15, 18, 21, 24];
+const ETH_DERIVE_DEFAULT = "/m/44'/60'/0'/0/0"; // a global registry to use internally
 
 const registry = new TypeRegistry();
 
+function getSuri(seed, type) {
+  return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
+}
+
 function transformAccounts(accounts) {
   return Object.values(accounts).map(({
     json: {
@@ -87,7 +92,7 @@ export default class Extension {
     suri,
     type
   }) {
-    keyring.addUri(suri, password, {
+    keyring.addUri(getSuri(suri, type), password, {
       genesisHash,
       name
     }, type);
@@ -361,7 +366,7 @@ export default class Extension {
   }) {
     const seed = mnemonicGenerate(length);
     return {
-      address: keyring.createFromUri(seed, {}, type).address,
+      address: keyring.createFromUri(getSuri(seed, type), {}, type).address,
       seed
     };
   }
@@ -383,7 +388,7 @@ export default class Extension {
     }
 
     return {
-      address: keyring.createFromUri(suri, {}, type).address,
+      address: keyring.createFromUri(getSuri(suri, type), {}, type).address,
       suri
     };
   }

package/package.json

@@ -14,16 +14,16 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.40.5-4",
+  "version": "0.41.2-2",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/api": "^6.7.1",
-    "@polkadot/extension-dapp": "^0.40.5-4",
-    "@polkadot/extension-inject": "^0.40.5-4",
-    "@polkadot/keyring": "^7.8.2",
-    "@polkadot/phishing": "^0.6.407",
-    "@polkadot/ui-keyring": "^0.86.5"
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/api": "^6.8.2-12",
+    "@polkadot/extension-dapp": "^0.41.2-2",
+    "@polkadot/extension-inject": "^0.41.2-2",
+    "@polkadot/keyring": "^7.8.3-27",
+    "@polkadot/phishing": "^0.6.442",
+    "@polkadot/ui-keyring": "^0.86.6-0"
   },
   "exports": {
     ".": {

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.40.5-4'
+  version: '0.41.2-2'
 };
 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.40.5-4'
+  version: '0.41.2-2'
 };

package/page/PostMessageProvider.cjs

@@ -126,7 +126,7 @@ class PostMessageProvider {
   } // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  async send(method, params, subscription) {
+  async send(method, params, _, subscription) {
     if (subscription) {
       const {
         callback,
@@ -176,7 +176,7 @@ class PostMessageProvider {
   }
 
   subscribe(type, method, params, callback) {
-    return this.send(method, params, {
+    return this.send(method, params, false, {
       callback,
       type
     });

package/page/PostMessageProvider.d.ts

@@ -48,7 +48,7 @@ export default class PostMessageProvider implements InjectedProvider {
      * @return unsubscribe function
      */
     on(type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb): () => void;
-    send(method: string, params: unknown[], subscription?: SubscriptionHandler): Promise<any>;
+    send(method: string, params: unknown[], _?: boolean, subscription?: SubscriptionHandler): Promise<any>;
     /**
      * @summary Spawn a provider on the extension background.
      */

package/page/PostMessageProvider.js

@@ -113,7 +113,7 @@ export default class PostMessageProvider {
   } // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-  async send(method, params, subscription) {
+  async send(method, params, _, subscription) {
     if (subscription) {
       const {
         callback,
@@ -163,7 +163,7 @@ export default class PostMessageProvider {
   }
 
   subscribe(type, method, params, callback) {
-    return this.send(method, params, {
+    return this.send(method, params, false, {
       callback,
       type
     });