@talismn/crypto 0.2.0 → 0.2.1

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

@@ -0,0 +1,5 @@
+type EncodeAddressOptions = {
+    ss58Format?: number | undefined;
+};
+export declare const encodeAnyAddress: (address: string, options?: EncodeAddressOptions) => string;
+export {};

package/dist/declarations/src/address/encoding/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./addressEncodingFromCurve";
-export * from "./base58";
+export * from "./solana";
 export * from "./bitcoin";
 export * from "./detectAddressEncoding";
 export * from "./ethereum";

package/dist/declarations/src/address/encoding/solana.d.ts

@@ -0,0 +1,2 @@
+export declare const encodeAddressSolana: (publicKey: Uint8Array) => string;
+export declare function isSolanaAddress(address: string): boolean;

package/dist/declarations/src/address/index.d.ts

@@ -2,4 +2,5 @@ export * from "./encoding";
 export * from "./addressFromPublicKey";
 export * from "./normalizeAddress";
 export * from "./isAddressEqual";
-export * from "./isValidAddress";
+export * from "./encodeAnyAddress";
+export * from "./isAddressValid";

package/dist/declarations/src/address/isAddressValid.d.ts

@@ -0,0 +1 @@
+export declare const isAddressValid: (address: string) => boolean;

package/dist/declarations/src/derivation/utils.d.ts

@@ -1,16 +1,7 @@
-import { KeypairCurve } from "../types";
+import { AccountPlatform, KeypairCurve } from "../types";
 export declare const deriveKeypair: (seed: Uint8Array, derivationPath: string, curve: KeypairCurve) => import("../types").Keypair;
 export declare const getPublicKeyFromSecret: (secretKey: Uint8Array, curve: KeypairCurve) => Uint8Array;
-export declare const addressFromSuri: (suri: string, type: KeypairCurve) => Promise<string>;
-/**
- * @dev we only expect suri to contain a mnemonic and derivation path.
- * for other cases see https://polkadot.js.org/docs/keyring/start/suri/
- */
-export declare const parseSuri: (suri: string) => {
-    mnemonic: string;
-    derivationPath: string;
-    password: string | undefined;
-};
+export declare const addressFromMnemonic: (mnemonic: string, derivationPath: string, curve: KeypairCurve) => Promise<string>;
 export declare const removeHexPrefix: (secretKey: string) => string;
-export declare const parseSecretKey: (secretKey: string, curve: KeypairCurve) => Uint8Array<ArrayBufferLike>;
+export declare const parseSecretKey: (secretKey: string, platform: AccountPlatform) => Uint8Array<ArrayBufferLike>;
 export declare const isValidDerivationPath: (derivationPath: string, curve: KeypairCurve) => Promise<boolean>;

package/dist/declarations/src/platform/index.d.ts

@@ -1,4 +1,4 @@
-import { AddressEncoding, KeypairCurve, Platform } from "../types";
-export declare const platformFromCurve: (curve: KeypairCurve) => Platform;
-export declare const platformFromEncoding: (encoding: AddressEncoding) => Platform;
-export declare const platformFromAddress: (address: string) => Platform;
+import { AccountPlatform, AddressEncoding, KeypairCurve } from "../types";
+export declare const getAccountPlatformFromCurve: (curve: KeypairCurve) => AccountPlatform;
+export declare const getAccountPlatformFromEncoding: (encoding: AddressEncoding) => AccountPlatform;
+export declare const getAccountPlatformFromAddress: (address: string) => AccountPlatform;

package/dist/declarations/src/types/index.d.ts

@@ -1,9 +1,9 @@
 export type KeypairCurve = "ecdsa" | "ed25519" | "sr25519" | "ethereum" | "bitcoin-ed25519" | "bitcoin-ecdsa" | "solana";
-export type AddressEncoding = "ss58" | "ethereum" | "bech32m" | "bech32" | "base58check" | "base58";
+export type AddressEncoding = "ss58" | "ethereum" | "bech32m" | "bech32" | "base58check" | "base58solana";
 export type Keypair = {
     type: KeypairCurve;
     secretKey: Uint8Array;
     publicKey: Uint8Array;
     address: string;
 };
-export type Platform = "ethereum" | "polkadot" | "bitcoin" | "solana";
+export type AccountPlatform = "ethereum" | "polkadot" | "bitcoin" | "solana";

package/dist/declarations/src/utils/exports.d.ts

@@ -1 +1,2 @@
-export { bytesToString, stringToBytes } from "@scure/base";
+export { base58, base64, hex, utf8 } from "@scure/base";
+export { ed25519 } from "@noble/curves/ed25519";

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

@@ -3,15 +3,15 @@
 var bip39 = require('@scure/bip39');
 var english = require('@scure/bip39/wordlists/english');
 var base = require('@scure/base');
+var ed25519 = require('@noble/curves/ed25519');
+var secp256k1 = require('@noble/curves/secp256k1');
 var bech32 = require('bech32');
 var bs58check = require('bs58check');
 var sha3 = require('@noble/hashes/sha3');
 var utils = require('@noble/hashes/utils');
 var blake2b = require('@noble/hashes/blake2b');
 var blake3$1 = require('@noble/hashes/blake3');
-var secp256k1 = require('@noble/curves/secp256k1');
 var scaleTs = require('scale-ts');
-var ed25519 = require('@noble/curves/ed25519');
 var bip32 = require('@scure/bip32');
 var hmac = require('@noble/hashes/hmac');
 var sha512 = require('@noble/hashes/sha512');
