@w3ux/utils 0.4.0 → 0.6.0

package/base.cjs

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/base.ts
@@ -45,7 +35,7 @@ __export(base_exports, {
 });
 module.exports = __toCommonJS(base_exports);
 var import_bignumber = require("bignumber.js");
-var import_keyring = __toESM(require("@polkadot/keyring"), 1);
+var import_util_crypto = require("@polkadot/util-crypto");
 var camelize = (str) => {
   const convertToString = (string) => {
     if (string) {
@@ -142,15 +132,11 @@ var withTimeout = (ms, promise, options) => {
 };
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
-var formatAccountSs58 = (address, ss58) => {
+var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const keyring = new import_keyring.default();
-    keyring.setSS58Format(ss58);
-    const formatted = keyring.addFromAddress(address).address;
-    if (formatted !== address) {
-      return formatted;
-    }
-    return null;
+    const decodedAddress = (0, import_util_crypto.decodeAddress)(address);
+    const formattedAddress = (0, import_util_crypto.encodeAddress)(decodedAddress, ss58Prefix);
+    return formattedAddress;
   } catch (e) {
     return null;
   }

package/base.d.cts

@@ -63,10 +63,10 @@ declare const appendOrEmpty: (condition: boolean | string | undefined, value: st
  */
 declare const appendOr: (condition: boolean | string | undefined, value: string, fallback: string) => string;
 /**
- * @name appendOr
+ * @name formatAccountSs58
  * @summary Formats an address with the supplied ss58 prefix, or returns null if invalid.
  */
-declare const formatAccountSs58: (address: string, ss58: number) => string;
+declare const formatAccountSs58: (address: string, ss58Prefix: number) => string;
 /**
  * @name removeHexPrefix
  * @summary Takes a string str as input and returns a new string with the "0x" prefix removed if it

package/base.d.ts

@@ -63,10 +63,10 @@ declare const appendOrEmpty: (condition: boolean | string | undefined, value: st
  */
 declare const appendOr: (condition: boolean | string | undefined, value: string, fallback: string) => string;
 /**
- * @name appendOr
+ * @name formatAccountSs58
  * @summary Formats an address with the supplied ss58 prefix, or returns null if invalid.
  */
-declare const formatAccountSs58: (address: string, ss58: number) => string;
+declare const formatAccountSs58: (address: string, ss58Prefix: number) => string;
 /**
  * @name removeHexPrefix
  * @summary Takes a string str as input and returns a new string with the "0x" prefix removed if it

package/base.js

@@ -1,6 +1,6 @@
 // src/base.ts
 import { BigNumber } from "bignumber.js";
-import Keyring from "@polkadot/keyring";
+import { decodeAddress, encodeAddress } from "@polkadot/util-crypto";
 var camelize = (str) => {
   const convertToString = (string) => {
     if (string) {
@@ -97,15 +97,11 @@ var withTimeout = (ms, promise, options) => {
 };
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
-var formatAccountSs58 = (address, ss58) => {
+var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const keyring = new Keyring();
-    keyring.setSS58Format(ss58);
-    const formatted = keyring.addFromAddress(address).address;
-    if (formatted !== address) {
-      return formatted;
-    }
-    return null;
+    const decodedAddress = decodeAddress(address);
+    const formattedAddress = encodeAddress(decodedAddress, ss58Prefix);
+    return formattedAddress;
   } catch (e) {
     return null;
   }

package/index.cjs

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -73,7 +63,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/base.ts
 var import_bignumber = require("bignumber.js");
-var import_keyring = __toESM(require("@polkadot/keyring"), 1);
+var import_util_crypto = require("@polkadot/util-crypto");
 var camelize = (str) => {
   const convertToString = (string) => {
     if (string) {
@@ -170,15 +160,11 @@ var withTimeout = (ms, promise, options) => {
 };
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
-var formatAccountSs58 = (address, ss58) => {
+var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const keyring = new import_keyring.default();
-    keyring.setSS58Format(ss58);
-    const formatted = keyring.addFromAddress(address).address;
-    if (formatted !== address) {
-      return formatted;
-    }
-    return null;
+    const decodedAddress = (0, import_util_crypto.decodeAddress)(address);
+    const formattedAddress = (0, import_util_crypto.encodeAddress)(decodedAddress, ss58Prefix);
+    return formattedAddress;
   } catch (e) {
     return null;
   }
@@ -186,7 +172,7 @@ var formatAccountSs58 = (address, ss58) => {
 var removeHexPrefix = (str) => str.replace(/^0x/, "");
 
 // src/unit.ts
-var import_keyring2 = require("@polkadot/keyring");
+var import_util_crypto2 = require("@polkadot/util-crypto");
 var import_util = require("@polkadot/util");
 var import_bignumber2 = require("bignumber.js");
 var remToUnit = (rem) => Number(rem.slice(0, rem.length - 3)) * parseFloat(getComputedStyle(document.documentElement).fontSize);
@@ -218,7 +204,10 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    (0, import_keyring2.encodeAddress)((0, import_util.isHex)(address) ? (0, import_util.hexToU8a)(address) : (0, import_keyring2.decodeAddress)(address));
+    if ((0, import_util.isHex)(address)) {
+      return true;
+    }
+    (0, import_util_crypto2.decodeAddress)(address);
     return true;
   } catch (e) {
     return false;

package/index.js

@@ -1,6 +1,6 @@
 // src/base.ts
 import { BigNumber } from "bignumber.js";
-import Keyring from "@polkadot/keyring";
+import { decodeAddress, encodeAddress } from "@polkadot/util-crypto";
 var camelize = (str) => {
   const convertToString = (string) => {
     if (string) {
@@ -97,15 +97,11 @@ var withTimeout = (ms, promise, options) => {
 };
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
-var formatAccountSs58 = (address, ss58) => {
+var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const keyring = new Keyring();
-    keyring.setSS58Format(ss58);
-    const formatted = keyring.addFromAddress(address).address;
-    if (formatted !== address) {
-      return formatted;
-    }
-    return null;
+    const decodedAddress = decodeAddress(address);
+    const formattedAddress = encodeAddress(decodedAddress, ss58Prefix);
+    return formattedAddress;
   } catch (e) {
     return null;
   }
@@ -113,8 +109,8 @@ var formatAccountSs58 = (address, ss58) => {
 var removeHexPrefix = (str) => str.replace(/^0x/, "");
 
 // src/unit.ts
-import { decodeAddress, encodeAddress } from "@polkadot/keyring";
-import { hexToU8a, isHex, u8aToString, u8aUnwrapBytes } from "@polkadot/util";
+import { decodeAddress as decodeAddress2 } from "@polkadot/util-crypto";
+import { isHex, u8aToString, u8aUnwrapBytes } from "@polkadot/util";
 import { BigNumber as BigNumber2 } from "bignumber.js";
 var remToUnit = (rem) => Number(rem.slice(0, rem.length - 3)) * parseFloat(getComputedStyle(document.documentElement).fontSize);
 var planckToUnit = (val, units) => new BigNumber2(
@@ -145,7 +141,10 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    encodeAddress(isHex(address) ? hexToU8a(address) : decodeAddress(address));
+    if (isHex(address)) {
+      return true;
+    }
+    decodeAddress2(address);
     return true;
   } catch (e) {
     return false;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@w3ux/utils",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@polkadot/keyring": "^12.6.2",
-    "@polkadot/util": "^12.6.2",
+    "@polkadot/util": "^13.1.1",
+    "@polkadot/util-crypto": "^13.1.1",
     "bignumber.js": "^9.1.1"
   },
   "main": "index.cjs",

package/unit.cjs

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/unit.ts
@@ -57,13 +47,13 @@ __export(unit_exports, {
   varToUrlHash: () => varToUrlHash
 });
 module.exports = __toCommonJS(unit_exports);
-var import_keyring2 = require("@polkadot/keyring");
+var import_util_crypto2 = require("@polkadot/util-crypto");
 var import_util = require("@polkadot/util");
 var import_bignumber2 = require("bignumber.js");
 
 // src/base.ts
 var import_bignumber = require("bignumber.js");
-var import_keyring = __toESM(require("@polkadot/keyring"), 1);
+var import_util_crypto = require("@polkadot/util-crypto");
 var ellipsisFn = (str, amount = 6, position = "center") => {
   const half = str.length / 2;
   if (amount <= 4) {
@@ -122,7 +112,10 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    (0, import_keyring2.encodeAddress)((0, import_util.isHex)(address) ? (0, import_util.hexToU8a)(address) : (0, import_keyring2.decodeAddress)(address));
+    if ((0, import_util.isHex)(address)) {
+      return true;
+    }
+    (0, import_util_crypto2.decodeAddress)(address);
     return true;
   } catch (e) {
     return false;

package/unit.js

@@ -1,11 +1,11 @@
 // src/unit.ts
-import { decodeAddress, encodeAddress } from "@polkadot/keyring";
-import { hexToU8a, isHex, u8aToString, u8aUnwrapBytes } from "@polkadot/util";
+import { decodeAddress as decodeAddress2 } from "@polkadot/util-crypto";
+import { isHex, u8aToString, u8aUnwrapBytes } from "@polkadot/util";
 import { BigNumber as BigNumber2 } from "bignumber.js";
 
 // src/base.ts
 import { BigNumber } from "bignumber.js";
-import Keyring from "@polkadot/keyring";
+import { decodeAddress, encodeAddress } from "@polkadot/util-crypto";
 var ellipsisFn = (str, amount = 6, position = "center") => {
   const half = str.length / 2;
   if (amount <= 4) {
@@ -64,7 +64,10 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    encodeAddress(isHex(address) ? hexToU8a(address) : decodeAddress(address));
+    if (isHex(address)) {
+      return true;
+    }
+    decodeAddress2(address);
     return true;
   } catch (e) {
     return false;