@polkadot/extension-dapp 0.40.1 → 0.40.3

package/bundle-polkadot-extension-dapp.js

@@ -31,25 +31,8 @@ const polkadotExtensionDapp = (function (exports, util, utilCrypto) {
   }
 
   // Copyright 2019-2021 @polkadot/extension authors & contributors
-  const ETHEREUM = util.u8aToU8a('\x19Ethereum Signed Message:\n');
-  const PREFIX = util.u8aToU8a('<Bytes>');
-  const POSTFIX = util.u8aToU8a('</Bytes>');
-  const WRAP_LEN = PREFIX.length + POSTFIX.length;
-
-  function isWrapped(u8a, withEthereum) {
-    return u8a.length >= WRAP_LEN && util.u8aEq(u8a.subarray(0, PREFIX.length), PREFIX) && util.u8aEq(u8a.slice(-POSTFIX.length), POSTFIX) || withEthereum && u8a.length >= ETHEREUM.length && util.u8aEq(u8a.subarray(0, ETHEREUM.length), ETHEREUM);
-  }
-
-  function unwrapBytes(bytes) {
-    const u8a = util.u8aToU8a(bytes); // we don't want to unwrap Ethereum-style wraps
-
-    return isWrapped(u8a, false) ? u8a.subarray(PREFIX.length, u8a.length - POSTFIX.length) : u8a;
-  }
-  function wrapBytes(bytes) {
-    const u8a = util.u8aToU8a(bytes); // if Ethereum-wrapping, we don't add our wrapping bytes
-
-    return isWrapped(u8a, true) ? u8a : util.u8aConcat(PREFIX, u8a, POSTFIX);
-  }
+  const unwrapBytes = util.u8aUnwrapBytes;
+  const wrapBytes = util.u8aWrapBytes;
 
   function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@polkadot/extension-dapp",
   "description": "Provides an interfaces around the injected globals for ease of access by dapp developers.",
-  "version": "0.40.1",
+  "version": "0.40.3",
   "type": "module",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "license": "Apache-2",
@@ -9,9 +9,9 @@
   "sideEffects": false,
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/extension-inject": "^0.40.1",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1"
+    "@polkadot/extension-inject": "^0.40.3",
+    "@polkadot/util": "^7.4.1",
+    "@polkadot/util-crypto": "^7.4.1"
   },
   "peerDependencies": {
     "@polkadot/api": "*",

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/extension-dapp',
-  version: '0.40.1'
+  version: '0.40.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-dapp',
-  version: '0.40.1'
+  version: '0.40.3'
 };

package/wrapBytes.cjs

@@ -3,34 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unwrapBytes = unwrapBytes;
-exports.wrapBytes = wrapBytes;
-exports.POSTFIX = exports.PREFIX = exports.ETHEREUM = void 0;
+exports.wrapBytes = exports.unwrapBytes = exports.isWrapped = exports.PREFIX = exports.POSTFIX = exports.ETHEREUM = void 0;
 
 var _util = require("@polkadot/util");
 
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const ETHEREUM = (0, _util.u8aToU8a)('\x19Ethereum Signed Message:\n');
+const ETHEREUM = _util.U8A_WRAP_ETHEREUM;
 exports.ETHEREUM = ETHEREUM;
-const PREFIX = (0, _util.u8aToU8a)('<Bytes>');
-exports.PREFIX = PREFIX;
-const POSTFIX = (0, _util.u8aToU8a)('</Bytes>');
+const POSTFIX = _util.U8A_WRAP_POSTFIX;
 exports.POSTFIX = POSTFIX;
-const WRAP_LEN = PREFIX.length + POSTFIX.length;
-
-function isWrapped(u8a, withEthereum) {
-  return u8a.length >= WRAP_LEN && (0, _util.u8aEq)(u8a.subarray(0, PREFIX.length), PREFIX) && (0, _util.u8aEq)(u8a.slice(-POSTFIX.length), POSTFIX) || withEthereum && u8a.length >= ETHEREUM.length && (0, _util.u8aEq)(u8a.subarray(0, ETHEREUM.length), ETHEREUM);
-}
-
-function unwrapBytes(bytes) {
-  const u8a = (0, _util.u8aToU8a)(bytes); // we don't want to unwrap Ethereum-style wraps
-
-  return isWrapped(u8a, false) ? u8a.subarray(PREFIX.length, u8a.length - POSTFIX.length) : u8a;
-}
-
-function wrapBytes(bytes) {
-  const u8a = (0, _util.u8aToU8a)(bytes); // if Ethereum-wrapping, we don't add our wrapping bytes
-
-  return isWrapped(u8a, true) ? u8a : (0, _util.u8aConcat)(PREFIX, u8a, POSTFIX);
-}
+const PREFIX = _util.U8A_WRAP_PREFIX;
+exports.PREFIX = PREFIX;
+const isWrapped = _util.u8aIsWrapped;
+exports.isWrapped = isWrapped;
+const unwrapBytes = _util.u8aUnwrapBytes;
+exports.unwrapBytes = unwrapBytes;
+const wrapBytes = _util.u8aWrapBytes;
+exports.wrapBytes = wrapBytes;

package/wrapBytes.d.ts

@@ -1,5 +1,7 @@
+import { u8aIsWrapped, u8aUnwrapBytes, u8aWrapBytes } from '@polkadot/util';
 export declare const ETHEREUM: Uint8Array;
-export declare const PREFIX: Uint8Array;
 export declare const POSTFIX: Uint8Array;
-export declare function unwrapBytes(bytes: string | Uint8Array): Uint8Array;
-export declare function wrapBytes(bytes: string | Uint8Array): Uint8Array;
+export declare const PREFIX: Uint8Array;
+export declare const isWrapped: typeof u8aIsWrapped;
+export declare const unwrapBytes: typeof u8aUnwrapBytes;
+export declare const wrapBytes: typeof u8aWrapBytes;

package/wrapBytes.js

@@ -1,22 +1,9 @@
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { u8aConcat, u8aEq, u8aToU8a } from '@polkadot/util';
-export const ETHEREUM = u8aToU8a('\x19Ethereum Signed Message:\n');
-export const PREFIX = u8aToU8a('<Bytes>');
-export const POSTFIX = u8aToU8a('</Bytes>');
-const WRAP_LEN = PREFIX.length + POSTFIX.length;
-
-function isWrapped(u8a, withEthereum) {
-  return u8a.length >= WRAP_LEN && u8aEq(u8a.subarray(0, PREFIX.length), PREFIX) && u8aEq(u8a.slice(-POSTFIX.length), POSTFIX) || withEthereum && u8a.length >= ETHEREUM.length && u8aEq(u8a.subarray(0, ETHEREUM.length), ETHEREUM);
-}
-
-export function unwrapBytes(bytes) {
-  const u8a = u8aToU8a(bytes); // we don't want to unwrap Ethereum-style wraps
-
-  return isWrapped(u8a, false) ? u8a.subarray(PREFIX.length, u8a.length - POSTFIX.length) : u8a;
-}
-export function wrapBytes(bytes) {
-  const u8a = u8aToU8a(bytes); // if Ethereum-wrapping, we don't add our wrapping bytes
-
-  return isWrapped(u8a, true) ? u8a : u8aConcat(PREFIX, u8a, POSTFIX);
-}
+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;
+export const PREFIX = U8A_WRAP_PREFIX;
+export const isWrapped = u8aIsWrapped;
+export const unwrapBytes = u8aUnwrapBytes;
+export const wrapBytes = u8aWrapBytes;