@polkadot/extension-inject 0.44.6 → 0.44.7

package/bundle.js

@@ -1,20 +1,51 @@
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-export { packageInfo } from "./packageInfo.js"; // It is recommended to always use the function below to shield the extension and dapp from
+
+import { cyrb53 } from "./cyrb53.js";
+export { packageInfo } from "./packageInfo.js";
+
+// setting for new-style connect (more-secure with no details exposed without
+// user acknowledgement, however slightly less-compatible with all dapps, some
+// may have not upgraded and don't have access to the latest interfaces)
+//
+// NOTE: In future versions this will be made the default
+const IS_CONNECT_CAPABLE = false;
+
+// It is recommended to always use the function below to shield the extension and dapp from
 // any future changes. The exposed interface will manage access between the 2 environments,
 // be it via window (current), postMessage (under consideration) or any other mechanism
-
 export function injectExtension(enable, {
   name,
   version
 }) {
   // small helper with the typescript types, just cast window
-  const windowInject = window; // don't clobber the existing object, we will add it (or create as needed)
-
-  windowInject.injectedWeb3 = windowInject.injectedWeb3 || {}; // add our enable function
+  const windowInject = window;
 
-  windowInject.injectedWeb3[name] = {
-    enable: origin => enable(origin),
-    version
-  };
+  // don't clobber the existing object, we will add it (or create as needed)
+  windowInject.injectedWeb3 = windowInject.injectedWeb3 || {};
+  if (IS_CONNECT_CAPABLE) {
+    // expose our extension on the window object, new-style with connect(origin)
+    windowInject.injectedWeb3[cyrb53(`${name}/${version}`)] = {
+      connect: origin => enable(origin).then(({
+        accounts,
+        metadata,
+        provider,
+        signer
+      }) => ({
+        accounts,
+        metadata,
+        name,
+        provider,
+        signer,
+        version
+      })),
+      enable: () => Promise.reject(new Error('This extension does not have support for enable(...), rather is only supports the new connect(...) variant (no extension name/version metadata without specific user-approval)'))
+    };
+  } else {
+    // expose our extension on the window object, old-style with enable(origin)
+    windowInject.injectedWeb3[name] = {
+      enable: origin => enable(origin),
+      version
+    };
+  }
 }

package/chrome.js

@@ -1,4 +1,5 @@
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { extractGlobal, xglobal } from '@polkadot/x-global';
 export const chrome = extractGlobal('chrome', xglobal.browser);

package/cjs/bundle.js

@@ -10,11 +10,18 @@ Object.defineProperty(exports, "packageInfo", {
     return _packageInfo.packageInfo;
   }
 });
-
+var _cyrb = require("./cyrb53");
 var _packageInfo = require("./packageInfo");
-
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
+// setting for new-style connect (more-secure with no details exposed without
+// user acknowledgement, however slightly less-compatible with all dapps, some
+// may have not upgraded and don't have access to the latest interfaces)
+//
+// NOTE: In future versions this will be made the default
+const IS_CONNECT_CAPABLE = false;
+
 // It is recommended to always use the function below to shield the extension and dapp from
 // any future changes. The exposed interface will manage access between the 2 environments,
 // be it via window (current), postMessage (under consideration) or any other mechanism
@@ -24,12 +31,36 @@ function injectExtension(enable, _ref) {
     version
   } = _ref;
   // small helper with the typescript types, just cast window
-  const windowInject = window; // don't clobber the existing object, we will add it (or create as needed)
+  const windowInject = window;
 