@@ -140,18 +140,18 @@ const addressEncodingFromCurve = curve => {
     case "ethereum":
       return "ethereum";
     case "solana":
-      return "base58";
+      return "base58solana";
   }
 };
 
-const encodeAddressBase58 = publicKey => {
+const encodeAddressSolana = publicKey => {
+  if (publicKey.length !== 32) throw new Error("Public key must be 32 bytes long for Solana base58 encoding");
   return base.base58.encode(publicKey);
 };
-/** Detect if address is base58 encoded (NOTE: also returns true for ss58 addresses) */
-function isBase58Address(address) {
+function isSolanaAddress(address) {
   try {
-    base.base58.decode(address);
-    return true;
+    const bytes = base.base58.decode(address);
+    return bytes.length === 32;
   } catch (error) {
     return false;
   }
@@ -287,7 +287,7 @@ const blake2b512 = msg => blake2b.blake2b(msg, {
 const getSafeHash = bytes => {
   // cryptographically secure one way hash
   // outputs 44 characters without special characters
-  return base.bytesToString("base58", blake3$1.blake3(bytes));
+  return base.base58.encode(blake3$1.blake3(bytes));
 };
 
 // Inspired from MIT licensed @polkadot-labs/hdkd-helpers
@@ -336,10 +336,10 @@ const CACHE$1 = new Map();
 const detectAddressEncodingInner = address => {
   if (isEthereumAddress(address)) return "ethereum";
   if (isSs58Address(address)) return "ss58";
+  if (isSolanaAddress(address)) return "base58solana";
   if (isBech32mAddress(address)) return "bech32m";
   if (isBech32Address(address)) return "bech32";
   if (isBase58CheckAddress(address)) return "base58check";
-  if (isBase58Address(address)) return "base58";
   throw new Error(`Unknown address encoding`);
 };
 const detectAddressEncoding = address => {
@@ -353,12 +353,12 @@ const addressFromPublicKey = (publicKey, encoding, options) => {
       return encodeAddressSs58(publicKey, options?.ss58Prefix);
     case "ethereum":
       return encodeAddressEthereum(publicKey);
+    case "base58solana":
+      return encodeAddressSolana(publicKey);
     case "bech32m":
     case "bech32":
     case "base58check":
       throw new Error("addressFromPublicKey is not implemented for Bitcoin");
-    case "base58":
-      return encodeAddressBase58(publicKey);
   }
 };
 
@@ -382,7 +382,7 @@ const normalizeAnyAddress = address => {
     case "bech32m":
     case "bech32":
     case "base58check":
-    case "base58":
+    case "base58solana":
       return address;
     case "ss58":
       {
@@ -401,9 +401,23 @@ const isAddressEqual = (address1, address2) => {
   }
 };
 
-const isValidAddress = address => {
+const encodeAnyAddress = (address, options) => {
+  // this leverages cache
+  const encoding = detectAddressEncoding(address);
+
+  // this does NOT leverage cache
+  if (encoding === "ss58" && options?.ss58Format !== undefined) {
+    const [publicKey] = decodeSs58Address(address);
+    return encodeAddressSs58(publicKey, options?.ss58Format ?? 42);
+  }
+
+  // this leverages cache
+  return normalizeAddress(address);
+};
+
+const isAddressValid = address => {
   try {
-    normalizeAddress(address);
+    detectAddressEncoding(address);
     return true;
   } catch {
     return false;
@@ -544,7 +558,7 @@ const deriveSolana = (seed, derivationPath) => {
     type: "solana",
     secretKey,
     publicKey,
-    address: addressFromPublicKey(publicKey, "base58")
+    address: addressFromPublicKey(publicKey, "base58solana")
   };
 };
 const getPublicKeySolana = secretKey => {
@@ -602,60 +616,42 @@ const getPublicKeyFromSecret = (secretKey, curve) => {
       return getPublicKeySolana(secretKey);
   }
 };
-const addressFromSuri = async (suri, type) => {
-  const {
-    mnemonic,
-    derivationPath,
-    password
-  } = parseSuri(suri);
+const addressFromMnemonic = async (mnemonic, derivationPath, curve) => {
   const entropy = mnemonicToEntropy(mnemonic);
-  const seed = await entropyToSeed(entropy, type, password); // ~80ms
+  const seed = await entropyToSeed(entropy, curve);
   const {
-    secretKey
-  } = deriveKeypair(seed, derivationPath, type);
-  const publicKey = getPublicKeyFromSecret(secretKey, type);
-  const encoding = addressEncodingFromCurve(type);
-  return addressFromPublicKey(publicKey, encoding);
-};
-
-/**
- * @dev we only expect suri to contain a mnemonic and derivation path.
- * for other cases see https://polkadot.js.org/docs/keyring/start/suri/
- */
-const parseSuri = suri => {
-  // extract password if any
-  const indexOfPassword = suri.indexOf("///");
-  const password = indexOfPassword === -1 ? undefined : suri.slice(indexOfPassword + 3);
-  if (password) suri = suri.slice(0, indexOfPassword);
-
-  // split mnemonic and derivation path
-  const indexOfSlash = suri.indexOf("/");
-  const mnemonic = indexOfSlash === -1 ? suri : suri.slice(0, indexOfSlash);
-  let derivationPath = indexOfSlash === -1 ? "" : suri.slice(indexOfSlash);
-
-  // if BIP44, leading slash must be removed
-  if (derivationPath.startsWith("/m/")) derivationPath = derivationPath.slice(1);
-  if (!isValidMnemonic(mnemonic)) throw new Error("Invalid mnemonic");
-  return {
-    mnemonic,
-    derivationPath,
-    password
-  };
+    address
+  } = deriveKeypair(seed, derivationPath, curve);
+  return address;
 };
 const removeHexPrefix = secretKey => {
   if (secretKey.startsWith("0x")) return secretKey.slice(2);
   return secretKey;
 };
-const parseSecretKey = (secretKey, curve) => {
-  switch (curve) {
+const parseSecretKey = (secretKey, platform) => {
+  switch (platform) {
     case "ethereum":
-      return base.stringToBytes("hex", removeHexPrefix(secretKey));
-    case "ed25519":
-    case "sr25519":
-    case "ecdsa":
-    case "bitcoin-ecdsa":
-    case "bitcoin-ed25519":
+      {
+        const privateKey = removeHexPrefix(secretKey);
+        return base.hex.decode(privateKey);
+      }
     case "solana":
+      {
+        const bytes = secretKey.startsWith("[") ?
+        // JSON bytes array (ex: solflare)
+        Uint8Array.from(JSON.parse(secretKey)) :
+        // base58 encoded string (ex: phantom)
+        base.base58.decode(secretKey);
+        if (bytes.length === 64) {
+          const privateKey = bytes.slice(0, 32);
+          const publicKey = bytes.slice(32, 64);
+          const computedPublicKey = getPublicKeySolana(privateKey);
+          if (!publicKey.every((b, i) => b === computedPublicKey[i])) throw new Error("Invalid Solana secret key: public key does not match");
+          return privateKey;
+        } else if (bytes.length === 32) return bytes;
+        throw new Error("Invalid Solana secret key length");
+      }
+    default:
       throw new Error("Not implemented");
   }
 };
@@ -670,7 +666,7 @@ const isValidDerivationPath = async (derivationPath, curve) => {
   }
 };
 
-const platformFromCurve = curve => {
+const getAccountPlatformFromCurve = curve => {
   switch (curve) {
     case "sr25519":
     case "ed25519":
@@ -685,7 +681,7 @@ const platformFromCurve = curve => {
       return "solana";
   }
 };
-const platformFromEncoding = encoding => {
+const getAccountPlatformFromEncoding = encoding => {
   switch (encoding) {
     case "ss58":
       return "polkadot";
@@ -695,28 +691,40 @@ const platformFromEncoding = encoding => {
     case "bech32":
     case "base58check":
       return "bitcoin";
-    case "base58":
+    case "base58solana":
       return "solana";
   }
 };
-const platformFromAddress = address => {
+const getAccountPlatformFromAddress = address => {
   const encoding = detectAddressEncoding(address);
-  return platformFromEncoding(encoding);
+  return getAccountPlatformFromEncoding(encoding);
 };
 
-Object.defineProperty(exports, "bytesToString", {
+Object.defineProperty(exports, "base58", {
+  enumerable: true,
+  get: function () { return base.base58; }
+});
+Object.defineProperty(exports, "base64", {
+  enumerable: true,
+  get: function () { return base.base64; }
+});
+Object.defineProperty(exports, "hex", {
+  enumerable: true,
+  get: function () { return base.hex; }
+});
+Object.defineProperty(exports, "utf8", {
   enumerable: true,
-  get: function () { return base.bytesToString; }
+  get: function () { return base.utf8; }
 });
-Object.defineProperty(exports, "stringToBytes", {
+Object.defineProperty(exports, "ed25519", {
   enumerable: true,
-  get: function () { return base.stringToBytes; }
+  get: function () { return ed25519.ed25519; }
 });
 exports.DEV_MNEMONIC_ETHEREUM = DEV_MNEMONIC_ETHEREUM;
 exports.DEV_MNEMONIC_POLKADOT = DEV_MNEMONIC_POLKADOT;
 exports.addressEncodingFromCurve = addressEncodingFromCurve;
+exports.addressFromMnemonic = addressFromMnemonic;
 exports.addressFromPublicKey = addressFromPublicKey;
-exports.addressFromSuri = addressFromSuri;
 exports.blake2b256 = blake2b256;
 exports.blake2b512 = blake2b512;
 exports.blake3 = blake3;
@@ -724,35 +732,35 @@ exports.checksumEthereumAddress = checksumEthereumAddress;
 exports.decodeSs58Address = decodeSs58Address;
 exports.deriveKeypair = deriveKeypair;
 exports.detectAddressEncoding = detectAddressEncoding;
-exports.encodeAddressBase58 = encodeAddressBase58;
 exports.encodeAddressEthereum = encodeAddressEthereum;
+exports.encodeAddressSolana = encodeAddressSolana;
 exports.encodeAddressSs58 = encodeAddressSs58;
+exports.encodeAnyAddress = encodeAnyAddress;
 exports.entropyToMnemonic = entropyToMnemonic;
 exports.entropyToSeed = entropyToSeed;
 exports.fromBase58Check = fromBase58Check;
 exports.fromBech32 = fromBech32;
 exports.fromBech32m = fromBech32m;
 exports.generateMnemonic = generateMnemonic;
+exports.getAccountPlatformFromAddress = getAccountPlatformFromAddress;
+exports.getAccountPlatformFromCurve = getAccountPlatformFromCurve;
+exports.getAccountPlatformFromEncoding = getAccountPlatformFromEncoding;
 exports.getDevSeed = getDevSeed;
 exports.getPublicKeyFromSecret = getPublicKeyFromSecret;
 exports.getSafeHash = getSafeHash;
 exports.isAddressEqual = isAddressEqual;
-exports.isBase58Address = isBase58Address;
+exports.isAddressValid = isAddressValid;
 exports.isBase58CheckAddress = isBase58CheckAddress;
 exports.isBech32Address = isBech32Address;
 exports.isBech32mAddress = isBech32mAddress;
 exports.isBitcoinAddress = isBitcoinAddress;
 exports.isEthereumAddress = isEthereumAddress;
+exports.isSolanaAddress = isSolanaAddress;
 exports.isSs58Address = isSs58Address;
-exports.isValidAddress = isValidAddress;
 exports.isValidDerivationPath = isValidDerivationPath;
 exports.isValidMnemonic = isValidMnemonic;
 exports.mnemonicToEntropy = mnemonicToEntropy;
 exports.normalizeAddress = normalizeAddress;
 exports.parseSecretKey = parseSecretKey;
-exports.parseSuri = parseSuri;
 exports.pbkdf2 = pbkdf2;
-exports.platformFromAddress = platformFromAddress;
-exports.platformFromCurve = platformFromCurve;
-exports.platformFromEncoding = platformFromEncoding;
 exports.removeHexPrefix = removeHexPrefix;

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

@@ -3,15 +3,15 @@
 var bip39 = require('@scure/bip39');
 var english = require('@scure/bip39/wordlists/english');
 var base = require('@scure/base');
+var ed25519 = require('@noble/curves/ed25519');
+var secp256k1 = require('@noble/curves/secp256k1');
 var bech32 = require('bech32');
 var bs58check = require('bs58check');
 var sha3 = require('@noble/hashes/sha3');
 var utils = require('@noble/hashes/utils');
 var blake2b = require('@noble/hashes/blake2b');
 var blake3$1 = require('@noble/hashes/blake3');
-var secp256k1 = require('@noble/curves/secp256k1');
 var scaleTs = require('scale-ts');
-var ed25519 = require('@noble/curves/ed25519');
 var bip32 = require('@scure/bip32');
 var hmac = require('@noble/hashes/hmac');
 var sha512 = require('@noble/hashes/sha512');
@@ -140,18 +140,18 @@ const addressEncodingFromCurve = curve => {
     case "ethereum":
       return "ethereum";
     case "solana":
-      return "base58";
+      return "base58solana";
   }
 };
 
-const encodeAddressBase58 = publicKey => {
+const encodeAddressSolana = publicKey => {
+  if (publicKey.length !== 32) throw new Error("Public key must be 32 bytes long for Solana base58 encoding");
   return base.base58.encode(publicKey);
 };
-/** Detect if address is base58 encoded (NOTE: also returns true for ss58 addresses) */
-function isBase58Address(address) {
+function isSolanaAddress(address) {
   try {
-    base.base58.decode(address);
-    return true;
+    const bytes = base.base58.decode(address);
+    return bytes.length === 32;
   } catch (error) {
     return false;
   }
@@ -287,7 +287,7 @@ const blake2b512 = msg => blake2b.blake2b(msg, {
 const getSafeHash = bytes => {
   // cryptographically secure one way hash
   // outputs 44 characters without special characters
-  return base.bytesToString("base58", blake3$1.blake3(bytes));
+  return base.base58.encode(blake3$1.blake3(bytes));
 };
 
 // Inspired from MIT licensed @polkadot-labs/hdkd-helpers
@@ -336,10 +336,10 @@ const CACHE$1 = new Map();
 const detectAddressEncodingInner = address => {
   if (isEthereumAddress(address)) return "ethereum";
   if (isSs58Address(address)) return "ss58";
+  if (isSolanaAddress(address)) return "base58solana";
   if (isBech32mAddress(address)) return "bech32m";
   if (isBech32Address(address)) return "bech32";
   if (isBase58CheckAddress(address)) return "base58check";
-  if (isBase58Address(address)) return "base58";
   throw new Error(`Unknown address encoding`);
 };
 const detectAddressEncoding = address => {
@@ -353,12 +353,12 @@ const addressFromPublicKey = (publicKey, encoding, options) => {
       return encodeAddressSs58(publicKey, options?.ss58Prefix);
     case "ethereum":
       return encodeAddressEthereum(publicKey);
+    case "base58solana":
+      return encodeAddressSolana(publicKey);
     case "bech32m":
     case "bech32":
     case "base58check":
       throw new Error("addressFromPublicKey is not implemented for Bitcoin");
-    case "base58":
-      return encodeAddressBase58(publicKey);
   }
 };
 
@@ -382,7 +382,7 @@ const normalizeAnyAddress = address => {
     case "bech32m":
     case "bech32":
     case "base58check":
-    case "base58":
+    case "base58solana":
       return address;
     case "ss58":
       {
@@ -401,9 +401,23 @@ const isAddressEqual = (address1, address2) => {
   }
 };
 
-const isValidAddress = address => {
+const encodeAnyAddress = (address, options) => {
+  // this leverages cache
+  const encoding = detectAddressEncoding(address);
+
+  // this does NOT leverage cache
+  if (encoding === "ss58" && options?.ss58Format !== undefined) {
+    const [publicKey] = decodeSs58Address(address);
+    return encodeAddressSs58(publicKey, options?.ss58Format ?? 42);
+  }
+
+  // this leverages cache
+  return normalizeAddress(address);
+};
+
+const isAddressValid = address => {
   try {
-    normalizeAddress(address);
+    detectAddressEncoding(address);
     return true;
   } catch {
     return false;
@@ -544,7 +558,7 @@ const deriveSolana = (seed, derivationPath) => {
     type: "solana",
     secretKey,
     publicKey,
-    address: addressFromPublicKey(publicKey, "base58")
+    address: addressFromPublicKey(publicKey, "base58solana")
   };
 };
 const getPublicKeySolana = secretKey => {
@@ -602,60 +616,42 @@ const getPublicKeyFromSecret = (secretKey, curve) => {
       return getPublicKeySolana(secretKey);
   }
 };
-const addressFromSuri = async (suri, type) => {
-  const {
-    mnemonic,
-    derivationPath,
-    password
-  } = parseSuri(suri);
+const addressFromMnemonic = async (mnemonic, derivationPath, curve) => {
   const entropy = mnemonicToEntropy(mnemonic);
-  const seed = await entropyToSeed(entropy, type, password); // ~80ms
+  const seed = await entropyToSeed(entropy, curve);
   const {
-    secretKey
-  } = deriveKeypair(seed, derivationPath, type);
-  const publicKey = getPublicKeyFromSecret(secretKey, type);
-  const encoding = addressEncodingFromCurve(type);
-  return addressFromPublicKey(publicKey, encoding);
-};
-
-/**
- * @dev we only expect suri to contain a mnemonic and derivation path.
- * for other cases see https://polkadot.js.org/docs/keyring/start/suri/
- */
-const parseSuri = suri => {
-  // extract password if any
-  const indexOfPassword = suri.indexOf("///");
-  const password = indexOfPassword === -1 ? undefined : suri.slice(indexOfPassword + 3);
-  if (password) suri = suri.slice(0, indexOfPassword);
-
-  // split mnemonic and derivation path
-  const indexOfSlash = suri.indexOf("/");
-  const mnemonic = indexOfSlash === -1 ? suri : suri.slice(0, indexOfSlash);
-  let derivationPath = indexOfSlash === -1 ? "" : suri.slice(indexOfSlash);
-
-  // if BIP44, leading slash must be removed
-  if (derivationPath.startsWith("/m/")) derivationPath = derivationPath.slice(1);
-  if (!isValidMnemonic(mnemonic)) throw new Error("Invalid mnemonic");
-  return {
-    mnemonic,
-    derivationPath,
-    password
-  };
+    address
+  } = deriveKeypair(seed, derivationPath, curve);
+  return address;
 };
 const removeHexPrefix = secretKey => {
   if (secretKey.startsWith("0x")) return secretKey.slice(2);
   return secretKey;
 };
-const parseSecretKey = (secretKey, curve) => {
-  switch (curve) {
+const parseSecretKey = (secretKey, platform) => {
+  switch (platform) {
     case "ethereum":
-      return base.stringToBytes("hex", removeHexPrefix(secretKey));
-    case "ed25519":
-    case "sr25519":
-    case "ecdsa":
-    case "bitcoin-ecdsa":
-    case "bitcoin-ed25519":
+      {
+        const privateKey = removeHexPrefix(secretKey);
+        return base.hex.decode(privateKey);
+      }
     case "solana":
+      {
+        const bytes = secretKey.startsWith("[") ?
+        // JSON bytes array (ex: solflare)
+        Uint8Array.from(JSON.parse(secretKey)) :
+        // base58 encoded string (ex: phantom)
+        base.base58.decode(secretKey);
+        if (bytes.length === 64) {
+          const privateKey = bytes.slice(0, 32);
+          const publicKey = bytes.slice(32, 64);
+          const computedPublicKey = getPublicKeySolana(privateKey);
+          if (!publicKey.every((b, i) => b === computedPublicKey[i])) throw new Error("Invalid Solana secret key: public key does not match");
+          return privateKey;
+        } else if (bytes.length === 32) return bytes;
+        throw new Error("Invalid Solana secret key length");
+      }
+    default:
       throw new Error("Not implemented");
   }
 };
@@ -670,7 +666,7 @@ const isValidDerivationPath = async (derivationPath, curve) => {
   }
 };
 
-const platformFromCurve = curve => {
+const getAccountPlatformFromCurve = curve => {
   switch (curve) {
     case "sr25519":
     case "ed25519":
@@ -685,7 +681,7 @@ const platformFromCurve = curve => {
       return "solana";
   }
 };
-const platformFromEncoding = encoding => {
+const getAccountPlatformFromEncoding = encoding => {
   switch (encoding) {
     case "ss58":
       return "polkadot";
@@ -695,28 +691,40 @@ const platformFromEncoding = encoding => {
     case "bech32":
     case "base58check":
       return "bitcoin";
-    case "base58":
+    case "base58solana":
       return "solana";
   }
 };
-const platformFromAddress = address => {
+const getAccountPlatformFromAddress = address => {
   const encoding = detectAddressEncoding(address);
-  return platformFromEncoding(encoding);
+  return getAccountPlatformFromEncoding(encoding);
 };
 
-Object.defineProperty(exports, "bytesToString", {
+Object.defineProperty(exports, "base58", {
+  enumerable: true,
+  get: function () { return base.base58; }
+});
+Object.defineProperty(exports, "base64", {
+  enumerable: true,
+  get: function () { return base.base64; }
+});
+Object.defineProperty(exports, "hex", {
+  enumerable: true,
+  get: function () { return base.hex; }
+});
+Object.defineProperty(exports, "utf8", {
   enumerable: true,
-  get: function () { return base.bytesToString; }
+  get: function () { return base.utf8; }
 });
-Object.defineProperty(exports, "stringToBytes", {
+Object.defineProperty(exports, "ed25519", {
   enumerable: true,
-  get: function () { return base.stringToBytes; }
+  get: function () { return ed25519.ed25519; }
 });
 exports.DEV_MNEMONIC_ETHEREUM = DEV_MNEMONIC_ETHEREUM;
 exports.DEV_MNEMONIC_POLKADOT = DEV_MNEMONIC_POLKADOT;
 exports.addressEncodingFromCurve = addressEncodingFromCurve;
+exports.addressFromMnemonic = addressFromMnemonic;
 exports.addressFromPublicKey = addressFromPublicKey;
-exports.addressFromSuri = addressFromSuri;
 exports.blake2b256 = blake2b256;
 exports.blake2b512 = blake2b512;
 exports.blake3 = blake3;
@@ -724,35 +732,35 @@ exports.checksumEthereumAddress = checksumEthereumAddress;
 exports.decodeSs58Address = decodeSs58Address;
 exports.deriveKeypair = deriveKeypair;
 exports.detectAddressEncoding = detectAddressEncoding;
-exports.encodeAddressBase58 = encodeAddressBase58;
 exports.encodeAddressEthereum = encodeAddressEthereum;
+exports.encodeAddressSolana = encodeAddressSolana;
 exports.encodeAddressSs58 = encodeAddressSs58;
+exports.encodeAnyAddress = encodeAnyAddress;
 exports.entropyToMnemonic = entropyToMnemonic;
 exports.entropyToSeed = entropyToSeed;
 exports.fromBase58Check = fromBase58Check;
 exports.fromBech32 = fromBech32;
 exports.fromBech32m = fromBech32m;
 exports.generateMnemonic = generateMnemonic;
+exports.getAccountPlatformFromAddress = getAccountPlatformFromAddress;
+exports.getAccountPlatformFromCurve = getAccountPlatformFromCurve;
+exports.getAccountPlatformFromEncoding = getAccountPlatformFromEncoding;
 exports.getDevSeed = getDevSeed;
 exports.getPublicKeyFromSecret = getPublicKeyFromSecret;
 exports.getSafeHash = getSafeHash;
 exports.isAddressEqual = isAddressEqual;
-exports.isBase58Address = isBase58Address;
+exports.isAddressValid = isAddressValid;
 exports.isBase58CheckAddress = isBase58CheckAddress;
 exports.isBech32Address = isBech32Address;
 exports.isBech32mAddress = isBech32mAddress;
 exports.isBitcoinAddress = isBitcoinAddress;
 exports.isEthereumAddress = isEthereumAddress;
+exports.isSolanaAddress = isSolanaAddress;
 exports.isSs58Address = isSs58Address;
-exports.isValidAddress = isValidAddress;
 exports.isValidDerivationPath = isValidDerivationPath;
 exports.isValidMnemonic = isValidMnemonic;
 exports.mnemonicToEntropy = mnemonicToEntropy;
 exports.normalizeAddress = normalizeAddress;
 exports.parseSecretKey = parseSecretKey;
-exports.parseSuri = parseSuri;
 exports.pbkdf2 = pbkdf2;
-exports.platformFromAddress = platformFromAddress;
-exports.platformFromCurve = platformFromCurve;
-exports.platformFromEncoding = platformFromEncoding;
 exports.removeHexPrefix = removeHexPrefix;

package/dist/talismn-crypto.esm.js

@@ -1,16 +1,17 @@
 import { mnemonicToEntropy as mnemonicToEntropy$1, entropyToMnemonic as entropyToMnemonic$1, validateMnemonic, generateMnemonic as generateMnemonic$1 } from '@scure/bip39';
 import { wordlist } from '@scure/bip39/wordlists/english';
-import { base58, bytesToString, stringToBytes } from '@scure/base';
-export { bytesToString, stringToBytes } from '@scure/base';
+import { base58, hex } from '@scure/base';
+export { base58, base64, hex, utf8 } from '@scure/base';
+import { ed25519 } from '@noble/curves/ed25519';
+export { ed25519 } from '@noble/curves/ed25519';
+import { secp256k1 } from '@noble/curves/secp256k1';
 import { bech32m, bech32 } from 'bech32';
 import bs58check from 'bs58check';
 import { keccak_256 } from '@noble/hashes/sha3';
 import { bytesToHex, randomBytes } from '@noble/hashes/utils';
 import { blake2b } from '@noble/hashes/blake2b';
 import { blake3 as blake3$1 } from '@noble/hashes/blake3';
-import { secp256k1 } from '@noble/curves/secp256k1';
 import { Tuple, str, Bytes, u32 } from 'scale-ts';
-import { ed25519 } from '@noble/curves/ed25519';
 import { HDKey } from '@scure/bip32';
 import { hmac } from '@noble/hashes/hmac';
 import { sha512 } from '@noble/hashes/sha512';
@@ -135,18 +136,18 @@ const addressEncodingFromCurve = curve => {
     case "ethereum":
       return "ethereum";
     case "solana":
-      return "base58";
+      return "base58solana";
   }
 };
 
-const encodeAddressBase58 = publicKey => {
+const encodeAddressSolana = publicKey => {
+  if (publicKey.length !== 32) throw new Error("Public key must be 32 bytes long for Solana base58 encoding");
   return base58.encode(publicKey);
 };
-/** Detect if address is base58 encoded (NOTE: also returns true for ss58 addresses) */
-function isBase58Address(address) {
+function isSolanaAddress(address) {
   try {
-    base58.decode(address);
-    return true;
+    const bytes = base58.decode(address);
+    return bytes.length === 32;
   } catch (error) {
     return false;
   }
@@ -282,7 +283,7 @@ const blake2b512 = msg => blake2b(msg, {
 const getSafeHash = bytes => {
   // cryptographically secure one way hash
   // outputs 44 characters without special characters
-  return bytesToString("base58", blake3$1(bytes));
+  return base58.encode(blake3$1(bytes));
 };
 
 // Inspired from MIT licensed @polkadot-labs/hdkd-helpers
@@ -331,10 +332,10 @@ const CACHE$1 = new Map();
 const detectAddressEncodingInner = address => {
   if (isEthereumAddress(address)) return "ethereum";
   if (isSs58Address(address)) return "ss58";
+  if (isSolanaAddress(address)) return "base58solana";
   if (isBech32mAddress(address)) return "bech32m";
   if (isBech32Address(address)) return "bech32";
   if (isBase58CheckAddress(address)) return "base58check";
-  if (isBase58Address(address)) return "base58";
   throw new Error(`Unknown address encoding`);
 };
 const detectAddressEncoding = address => {
@@ -348,12 +349,12 @@ const addressFromPublicKey = (publicKey, encoding, options) => {
       return encodeAddressSs58(publicKey, options?.ss58Prefix);
     case "ethereum":
       return encodeAddressEthereum(publicKey);
+    case "base58solana":
+      return encodeAddressSolana(publicKey);
     case "bech32m":
     case "bech32":
     case "base58check":
       throw new Error("addressFromPublicKey is not implemented for Bitcoin");
-    case "base58":
-      return encodeAddressBase58(publicKey);
   }
 };
 
@@ -377,7 +378,7 @@ const normalizeAnyAddress = address => {
     case "bech32m":
     case "bech32":
     case "base58check":
-    case "base58":
+    case "base58solana":
       return address;
     case "ss58":
       {
@@ -396,9 +397,23 @@ const isAddressEqual = (address1, address2) => {
   }
 };
 
-const isValidAddress = address => {
+const encodeAnyAddress = (address, options) => {
+  // this leverages cache
+  const encoding = detectAddressEncoding(address);
+
+  // this does NOT leverage cache
+  if (encoding === "ss58" && options?.ss58Format !== undefined) {
+    const [publicKey] = decodeSs58Address(address);
+    return encodeAddressSs58(publicKey, options?.ss58Format ?? 42);
+  }
+
+  // this leverages cache
+  return normalizeAddress(address);
+};
+
+const isAddressValid = address => {
   try {
-    normalizeAddress(address);
+    detectAddressEncoding(address);
     return true;
   } catch {
     return false;
@@ -539,7 +554,7 @@ const deriveSolana = (seed, derivationPath) => {
     type: "solana",
     secretKey,
     publicKey,
-    address: addressFromPublicKey(publicKey, "base58")
+    address: addressFromPublicKey(publicKey, "base58solana")
   };
 };
 const getPublicKeySolana = secretKey => {
@@ -597,60 +612,42 @@ const getPublicKeyFromSecret = (secretKey, curve) => {
       return getPublicKeySolana(secretKey);
   }
 };
-const addressFromSuri = async (suri, type) => {
-  const {
-    mnemonic,
-    derivationPath,
-    password
-  } = parseSuri(suri);
+const addressFromMnemonic = async (mnemonic, derivationPath, curve) => {
   const entropy = mnemonicToEntropy(mnemonic);
-  const seed = await entropyToSeed(entropy, type, password); // ~80ms
+  const seed = await entropyToSeed(entropy, curve);
   const {
-    secretKey
-  } = deriveKeypair(seed, derivationPath, type);
-  const publicKey = getPublicKeyFromSecret(secretKey, type);
-  const encoding = addressEncodingFromCurve(type);
-  return addressFromPublicKey(publicKey, encoding);
-};
-
-/**
- * @dev we only expect suri to contain a mnemonic and derivation path.
- * for other cases see https://polkadot.js.org/docs/keyring/start/suri/
- */
-const parseSuri = suri => {
-  // extract password if any
-  const indexOfPassword = suri.indexOf("///");
-  const password = indexOfPassword === -1 ? undefined : suri.slice(indexOfPassword + 3);
-  if (password) suri = suri.slice(0, indexOfPassword);
-
-  // split mnemonic and derivation path
-  const indexOfSlash = suri.indexOf("/");
-  const mnemonic = indexOfSlash === -1 ? suri : suri.slice(0, indexOfSlash);
-  let derivationPath = indexOfSlash === -1 ? "" : suri.slice(indexOfSlash);
-
-  // if BIP44, leading slash must be removed
-  if (derivationPath.startsWith("/m/")) derivationPath = derivationPath.slice(1);
-  if (!isValidMnemonic(mnemonic)) throw new Error("Invalid mnemonic");
-  return {
-    mnemonic,
-    derivationPath,
-    password
-  };
+    address
+  } = deriveKeypair(seed, derivationPath, curve);
+  return address;
 };
 const removeHexPrefix = secretKey => {
   if (secretKey.startsWith("0x")) return secretKey.slice(2);
   return secretKey;
 };
-const parseSecretKey = (secretKey, curve) => {
-  switch (curve) {
+const parseSecretKey = (secretKey, platform) => {
+  switch (platform) {
     case "ethereum":
-      return stringToBytes("hex", removeHexPrefix(secretKey));
-    case "ed25519":
-    case "sr25519":
-    case "ecdsa":
-    case "bitcoin-ecdsa":
-    case "bitcoin-ed25519":
+      {
+        const privateKey = removeHexPrefix(secretKey);
+        return hex.decode(privateKey);
+      }
     case "solana":
+      {
+        const bytes = secretKey.startsWith("[") ?
+        // JSON bytes array (ex: solflare)
+        Uint8Array.from(JSON.parse(secretKey)) :
+        // base58 encoded string (ex: phantom)
+        base58.decode(secretKey);
+        if (bytes.length === 64) {
+          const privateKey = bytes.slice(0, 32);
+          const publicKey = bytes.slice(32, 64);
+          const computedPublicKey = getPublicKeySolana(privateKey);
+          if (!publicKey.every((b, i) => b === computedPublicKey[i])) throw new Error("Invalid Solana secret key: public key does not match");
+          return privateKey;
+        } else if (bytes.length === 32) return bytes;
+        throw new Error("Invalid Solana secret key length");
+      }
+    default:
       throw new Error("Not implemented");
   }
 };
@@ -665,7 +662,7 @@ const isValidDerivationPath = async (derivationPath, curve) => {
   }
 };
 
-const platformFromCurve = curve => {
+const getAccountPlatformFromCurve = curve => {
   switch (curve) {
     case "sr25519":
     case "ed25519":
@@ -680,7 +677,7 @@ const platformFromCurve = curve => {
       return "solana";
   }
 };
-const platformFromEncoding = encoding => {
+const getAccountPlatformFromEncoding = encoding => {
   switch (encoding) {
     case "ss58":
       return "polkadot";
@@ -690,13 +687,13 @@ const platformFromEncoding = encoding => {
     case "bech32":
     case "base58check":
       return "bitcoin";
-    case "base58":
+    case "base58solana":
       return "solana";
   }
 };
-const platformFromAddress = address => {
+const getAccountPlatformFromAddress = address => {
   const encoding = detectAddressEncoding(address);
-  return platformFromEncoding(encoding);
+  return getAccountPlatformFromEncoding(encoding);
 };
 
-export { DEV_MNEMONIC_ETHEREUM, DEV_MNEMONIC_POLKADOT, addressEncodingFromCurve, addressFromPublicKey, addressFromSuri, blake2b256, blake2b512, blake3, checksumEthereumAddress, decodeSs58Address, deriveKeypair, detectAddressEncoding, encodeAddressBase58, encodeAddressEthereum, encodeAddressSs58, entropyToMnemonic, entropyToSeed, fromBase58Check, fromBech32, fromBech32m, generateMnemonic, getDevSeed, getPublicKeyFromSecret, getSafeHash, isAddressEqual, isBase58Address, isBase58CheckAddress, isBech32Address, isBech32mAddress, isBitcoinAddress, isEthereumAddress, isSs58Address, isValidAddress, isValidDerivationPath, isValidMnemonic, mnemonicToEntropy, normalizeAddress, parseSecretKey, parseSuri, pbkdf2, platformFromAddress, platformFromCurve, platformFromEncoding, removeHexPrefix };
+export { DEV_MNEMONIC_ETHEREUM, DEV_MNEMONIC_POLKADOT, addressEncodingFromCurve, addressFromMnemonic, addressFromPublicKey, blake2b256, blake2b512, blake3, checksumEthereumAddress, decodeSs58Address, deriveKeypair, detectAddressEncoding, encodeAddressEthereum, encodeAddressSolana, encodeAddressSs58, encodeAnyAddress, entropyToMnemonic, entropyToSeed, fromBase58Check, fromBech32, fromBech32m, generateMnemonic, getAccountPlatformFromAddress, getAccountPlatformFromCurve, getAccountPlatformFromEncoding, getDevSeed, getPublicKeyFromSecret, getSafeHash, isAddressEqual, isAddressValid, isBase58CheckAddress, isBech32Address, isBech32mAddress, isBitcoinAddress, isEthereumAddress, isSolanaAddress, isSs58Address, isValidDerivationPath, isValidMnemonic, mnemonicToEntropy, normalizeAddress, parseSecretKey, pbkdf2, removeHexPrefix };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/crypto",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -15,8 +15,7 @@
   "main": "dist/talismn-crypto.cjs.js",
   "module": "dist/talismn-crypto.esm.js",
   "files": [
-    "/dist",
-    "/plugins"
+    "/dist"
   ],
   "engines": {
     "node": ">=18"
@@ -55,6 +54,6 @@
   "scripts": {
     "test": "jest --detectOpenHandles",
     "lint": "eslint src --max-warnings 0",
-    "clean": "rm -rf dist plugins/dist .turbo node_modules"
+    "clean": "rm -rf dist .turbo node_modules"
   }
 }

package/dist/declarations/src/address/encoding/base58.d.ts

@@ -1,3 +0,0 @@
-export declare const encodeAddressBase58: (publicKey: Uint8Array) => string;
-/** Detect if address is base58 encoded (NOTE: also returns true for ss58 addresses) */
-export declare function isBase58Address(address: string): boolean;

package/dist/declarations/src/address/isValidAddress.d.ts

@@ -1 +0,0 @@
-export declare const isValidAddress: (address: string) => boolean;