@talismn/orb 0.0.0-pr771-20230519010247 → 0.0.0-pr771-20230520011730

package/CHANGELOG.md

@@ -1,15 +1,7 @@
 # @talismn/orb
 
-## 0.0.0-pr771-20230519010247
+## 0.0.0-pr771-20230520011730
 
 ### Minor Changes
 
 - 254d37f2: init
-
-### Patch Changes
-
-- Updated dependencies [f7aca48b]
-- Updated dependencies [01bf239b]
-- Updated dependencies [48f0222e]
-- Updated dependencies [01bf239b]
-  - @talismn/util@0.0.0-pr771-20230519010247

package/dist/declarations/src/lib/encodeAnyAddress.d.ts

@@ -0,0 +1 @@
+export declare function encodeAnyAddress(key: string | Uint8Array, ss58Format?: number | undefined): string;

package/dist/talismn-orb.cjs.dev.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var util = require('@talismn/util');
 var md5 = require('blueimp-md5');
 var Color = require('color');
 var nanoid = require('nanoid');
 var react = require('react');
+var utilCrypto = require('@polkadot/util-crypto');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -14,6 +14,16 @@ function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e };
 var md5__default = /*#__PURE__*/_interopDefault(md5);
 var Color__default = /*#__PURE__*/_interopDefault(Color);
 
+function encodeAnyAddress(key, ss58Format) {
+  try {
+    return utilCrypto.encodeAddress(key, ss58Format);
+  } catch (error) {
+    if (typeof key !== "string") throw error;
+    if (!utilCrypto.isEthereumAddress(key)) throw error;
+    return utilCrypto.ethereumEncode(key);
+  }
+}
+
 const djb2 = str => {
   let hash = 5381;
   for (let i = 0; i < str.length; i++) hash = (hash << 5) + hash + str.charCodeAt(i);
@@ -33,7 +43,7 @@ const useTalismanOrb = seed => {
     try {
       // seed may be specific to a ss58 prefix, get the base address
       // eslint-disable-next-line no-var
-      var address = isEthereum ? seed : util.encodeAnyAddress(seed);
+      var address = isEthereum ? seed : encodeAnyAddress(seed);
     } catch (err) {
       address = seed;
     }

package/dist/talismn-orb.cjs.prod.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var util = require('@talismn/util');
 var md5 = require('blueimp-md5');
 var Color = require('color');
 var nanoid = require('nanoid');
 var react = require('react');
+var utilCrypto = require('@polkadot/util-crypto');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -14,6 +14,16 @@ function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e };
 var md5__default = /*#__PURE__*/_interopDefault(md5);
 var Color__default = /*#__PURE__*/_interopDefault(Color);
 
+function encodeAnyAddress(key, ss58Format) {
+  try {
+    return utilCrypto.encodeAddress(key, ss58Format);
+  } catch (error) {
+    if (typeof key !== "string") throw error;
+    if (!utilCrypto.isEthereumAddress(key)) throw error;
+    return utilCrypto.ethereumEncode(key);
+  }
+}
+
 const djb2 = str => {
   let hash = 5381;
   for (let i = 0; i < str.length; i++) hash = (hash << 5) + hash + str.charCodeAt(i);
@@ -33,7 +43,7 @@ const useTalismanOrb = seed => {
     try {
       // seed may be specific to a ss58 prefix, get the base address
       // eslint-disable-next-line no-var
-      var address = isEthereum ? seed : util.encodeAnyAddress(seed);
+      var address = isEthereum ? seed : encodeAnyAddress(seed);
     } catch (err) {
       address = seed;
     }

package/dist/talismn-orb.esm.js

@@ -1,10 +1,20 @@
-import { encodeAnyAddress } from '@talismn/util';
 import md5 from 'blueimp-md5';
 import Color from 'color';
 import { nanoid } from 'nanoid';
 import { useMemo } from 'react';
+import { encodeAddress, isEthereumAddress, ethereumEncode } from '@polkadot/util-crypto';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
+function encodeAnyAddress(key, ss58Format) {
+  try {
+    return encodeAddress(key, ss58Format);
+  } catch (error) {
+    if (typeof key !== "string") throw error;
+    if (!isEthereumAddress(key)) throw error;
+    return ethereumEncode(key);
+  }
+}
+
 const djb2 = str => {
   let hash = 5381;
   for (let i = 0; i < str.length; i++) hash = (hash << 5) + hash + str.charCodeAt(i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/orb",
-  "version": "0.0.0-pr771-20230519010247",
+  "version": "0.0.0-pr771-20230520011730",
   "author": "Talisman",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -22,13 +22,13 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "@talismn/util": "0.0.0-pr771-20230519010247",
+    "@polkadot/util-crypto": "12.2.1",
     "blueimp-md5": "2.19.0",
     "color": "4.2.3",
     "nanoid": "3.3.6"
   },
   "devDependencies": {
-    "@talismn/eslint-config": "0.0.0-pr771-20230519010247",
+    "@talismn/eslint-config": "0.0.0-pr771-20230520011730",
     "@talismn/tsconfig": "0.0.2",
     "@types/react": "18.0.14",
     "@types/react-dom": "18.0.5",

package/src/components/TalismanOrb.tsx

@@ -1,9 +1,10 @@
-import { encodeAnyAddress } from "@talismn/util"
 import md5 from "blueimp-md5"
 import Color from "color"
 import { nanoid } from "nanoid"
 import { FC, useMemo } from "react"
 
+import { encodeAnyAddress } from "../lib/encodeAnyAddress"
+
 const djb2 = (str: string) => {
   let hash = 5381
   for (let i = 0; i < str.length; i++) hash = (hash << 5) + hash + str.charCodeAt(i)

package/src/lib/encodeAnyAddress.ts

@@ -0,0 +1,15 @@
+import { encodeAddress, ethereumEncode, isEthereumAddress } from "@polkadot/util-crypto"
+
+export function encodeAnyAddress(
+  key: string | Uint8Array,
+  ss58Format?: number | undefined
+): string {
+  try {
+    return encodeAddress(key, ss58Format)
+  } catch (error) {
+    if (typeof key !== "string") throw error
+    if (!isEthereumAddress(key)) throw error
+
+    return ethereumEncode(key)
+  }
+}