-  windowInject.injectedWeb3 = windowInject.injectedWeb3 || {}; // add our enable function
-
-  windowInject.injectedWeb3[name] = {
-    enable: origin => enable(origin),
-    version
-  };
+  // don't clobber the existing object, we will add it (or create as needed)
+  windowInject.injectedWeb3 = windowInject.injectedWeb3 || {};
+  if (IS_CONNECT_CAPABLE) {
+    // expose our extension on the window object, new-style with connect(origin)
+    windowInject.injectedWeb3[(0, _cyrb.cyrb53)(`${name}/${version}`)] = {
+      connect: origin => enable(origin).then(_ref2 => {
+        let {
+          accounts,
+          metadata,
+          provider,
+          signer
+        } = _ref2;
+        return {
+          accounts,
+          metadata,
+          name,
+          provider,
+          signer,
+          version
+        };
+      }),
+      enable: () => Promise.reject(new Error('This extension does not have support for enable(...), rather is only supports the new connect(...) variant (no extension name/version metadata without specific user-approval)'))
+    };
+  } else {
+    // expose our extension on the window object, old-style with enable(origin)
+    windowInject.injectedWeb3[name] = {
+      enable: origin => enable(origin),
+      version
+    };
+  }
 }

package/cjs/chrome.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.chrome = void 0;
-
 var _xGlobal = require("@polkadot/x-global");
-
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const chrome = (0, _xGlobal.extractGlobal)('chrome', _xGlobal.xglobal.browser);
 exports.chrome = chrome;

package/cjs/crossenv.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var _xGlobal = require("@polkadot/x-global");
-
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 (0, _xGlobal.exposeGlobal)('chrome', _xGlobal.xglobal.browser);

package/cjs/cyrb53.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cyrb53 = cyrb53;
+// Copyright 2019-2022 @polkadot/extension-inject authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// cyrb53 (c) 2018 bryc (github.com/bryc)
+// A fast and simple hash function with decent collision resistance.
+// Largely inspired by MurmurHash2/3, but with a focus on speed/simplicity.
+// Public domain. Attribution appreciated.
+//
+// From https://github.com/bryc/code/blob/fed42df9db547493452e32375c93d7854383e480/jshash/experimental/cyrb53.js
+// As shared in https://stackoverflow.com/a/52171480
+//
+// Small changes made to the code as linked above:
+// . - Seed value is required (set  as Date.now() in usage, could change)
+//   - Return value is a hex string (as per comment in SO answer)
+//   - TS typings added
+//   - Non-intrusive coding-style variable declaration changes
+function cyrb53(input) {
+  let seed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Date.now();
+  let h1 = 0xdeadbeef ^ seed;
+  let h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0; i < input.length; i++) {
+    const ch = input.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
+
+  // https://stackoverflow.com/a/52171480
+  return (h2 >>> 0).toString(16).padStart(8, '0') + (h1 >>> 0).toString(16).padStart(8, '0');
+}

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-inject 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-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 const packageInfo = {
   name: '@polkadot/extension-inject',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.44.6'
+  version: '0.44.7'
 };
 exports.packageInfo = packageInfo;

package/crossenv.js

@@ -1,4 +1,5 @@
 // Copyright 2019-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 import { exposeGlobal, xglobal } from '@polkadot/x-global';
 exposeGlobal('chrome', xglobal.browser);

package/cyrb53.d.ts

@@ -0,0 +1 @@
+export declare function cyrb53(input: string, seed?: number): string;

package/cyrb53.js

@@ -0,0 +1,30 @@
+// Copyright 2019-2022 @polkadot/extension-inject authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// cyrb53 (c) 2018 bryc (github.com/bryc)
+// A fast and simple hash function with decent collision resistance.
+// Largely inspired by MurmurHash2/3, but with a focus on speed/simplicity.
+// Public domain. Attribution appreciated.
+//
+// From https://github.com/bryc/code/blob/fed42df9db547493452e32375c93d7854383e480/jshash/experimental/cyrb53.js
+// As shared in https://stackoverflow.com/a/52171480
+//
+// Small changes made to the code as linked above:
+// . - Seed value is required (set  as Date.now() in usage, could change)
+//   - Return value is a hex string (as per comment in SO answer)
+//   - TS typings added
+//   - Non-intrusive coding-style variable declaration changes
+export function cyrb53(input, seed = Date.now()) {
+  let h1 = 0xdeadbeef ^ seed;
+  let h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0; i < input.length; i++) {
+    const ch = input.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
+
+  // https://stackoverflow.com/a/52171480
+  return (h2 >>> 0).toString(16).padStart(8, '0') + (h1 >>> 0).toString(16).padStart(8, '0');
+}

package/detectOther.js

@@ -1,4 +1,6 @@
 // Copyright 2017-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Empty template, auto-generated by @polkadot/dev
+
 export default [];

package/detectPackage.js

@@ -1,6 +1,8 @@
 // Copyright 2017-2022 @polkadot/extension-inject 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-inject 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

@@ -14,7 +14,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.44.6",
+  "version": "0.44.7",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -41,6 +41,11 @@
       "require": "./cjs/crossenv.js",
       "default": "./crossenv.js"
     },
+    "./cyrb53": {
+      "types": "./cyrb53.d.ts",
+      "require": "./cjs/cyrb53.js",
+      "default": "./cyrb53.js"
+    },
     "./detectOther": {
       "types": "./detectOther.d.ts",
       "require": "./cjs/detectOther.js",
@@ -69,12 +74,12 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
-    "@polkadot/rpc-provider": "^9.2.3",
-    "@polkadot/types": "^9.2.3",
-    "@polkadot/util": "^10.1.5",
-    "@polkadot/util-crypto": "^10.1.5",
-    "@polkadot/x-global": "^10.1.5"
+    "@babel/runtime": "^7.20.7",
+    "@polkadot/rpc-provider": "^9.10.4",
+    "@polkadot/types": "^9.10.4",
+    "@polkadot/util": "^10.2.1",
+    "@polkadot/util-crypto": "^10.2.1",
+    "@polkadot/x-global": "^10.2.1"
   },
   "peerDependencies": {
     "@polkadot/api": "*"

package/packageInfo.js

@@ -1,9 +1,11 @@
 // Copyright 2017-2022 @polkadot/extension-inject authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 export const packageInfo = {
   name: '@polkadot/extension-inject',
   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.6'
+  version: '0.44.7'
 };

package/types.d.ts

@@ -2,8 +2,8 @@ import type { Signer as InjectedSigner } from '@polkadot/api/types';
 import type { ProviderInterface } from '@polkadot/rpc-provider/types';
 import type { ExtDef } from '@polkadot/types/extrinsic/signedExtensions/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
-declare type This = typeof globalThis;
-export declare type Unsubcall = () => void;
+type This = typeof globalThis;
+export type Unsubcall = () => void;
 export interface InjectedAccount {
     address: string;
     genesisHash?: string | null;
@@ -57,7 +57,7 @@ export interface InjectedMetadata {
     get: () => Promise<InjectedMetadataKnown[]>;
     provide: (definition: MetadataDef) => Promise<boolean>;
 }
-export declare type ProviderList = Record<string, ProviderMeta>;
+export type ProviderList = Record<string, ProviderMeta>;
 export interface InjectedProvider extends ProviderInterface {
     listProviders: () => Promise<ProviderList>;
     startProvider: (key: string) => Promise<ProviderMeta>;
@@ -73,17 +73,19 @@ export interface Injected {
     signer: InjectedSigner;
 }
 export interface InjectedWindowProvider {
-    enable: (origin: string) => Promise<Injected>;
-    version: string;
+    connect?: (origin: string) => Promise<InjectedExtension>;
+    enable?: (origin: string) => Promise<Injected>;
+    version?: string;
 }
 export interface InjectedWindow extends This {
     injectedWeb3: Record<string, InjectedWindowProvider>;
 }
-export declare type InjectedExtension = InjectedExtensionInfo & Injected;
-export declare type InjectOptions = InjectedExtensionInfo;
+export type InjectedExtension = InjectedExtensionInfo & Injected;
+export type InjectOptions = InjectedExtensionInfo;
 export interface Web3AccountsOptions {
-    ss58Format?: number;
     accountType?: KeypairType[];
     extensions?: string[];
+    genesisHash?: string | null;
+    ss58Format?: number;
 }
 export {};